Apply change from #15157

prettier · Aug 14, 2023 · de94bcc · de94bcc
1 parent 1027e59
commit de94bcc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/scripts/build/config.js b/scripts/build/config.js
@@ -1,7 +1,6 @@
 import path from "node:path";
 import url from "node:url";
 import fs from "node:fs";
-import { createRequire } from "node:module";
 import createEsmUtils from "esm-utils";
 import { PROJECT_ROOT, DIST_DIR, copyFile } from "../utils/index.js";
 import buildJavascriptModule from "./build-javascript-module.js";
@@ -426,11 +425,20 @@ const nonPluginUniversalFiles = [
     umdVariableName: "prettier",
     replaceModule: [
       {
-        module: require.resolve("@babel/highlight"),
-        path: path.join(dirname, "./shims/babel-highlight.js"),
+        module: require.resolve("@babel/highlight", {
+          paths: [require.resolve("@babel/code-frame")],
+        }),
       },
       {
-        module: createRequire(require.resolve("vnopts")).resolve("chalk"),
+        module: require.resolve("chalk", {
+          paths: [require.resolve("@babel/code-frame")],
+        }),
+        path: path.join(dirname, "./shims/chalk.js"),
+      },
+      {
+        module: require.resolve("chalk", {
+          paths: [require.resolve("vnopts")],
+        }),
         path: path.join(dirname, "./shims/chalk.js"),
       },
       replaceDiffPackageEntry("lib/diff/array.js"),

diff --git a/scripts/build/shims/babel-highlight.js b/scripts/build/shims/babel-highlight.js
@@ -1,4 +1,2 @@
-import chalk from "./chalk.js";
-
 export const shouldHighlight = () => false;
-export const getChalk = () => chalk;
+export default String;