Centralize transform-export-namespace-from handling as a normal plugin

nicolo-ribaudo · Sep 20, 2023 · b5763e2 · b5763e2
1 parent b0277c6
commit b5763e2
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 41 deletions.
diff --git a/packages/babel-preset-env/src/index.ts b/packages/babel-preset-env/src/index.ts
@@ -118,15 +118,10 @@ export const transformIncludesAndExcludes = (opts: Array<string>): any => {
   );
 };
 
-function getModulesPluginNames({
-  modules,
-  shouldTransformDynamicImport,
-  shouldTransformExportNamespaceFrom,
-}: {
-  modules: Exclude<ModuleOption, "auto">;
-  shouldTransformDynamicImport: boolean;
-  shouldTransformExportNamespaceFrom: boolean;
-}) {
+function getSpecialModulesPluginNames(
+  modules: Exclude<ModuleOption, "auto">,
+  shouldTransformDynamicImport: boolean,
+) {
   const modulesPluginNames = [];
   if (modules) {
     modulesPluginNames.push(moduleTransformations[modules]);
@@ -143,10 +138,6 @@ function getModulesPluginNames({
     }
   }
 
-  if (shouldTransformExportNamespaceFrom) {
-    modulesPluginNames.push("transform-export-namespace-from");
-  }
-
   if (!process.env.BABEL_8_BREAKING) {
     // Enable module-related syntax plugins for older Babel versions
     if (!shouldTransformDynamicImport) {
@@ -354,20 +345,26 @@ option \`forceAllTransforms: true\` instead.
       : optionsModules;
   const shouldTransformDynamicImport =
     optionsModules === "auto" ? !api.caller(supportsDynamicImport) : !!modules;
-  const shouldTransformExportNamespaceFrom =
-    optionsModules === "auto" && !api.caller(supportsExportNamespaceFrom);
-  const modulesPluginNames = getModulesPluginNames({
-    modules,
-    shouldTransformDynamicImport,
-    shouldTransformExportNamespaceFrom,
-  });
+
+  // If the caller does not support export-namespace-from, we forcefully add
+  // the plugin to `includes`.
+  // TODO(Babel 8): stop doing this, similarly to how we don't do this for any
+  // other plugin. We can consider adding bundlers as targets in the future,
+  // but we should not have a one-off special case for this plugin.
+  if (
+    optionsModules === "auto" &&
+    !api.caller(supportsExportNamespaceFrom) &&
+    !exclude.plugins.has("transform-export-namespace-from")
+  ) {
+    include.plugins.add("transform-export-namespace-from");
+  }
 
   const pluginNames = filterItems(
     compatData,
     include.plugins,
     exclude.plugins,
     transformTargets,
-    modulesPluginNames,
+    getSpecialModulesPluginNames(modules, shouldTransformDynamicImport),
     getOptionSpecificExcludesFor({ loose }),
     pluginSyntaxMap,
   );

diff --git a/...safari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/stdout.txt b/...safari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/stdout.txt
@@ -19,11 +19,10 @@ Using plugins:
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   bugfix/transform-safari-id-destructuring-collision-in-function-expression { safari < 16.3 }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
 

diff --git a/...es/bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/stdout.txt b/...es/bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/stdout.txt
@@ -20,10 +20,9 @@ Using plugins:
   transform-parameters { safari < 16.3 }
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
 

diff --git a/...tures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89-no-bugfixes/stdout.txt b/...tures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89-no-bugfixes/stdout.txt
@@ -19,10 +19,9 @@ Using plugins:
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
 

diff --git a/...env/test/fixtures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89/stdout.txt b/...env/test/fixtures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89/stdout.txt
@@ -19,11 +19,10 @@ Using plugins:
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   bugfix/transform-v8-spread-parameters-in-optional-chaining { chrome < 91 }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
 

diff --git a/...ges/babel-preset-env/test/fixtures/debug-babel-7/browserslists-defaults-not-ie/stdout.txt b/...ges/babel-preset-env/test/fixtures/debug-babel-7/browserslists-defaults-not-ie/stdout.txt
@@ -28,10 +28,9 @@ Using plugins:
   transform-parameters { ios < 16.3, safari < 16.3 }
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
 

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/browserslists-defaults/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/browserslists-defaults/stdout.txt
@@ -28,10 +28,9 @@ Using plugins:
   transform-parameters { ios < 16.3, safari < 16.3 }
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
 

diff --git a/...el-preset-env/test/fixtures/debug-babel-7/browserslists-last-2-versions-not-ie/stdout.txt b/...el-preset-env/test/fixtures/debug-babel-7/browserslists-last-2-versions-not-ie/stdout.txt
@@ -27,10 +27,9 @@ Using plugins:
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
 

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/shippedProposals-chrome-80/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/shippedProposals-chrome-80/stdout.txt
@@ -21,10 +21,9 @@ Using plugins:
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
   syntax-import-attributes

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/shippedProposals-chrome-84/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/shippedProposals-chrome-84/stdout.txt
@@ -20,10 +20,9 @@ Using plugins:
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta
   syntax-import-attributes

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/top-level-targets/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/top-level-targets/stdout.txt
@@ -21,10 +21,9 @@ Using plugins:
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
-  syntax-export-namespace-from
+  transform-export-namespace-from { }
   transform-modules-commonjs
   transform-dynamic-import
-  transform-export-namespace-from { }
   syntax-top-level-await
   syntax-import-meta