@rollup/plugin-commonjs 28.0.9 → 29.0.1

package/README.md

@@ -63,6 +63,34 @@ You can also provide a [picomatch pattern](https://github.com/micromatch/picomat
 
 `"debug"` works like `"auto"` but after bundling, it will display a warning containing a list of ids that have been wrapped which can be used as picomatch pattern for fine-tuning or to avoid the potential race conditions mentioned for `"auto"`.
 
+### `requireNodeBuiltins`
+
+Type: `boolean`<br>
+Default: `false`
+
+When enabled, external Node built-ins (e.g., `node:fs`, `node:path`) required from wrapped CommonJS modules will use `createRequire(import.meta.url)` instead of being hoisted as ESM imports. This prevents eager loading of Node built-ins at module initialization time and preserves the lazy execution semantics of `require()`.
+
+**Important:** Enabling this option adds a dependency on `node:module` in the output bundle, which may not be available in some environments like edge runtimes (Cloudflare Workers, Vercel Edge Runtime). Only enable this option if you are targeting Node.js environments and need the lazy loading behavior for Node built-ins.
+
+Example:
+
+```js
+commonjs({
+  strictRequires: true,
+  requireNodeBuiltins: true
+});
+```
+
+With `requireNodeBuiltins: true`, code like:
+
+```js
+if (condition) {
+  require('node:fs');
+}
+```
+
+will generate output using `createRequire` instead of hoisting the import to the top of the file.
+
 ### `dynamicRequireTargets`
 
 Type: `string | string[]`<br>

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.9";
+var version = "29.0.0";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
@@ -655,7 +655,12 @@ function getResolveId(extensions, isPossibleCjsId) {
   };
 }
 
