Merge branch 'rollup:master' into master

.github/workflows/node-windows.yml

@@ -47,4 +47,4 @@ jobs:
         run: pnpm install --ignore-scripts
 
       - name: run tests
-        run: pnpm --filter "...[origin/master]" ci:test
+        run: pnpm --workspace-concurrency 1 --filter "...[origin/master]" ci:test

.github/workflows/release.yml

@@ -21,6 +21,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
+          token: ${{ secrets.GH_TOKEN }}
 
       - name: Update Master
         run: |
@@ -75,7 +76,7 @@ jobs:
           git config pull.rebase false
           git config --global user.email "[email protected]"
           git config --global user.name "Release Workflow"
-          git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}
+          git remote set-url origin https://github.com/${{ github.repository }}
 
       - name: pnpm install
         run: pnpm install --frozen-lockfile

packages/alias/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-alias ChangeLog
 
+## v5.0.1
+
+_2023-10-05_
+
+### Bugfixes
+
+- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595)
+
 ## v5.0.0
 
 _2023-04-04_

packages/alias/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-alias",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "publishConfig": {
     "access": "public"
   },
@@ -50,7 +50,7 @@
     "alias"
   ],
   "peerDependencies": {
-    "rollup": "^1.20.0||^2.0.0||^3.0.0"
+    "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
   },
   "peerDependenciesMeta": {
     "rollup": {
@@ -64,7 +64,7 @@
     "@rollup/plugin-node-resolve": "^15.0.0",
     "@rollup/plugin-typescript": "^9.0.1",
     "del-cli": "^5.0.0",
-    "rollup": "^3.2.3",
+    "rollup": "^4.0.0-24",
     "typescript": "^4.8.3"
   },
   "ava": {

packages/alias/test/test.mjs

@@ -455,7 +455,7 @@ test('Forwards isEntry and custom options to a custom resolver', (t) => {
       {
         source: 'nonEntry',
         importer: '/src/importer.js',
-        options: { assertions: {}, isEntry: false, custom: { test: 42 } }
+        options: { attributes: {}, isEntry: false, custom: { test: 42 } }
       }
     ]
   ).then((result) => {
@@ -464,7 +464,7 @@ test('Forwards isEntry and custom options to a custom resolver', (t) => {
         'entry-point',
         '/src/importer.js',
         {
-          assertions: {},
+          attributes: {},
           custom: void 0,
           isEntry: true
         }
@@ -473,7 +473,7 @@ test('Forwards isEntry and custom options to a custom resolver', (t) => {
         'non-entry-point',
         '/src/importer.js',
         {
-          assertions: {},
+          attributes: {},
           custom: { test: 42 },
           isEntry: false
         }
@@ -514,7 +514,7 @@ test('Forwards isEntry and custom options to other plugins', (t) => {
         'entry-point',
         '/src/importer.js',
         {
-          assertions: {},
+          attributes: {},
           custom: void 0,
           isEntry: true
         }
@@ -523,7 +523,7 @@ test('Forwards isEntry and custom options to other plugins', (t) => {
         'non-entry-point',
         '/src/importer.js',
         {
-          assertions: {},
+          attributes: {},
           custom: { test: 42 },
           isEntry: false
         }

packages/auto-install/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-auto-install ChangeLog
 
+## v3.0.5
+
+_2023-10-05_
+
+### Bugfixes
+
+- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595)
+
 ## v3.0.4
 
 _2023-04-04_

packages/auto-install/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-auto-install",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
     "modules"
   ],
   "peerDependencies": {
-    "rollup": "^1.20.0||^2.0.0||^3.0.0"
+    "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
   },
   "peerDependenciesMeta": {
     "rollup": {
@@ -64,7 +64,7 @@
     "@rollup/plugin-typescript": "^9.0.1",
     "del": "^6.1.1",
     "node-noop": "^1.0.0",
-    "rollup": "^3.2.3",
+    "rollup": "^4.0.0-24",
     "typescript": "^4.8.3"
   },
   "ava": {

packages/babel/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-babel ChangeLog
 
+## v6.0.4
+
+_2023-10-05_
+
+### Bugfixes
+
+- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595)
+
 ## v6.0.3
 
 _2022-11-25_

packages/babel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-babel",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
   "peerDependencies": {
     "@babel/core": "^7.0.0",
     "@types/babel__core": "^7.1.9",
-    "rollup": "^1.20.0||^2.0.0||^3.0.0"
+    "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
   },
   "peerDependenciesMeta": {
     "rollup": {
@@ -78,7 +78,7 @@
     "@rollup/plugin-json": "^5.0.0",
     "@rollup/plugin-node-resolve": "^15.0.0",
     "@types/babel__core": "^7.1.9",
-    "rollup": "^3.2.3",
+    "rollup": "^4.0.0-24",
     "source-map": "^0.7.4"
   },
   "ava": {

packages/babel/test/as-output-plugin.mjs

@@ -222,7 +222,7 @@ test('transforms all chunks in a code-splitting setup', async (t) => {
   t.deepEqual(
     output.map(({ code }) => code),
     [
-      `import('./dep-20aaf50b.js').then(function (result) {
+      `import('./dep--s88I99N.js').then(function (result) {
   return console.log(result);
 });
 `,

packages/beep/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-beep ChangeLog
 
+## v1.0.3
+
+_2023-10-05_
+
+### Bugfixes
+
+- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595)
+
 ## v1.0.2
 
 _2022-10-21_

packages/beep/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-beep",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -37,15 +37,15 @@
     "rollup"
   ],
   "peerDependencies": {
-    "rollup": "^1.20.0||^2.0.0||^3.0.0"
+    "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
   },
   "peerDependenciesMeta": {
     "rollup": {
       "optional": true
     }
   },
   "devDependencies": {
-    "rollup": "^3.2.3",
+    "rollup": "^4.0.0-24",
     "strip-ansi": "^7.0.1"
   },
   "types": "types/index.d.ts",

packages/buble/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-buble ChangeLog
 
+## v1.0.3
+
+_2023-10-05_
+
+### Bugfixes
+
+- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595)
+
 ## v1.0.2
 
 _2023-01-20_

packages/buble/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-buble",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
     "modules"
   ],
   "peerDependencies": {
-    "rollup": "^1.20.0||^2.0.0||^3.0.0"
+    "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
   },
   "peerDependenciesMeta": {
     "rollup": {
@@ -67,7 +67,7 @@
   "devDependencies": {
     "@rollup/plugin-typescript": "^9.0.1",
     "del-cli": "^5.0.0",
-    "rollup": "^3.2.3",
+    "rollup": "^4.0.0-24",
     "source-map": "^0.7.4",
     "typescript": "^4.8.3"
   },

packages/commonjs/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @rollup/plugin-commonjs ChangeLog
 
+## v25.0.7
+
+_2023-10-15_
+
+### Bugfixes
+
+- fix: bump magic-string version [#1596](https://github.com/rollup/plugins/pull/1596)
+
+## v25.0.6
+
+_2023-10-15_
+
+### Bugfixes
+
+- fix: Keep the shebang at the top of the file content [#1610](https://github.com/rollup/plugins/pull/1610)
+
+## v25.0.5
+
+_2023-10-05_
+
+### Bugfixes
+
+- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595)
+
 ## v25.0.4
 
 _2023-08-11_

packages/commonjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "25.0.4",
+  "version": "25.0.7",
   "publishConfig": {
     "access": "public"
   },
@@ -53,7 +53,7 @@
     "require"
   ],
   "peerDependencies": {
-    "rollup": "^2.68.0||^3.0.0"
+    "rollup": "^2.68.0||^3.0.0||^4.0.0"
   },
   "peerDependenciesMeta": {
     "rollup": {
@@ -66,14 +66,14 @@
     "estree-walker": "^2.0.2",
     "glob": "^8.0.3",
     "is-reference": "1.2.1",
-    "magic-string": "^0.27.0"
+    "magic-string": "^0.30.3"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^5.0.0",
     "@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",

packages/commonjs/src/index.js

@@ -271,7 +271,16 @@ export default 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)) {
@@ -306,7 +315,7 @@ export default function commonjs(options = {}) {
       try {
         return transformAndCheckExports.call(this, code, id);
       } catch (err) {
-        return this.error(err, err.loc);
+        return this.error(err, err.pos);
       }
     }
   };

packages/commonjs/src/proxies.js

@@ -44,7 +44,7 @@ export async function getStaticRequireProxy(id, requireReturnsDefault, loadModul
   return `export { default } from ${JSON.stringify(id)};`;
 }
 
-export function getEntryProxy(id, defaultIsModuleExports, getModuleInfo) {
+export function getEntryProxy(id, defaultIsModuleExports, getModuleInfo, shebang) {
   const {
     meta: { commonjs: commonjsMeta },
     hasDefaultExport
@@ -55,9 +55,13 @@ export 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
+  };
 }
 
 export function getEsImportProxy(id, defaultIsModuleExports) {