Reference the CommonJS helpers when a file is not explicitly a module. (#8518)

packages/babel-plugin-transform-runtime/src/index.js

@@ -107,7 +107,6 @@ export default declare((api, options, dirname) => {
     );
   }
 
-  const helpersDir = useESModules ? "helpers/esm" : "helpers";
   const injectCoreJS2 = `${corejsVersion}` === "2";
   const moduleName = injectCoreJS2
     ? "@babel/runtime-corejs2"
@@ -145,6 +144,11 @@ export default declare((api, options, dirname) => {
           const blockHoist =
             isInteropHelper && !isModule(file.path) ? 4 : undefined;
 
+          const helpersDir =
+            useESModules && file.path.node.sourceType === "module"
+              ? "helpers/esm"
+              : "helpers";
+
           return this.addDefaultImport(
             `${modulePath}/${helpersDir}/${name}`,
             name,

packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs-useES6Modules/output.js

@@ -1,23 +0,0 @@
-var _classCallCheck = require("@babel/runtime-corejs2/helpers/esm/classCallCheck");
-
-var _possibleConstructorReturn = require("@babel/runtime-corejs2/helpers/esm/possibleConstructorReturn");
-
-var _getPrototypeOf = require("@babel/runtime-corejs2/helpers/esm/getPrototypeOf");
-
-var _inherits = require("@babel/runtime-corejs2/helpers/esm/inherits");
-
-let Foo =
-/*#__PURE__*/
-function (_Bar) {
-  "use strict";
-
-  _inherits(Foo, _Bar);
-
-  function Foo() {
-    _classCallCheck(this, Foo);
-
-    return _possibleConstructorReturn(this, _getPrototypeOf(Foo).apply(this, arguments));
-  }
-
-  return Foo;
-}(Bar);

packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs-useES6Modules/output.mjs

@@ -0,0 +1,18 @@
+import _classCallCheck from "@babel/runtime-corejs2/helpers/esm/classCallCheck";
+import _possibleConstructorReturn from "@babel/runtime-corejs2/helpers/esm/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime-corejs2/helpers/esm/getPrototypeOf";
+import _inherits from "@babel/runtime-corejs2/helpers/esm/inherits";
+
+let Foo =
+/*#__PURE__*/
+function (_Bar) {
+  _inherits(Foo, _Bar);
+
+  function Foo() {
+    _classCallCheck(this, Foo);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(Foo).apply(this, arguments));
+  }
+
+  return Foo;
+}(Bar);

packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs/output.js

@@ -1,23 +0,0 @@
-var _classCallCheck = require("@babel/runtime-corejs2/helpers/classCallCheck");
-
-var _possibleConstructorReturn = require("@babel/runtime-corejs2/helpers/possibleConstructorReturn");
-
-var _getPrototypeOf = require("@babel/runtime-corejs2/helpers/getPrototypeOf");
-
-var _inherits = require("@babel/runtime-corejs2/helpers/inherits");
-
-let Foo =
-/*#__PURE__*/
-function (_Bar) {
-  "use strict";
-
-  _inherits(Foo, _Bar);
-
-  function Foo() {
-    _classCallCheck(this, Foo);
-
-    return _possibleConstructorReturn(this, _getPrototypeOf(Foo).apply(this, arguments));
-  }
-
-  return Foo;
-}(Bar);

packages/babel-plugin-transform-runtime/test/fixtures/use-options/corejs/output.mjs

@@ -0,0 +1,18 @@
+import _classCallCheck from "@babel/runtime-corejs2/helpers/classCallCheck";
+import _possibleConstructorReturn from "@babel/runtime-corejs2/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime-corejs2/helpers/getPrototypeOf";
+import _inherits from "@babel/runtime-corejs2/helpers/inherits";
+
+let Foo =
+/*#__PURE__*/
+function (_Bar) {
+  _inherits(Foo, _Bar);
+
+  function Foo() {
+    _classCallCheck(this, Foo);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(Foo).apply(this, arguments));
+  }
+
+  return Foo;
+}(Bar);

packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/output.js

@@ -1,10 +1,10 @@
-var _classCallCheck = require("@babel/runtime/helpers/esm/classCallCheck");
+var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 
-var _possibleConstructorReturn = require("@babel/runtime/helpers/esm/possibleConstructorReturn");
+var _possibleConstructorReturn = require("@babel/runtime/helpers/possibleConstructorReturn");
 
-var _getPrototypeOf = require("@babel/runtime/helpers/esm/getPrototypeOf");
+var _getPrototypeOf = require("@babel/runtime/helpers/getPrototypeOf");
 
-var _inherits = require("@babel/runtime/helpers/esm/inherits");
+var _inherits = require("@babel/runtime/helpers/inherits");
 
 let Foo =
 /*#__PURE__*/

packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-mjs/input.mjs

@@ -0,0 +1 @@
+class Foo extends Bar {}

packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-mjs/options.json

@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "useESModules": true }], "transform-classes"]
+}

packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-mjs/output.mjs

@@ -0,0 +1,18 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+
+let Foo =
+/*#__PURE__*/
+function (_Bar) {
+  _inherits(Foo, _Bar);
+
+  function Foo() {
+    _classCallCheck(this, Foo);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(Foo).apply(this, arguments));
+  }
+
+  return Foo;
+}(Bar);