@rollup/plugin-commonjs 22.0.0-8 → 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-8";
+var version = "22.0.0-9";
 var peerDependencies = {
-	rollup: "^2.66.1"
+	rollup: "^2.67.0"
 };
 
 function tryParse(parse, code, id) {
@@ -421,11 +421,11 @@ async function getStaticRequireProxy(id, requireReturnsDefault, loadModule) {
   return `export { default } from ${JSON.stringify(id)};`;
 }
 
-async function getEntryProxy(id, defaultIsModuleExports, loadModule) {
+function getEntryProxy(id, defaultIsModuleExports, getModuleInfo) {
   const {
     meta: { commonjs: commonjsMeta },
     hasDefaultExport
-  } = await loadModule({ id, moduleSideEffects: true });
+  } = getModuleInfo(id);
   if (!commonjsMeta || commonjsMeta.isCommonJS !== IS_WRAPPED_COMMONJS) {
     const stringifiedId = JSON.stringify(id);
     let code = `export * from ${stringifiedId};`;
@@ -493,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)) {
@@ -543,13 +540,6 @@ 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);
@@ -562,13 +552,15 @@ function getResolveId(extensions) {
     ) {
       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);
     }
@@ -2050,7 +2042,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);
+        return getEntryProxy(
+          id.slice(0, -ENTRY_SUFFIX.length),
+          defaultIsModuleExports,
+          this.getModuleInfo
+        );
       }
 
       if (isWrappedId(id, ES_IMPORT_SUFFIX)) {