From 5465517f4b3528f49b2155e28269cc4f162fd0f6 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Fri, 23 Sep 2022 19:24:54 +0800 Subject: [PATCH] Bundle `third-party.js` in ESM (#13509) --- scripts/build/bundler.mjs | 2 +- scripts/build/config.mjs | 3 ++- tests/integration/env.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/build/bundler.mjs b/scripts/build/bundler.mjs index d25a962c2..8c601991f 100644 --- a/scripts/build/bundler.mjs +++ b/scripts/build/bundler.mjs @@ -218,7 +218,7 @@ function* getEsbuildOptions(bundle, buildOptions) { esbuildOptions.platform = "node"; esbuildOptions.external.push(...bundledFiles.map(({ output }) => output)); - if (interopDefault) { + if (bundle.format !== "esm" && interopDefault) { esbuildOptions.plugins.push(esbuildPluginInteropDefault()); } diff --git a/scripts/build/config.mjs b/scripts/build/config.mjs index 8d08d025a..51c0be882 100644 --- a/scripts/build/config.mjs +++ b/scripts/build/config.mjs @@ -279,11 +279,12 @@ const coreBundles = [ output: "cli.mjs", format: "esm", external: ["benchmark"], - interopDefault: false, replaceModule: [replaceDiffPackageEntry("lib/patch/create.js")], }, { input: "src/common/third-party.js", + output: "third-party.mjs", + format: "esm", replaceModule: [ // cosmiconfig@6 -> import-fresh can't find parentModule, since module is bundled { diff --git a/tests/integration/env.js b/tests/integration/env.js index 42bc87b69..2ac5e08ad 100644 --- a/tests/integration/env.js +++ b/tests/integration/env.js @@ -12,7 +12,7 @@ const prettierCli = path.join( ); const thirdParty = isProduction - ? path.join(PRETTIER_DIR, "./third-party.js") + ? path.join(PRETTIER_DIR, "./third-party.mjs") : path.join(PRETTIER_DIR, "./src/common/third-party.js"); const projectRoot = path.join(__dirname, "../..");