-function getRequireResolver(extensions, detectCyclesAndConditional, currentlyResolving) {
+function getRequireResolver(
+  extensions,
+  detectCyclesAndConditional,
+  currentlyResolving,
+  requireNodeBuiltins
+) {
   const knownCjsModuleTypes = Object.create(null);
   const requiredIds = Object.create(null);
   const unconditionallyRequiredIds = Object.create(null);
@@ -840,21 +845,24 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
             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.
+          // Only apply this when requireNodeBuiltins option is enabled.
           const isExternalWrapped = isWrappedId(dependencyId, EXTERNAL_SUFFIX);
           let resolvedDependencyId = dependencyId;
-          if (parentMeta.isCommonJS === IS_WRAPPED_COMMONJS && !allowProxy && isExternalWrapped) {
-            const actualExternalId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
-            if (actualExternalId.startsWith('node:')) {
-              isCommonJS = IS_WRAPPED_COMMONJS;
-              parentMeta.isRequiredCommonJS[dependencyId] = isCommonJS;
-            }
-          } else if (isExternalWrapped && !allowProxy) {
-            // If the parent is not wrapped but the dependency is a node: builtin external,
-            // unwrap the EXTERNAL_SUFFIX so it's treated as a normal external.
-            // This avoids trying to load the lazy __require proxy for non-wrapped contexts.
-            const actualExternalId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
-            if (actualExternalId.startsWith('node:')) {
-              resolvedDependencyId = actualExternalId;
+          if (requireNodeBuiltins === true) {
+            if (parentMeta.isCommonJS === IS_WRAPPED_COMMONJS && !allowProxy && isExternalWrapped) {
+              const actualExternalId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
+              if (actualExternalId.startsWith('node:')) {
+                isCommonJS = IS_WRAPPED_COMMONJS;
+                parentMeta.isRequiredCommonJS[dependencyId] = isCommonJS;
+              }
+            } else if (isExternalWrapped && !allowProxy) {
+              // If the parent is not wrapped but the dependency is a node: builtin external,
+              // unwrap the EXTERNAL_SUFFIX so it's treated as a normal external.
+              // This avoids trying to load the lazy __require proxy for non-wrapped contexts.
+              const actualExternalId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
+              if (actualExternalId.startsWith('node:')) {
+                resolvedDependencyId = actualExternalId;
+              }
             }
           }
           const isWrappedCommonJS = isCommonJS === IS_WRAPPED_COMMONJS;
@@ -1033,6 +1041,10 @@ function isShorthandProperty(parent) {
   return parent && parent.type === 'Property' && parent.shorthand;
 }
 
+function isPropertyDefinitionKey(parent, node) {
+  return parent && parent.type === 'PropertyDefinition' && parent.key === node;
+}
+
 function wrapCode(magicString, uses, moduleName, exportsName, indentExclusionRanges) {
   const args = [];
   const passedArgs = [];
@@ -1787,7 +1799,7 @@ async function transformCommonjs(
           if (
             !isReference(node, parent) ||
             scope.contains(name) ||
-            (parent.type === 'PropertyDefinition' && parent.key === node)
+            isPropertyDefinitionKey(parent, node)
           )
             return;
           switch (name) {
@@ -1814,6 +1826,10 @@ async function transformCommonjs(
             case 'global':
               uses.global = true;
               if (!ignoreGlobal) {
+                if (isShorthandProperty(parent)) {
+                  skippedNodes.add(parent.value);
+                  magicString.prependRight(node.start, 'global: ');
+                }
                 replacedGlobal.push(node);
               }
               return;
@@ -1934,6 +1950,7 @@ async function transformCommonjs(
 
   for (const node of replacedGlobal) {
     magicString.overwrite(node.start, node.end, `${helpersName}.commonjsGlobal`, {
+      contentOnly: true,
       storeName: true
     });
   }
@@ -2090,7 +2107,8 @@ function commonjs(options = {}) {
     ignoreDynamicRequires,
     requireReturnsDefault: requireReturnsDefaultOption,
     defaultIsModuleExports: defaultIsModuleExportsOption,
-    esmExternals
+    esmExternals,
+    requireNodeBuiltins = false
   } = options;
   const extensions = options.extensions || ['.js'];
   const filter = pluginutils.createFilter(options.include, options.exclude);
@@ -2263,7 +2281,8 @@ function commonjs(options = {}) {
       requireResolver = getRequireResolver(
         extensions,
         detectCyclesAndConditional,
-        currentlyResolving
+        currentlyResolving,
+        requireNodeBuiltins
       );
     },
 
@@ -2311,7 +2330,7 @@ function commonjs(options = {}) {
 
       if (isWrappedId(id, EXTERNAL_SUFFIX)) {
         const actualId = unwrapId(id, EXTERNAL_SUFFIX);
-        if (actualId.startsWith('node:')) {
+        if (requireNodeBuiltins === true && actualId.startsWith('node:')) {
           return getExternalBuiltinRequireProxy(actualId);
         }
         return getUnknownRequireProxy(

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.9";
+var version = "29.0.0";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
@@ -651,7 +651,12 @@ function getResolveId(extensions, isPossibleCjsId) {
   };
 }
 
-function getRequireResolver(extensions, detectCyclesAndConditional, currentlyResolving) {
+function getRequireResolver(
+  extensions,
+  detectCyclesAndConditional,
+  currentlyResolving,
+  requireNodeBuiltins
+) {
   const knownCjsModuleTypes = Object.create(null);
   const requiredIds = Object.create(null);
   const unconditionallyRequiredIds = Object.create(null);
@@ -836,21 +841,24 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
             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.
+          // Only apply this when requireNodeBuiltins option is enabled.
           const isExternalWrapped = isWrappedId(dependencyId, EXTERNAL_SUFFIX);
           let resolvedDependencyId = dependencyId;
-          if (parentMeta.isCommonJS === IS_WRAPPED_COMMONJS && !allowProxy && isExternalWrapped) {
-            const actualExternalId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
-            if (actualExternalId.startsWith('node:')) {
-              isCommonJS = IS_WRAPPED_COMMONJS;
-              parentMeta.isRequiredCommonJS[dependencyId] = isCommonJS;
-            }
-          } else if (isExternalWrapped && !allowProxy) {
-            // If the parent is not wrapped but the dependency is a node: builtin external,
-            // unwrap the EXTERNAL_SUFFIX so it's treated as a normal external.
-            // This avoids trying to load the lazy __require proxy for non-wrapped contexts.
-            const actualExternalId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
-            if (actualExternalId.startsWith('node:')) {
-              resolvedDependencyId = actualExternalId;
+          if (requireNodeBuiltins === true) {
+            if (parentMeta.isCommonJS === IS_WRAPPED_COMMONJS && !allowProxy && isExternalWrapped) {
+              const actualExternalId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
+              if (actualExternalId.startsWith('node:')) {
+                isCommonJS = IS_WRAPPED_COMMONJS;
+                parentMeta.isRequiredCommonJS[dependencyId] = isCommonJS;
+              }
+            } else if (isExternalWrapped && !allowProxy) {
+              // If the parent is not wrapped but the dependency is a node: builtin external,
+              // unwrap the EXTERNAL_SUFFIX so it's treated as a normal external.
+              // This avoids trying to load the lazy __require proxy for non-wrapped contexts.
+              const actualExternalId = unwrapId(dependencyId, EXTERNAL_SUFFIX);
+              if (actualExternalId.startsWith('node:')) {
+                resolvedDependencyId = actualExternalId;
+              }
             }
           }
           const isWrappedCommonJS = isCommonJS === IS_WRAPPED_COMMONJS;
@@ -1029,6 +1037,10 @@ function isShorthandProperty(parent) {
   return parent && parent.type === 'Property' && parent.shorthand;
 }
 
+function isPropertyDefinitionKey(parent, node) {
+  return parent && parent.type === 'PropertyDefinition' && parent.key === node;
+}
+
 function wrapCode(magicString, uses, moduleName, exportsName, indentExclusionRanges) {
   const args = [];
   const passedArgs = [];
@@ -1783,7 +1795,7 @@ async function transformCommonjs(
           if (
             !isReference(node, parent) ||
             scope.contains(name) ||
-            (parent.type === 'PropertyDefinition' && parent.key === node)
+            isPropertyDefinitionKey(parent, node)
           )
             return;
           switch (name) {
@@ -1810,6 +1822,10 @@ async function transformCommonjs(
             case 'global':
               uses.global = true;
               if (!ignoreGlobal) {
+                if (isShorthandProperty(parent)) {
+                  skippedNodes.add(parent.value);
+                  magicString.prependRight(node.start, 'global: ');
+                }
                 replacedGlobal.push(node);
               }
               return;
@@ -1930,6 +1946,7 @@ async function transformCommonjs(
 
   for (const node of replacedGlobal) {
     magicString.overwrite(node.start, node.end, `${helpersName}.commonjsGlobal`, {
+      contentOnly: true,
       storeName: true
     });
   }
@@ -2086,7 +2103,8 @@ function commonjs(options = {}) {
     ignoreDynamicRequires,
     requireReturnsDefault: requireReturnsDefaultOption,
     defaultIsModuleExports: defaultIsModuleExportsOption,
-    esmExternals
+    esmExternals,
+    requireNodeBuiltins = false
   } = options;
   const extensions = options.extensions || ['.js'];
   const filter = createFilter(options.include, options.exclude);
@@ -2259,7 +2277,8 @@ function commonjs(options = {}) {
       requireResolver = getRequireResolver(
         extensions,
         detectCyclesAndConditional,
-        currentlyResolving
+        currentlyResolving,
+        requireNodeBuiltins
       );
     },
 
@@ -2307,7 +2326,7 @@ function commonjs(options = {}) {
 
       if (isWrappedId(id, EXTERNAL_SUFFIX)) {
         const actualId = unwrapId(id, EXTERNAL_SUFFIX);
-        if (actualId.startsWith('node:')) {
+        if (requireNodeBuiltins === true && actualId.startsWith('node:')) {
           return getExternalBuiltinRequireProxy(actualId);
         }
         return getUnknownRequireProxy(

package/package.json

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

package/types/index.d.ts

@@ -225,6 +225,17 @@ interface RollupCommonJSOptions {
    * home directory name. By default, it uses the current working directory.
    */
   dynamicRequireRoot?: string;
+  /**
+   * When enabled, external Node built-ins (e.g., `node:fs`) required from wrapped CommonJS modules
+   * will use `createRequire(import.meta.url)` instead of being hoisted as ESM imports. This prevents
+   * eager loading of Node built-ins at module initialization time.
+   *
+   * Note: This option adds a dependency on `node:module` in the output, which may not be available
+   * in some environments like edge runtimes (Cloudflare Workers, Vercel Edge Runtime).
+   *
+   * @default false
+   */
+  requireNodeBuiltins?: boolean;
 }
 
 /**