Renames pnpEnableExperimentalEsm into pnpEnableEsmLoader (#3635)

yarnpkg · Oct 25, 2021 · fe834db · fe834db
1 parent 8a11db0
commit fe834db
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/.yarn/versions/84ac6b01.yml b/.yarn/versions/84ac6b01.yml
@@ -0,0 +1,23 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-pnp": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -3,7 +3,7 @@ changesetIgnorePatterns:
 
 enableGlobalCache: false
 
-pnpEnableExperimentalEsm: false
+pnpEnableEsmLoader: false
 
 immutablePatterns:
   - .pnp.*

diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/pnp-esm.test.ts b/packages/acceptance-tests/pkg-tests-specs/sources/pnp-esm.test.ts
@@ -273,7 +273,7 @@ describe(`Plug'n'Play - ESM`, () => {
     makeTemporaryEnv(
       { },
       {
-        pnpEnableExperimentalEsm: true,
+        pnpEnableEsmLoader: true,
       },
       async ({path, run, source}) => {
         await xfs.writeFilePromise(ppath.join(path, `index` as Filename), `console.log(typeof require === 'undefined')`);
@@ -371,7 +371,7 @@ describe(`Plug'n'Play - ESM`, () => {
         },
       },
       {
-        pnpEnableExperimentalEsm: true,
+        pnpEnableEsmLoader: true,
       },
       async ({path, run, source}) => {
         await xfs.writeFilePromise(ppath.join(path, `index.js` as Filename), `import('no-deps').then(() => console.log(42))`);

diff --git a/packages/gatsby/static/configuration/yarnrc.json b/packages/gatsby/static/configuration/yarnrc.json
@@ -556,7 +556,7 @@
       "format": "uri-reference",
       "default": "./.pnp.data.json"
     },
-    "pnpEnableExperimentalEsm": {
+    "pnpEnableEsmLoader": {
       "_package": "@yarnpkg/plugin-pnp",
       "description": "If true, Yarn will generate an experimental ESM loader (`.pnp.loader.mjs`). Yarn tries to automatically detect whether ESM support is required.",
       "type": "boolean",

diff --git a/packages/plugin-pnp/sources/PnpLinker.ts b/packages/plugin-pnp/sources/PnpLinker.ts
@@ -294,8 +294,8 @@ export class PnpInstaller implements Installer {
   }
 
   private isEsmEnabled() {
-    if (this.opts.project.configuration.sources.has(`pnpEnableExperimentalEsm`))
-      return this.opts.project.configuration.get(`pnpEnableExperimentalEsm`);
+    if (this.opts.project.configuration.sources.has(`pnpEnableEsmLoader`))
+      return this.opts.project.configuration.get(`pnpEnableEsmLoader`);
 
     if (this.isESMLoaderRequired)
       return true;

diff --git a/packages/plugin-pnp/sources/index.ts b/packages/plugin-pnp/sources/index.ts
@@ -64,7 +64,7 @@ declare module '@yarnpkg/core' {
     pnpMode: string;
     pnpShebang: string;
     pnpIgnorePatterns: Array<string>;
-    pnpEnableExperimentalEsm: boolean
+    pnpEnableEsmLoader: boolean
     pnpEnableInlining: boolean;
     pnpFallbackMode: string;
     pnpUnpluggedFolder: PortablePath;
@@ -99,7 +99,7 @@ const plugin: Plugin<CoreHooks & StageHooks> = {
       default: [],
       isArray: true,
     },
-    pnpEnableExperimentalEsm: {
+    pnpEnableEsmLoader: {
       description: `If true, Yarn will generate an ESM loader (\`.pnp.loader.mjs\`). If this is not explicitly set Yarn tries to automatically detect whether ESM support is required.`,
       type: SettingsType.BOOLEAN,
       default: false,