@rollup/plugin-commonjs 25.0.4 → 25.0.6

package/dist/cjs/index.js

@@ -11,9 +11,9 @@ var estreeWalker = require('estree-walker');
 var MagicString = require('magic-string');
 var isReference = require('is-reference');
 
-var version = "25.0.4";
+var version = "25.0.6";
 var peerDependencies = {
-	rollup: "^2.68.0||^3.0.0"
+	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
 
 function tryParse(parse, code, id) {
@@ -36,6 +36,7 @@ function hasCjsKeywords(code, ignoreGlobal) {
 
 /* eslint-disable no-underscore-dangle */
 
+
 function analyzeTopLevelStatements(parse, code, id) {
   const ast = tryParse(parse, code, id);
 
@@ -82,6 +83,7 @@ function analyzeTopLevelStatements(parse, code, id) {
 
 /* eslint-disable import/prefer-default-export */
 
+
 function deconflict(scopes, globals, identifier) {
   let i = 1;
   let deconflicted = pluginutils.makeLegalIdentifier(identifier);
@@ -432,7 +434,7 @@ async function getStaticRequireProxy(id, requireReturnsDefault, loadModule) {
   return `export { default } from ${JSON.stringify(id)};`;
 }
 
-function getEntryProxy(id, defaultIsModuleExports, getModuleInfo) {
+function getEntryProxy(id, defaultIsModuleExports, getModuleInfo, shebang) {
   const {
     meta: { commonjs: commonjsMeta },
     hasDefaultExport
@@ -443,9 +445,13 @@ function getEntryProxy(id, defaultIsModuleExports, getModuleInfo) {
     if (hasDefaultExport) {
       code += `export { default } from ${stringifiedId};`;
     }
-    return code;
+    return shebang + code;
   }
-  return getEsImportProxy(id, defaultIsModuleExports);
+  const result = getEsImportProxy(id, defaultIsModuleExports);
+  return {
+    ...result,
+    code: shebang + result.code
+  };
 }
 
 function getEsImportProxy(id, defaultIsModuleExports) {
@@ -470,6 +476,7 @@ function getEsImportProxy(id, defaultIsModuleExports) {
 
 /* eslint-disable no-param-reassign, no-undefined */
 
+
 function getCandidatesForExtension(resolved, extension) {
   return [resolved + extension, `${resolved}${path.sep}index${extension}`];
 }
@@ -780,6 +787,7 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
             currentlyResolvingForParent.add(source);
             const resolved =
               (await rollupContext.resolve(source, parentId, {
+                skipSelf: false,
                 custom: { 'node-resolve': { isRequire: true } }
               })) || resolveExtensions(source, parentId, extensions);
             currentlyResolvingForParent.delete(source);
@@ -1448,6 +1456,7 @@ function getGenerateRequireName() {
 
 /* eslint-disable no-param-reassign, no-shadow, no-underscore-dangle, no-continue */
 
+
 const exportsPattern = /^(?:module\.)?exports(?:\.([a-zA-Z_$][a-zA-Z_$0-9]*))?$/;
 
 const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/;
@@ -1718,6 +1727,9 @@ async function transformCommonjs(
               }
               if (!ignoreDynamicRequires) {
                 if (isShorthandProperty(parent)) {
+                  // as key and value are the same object, isReference regards
+                  // both as references, so we need to skip now
+                  skippedNodes.add(parent.value);
                   magicString.prependRight(node.start, 'require: ');
                 }
                 replacedDynamicRequires.push(node);
@@ -1893,6 +1905,13 @@ async function transformCommonjs(
     magicString.remove(0, commentEnd).trim();
   }
 
+  let shebang = '';
+  if (code.startsWith('#!')) {
+    const shebangEndPosition = code.indexOf('\n') + 1;
+    shebang = code.slice(0, shebangEndPosition);
+    magicString.remove(0, shebangEndPosition).trim();
+  }
+
   const exportMode = isEsModule
     ? 'none'
     : shouldWrap
@@ -1976,14 +1995,14 @@ function ${requireName} () {
 
   magicString
     .trim()
-    .prepend(leadingComment + importBlock)
+    .prepend(shebang + leadingComment + importBlock)
     .append(exportBlock);
 
   return {
     code: magicString.toString(),
     map: sourceMap ? magicString.generateMap() : null,
     syntheticNamedExports: isEsModule || usesRequireWrapper ? false : '__moduleExports',
-    meta: { commonjs: commonjsMeta }
+    meta: { commonjs: { ...commonjsMeta, shebang } }
   };
 }
 
@@ -2225,7 +2244,16 @@ function commonjs(options = {}) {
       // entry suffix is just appended to not mess up relative external resolution
       if (id.endsWith(ENTRY_SUFFIX)) {
         const acutalId = id.slice(0, -ENTRY_SUFFIX.length);
-        return getEntryProxy(acutalId, getDefaultIsModuleExports(acutalId), this.getModuleInfo);
+        const {
+          meta: { commonjs: commonjsMeta }
+        } = this.getModuleInfo(acutalId);
+        const shebang = commonjsMeta?.shebang ?? '';
+        return getEntryProxy(
+          acutalId,
+          getDefaultIsModuleExports(acutalId),
+          this.getModuleInfo,
+          shebang
+        );
       }
 
       if (isWrappedId(id, ES_IMPORT_SUFFIX)) {
@@ -2260,7 +2288,7 @@ function commonjs(options = {}) {
       try {
         return transformAndCheckExports.call(this, code, id);
       } catch (err) {
-        return this.error(err, err.loc);
+        return this.error(err, err.pos);
       }
     }
   };

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 = "25.0.4";
+var version = "25.0.6";
 var peerDependencies = {
-	rollup: "^2.68.0||^3.0.0"
+	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
 
 function tryParse(parse, code, id) {
@@ -32,6 +32,7 @@ function hasCjsKeywords(code, ignoreGlobal) {
 
 /* eslint-disable no-underscore-dangle */
 
+
 function analyzeTopLevelStatements(parse, code, id) {
   const ast = tryParse(parse, code, id);
 
@@ -78,6 +79,7 @@ function analyzeTopLevelStatements(parse, code, id) {
 
 /* eslint-disable import/prefer-default-export */
 
+
 function deconflict(scopes, globals, identifier) {
   let i = 1;
   let deconflicted = makeLegalIdentifier(identifier);
@@ -428,7 +430,7 @@ async function getStaticRequireProxy(id, requireReturnsDefault, loadModule) {
   return `export { default } from ${JSON.stringify(id)};`;
 }
 
-function getEntryProxy(id, defaultIsModuleExports, getModuleInfo) {
+function getEntryProxy(id, defaultIsModuleExports, getModuleInfo, shebang) {
   const {
     meta: { commonjs: commonjsMeta },
     hasDefaultExport
@@ -439,9 +441,13 @@ function getEntryProxy(id, defaultIsModuleExports, getModuleInfo) {
     if (hasDefaultExport) {
       code += `export { default } from ${stringifiedId};`;
     }
-    return code;
+    return shebang + code;
   }
-  return getEsImportProxy(id, defaultIsModuleExports);
+  const result = getEsImportProxy(id, defaultIsModuleExports);
+  return {
+    ...result,
+    code: shebang + result.code
+  };
 }
 
 function getEsImportProxy(id, defaultIsModuleExports) {
@@ -466,6 +472,7 @@ function getEsImportProxy(id, defaultIsModuleExports) {
 
 /* eslint-disable no-param-reassign, no-undefined */
 
+
 function getCandidatesForExtension(resolved, extension) {
   return [resolved + extension, `${resolved}${sep}index${extension}`];
 }
@@ -776,6 +783,7 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
             currentlyResolvingForParent.add(source);
             const resolved =
               (await rollupContext.resolve(source, parentId, {
+                skipSelf: false,
                 custom: { 'node-resolve': { isRequire: true } }
               })) || resolveExtensions(source, parentId, extensions);
             currentlyResolvingForParent.delete(source);
@@ -1444,6 +1452,7 @@ function getGenerateRequireName() {
 
 /* eslint-disable no-param-reassign, no-shadow, no-underscore-dangle, no-continue */
 
+
 const exportsPattern = /^(?:module\.)?exports(?:\.([a-zA-Z_$][a-zA-Z_$0-9]*))?$/;
 
 const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/;
@@ -1714,6 +1723,9 @@ async function transformCommonjs(
               }
               if (!ignoreDynamicRequires) {
                 if (isShorthandProperty(parent)) {
+                  // as key and value are the same object, isReference regards
+                  // both as references, so we need to skip now
+                  skippedNodes.add(parent.value);
                   magicString.prependRight(node.start, 'require: ');
                 }
                 replacedDynamicRequires.push(node);
@@ -1889,6 +1901,13 @@ async function transformCommonjs(
     magicString.remove(0, commentEnd).trim();
   }
 
+  let shebang = '';
+  if (code.startsWith('#!')) {
+    const shebangEndPosition = code.indexOf('\n') + 1;
+    shebang = code.slice(0, shebangEndPosition);
+    magicString.remove(0, shebangEndPosition).trim();
+  }
+
   const exportMode = isEsModule
     ? 'none'
     : shouldWrap
@@ -1972,14 +1991,14 @@ function ${requireName} () {
 
   magicString
     .trim()
-    .prepend(leadingComment + importBlock)
+    .prepend(shebang + leadingComment + importBlock)
     .append(exportBlock);
 
   return {
     code: magicString.toString(),
     map: sourceMap ? magicString.generateMap() : null,
     syntheticNamedExports: isEsModule || usesRequireWrapper ? false : '__moduleExports',
-    meta: { commonjs: commonjsMeta }
+    meta: { commonjs: { ...commonjsMeta, shebang } }
   };
 }
 
@@ -2221,7 +2240,16 @@ function commonjs(options = {}) {
       // entry suffix is just appended to not mess up relative external resolution
       if (id.endsWith(ENTRY_SUFFIX)) {
         const acutalId = id.slice(0, -ENTRY_SUFFIX.length);
-        return getEntryProxy(acutalId, getDefaultIsModuleExports(acutalId), this.getModuleInfo);
+        const {
+          meta: { commonjs: commonjsMeta }
+        } = this.getModuleInfo(acutalId);
+        const shebang = commonjsMeta?.shebang ?? '';
+        return getEntryProxy(
+          acutalId,
+          getDefaultIsModuleExports(acutalId),
+          this.getModuleInfo,
+          shebang
+        );
       }
 
       if (isWrappedId(id, ES_IMPORT_SUFFIX)) {
@@ -2256,7 +2284,7 @@ function commonjs(options = {}) {
       try {
         return transformAndCheckExports.call(this, code, id);
       } catch (err) {
-        return this.error(err, err.loc);
+        return this.error(err, err.pos);
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "25.0.4",
+  "version": "25.0.6",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "require"
   ],
   "peerDependencies": {
-    "rollup": "^2.68.0||^3.0.0"
+    "rollup": "^2.68.0||^3.0.0||^4.0.0"
   },
   "peerDependenciesMeta": {
     "rollup": {
@@ -74,7 +74,7 @@
     "@rollup/plugin-node-resolve": "^15.0.0",
     "locate-character": "^2.0.5",
     "require-relative": "^0.8.7",
-    "rollup": "^3.19.0",
+    "rollup": "^4.0.0-24",
     "shx": "^0.3.4",
     "source-map": "^0.7.4",
     "source-map-support": "^0.5.21",