Set "type": "commonjs" to internally track CJS vs ESM (#15665)

babel · May 29, 2023 · 9ca034f · 9ca034f
1 parent ef72841
commit 9ca034f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/Makefile.js b/Makefile.js
diff --git a/Makefile.source.mjs b/Makefile.source.mjs
@@ -142,7 +142,7 @@ target["clean-runtime-helpers"] = function () {
  */
 
 target["use-cjs"] = function () {
-  node(["scripts/set-module-type.js", "script"]);
+  node(["scripts/set-module-type.js", "commonjs"]);
 
   target["bootstrap"]();
 };

diff --git a/babel.config.js b/babel.config.js
@@ -13,10 +13,10 @@ module.exports = function (api) {
 
   const outputType = api.cache.invalidate(() => {
     try {
-      return fs.readFileSync(__dirname + "/.module-type", "utf-8").trim();
-    } catch (_) {
-      return "script";
-    }
+      const type = fs.readFileSync(__dirname + "/.module-type", "utf-8").trim();
+      if (type === "module") return type;
+    } catch (_) {}
+    return "script";
   });
 
   const sources = ["packages/*/src", "codemods/*/src", "eslint/*/src"];

diff --git a/packages/babel-helpers/scripts/generate-regenerator-runtime.js b/packages/babel-helpers/scripts/generate-regenerator-runtime.js
@@ -6,14 +6,13 @@ import { createRequire } from "module";
 const [parse, generate] = await Promise.all([
   import("@babel/parser").then(ns => ns.parse),
   import("@babel/generator").then(ns => ns.default.default || ns.default),
-]).catch(error =>
-  Promise.reject(
-    new Error(
-      "Before running generate-helpers.js you must compile @babel/parser and @babel/generator.",
-      { cause: error }
-    )
-  )
-);
+]).catch(error => {
+  console.error(error);
+  throw new Error(
+    "Before running generate-helpers.js you must compile @babel/parser and @babel/generator.",
+    { cause: error }
+  );
+});
 
 const REGENERATOR_RUNTIME_IN_FILE = fs.readFileSync(
   createRequire(import.meta.url).resolve("regenerator-runtime"),

diff --git a/scripts/set-module-type.js b/scripts/set-module-type.js
@@ -14,14 +14,14 @@ if (process.argv.length >= 3) {
 } else if (fs.existsSync(root(".module-type"))) {
   moduleType = fs.readFileSync(root(".module-type"), "utf-8").trim();
 } else {
-  moduleType = "script";
+  moduleType = "commonjs";
 }
 
 if (moduleType === "clean") {
   try {
     fs.unlinkSync(root(".module-type"));
   } catch {}
-} else if (moduleType === "module" || moduleType === "script") {
+} else if (moduleType === "module" || moduleType === "commonjs") {
   fs.writeFileSync(root(".module-type"), moduleType);
 } else {
   throw new Error(`Unknown module type: ${moduleType}`);