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

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-9";
 var peerDependencies = {
-	rollup: "^2.64.0"
+	rollup: "^2.67.0"
 };
 
 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)};`;
 }
 
+function getEntryProxy(id, defaultIsModuleExports, getModuleInfo) {
+  const {
+    meta: { commonjs: commonjsMeta },
+    hasDefaultExport
+  } = getModuleInfo(id);
+  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`;
@@ -476,11 +493,8 @@ function resolveExtensions(importee, importer, extensions) {
 function getResolveId(extensions) {
   return async function resolveId(importee, importer, resolveOptions) {
     // We assume that all requires are pre-resolved
-    if (
-      resolveOptions.custom &&
-      resolveOptions.custom['node-resolve'] &&
-      resolveOptions.custom['node-resolve'].isRequire
-    ) {
+    const customOptions = resolveOptions.custom;
+    if (customOptions && customOptions['node-resolve'] && customOptions['node-resolve'].isRequire) {
       return null;
     }
     if (isWrappedId(importee, WRAPPED_SUFFIX)) {
@@ -488,6 +502,7 @@ function getResolveId(extensions) {
     }
 
     if (
+      importee.endsWith(ENTRY_SUFFIX) ||
       isWrappedId(importee, MODULE_SUFFIX) ||
       isWrappedId(importee, EXPORTS_SUFFIX) ||
       isWrappedId(importee, PROXY_SUFFIX) ||
@@ -504,7 +519,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;
       }
@@ -524,22 +540,27 @@ function getResolveId(extensions) {
 
     // If this is an entry point or ESM import, we need to figure out if the importee is wrapped and
     // if that is the case, we need to add a proxy.
-    const customOptions = resolveOptions.custom;
-
-    // If this is a require, we do not need a proxy
-    if (customOptions && customOptions['node-resolve'] && customOptions['node-resolve'].isRequire) {
-      return null;
-    }
-
     const resolved =
       (await this.resolve(importee, importer, Object.assign({ skipSelf: true }, resolveOptions))) ||
       resolveExtensions(importee, importer, extensions);
-    if (!resolved || resolved.external) {
+    // Make sure that even if other plugins resolve again, we ignore our own proxies
+    if (
+      !resolved ||
+      resolved.external ||
+      resolved.id.endsWith(ENTRY_SUFFIX) ||
+      isWrappedId(resolved.id, ES_IMPORT_SUFFIX)
+    ) {
       return resolved;
     }
+    const moduleInfo = await this.load(resolved);
+    if (resolveOptions.isEntry) {
+      moduleInfo.moduleSideEffects = true;
+      // 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);
+    } = moduleInfo;
     if (commonjsMeta && commonjsMeta.isCommonJS === IS_WRAPPED_COMMONJS) {
       return wrapId(resolved.id, ES_IMPORT_SUFFIX);
     }
@@ -1798,6 +1819,8 @@ function ${requireName} () {
   };
 }
 
+const PLUGIN_NAME = 'commonjs';
+
 function commonjs(options = {}) {
   const {
     ignoreGlobal,
@@ -1933,7 +1956,7 @@ function commonjs(options = {}) {
   }
 
   return {
-    name: 'commonjs',
+    name: PLUGIN_NAME,
 
     version,
 
@@ -1941,7 +1964,7 @@ function commonjs(options = {}) {
       // We inject the resolver in the beginning so that "catch-all-resolver" like node-resolver
       // do not prevent our plugin from resolving entry points ot proxies.
       const plugins = Array.isArray(rawOptions.plugins)
-        ? rawOptions.plugins
+        ? [...rawOptions.plugins]
         : rawOptions.plugins
         ? [rawOptions.plugins]
         : [];
@@ -2017,6 +2040,15 @@ 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.getModuleInfo
+        );
+      }
+
       if (isWrappedId(id, ES_IMPORT_SUFFIX)) {
         return getEsImportProxy(unwrapId(id, ES_IMPORT_SUFFIX), defaultIsModuleExports);
       }