@rollup/plugin-commonjs 28.0.5 → 28.0.7

package/dist/cjs/index.js

@@ -11,7 +11,7 @@ var estreeWalker = require('estree-walker');
 var MagicString = require('magic-string');
 var isReference = require('is-reference');
 
-var version = "28.0.5";
+var version = "28.0.7";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
@@ -494,6 +494,19 @@ function getEsImportProxy(id, defaultIsModuleExports, moduleSideEffects) {
   };
 }
 
+// For external Node built-ins required from wrapped CommonJS modules, we must not
+// hoist an ESM import of the built-in (which would eagerly load it). Instead,
+// expose a lazy `__require()` that resolves the built-in at runtime via
+// `createRequire(import.meta.url)`.
+function getExternalBuiltinRequireProxy(id) {
+  const stringifiedId = JSON.stringify(id);
+  return (
+    `import { createRequire } from 'node:module';\n` +
+    `const require = createRequire(import.meta.url);\n` +
+    `export function __require() { return require(${stringifiedId}); }`
+  );
+}
+
 /* eslint-disable no-param-reassign, no-undefined */
 
 
@@ -774,7 +787,7 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
                 return (
                   (await getTypeForImportedModule(
                     (
-                      await this.load({ id: resolved.id })
+                      await this.load(resolved)
                     ).meta.commonjs.resolved,
                     this.load
                   )) !== IS_WRAPPED_COMMONJS
@@ -823,8 +836,21 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
         fullyAnalyzedModules[parentId] = true;
         return requireTargets.map(({ id: dependencyId, allowProxy }, index) => {
           // eslint-disable-next-line no-multi-assign
-          const isCommonJS = (parentMeta.isRequiredCommonJS[dependencyId] =
+          let isCommonJS = (parentMeta.isRequiredCommonJS[dependencyId] =
             getTypeForFullyAnalyzedModule(dependencyId));
+          // Special-case external Node built-ins to be handled via a lazy __require
+          // helper instead of hoisted ESM imports when strict wrapping is used.
+          if (
+            parentMeta.initialCommonJSType === IS_WRAPPED_COMMONJS &&
+            !allowProxy &&
+            isWrappedId(dependencyId, EXTERNAL_SUFFIX)
+          ) {
+            const actualId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
+            const isNodeBuiltin = actualId.startsWith('node:');
+            if (isNodeBuiltin) {
+              isCommonJS = IS_WRAPPED_COMMONJS;
+            }
+          }
           const isWrappedCommonJS = isCommonJS === IS_WRAPPED_COMMONJS;
           fullyAnalyzedModules[dependencyId] = true;
           return {
@@ -1814,7 +1840,7 @@ async function transformCommonjs(
           }
           return;
         case 'ThisExpression':
-          // rewrite top-level `this` as `commonjsHelpers.commonjsGlobal`
+          // rewrite top-level `this` as `exportsName`
           if (lexicalDepth === 0 && !classBodyDepth) {
             uses.global = true;
             if (!ignoreGlobal) {
@@ -2267,6 +2293,9 @@ function commonjs(options = {}) {
 
       if (isWrappedId(id, EXTERNAL_SUFFIX)) {
         const actualId = unwrapId(id, EXTERNAL_SUFFIX);
+        if (actualId.startsWith('node:')) {
+          return getExternalBuiltinRequireProxy(actualId);
+        }
         return getUnknownRequireProxy(
           actualId,
           isEsmExternal(actualId) ? getRequireReturnsDefault(actualId) : true

package/dist/es/index.js

@@ -7,7 +7,7 @@ import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import isReference from 'is-reference';
 
-var version = "28.0.5";
+var version = "28.0.7";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
@@ -490,6 +490,19 @@ function getEsImportProxy(id, defaultIsModuleExports, moduleSideEffects) {
   };
 }
 
+// For external Node built-ins required from wrapped CommonJS modules, we must not
+// hoist an ESM import of the built-in (which would eagerly load it). Instead,
+// expose a lazy `__require()` that resolves the built-in at runtime via
+// `createRequire(import.meta.url)`.
+function getExternalBuiltinRequireProxy(id) {
+  const stringifiedId = JSON.stringify(id);
+  return (
+    `import { createRequire } from 'node:module';\n` +
+    `const require = createRequire(import.meta.url);\n` +
+    `export function __require() { return require(${stringifiedId}); }`
+  );
+}
+
 /* eslint-disable no-param-reassign, no-undefined */
 
 
@@ -770,7 +783,7 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
                 return (
                   (await getTypeForImportedModule(
                     (
-                      await this.load({ id: resolved.id })
+                      await this.load(resolved)
                     ).meta.commonjs.resolved,
                     this.load
                   )) !== IS_WRAPPED_COMMONJS
@@ -819,8 +832,21 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
         fullyAnalyzedModules[parentId] = true;
         return requireTargets.map(({ id: dependencyId, allowProxy }, index) => {
           // eslint-disable-next-line no-multi-assign
-          const isCommonJS = (parentMeta.isRequiredCommonJS[dependencyId] =
+          let isCommonJS = (parentMeta.isRequiredCommonJS[dependencyId] =
             getTypeForFullyAnalyzedModule(dependencyId));
+          // Special-case external Node built-ins to be handled via a lazy __require
+          // helper instead of hoisted ESM imports when strict wrapping is used.
+          if (
+            parentMeta.initialCommonJSType === IS_WRAPPED_COMMONJS &&
+            !allowProxy &&
+            isWrappedId(dependencyId, EXTERNAL_SUFFIX)
+          ) {
+            const actualId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
+            const isNodeBuiltin = actualId.startsWith('node:');
+            if (isNodeBuiltin) {
+              isCommonJS = IS_WRAPPED_COMMONJS;
+            }
+          }
           const isWrappedCommonJS = isCommonJS === IS_WRAPPED_COMMONJS;
           fullyAnalyzedModules[dependencyId] = true;
           return {
@@ -1810,7 +1836,7 @@ async function transformCommonjs(
           }
           return;
         case 'ThisExpression':
-          // rewrite top-level `this` as `commonjsHelpers.commonjsGlobal`
+          // rewrite top-level `this` as `exportsName`
           if (lexicalDepth === 0 && !classBodyDepth) {
             uses.global = true;
             if (!ignoreGlobal) {
@@ -2263,6 +2289,9 @@ function commonjs(options = {}) {
 
       if (isWrappedId(id, EXTERNAL_SUFFIX)) {
         const actualId = unwrapId(id, EXTERNAL_SUFFIX);
+        if (actualId.startsWith('node:')) {
+          return getExternalBuiltinRequireProxy(actualId);
+        }
         return getUnknownRequireProxy(
           actualId,
           isEsmExternal(actualId) ? getRequireReturnsDefault(actualId) : true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "28.0.5",
+  "version": "28.0.7",
   "publishConfig": {
     "access": "public"
   },