Correctly update module.exports.default of typeof helper (#12858)

.gitignore

@@ -31,6 +31,7 @@ package-lock.json
 !/packages/babel-runtime/helpers/toArray/*
 !/packages/babel-runtime/helpers/iterableToArray/*
 !/packages/babel-runtime/helpers/temporalRef/*
+!/packages/babel-runtime/helpers/typeof/*
 /packages/babel-runtime/helpers/esm/*.js
 !/packages/babel-runtime/helpers/esm/toArray.js
 !/packages/babel-runtime/helpers/esm/iterableToArray.js
@@ -42,6 +43,7 @@ package-lock.json
 !/packages/babel-runtime-corejs2/helpers/toArray/*
 !/packages/babel-runtime-corejs2/helpers/iterableToArray/*
 !/packages/babel-runtime-corejs2/helpers/temporalRef/*
+!/packages/babel-runtime-corejs2/helpers/typeof/*
 /packages/babel-runtime-corejs2/helpers/esm/*.js
 !/packages/babel-runtime-corejs2/helpers/esm/toArray.js
 !/packages/babel-runtime-corejs2/helpers/esm/iterableToArray.js

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

@@ -287,15 +287,14 @@ function buildRuntimeRewritePlugin(runtimeName, helperName) {
 function addDefaultCJSExport({ template }) {
   return {
     visitor: {
-      Program: {
+      AssignmentExpression: {
         exit(path) {
-          path.pushContainer(
+          if (path.get("left").matchesPattern("module.exports")) {
-            "body",
+            path.insertAfter(template.expression.ast`
-            template.statements.ast`
+              module.exports.default = module.exports,
-              module.exports.default = module.exports;
+              module.exports.__esModule = true
-              module.exports.__esModule = true;
+            `);
-            `
+          }
-          );
         },
       },
     },

packages/babel-plugin-transform-runtime/test/regression.js

@@ -0,0 +1,11 @@
+it("module.exports.default is correctly updated", () => {
+  const typeofHelper = require("@babel/runtime/helpers/typeof");
+
+  expect(typeof typeofHelper).toBe("function");
+  expect(typeof typeofHelper.default).toBe("function");
+
+  typeofHelper();
+
+  expect(typeof typeofHelper).toBe("function");
+  expect(typeof typeofHelper.default).toBe("function");
+});

packages/babel-runtime-corejs2/helpers/iterableToArray/index.js

@@ -9,5 +9,4 @@ function _iterableToArray(iter) {
 }
 
 module.exports = _iterableToArray;
-module.exports["default"] = module.exports;
+module.exports["default"] = module.exports, module.exports.__esModule = true;
-module.exports.__esModule = true;

packages/babel-runtime-corejs2/helpers/temporalRef/index.js

@@ -7,5 +7,4 @@ function _temporalRef(val, name) {
 }
 
 module.exports = _temporalRef;
-module.exports["default"] = module.exports;
+module.exports["default"] = module.exports, module.exports.__esModule = true;
-module.exports.__esModule = true;

packages/babel-runtime-corejs2/helpers/toArray/index.js

@@ -11,5 +11,4 @@ function _toArray(arr) {
 }
 
 module.exports = _toArray;
-module.exports["default"] = module.exports;
+module.exports["default"] = module.exports, module.exports.__esModule = true;
-module.exports.__esModule = true;

packages/babel-runtime-corejs2/helpers/typeof/_index.mjs

@@ -0,0 +1,17 @@
+import _Symbol from "@babel/runtime-corejs2/core-js/symbol";
+import _Symbol$iterator from "@babel/runtime-corejs2/core-js/symbol/iterator";
+export default function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  if (typeof _Symbol === "function" && typeof _Symbol$iterator === "symbol") {
+    _typeof = function _typeof(obj) {
+      return typeof obj;
+    };
+  } else {
+    _typeof = function _typeof(obj) {
+      return obj && typeof _Symbol === "function" && obj.constructor === _Symbol && obj !== _Symbol.prototype ? "symbol" : typeof obj;
+    };
+  }
+
+  return _typeof(obj);
+}

packages/babel-runtime-corejs2/helpers/typeof/index.js

@@ -0,0 +1,26 @@
+var _Symbol = require("@babel/runtime-corejs2/core-js/symbol");
+
+var _Symbol$iterator = require("@babel/runtime-corejs2/core-js/symbol/iterator");
+
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  if (typeof _Symbol === "function" && typeof _Symbol$iterator === "symbol") {
+    module.exports = _typeof = function _typeof(obj) {
+      return typeof obj;
+    };
+
+    module.exports["default"] = module.exports, module.exports.__esModule = true;
+  } else {
+    module.exports = _typeof = function _typeof(obj) {
+      return obj && typeof _Symbol === "function" && obj.constructor === _Symbol && obj !== _Symbol.prototype ? "symbol" : typeof obj;
+    };
+
+    module.exports["default"] = module.exports, module.exports.__esModule = true;
+  }
+
+  return _typeof(obj);
+}
+
+module.exports = _typeof;
+module.exports["default"] = module.exports, module.exports.__esModule = true;

packages/babel-runtime/helpers/iterableToArray/index.js

@@ -3,5 +3,4 @@ function _iterableToArray(iter) {
 }
 
 module.exports = _iterableToArray;
-module.exports["default"] = module.exports;
+module.exports["default"] = module.exports, module.exports.__esModule = true;
-module.exports.__esModule = true;

packages/babel-runtime/helpers/temporalRef/index.js

@@ -7,5 +7,4 @@ function _temporalRef(val, name) {
 }
 
 module.exports = _temporalRef;
-module.exports["default"] = module.exports;
+module.exports["default"] = module.exports, module.exports.__esModule = true;
-module.exports.__esModule = true;

packages/babel-runtime/helpers/toArray/index.js

@@ -11,5 +11,4 @@ function _toArray(arr) {
 }
 
 module.exports = _toArray;
-module.exports["default"] = module.exports;
+module.exports["default"] = module.exports, module.exports.__esModule = true;
-module.exports.__esModule = true;

packages/babel-runtime/helpers/typeof/_index.mjs

@@ -0,0 +1,15 @@
+export default function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+    _typeof = function _typeof(obj) {
+      return typeof obj;
+    };
+  } else {
+    _typeof = function _typeof(obj) {
+      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    };
+  }
+
+  return _typeof(obj);
+}

packages/babel-runtime/helpers/typeof/index.js

@@ -0,0 +1,22 @@
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+    module.exports = _typeof = function _typeof(obj) {
+      return typeof obj;
+    };
+
+    module.exports["default"] = module.exports, module.exports.__esModule = true;
+  } else {
+    module.exports = _typeof = function _typeof(obj) {
+      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    };
+
+    module.exports["default"] = module.exports, module.exports.__esModule = true;
+  }
+
+  return _typeof(obj);
+}
+
+module.exports = _typeof;
+module.exports["default"] = module.exports, module.exports.__esModule = true;