Bring back deferred require() calls in core and cli (#14028)

nicolo-ribaudo · web-flow · commit 3a85ddfb1b33 · 2021-12-06T21:33:33.000+01:00
diff --git a/babel.config.js b/babel.config.js
@@ -73,6 +73,12 @@ module.exports = function (api) {
     "eslint/*/test",
   ];
 
+  const lazyRequireSources = [
+    "./packages/babel-cli",
+    "./packages/babel-core",
+    "./packages/babel-preset-env/src/available-plugins.js",
+  ];
+
   switch (env) {
     // Configs used during bundling builds.
     case "standalone":
@@ -191,20 +197,6 @@ module.exports = function (api) {
         test: ["packages/babel-generator"].map(normalize),
         plugins: ["babel-plugin-transform-charcodes"],
       },
-      convertESM && {
-        test: [
-          "./packages/babel-cli",
-          "./packages/babel-core",
-          "./packages/babel-preset-env/src/available-plugins.js",
-        ].map(normalize),
-        plugins: [
-          // Explicitly use the lazy version of CommonJS modules.
-          [
-            "@babel/transform-modules-commonjs",
-            { importInterop: importInteropSrc, lazy: true },
-          ],
-        ],
-      },
       convertESM && {
         test: ["./packages/babel-node/src"].map(normalize),
         // Used to conditionally import kexec
@@ -215,8 +207,19 @@ module.exports = function (api) {
         assumptions: sourceAssumptions,
         plugins: [transformNamedBabelTypesImportToDestructuring],
       },
+      convertESM && {
+        test: lazyRequireSources.map(normalize),
+        plugins: [
+          // Explicitly use the lazy version of CommonJS modules.
+          [
+            "@babel/transform-modules-commonjs",
+            { importInterop: importInteropSrc, lazy: true },
+          ],
+        ],
+      },
       convertESM && {
         test: sources.map(normalize),
+        exclude: lazyRequireSources.map(normalize),
         plugins: [
           [
             "@babel/transform-modules-commonjs",
diff --git a/packages/babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.skip-bundled.js b/packages/babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.skip-bundled.js
@@ -1,5 +1,6 @@
-import { parseSync, traverse } from "@babel/core";
 import { shouldTransform } from "../lib/util.js";
+import babel from "@babel/core";
+const { parseSync, traverse } = babel;
 
 function getPath(input, parserOpts = {}) {
   let targetPath;
diff --git a/packages/babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining/test/util.skip-bundled.js b/packages/babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining/test/util.skip-bundled.js
@@ -1,5 +1,6 @@
-import { parseSync, traverse } from "@babel/core";
 import { shouldTransform } from "../lib/util.js";
+import babel from "@babel/core";
+const { parseSync, traverse } = babel;
 
 function getPath(input, parserOpts = {}) {
   let targetPath;
diff --git a/packages/babel-plugin-proposal-optional-chaining/test/util.skip-bundled.js b/packages/babel-plugin-proposal-optional-chaining/test/util.skip-bundled.js
@@ -1,5 +1,6 @@
 import { willPathCastToBoolean } from "../lib/util.js";
-import { parseSync, traverse } from "@babel/core";
+import babel from "@babel/core";
+const { parseSync, traverse } = babel;
 
 function getPath(input, parserOpts) {
   let targetPath;
