@rollup/plugin-commonjs 22.0.0-5 → 22.0.0-6

package/dist/es/index.js

@@ -7,9 +7,9 @@ import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import isReference from 'is-reference';
 
-var version = "22.0.0-5";
+var version = "22.0.0-6";
 var peerDependencies = {
-	rollup: "^2.64.0"
+	rollup: "^2.66.1"
 };
 
 function tryParse(parse, code, id) {
@@ -328,7 +328,8 @@ const WRAPPED_SUFFIX = '?commonjs-wrapped';
 const EXTERNAL_SUFFIX = '?commonjs-external';
 const EXPORTS_SUFFIX = '?commonjs-exports';
 const MODULE_SUFFIX = '?commonjs-module';
-const ES_IMPORT_SUFFIX = '?es-import';
+const ENTRY_SUFFIX = '?commonjs-entry';
+const ES_IMPORT_SUFFIX = '?commonjs-es-import';
 
 const DYNAMIC_MODULES_ID = '\0commonjs-dynamic-modules';
 const HELPERS_ID = '\0commonjsHelpers.js';
@@ -420,6 +421,22 @@ async function getStaticRequireProxy(id, requireReturnsDefault, loadModule) {
   return `export { default } from ${JSON.stringify(id)};`;
 }
 
+async function getEntryProxy(id, defaultIsModuleExports, loadModule) {
+  const {
+    meta: { commonjs: commonjsMeta },
+    hasDefaultExport
+  } = await loadModule({ id, moduleSideEffects: true });
+  if (!commonjsMeta || commonjsMeta.isCommonJS !== IS_WRAPPED_COMMONJS) {
+    const stringifiedId = JSON.stringify(id);
+    let code = `export * from ${stringifiedId};`;
+    if (hasDefaultExport) {
+      code += `export { default } from ${stringifiedId};`;
+    }
+    return code;
+  }
+  return getEsImportProxy(id, defaultIsModuleExports);
+}
+
 function getEsImportProxy(id, defaultIsModuleExports) {
   const name = getName(id);
   const exportsName = `${name}Exports`;
@@ -488,13 +505,15 @@ function getResolveId(extensions) {
     }
 
     if (
-      isWrappedId(importee, MODULE_SUFFIX) ||
-      isWrappedId(importee, EXPORTS_SUFFIX) ||
-      isWrappedId(importee, PROXY_SUFFIX) ||
-      isWrappedId(importee, ES_IMPORT_SUFFIX) ||
-      isWrappedId(importee, EXTERNAL_SUFFIX) ||
-      importee.startsWith(HELPERS_ID) ||
-      importee === DYNAMIC_MODULES_ID
+      importee.startsWith('\0') &&
+      (isWrappedId(importee, MODULE_SUFFIX) ||
+        isWrappedId(importee, EXPORTS_SUFFIX) ||
+        isWrappedId(importee, PROXY_SUFFIX) ||
+        isWrappedId(importee, ES_IMPORT_SUFFIX) ||
+        importee.endsWith(ENTRY_SUFFIX) ||
+        isWrappedId(importee, EXTERNAL_SUFFIX) ||
+        importee.startsWith(HELPERS_ID) ||
+        importee === DYNAMIC_MODULES_ID)
     ) {
       return importee;
     }
@@ -504,7 +523,8 @@ function getResolveId(extensions) {
         importer === DYNAMIC_MODULES_ID ||
         // Proxies are only importing resolved ids, no need to resolve again
         isWrappedId(importer, PROXY_SUFFIX) ||
-        isWrappedId(importer, ES_IMPORT_SUFFIX)
+        isWrappedId(importer, ES_IMPORT_SUFFIX) ||
+        importer.endsWith(ENTRY_SUFFIX)
       ) {
         return importee;
       }
@@ -537,6 +557,10 @@ function getResolveId(extensions) {
     if (!resolved || resolved.external) {
       return resolved;
     }
+    if (resolveOptions.isEntry) {
+      // We must not precede entry proxies with a `\0` as that will mess up relative external resolution
+      return resolved.id + ENTRY_SUFFIX;
+    }
     const {
       meta: { commonjs: commonjsMeta }
     } = await this.load(resolved);
@@ -2017,6 +2041,11 @@ function commonjs(options = {}) {
         );
       }
 
+      // entry suffix is just appended to not mess up relative external resolution
+      if (id.endsWith(ENTRY_SUFFIX)) {
+        return getEntryProxy(id.slice(0, -ENTRY_SUFFIX.length), defaultIsModuleExports, this.load);
+      }
+
       if (isWrappedId(id, ES_IMPORT_SUFFIX)) {
         return getEsImportProxy(unwrapId(id, ES_IMPORT_SUFFIX), defaultIsModuleExports);
       }