Fix remaining imports to be ESM-compatible (#14674)

Author: nicolo-ribaudo

.eslintrc.cjs

@@ -94,6 +94,23 @@ module.exports = {
       ],
       rules: {
         "no-restricted-globals": ["error", ...cjsGlobals],
+        "no-restricted-imports": [
+          "error",
+          {
+            patterns: ["**/*.json"],
+            paths: [
+              {
+                name: "semver",
+                message:
+                  "semver's named exports are not recognized by the Node.js ESM-CJS interop.",
+                importNames: Object.keys(require("semver")).filter(
+                  // We use it as a type import.
+                  name => name !== "SemVer"
+                ),
+              },
+            ],
+          },
+        ],
       },
     },
     {
@@ -137,6 +154,15 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ["packages/babel-preset-env/data/**/*.js"],
+      rules: {
+        "import/no-extraneous-dependencies": [
+          "error",
+          { packageDir: "./packages/babel-preset-env" },
+        ],
+      },
+    },
     {
       files: ["scripts/**/*.js"],
       rules: {

babel.config.js

@@ -277,12 +277,14 @@ const monorepoPackages = ["codemods", "eslint", "packages"]
   .reduce((a, b) => a.concat(b))
   .map(name => name.replace(/^babel-/, "@babel/"));
 
-function importInteropSrc(source) {
+function importInteropSrc(source, filename) {
   if (
     // These internal files are "real CJS" (whose default export is
     // on module.exports) and not compiled ESM.
     source.startsWith("@babel/compat-data/") ||
-    source.includes("babel-eslint-shared-fixtures/utils")
+    source.includes("babel-eslint-shared-fixtures/utils") ||
+    (source.includes("../data/") &&
+      /babel-preset-env[\\/]src[\\/]/.test(filename))
   ) {
     return "node";
   }

packages/babel-plugin-transform-runtime/scripts/build-dist.js

@@ -1,10 +1,10 @@
 import path from "path";
 import fs from "fs";
 import { createRequire } from "module";
-import helpers from "@babel/helpers";
+import * as helpers from "@babel/helpers";
 import { transformFromAstSync, File } from "@babel/core";
 import template from "@babel/template";
-import t from "@babel/types";
+import * as t from "@babel/types";
 import { fileURLToPath } from "url";
 
 import transformRuntime from "../lib/index.js";

packages/babel-preset-env/data/core-js-compat.js

@@ -0,0 +1 @@
+module.exports = require("core-js-compat/data.json");

packages/babel-preset-env/data/package.json

@@ -0,0 +1 @@
+{ "type": "commonjs" }

packages/babel-preset-env/src/filter-items.ts

@@ -1,4 +1,4 @@
-import { lt } from "semver";
+import semver from "semver";
 import { minVersions } from "./available-plugins";
 
 // $FlowIgnore
@@ -25,7 +25,7 @@ export function removeUnsupportedItems(
   babelVersion: string,
 ) {
   items.forEach(item => {
-    if (has(minVersions, item) && lt(babelVersion, minVersions[item])) {
+    if (has(minVersions, item) && semver.lt(babelVersion, minVersions[item])) {
       items.delete(item);
     }
   });

packages/babel-preset-env/src/index.ts

@@ -1,5 +1,4 @@
-import { lt } from "semver";
-import type { SemVer } from "semver";
+import semver, { type SemVer } from "semver";
 import { logPlugin } from "./debug";
 import getOptionSpecificExcludesFor from "./get-option-specific-excludes";
 import {
@@ -308,7 +307,7 @@ export default declarePreset((api, opts: Options) => {
     // @babel/core < 7.13.0 doesn't load targets (api.targets() always
     // returns {} thanks to @babel/helper-plugin-utils), so we always want
     // to fallback to the old targets behavior in this case.
-    lt(api.version, "7.13.0") ||
+    semver.lt(api.version, "7.13.0") ||
     // If any browserslist-related option is specified, fallback to the old
     // behavior of not using the targets specified in the top-level options.
     opts.targets ||

packages/babel-preset-env/src/normalize-options.ts

@@ -1,7 +1,6 @@
-import corejs3Polyfills from "core-js-compat/data.json";
-import { coerce } from "semver";
-import type { SemVer } from "semver";
+import semver, { type SemVer } from "semver";
 import corejs2Polyfills from "@babel/compat-data/corejs2-built-ins";
+import corejs3Polyfills from "../data/core-js-compat";
 import { plugins as pluginsList } from "./plugins-compat-data";
 import moduleTransformations from "./module-transformations";
 import { TopLevelOptions, ModulesOption, UseBuiltInsOption } from "./options";
@@ -187,7 +186,7 @@ export function normalizeCoreJSOption(
     rawVersion = corejs;
   }
 
-  const version = rawVersion ? coerce(String(rawVersion)) : false;
+  const version = rawVersion ? semver.coerce(String(rawVersion)) : false;
 
   if (!useBuiltIns && version) {
     console.warn(

packages/babel-traverse/scripts/generators/asserts.js

@@ -1,4 +1,4 @@
-import t from "@babel/types";
+import * as t from "@babel/types";
 
 export default function generateAsserts() {
   let output = `/*

packages/babel-traverse/scripts/generators/validators.js

@@ -1,5 +1,5 @@
-import t from "@babel/types";
-import virtualTypes from "../../lib/path/lib/virtual-types.js";
+import * as t from "@babel/types";
+import * as virtualTypes from "../../lib/path/lib/virtual-types.js";
 
 export default function generateValidators() {
   let output = `/*
@@ -18,6 +18,9 @@ export interface NodePathValidators {
   }
 
   for (const type of Object.keys(virtualTypes)) {
+    // TODO: Remove this check once we stop compiling to CJS
+    if (type === "default" || type === "__esModule") continue;
+
     const { types } = virtualTypes[type];
     if (type[0] === "_") continue;
     if (t.NODE_FIELDS[type] || t.FLIPPED_ALIAS_KEYS[type]) {