Merge branch 'rollup:master' into fix/1691

package.json

@@ -85,5 +85,6 @@
       "lib/client*.js",
       "test/"
     ]
-  }
+  },
+  "packageManager": "[email protected]+sha512.d1a029e1a447ad90bc96cd58b0fad486d2993d531856396f7babf2d83eb1823bb83c5a3d0fc18f675b2d10321d49eb161fece36fe8134aa5823ecd215feed392"
 }

packages/commonjs/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-commonjs ChangeLog
 
+## v25.0.8
+
+_2024-05-22_
+
+### Bugfixes
+
+- fix: preserve the class body property keys even if they are special keywords (#1688)
+
 ## v25.0.7
 
 _2023-10-15_

packages/commonjs/package.json

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

packages/commonjs/src/transform-commonjs.js

@@ -291,7 +291,12 @@ export default async function transformCommonjs(
           return;
         case 'Identifier': {
           const { name } = node;
-          if (!isReference(node, parent) || scope.contains(name)) return;
+          if (
+            !isReference(node, parent) ||
+            scope.contains(name) ||
+            (parent.type === 'PropertyDefinition' && parent.key === node)
+          )
+            return;
           switch (name) {
             case 'require':
               uses.require = true;

packages/commonjs/test/fixtures/function/class-body-property-keys-are-special-keywords/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'preserve the class body property keys even if they are special keywords',
+};

packages/commonjs/test/fixtures/function/class-body-property-keys-are-special-keywords/main.js

@@ -0,0 +1,7 @@
+class Rollup {
+  define;
+  require;
+  global;
+}
+
+exports.Rollup = Rollup;

packages/commonjs/test/snapshots/function.js.md

@@ -241,6 +241,30 @@ Generated by [AVA](https://avajs.dev).
       `,
     }
 
+## class-body-property-keys-are-special-keywords
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      Object.defineProperty(exports, '__esModule', { value: true });␊
+      ␊
+      var main = {};␊
+      ␊
+      class Rollup {␊
+        define;␊
+        require;␊
+        global;␊
+      }␊
+      ␊
+      var Rollup_1 = main.Rollup = Rollup;␊
+      ␊
+      exports.Rollup = Rollup_1;␊
+      exports.default = main;␊
+      `,
+    }
+
 ## compiled-esm-default-is-module-exports-false
 
 > Snapshot 1

packages/esm-shim/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-esm-shim ChangeLog
 
+## v0.1.6
+
+_2024-04-05_
+
+### Bugfixes
+
+- fix: do not insert shims at `import` literal (#1696)
+
 ## v0.1.5
 
 _2023-11-05_

packages/esm-shim/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-esm-shim",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "publishConfig": {
     "access": "public"
   },

packages/esm-shim/src/constants.ts

@@ -11,4 +11,4 @@ const require = cjsModule.createRequire(import.meta.url);
 `;
 
 export const ESMStaticImportRegex =
-  /(?<=\s|^|;)import\s*([\s"']*(?<imports>[\w\t\n\r $*,/{}]+)from\s*)?["']\s*(?<specifier>(?<="\s*)[^"]*[^\s"](?=\s*")|(?<='\s*)[^']*[^\s'](?=\s*'))\s*["'][\s;]*/gm;
+  /(?<=\s|^|;)import\s*([\s"']*(?<imports>[\w\t\n\r $*,/{}]+)from\s*)?["']\s*(?<specifier>(?<="\s*)[^"\n]*[^\s"](?=\s*")|(?<='\s*)[^'\n]*[^\s'](?=\s*'))\s*["'][\s;]*/gm;

packages/esm-shim/test/fixtures/cjs-import-literal.js

@@ -0,0 +1,6 @@
+const dn = __dirname;
+
+module.exports = {
+  keyword: ' import',
+  dn
+};

packages/esm-shim/test/snapshots/test.js.md

@@ -93,3 +93,23 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export { c, child, s };␊
     `
+
+## inject cjs shim should not break on valid js object with `import` literal value
+
+> Snapshot 1
+
+    `␊
+    // -- Shims --␊
+    import cjsUrl from 'node:url';␊
+    import cjsPath from 'node:path';␊
+    import cjsModule from 'node:module';␊
+    const __filename = cjsUrl.fileURLToPath(import.meta.url);␊
+    const __dirname = cjsPath.dirname(__filename);␊
+    const require = cjsModule.createRequire(import.meta.url);␊
+    const dn = __dirname;␊
+    ␊
+    module.exports = {␊
+      keyword: ' import',␊
+      dn␊
+    };␊
+    `

packages/esm-shim/test/test.js

@@ -67,3 +67,19 @@ test.serial('inject cjs shim for esm output with multiple import statements', as
   t.snapshot(output.code);
   t.falsy(output.map);
 });
+
+// see issue #1649 https://github.com/rollup/plugins/issues/1649
+test.serial(
+  'inject cjs shim should not break on valid js object with `import` literal value',
+  async (t) => {
+    const bundle = await rollup({
+      input: 'test/fixtures/cjs-import-literal.js',
+      plugins: [esmShim()]
+    });
+    const result = await bundle.generate({ format: 'es' });
+    t.is(result.output.length, 1);
+    const [output] = result.output;
+    t.snapshot(output.code);
+    t.falsy(output.map);
+  }
+);