Add new flag that indicates if a module has exports (#9171)

packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js

@@ -8,6 +8,8 @@ export type ModuleMetadata = {
   // The name of the variable that will reference an object containing export names.
   exportNameListName: null | string,
 
+  hasExports: boolean,
+
   // Lookup from local binding to export information.
   local: Map<string, LocalExportMetadata>,
 
@@ -52,18 +54,7 @@ export type LocalExportMetadata = {
  * Check if the module has any exports that need handling.
  */
 export function hasExports(metadata: ModuleMetadata) {
-  const { local, source } = metadata;
-
-  return (
-    local.size > 0 ||
-    Array.from(source).some(([, meta]) => {
-      return (
-        meta.reexports.size > 0 ||
-        meta.reexportNamespace.size > 0 ||
-        !!meta.reexportAll
-      );
-    })
-  );
+  return metadata.hasExports;
 }
 
 /**
@@ -99,7 +90,10 @@ export default function normalizeModuleAndLoadMetadata(
 
   nameAnonymousExports(programPath);
 
-  const { local, source } = getModuleMetadata(programPath, { loose, lazy });
+  const { local, source, hasExports } = getModuleMetadata(programPath, {
+    loose,
+    lazy,
+  });
 
   removeModuleDeclarations(programPath);
 
@@ -127,6 +121,7 @@ export default function normalizeModuleAndLoadMetadata(
   return {
     exportName,
     exportNameListName: null,
+    hasExports,
     local,
     source,
   };
@@ -171,6 +166,7 @@ function getModuleMetadata(
     }
     return data;
   };
+  let hasExports = false;
   programPath.get("body").forEach(child => {
     if (child.isImportDeclaration()) {
       const data = getData(child.node.source);
@@ -219,6 +215,7 @@ function getModuleMetadata(
         }
       });
     } else if (child.isExportAllDeclaration()) {
+      hasExports = true;
       const data = getData(child.node.source);
       if (!data.loc) data.loc = child.node.loc;
 
@@ -226,6 +223,7 @@ function getModuleMetadata(
         loc: child.node.loc,
       };
     } else if (child.isExportNamedDeclaration() && child.node.source) {
+      hasExports = true;
       const data = getData(child.node.source);
       if (!data.loc) data.loc = child.node.loc;
 
@@ -242,6 +240,11 @@ function getModuleMetadata(
           throw exportName.buildCodeFrameError('Illegal export "__esModule".');
         }
       });
+    } else if (
+      child.isExportNamedDeclaration() ||
+      child.isExportDefaultDeclaration()
+    ) {
+      hasExports = true;
     }
   });
 
@@ -295,6 +298,7 @@ function getModuleMetadata(
   }
 
   return {
+    hasExports,
     local: localData,
     source: sourceData,
   };

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
 
+exports.__esModule = true;
+
 var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault"));
 
 console.log(_interopRequireDefault2.default);

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js

@@ -2,6 +2,10 @@
 
 var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
 var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault"));
 
 console.log(_interopRequireDefault2.default);

packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/input.mjs

@@ -0,0 +1 @@
+export {};

packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/options.json

@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "transform-modules-commonjs"
+  ]
+}

packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/output.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});