From a683315da046ae595a1b3f016e4a5da1556ca070 Mon Sep 17 00:00:00 2001 From: sky0014 Date: Mon, 25 Sep 2023 22:40:06 +0800 Subject: [PATCH 01/20] feat(wasm): add include/exclude options for wasm plugin. (#1558) --- packages/wasm/README.md | 14 ++++++++++++++ packages/wasm/package.json | 3 +++ packages/wasm/src/index.ts | 10 ++++++++++ packages/wasm/types/index.d.ts | 15 ++++++++++++++- pnpm-lock.yaml | 19 +++++++++++++++++++ 5 files changed, 60 insertions(+), 1 deletion(-) diff --git a/packages/wasm/README.md b/packages/wasm/README.md index c3d974529..7c38fbfa4 100755 --- a/packages/wasm/README.md +++ b/packages/wasm/README.md @@ -46,6 +46,20 @@ Then call `rollup` either via the [CLI](https://www.rollupjs.org/guide/en/#comma ## Options +### `exclude` + +Type: `String` | `Array[...String]`
+Default: `null` + +A [picomatch pattern](https://github.com/micromatch/picomatch), or array of patterns, which specifies the files in the build the plugin should _ignore_. By default no files are ignored. + +### `include` + +Type: `String` | `Array[...String]`
+Default: `null` + +A [picomatch pattern](https://github.com/micromatch/picomatch), or array of patterns, which specifies the files in the build the plugin should operate on. By default all wasm files are targeted. + ### `sync` Type: `Array[...String]`
diff --git a/packages/wasm/package.json b/packages/wasm/package.json index 9ecd8a831..cb3655148 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -62,6 +62,9 @@ "optional": true } }, + "dependencies": { + "@rollup/pluginutils": "^5.0.2" + }, "devDependencies": { "@rollup/plugin-typescript": "^9.0.1", "del-cli": "^5.0.0", diff --git a/packages/wasm/src/index.ts b/packages/wasm/src/index.ts index 6607caa12..aa0c70b75 100644 --- a/packages/wasm/src/index.ts +++ b/packages/wasm/src/index.ts @@ -3,6 +3,7 @@ import * as path from 'path'; import { createHash } from 'crypto'; import type { Plugin } from 'rollup'; +import { createFilter } from '@rollup/pluginutils'; import type { RollupWasmOptions } from '../types'; @@ -19,6 +20,7 @@ export function wasm(options: RollupWasmOptions = {}): Plugin { const syncFiles = sync.map((x) => path.resolve(x)); const copies = Object.create(null); + const filter = createFilter(options.include, options.exclude); return { name: 'wasm', @@ -36,6 +38,10 @@ export function wasm(options: RollupWasmOptions = {}): Plugin { return getHelpersModule(targetEnv); } + if (!filter(id)) { + return null; + } + if (!/\.wasm$/.test(id)) { return null; } @@ -74,6 +80,10 @@ export function wasm(options: RollupWasmOptions = {}): Plugin { }, transform(code, id) { + if (!filter(id)) { + return null; + } + if (code && /\.wasm$/.test(id)) { const isSync = syncFiles.indexOf(id) !== -1; const publicFilepath = copies[id] ? `'${copies[id].publicFilepath}'` : null; diff --git a/packages/wasm/types/index.d.ts b/packages/wasm/types/index.d.ts index 62921467f..b846f3689 100644 --- a/packages/wasm/types/index.d.ts +++ b/packages/wasm/types/index.d.ts @@ -1,4 +1,5 @@ import type { Plugin } from 'rollup'; +import type { FilterPattern } from '@rollup/pluginutils'; /** * - `"auto"` will determine the environment at runtime and invoke the correct methods accordingly @@ -9,6 +10,18 @@ import type { Plugin } from 'rollup'; export type TargetEnv = 'auto' | 'auto-inline' | 'browser' | 'node'; export interface RollupWasmOptions { + /** + * A picomatch pattern, or array of patterns, which specifies the files in the build the plugin + * should _ignore_. + * By default no files are ignored. + */ + exclude?: FilterPattern; + /** + * A picomatch pattern, or array of patterns, which specifies the files in the build the plugin + * should operate on. + * By default all wasm files are targeted. + */ + include?: FilterPattern; /** * Specifies an array of strings that each represent a WebAssembly file to load synchronously. */ @@ -18,7 +31,7 @@ export interface RollupWasmOptions { * If `maxFileSize` is set to `0` all files will be copied. * Files specified in `sync` to load synchronously are always inlined, regardless of size. */ - maxFileSize?: Number; + maxFileSize?: number; /** * String used to rename the emitted Wasm files. */ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0db728ed9..4cd256063 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -794,6 +794,10 @@ importers: version: 4.8.4 packages/wasm: + dependencies: + '@rollup/pluginutils': + specifier: ^5.0.2 + version: 5.0.4(rollup@3.2.3) devDependencies: '@rollup/plugin-typescript': specifier: ^9.0.1 @@ -2422,6 +2426,21 @@ packages: rollup: 3.20.2 dev: false + /@rollup/pluginutils@5.0.4(rollup@3.2.3): + resolution: {integrity: sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@types/estree': 1.0.0 + estree-walker: 2.0.2 + picomatch: 2.3.1 + rollup: 3.2.3 + dev: false + /@sindresorhus/is@4.6.0: resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} engines: {node: '>=10'} From dcb319ed0931f6c0205a6ccc0df0f5e0f331307a Mon Sep 17 00:00:00 2001 From: Ian Yong Date: Mon, 25 Sep 2023 22:41:09 +0800 Subject: [PATCH 02/20] fix(typescript): fix sourcemap sourcecontent referencing non-existent files (#1571) * test(typescript): add test case for incorrect `sourceContent` * fix(typescript): fix .js.map files being treated as declarations --- .github/workflows/release.yml | 3 ++- packages/typescript/src/index.ts | 8 ++++---- packages/typescript/src/outputFile.ts | 7 +++++++ packages/typescript/test/test.js | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index acecfcbf2..d5a0b898a 100644 --- a/.github/workflows/release.yml +++ b/.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 "release-workflow@rollup.dev" 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 diff --git a/packages/typescript/src/index.ts b/packages/typescript/src/index.ts index 293e341d9..bea3e736d 100644 --- a/packages/typescript/src/index.ts +++ b/packages/typescript/src/index.ts @@ -17,7 +17,7 @@ import findTypescriptOutput, { normalizePath, emitFile, isDeclarationOutputFile, - isMapOutputFile + isTypeScriptMapOutputFile } from './outputFile'; import { preflight } from './preflight'; import createWatchProgram, { WatchProgramHelper } from './watchProgram'; @@ -156,11 +156,11 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi }, async generateBundle(outputOptions) { - const declarationAndMapFiles = [...emittedFiles.keys()].filter( - (fileName) => isDeclarationOutputFile(fileName) || isMapOutputFile(fileName) + const declarationAndTypeScriptMapFiles = [...emittedFiles.keys()].filter( + (fileName) => isDeclarationOutputFile(fileName) || isTypeScriptMapOutputFile(fileName) ); - declarationAndMapFiles.forEach((id) => { + declarationAndTypeScriptMapFiles.forEach((id) => { const code = getEmittedFile(id, emittedFiles, tsCache); if (!code || !parsedOptions.options.declaration) { return; diff --git a/packages/typescript/src/outputFile.ts b/packages/typescript/src/outputFile.ts index 4dc0de04d..d7b080ab1 100644 --- a/packages/typescript/src/outputFile.ts +++ b/packages/typescript/src/outputFile.ts @@ -24,6 +24,13 @@ export function isCodeOutputFile(name: string): boolean { * Checks if the given OutputFile represents some source map */ export function isMapOutputFile(name: string): boolean { + return name.endsWith('.map'); +} + +/** + * Checks if the given OutputFile represents some TypeScript source map + */ +export function isTypeScriptMapOutputFile(name: string): boolean { return name.endsWith('ts.map'); } diff --git a/packages/typescript/test/test.js b/packages/typescript/test/test.js index 27cb33a10..e746680c1 100644 --- a/packages/typescript/test/test.js +++ b/packages/typescript/test/test.js @@ -612,6 +612,24 @@ test.serial('should not emit null sourceContent', async (t) => { t.false(sourcemap.sourcesContent.includes(undefined)); }); +test.serial('should not emit sourceContent that references a non-existent file', async (t) => { + const bundle = await rollup({ + input: 'fixtures/basic/main.ts', + output: { + sourcemap: true + }, + plugins: [ + typescript({ + tsconfig: 'fixtures/basic/tsconfig.json' + }) + ], + onwarn + }); + const output = await getCode(bundle, { format: 'es', sourcemap: true }, true); + const sourcemap = output[0].map; + t.false(sourcemap.sourcesContent.includes('//# sourceMappingURL=main.js.map')); +}); + test.serial('should not fail if source maps are off', async (t) => { await t.notThrowsAsync( rollup({ From c1509e31e1ab61835a304304544d54177c3a1172 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Mon, 25 Sep 2023 15:38:27 +0000 Subject: [PATCH 03/20] chore(release): typescript v11.1.4 --- packages/typescript/CHANGELOG.md | 8 ++++++++ packages/typescript/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/typescript/CHANGELOG.md b/packages/typescript/CHANGELOG.md index 43e229d3d..fc740bc93 100644 --- a/packages/typescript/CHANGELOG.md +++ b/packages/typescript/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-typescript ChangeLog +## v11.1.4 + +_2023-09-25_ + +### Bugfixes + +- fix: fix sourcemap sourcecontent referencing non-existent files [#1571](https://github.com/rollup/plugins/pull/1571) + ## v11.1.3 _2023-08-26_ diff --git a/packages/typescript/package.json b/packages/typescript/package.json index 484a396f3..c43318c2a 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-typescript", - "version": "11.1.3", + "version": "11.1.4", "publishConfig": { "access": "public" }, From 0e2fbdd130078f9f82df71f620cccede0ec69e02 Mon Sep 17 00:00:00 2001 From: shellscape Date: Mon, 25 Sep 2023 11:40:25 -0400 Subject: [PATCH 04/20] chore(wasm): manually bump package version after failed release in CI --- packages/wasm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wasm/package.json b/packages/wasm/package.json index cb3655148..f287816b6 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-wasm", - "version": "6.1.3", + "version": "6.2.0", "publishConfig": { "access": "public" }, From fb2a2ae45ccc3161fd973415880518c43ab6e801 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Mon, 25 Sep 2023 15:43:01 +0000 Subject: [PATCH 05/20] chore(release): wasm v6.2.1 --- packages/wasm/CHANGELOG.md | 8 ++++++++ packages/wasm/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/wasm/CHANGELOG.md b/packages/wasm/CHANGELOG.md index 69446a52f..64919513f 100644 --- a/packages/wasm/CHANGELOG.md +++ b/packages/wasm/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-wasm ChangeLog +## v6.2.1 + +_2023-09-25_ + +### Updates + +- chore: manually bump package version after failed release in CI ([0e2fbdd](https://github.com/rollup/plugins/commit/0e2fbdd130078f9f82df71f620cccede0ec69e02)) + ## v6.1.3 _2023-05-12_ diff --git a/packages/wasm/package.json b/packages/wasm/package.json index f287816b6..7e555491b 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-wasm", - "version": "6.2.0", + "version": "6.2.1", "publishConfig": { "access": "public" }, From 09bab885e7943449d5c241435591ff434c52d431 Mon Sep 17 00:00:00 2001 From: Chikamatsu Kazuya <43089218+chika3742@users.noreply.github.com> Date: Tue, 26 Sep 2023 00:50:25 +0900 Subject: [PATCH 06/20] fix(dsv): fix type of processRow option (#1581) * fix(typescript): fix sourcemap sourcecontent referencing non-existent files (#1571) * test(typescript): add test case for incorrect `sourceContent` * fix(typescript): fix .js.map files being treated as declarations * fix(dsv): type of processRow * test(dsv): update test for processRow types --------- Co-authored-by: Ian Yong --- packages/dsv/test/types.ts | 12 +++++++++++- packages/dsv/types/index.d.ts | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/dsv/test/types.ts b/packages/dsv/test/types.ts index f48fb7319..54528eef5 100644 --- a/packages/dsv/test/types.ts +++ b/packages/dsv/test/types.ts @@ -13,7 +13,17 @@ const config: RollupOptions = { include: 'node_modules/**', exclude: ['node_modules/foo/**', 'node_modules/bar/**'], processRow(row) { - return row; + return { + foo: +row.foo, + bar: new Date(row.bar), + baz: row.baz === 'true', + ...row + }; + } + }), + dsv({ + processRow() { + // void } }) ] diff --git a/packages/dsv/types/index.d.ts b/packages/dsv/types/index.d.ts index f923829cd..e1031295a 100644 --- a/packages/dsv/types/index.d.ts +++ b/packages/dsv/types/index.d.ts @@ -20,7 +20,7 @@ interface RollupDsvOptions { * The function can either manipulate the passed row, or return an entirely new row object. * @default undefined */ - processRow?: null | ((row: DSVRowString, id: string) => DSVRowString | undefined); + processRow?: null | ((row: DSVRowString, id: string) => object | void); } /** From 4fcc32a5b13e7b13331b1cb5198800df1ea106ea Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Mon, 25 Sep 2023 15:53:19 +0000 Subject: [PATCH 07/20] chore(release): dsv v3.0.3 --- packages/dsv/CHANGELOG.md | 8 ++++++++ packages/dsv/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/dsv/CHANGELOG.md b/packages/dsv/CHANGELOG.md index ee161557b..1d2f0fe28 100755 --- a/packages/dsv/CHANGELOG.md +++ b/packages/dsv/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-dsv ChangeLog +## v3.0.3 + +_2023-09-25_ + +### Bugfixes + +- fix: fix type of processRow option [#1581](https://github.com/rollup/plugins/pull/1581) + ## v3.0.2 _2023-01-20_ diff --git a/packages/dsv/package.json b/packages/dsv/package.json index ea17b8f19..c3c0d6a23 100755 --- a/packages/dsv/package.json +++ b/packages/dsv/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-dsv", - "version": "3.0.2", + "version": "3.0.3", "publishConfig": { "access": "public" }, From 841a0391c1dd11fed16771a202e6eff97cf4139b Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Thu, 5 Oct 2023 13:54:18 +0200 Subject: [PATCH 08/20] fix(alias,auto-install,babel,beep,buble,commonjs,data-uri,dsv,dynamic-import-vars,eslint,esm-shim,graphql,html,image,inject,json,legacy,multi-entry,node-resolve,pluginutils,replace,run,strip,sucrase,swc,terser,typescript,url,virtual,wasm,yaml): ensure rollup 4 compatibility (#1595) --- .github/workflows/node-windows.yml | 2 +- packages/alias/package.json | 4 +- packages/alias/test/test.mjs | 10 +- packages/auto-install/package.json | 4 +- packages/babel/package.json | 4 +- packages/babel/test/as-output-plugin.mjs | 2 +- packages/beep/package.json | 4 +- packages/buble/package.json | 4 +- packages/commonjs/package.json | 4 +- packages/commonjs/src/index.js | 2 +- .../commonjs/src/resolve-require-sources.js | 1 + packages/commonjs/src/transform-commonjs.js | 3 + .../function/custom-options/_config.js | 10 +- .../commonjs/test/snapshots/function.js.md | 133 +++--- .../commonjs/test/snapshots/function.js.snap | Bin 19764 -> 19682 bytes packages/commonjs/test/test.js | 24 +- packages/data-uri/package.json | 4 +- packages/dsv/package.json | 4 +- packages/dynamic-import-vars/package.json | 4 +- ...llup-plugin-dynamic-import-vars.test.js.md | 54 +-- ...up-plugin-dynamic-import-vars.test.js.snap | Bin 973 -> 976 bytes packages/eslint/package.json | 4 +- packages/esm-shim/package.json | 4 +- packages/graphql/package.json | 4 +- packages/html/package.json | 4 +- packages/html/test/snapshots/test.js.md | 2 - packages/html/test/snapshots/test.js.snap | Bin 1488 -> 1452 bytes packages/image/package.json | 4 +- packages/image/src/index.js | 1 + packages/inject/package.json | 4 +- packages/json/package.json | 4 +- packages/legacy/package.json | 4 +- packages/multi-entry/package.json | 4 +- packages/node-resolve/package.json | 4 +- packages/node-resolve/src/index.js | 1 + .../test/snapshots/prefer-builtins.js.md | 1 - .../test/snapshots/prefer-builtins.js.snap | Bin 388 -> 356 bytes .../node-resolve/test/snapshots/test.mjs.md | 1 - .../node-resolve/test/snapshots/test.mjs.snap | Bin 867 -> 823 bytes packages/node-resolve/test/test.mjs | 26 +- packages/pluginutils/package.json | 4 +- packages/replace/package.json | 4 +- packages/replace/test/snapshots/misc.js.md | 1 - packages/replace/test/snapshots/misc.js.snap | Bin 436 -> 399 bytes packages/run/package.json | 4 +- packages/strip/package.json | 4 +- packages/sucrase/package.json | 4 +- packages/swc/package.json | 6 +- packages/terser/package.json | 4 +- packages/typescript/package.json | 4 +- .../typescript/src/diagnostics/toWarning.ts | 15 +- packages/typescript/src/index.ts | 14 +- packages/typescript/src/preflight.ts | 8 +- .../typescript/test/snapshots/warnings.ts.md | 1 - .../test/snapshots/warnings.ts.snap | Bin 475 -> 435 bytes packages/typescript/test/test.js | 4 +- packages/url/package.json | 4 +- packages/url/src/index.js | 1 + packages/virtual/package.json | 4 +- packages/wasm/package.json | 4 +- packages/wasm/src/index.ts | 1 + packages/yaml/package.json | 4 +- pnpm-lock.yaml | 433 ++++++++++-------- 63 files changed, 462 insertions(+), 415 deletions(-) diff --git a/.github/workflows/node-windows.yml b/.github/workflows/node-windows.yml index 474003c5c..330e0aeaf 100644 --- a/.github/workflows/node-windows.yml +++ b/.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 diff --git a/packages/alias/package.json b/packages/alias/package.json index 214031d79..883198425 100755 --- a/packages/alias/package.json +++ b/packages/alias/package.json @@ -51,7 +51,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": { @@ -65,7 +65,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" }, "types": "./types/index.d.ts", diff --git a/packages/alias/test/test.mjs b/packages/alias/test/test.mjs index a4d0781e7..55a67aa0d 100755 --- a/packages/alias/test/test.mjs +++ b/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 } diff --git a/packages/auto-install/package.json b/packages/auto-install/package.json index a5c0fd103..297a187cc 100755 --- a/packages/auto-install/package.json +++ b/packages/auto-install/package.json @@ -53,7 +53,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": { @@ -65,7 +65,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" }, "types": "./types/index.d.ts", diff --git a/packages/babel/package.json b/packages/babel/package.json index 88e94728e..28afc3110 100644 --- a/packages/babel/package.json +++ b/packages/babel/package.json @@ -55,7 +55,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": { @@ -79,7 +79,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" }, "types": "./types/index.d.ts", diff --git a/packages/babel/test/as-output-plugin.mjs b/packages/babel/test/as-output-plugin.mjs index b9ac6d091..479931448 100644 --- a/packages/babel/test/as-output-plugin.mjs +++ b/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); }); `, diff --git a/packages/beep/package.json b/packages/beep/package.json index 4b6c21c73..e87210fe0 100644 --- a/packages/beep/package.json +++ b/packages/beep/package.json @@ -37,7 +37,7 @@ "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": { @@ -45,7 +45,7 @@ } }, "devDependencies": { - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "strip-ansi": "^7.0.1" }, "types": "types/index.d.ts", diff --git a/packages/buble/package.json b/packages/buble/package.json index 7965d3fa2..2cc4036f8 100644 --- a/packages/buble/package.json +++ b/packages/buble/package.json @@ -53,7 +53,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": { @@ -68,7 +68,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" }, diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index 1cff5476a..bd189461b 100644 --- a/packages/commonjs/package.json +++ b/packages/commonjs/package.json @@ -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", diff --git a/packages/commonjs/src/index.js b/packages/commonjs/src/index.js index 99a92a8d5..da40131b5 100644 --- a/packages/commonjs/src/index.js +++ b/packages/commonjs/src/index.js @@ -306,7 +306,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); } } }; diff --git a/packages/commonjs/src/resolve-require-sources.js b/packages/commonjs/src/resolve-require-sources.js index 4efd6993d..22d9e3f65 100644 --- a/packages/commonjs/src/resolve-require-sources.js +++ b/packages/commonjs/src/resolve-require-sources.js @@ -170,6 +170,7 @@ export function getRequireResolver(extensions, detectCyclesAndConditional, curre currentlyResolvingForParent.add(source); const resolved = (await rollupContext.resolve(source, parentId, { + skipSelf: false, custom: { 'node-resolve': { isRequire: true } } })) || resolveExtensions(source, parentId, extensions); currentlyResolvingForParent.delete(source); diff --git a/packages/commonjs/src/transform-commonjs.js b/packages/commonjs/src/transform-commonjs.js index 84280cd1e..892e3b943 100644 --- a/packages/commonjs/src/transform-commonjs.js +++ b/packages/commonjs/src/transform-commonjs.js @@ -300,6 +300,9 @@ export default 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); diff --git a/packages/commonjs/test/fixtures/function/custom-options/_config.js b/packages/commonjs/test/fixtures/function/custom-options/_config.js index d6b87f3ab..8fe741c1b 100644 --- a/packages/commonjs/test/fixtures/function/custom-options/_config.js +++ b/packages/commonjs/test/fixtures/function/custom-options/_config.js @@ -13,12 +13,16 @@ module.exports = { plugins: [ { async buildStart() { - await this.resolve('./other.js', ID_MAIN, { isEntry: true, custom: { test: 42 } }); + await this.resolve('./other.js', ID_MAIN, { + skipSelf: false, + isEntry: true, + custom: { test: 42 } + }); }, buildEnd() { assert.deepStrictEqual(resolveIdArgs, [ - ['other.js', 'main.js', { assertions: {}, custom: { test: 42 }, isEntry: true }], - ['main.js', void 0, { assertions: {}, custom: {}, isEntry: true }] + ['other.js', 'main.js', { attributes: {}, custom: { test: 42 }, isEntry: true }], + ['main.js', void 0, { attributes: {}, custom: {}, isEntry: true }] ]); }, resolveId(source, importer, options) { diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index 34d524d8e..bffef3a99 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -1081,7 +1081,24 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'generated-lib2.js': `'use strict';␊ + 'main.js': `'use strict';␊ + ␊ + var main2 = require('./main2.js');␊ + ␊ + /* eslint-disable import/no-dynamic-require, global-require */␊ + ␊ + let message;␊ + ␊ + for (const index of [1, 2]) {␊ + try {␊ + message = main2.createCommonjsRequire("/fixtures/function/dynamic-require-code-splitting")(\`./target${index}.js\`);␊ + } catch (err) {␊ + ({ message } = err);␊ + }␊ + t.is(message, index.toString());␊ + }␊ + `, + 'main2.js': `'use strict';␊ ␊ var target1;␊ var hasRequiredTarget1;␊ @@ -1211,28 +1228,6 @@ Generated by [AVA](https://avajs.dev). ␊ exports.createCommonjsRequire = createCommonjsRequire;␊ `, - 'main.js': `'use strict';␊ - ␊ - var lib2 = require('./generated-lib2.js');␊ - ␊ - /* eslint-disable import/no-dynamic-require, global-require */␊ - ␊ - let message;␊ - ␊ - for (const index of [1, 2]) {␊ - try {␊ - message = lib2.createCommonjsRequire("/fixtures/function/dynamic-require-code-splitting")(\`./target${index}.js\`);␊ - } catch (err) {␊ - ({ message } = err);␊ - }␊ - t.is(message, index.toString());␊ - }␊ - `, - 'main2.js': `'use strict';␊ - ␊ - require('./generated-lib2.js');␊ - ␊ - `, } ## dynamic-require-different-loader @@ -1511,6 +1506,7 @@ Generated by [AVA](https://avajs.dev). ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ + ␊ t.is(result, 'submodule');␊ `, } @@ -3454,6 +3450,9 @@ Generated by [AVA](https://avajs.dev). const getGlobalPollution = () => 'foo';␊ ␊ // this test makes sure that "submodule" is not wrapped in commonjs␊ + // helper due to its use of "typeof module", given that "submodule" has es6 exports.␊ + // any attempt to wrap it in a function will just fail as it's invalid syntax.␊ + ␊ ␊ t.is(getGlobalPollution(), global.pollution);␊ `, @@ -4023,11 +4022,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var other = require('./other-77ad7026.js');␊ + var other = require('./other.js');␊ ␊ - t.is(other.foo, 'foo');␊ + t.is(other, 'foo');␊ `, - 'other-77ad7026.js': `'use strict';␊ + 'other.js': `'use strict';␊ ␊ function getDefaultExportFromCjs (x) {␊ return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ @@ -4037,15 +4036,7 @@ Generated by [AVA](https://avajs.dev). ␊ var foo = /*@__PURE__*/getDefaultExportFromCjs(other);␊ ␊ - exports.foo = foo;␊ - `, - 'other.js': `'use strict';␊ - ␊ - var other = require('./other-77ad7026.js');␊ - ␊ - ␊ - ␊ - module.exports = other.foo;␊ + module.exports = foo;␊ `, } @@ -5124,6 +5115,16 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ + var foo;␊ + var hasRequiredFoo;␊ + ␊ + function requireFoo () {␊ + if (hasRequiredFoo) return foo;␊ + hasRequiredFoo = 1;␊ + foo = 1;␊ + return foo;␊ + }␊ + ␊ var multiply;␊ var hasRequiredMultiply;␊ ␊ @@ -5136,16 +5137,6 @@ Generated by [AVA](https://avajs.dev). return multiply;␊ }␊ ␊ - var foo;␊ - var hasRequiredFoo;␊ - ␊ - function requireFoo () {␊ - if (hasRequiredFoo) return foo;␊ - hasRequiredFoo = 1;␊ - foo = 1;␊ - return foo;␊ - }␊ - ␊ /* eslint-disable global-require */␊ ␊ var main = function () {␊ @@ -5806,7 +5797,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'bar-imported-f14679e4.js': `'use strict';␊ + 'bar-imported-QFe_5Jm2.js': `'use strict';␊ ␊ var barImported = 'imported';␊ ␊ @@ -5822,12 +5813,12 @@ Generated by [AVA](https://avajs.dev). ␊ requiring.foo = fooRequired;␊ ␊ - requiring.barPromise = Promise.resolve().then(function () { return require('./bar-imported-f14679e4.js'); });␊ + requiring.barPromise = Promise.resolve().then(function () { return require('./bar-imported-QFe_5Jm2.js'); });␊ ␊ t.is(foo, 'imported');␊ t.is(requiring.foo, 'required');␊ ␊ - var main = Promise.all([Promise.resolve().then(function () { return require('./bar-imported-f14679e4.js'); }), requiring.barPromise]);␊ + var main = Promise.all([Promise.resolve().then(function () { return require('./bar-imported-QFe_5Jm2.js'); }), requiring.barPromise]);␊ ␊ module.exports = main;␊ `, @@ -5930,7 +5921,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - '_virtual/_commonjsHelpers.js': `'use strict';␊ + 'main.js': `'use strict';␊ ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ @@ -5938,37 +5929,23 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - exports.commonjsGlobal = commonjsGlobal;␊ - exports.getDefaultExportFromCjs = getDefaultExportFromCjs;␊ - `, - 'main.js': `'use strict';␊ - ␊ - var _commonjsHelpers = require('./_virtual/_commonjsHelpers.js');␊ - var main$1 = require('./main2.js');␊ - ␊ - var mainExports = main$1.__require();␊ - var main = /*@__PURE__*/_commonjsHelpers.getDefaultExportFromCjs(mainExports);␊ - ␊ - module.exports = main;␊ - `, - 'main2.js': `'use strict';␊ - ␊ - var _commonjsHelpers = require('./_virtual/_commonjsHelpers.js');␊ - ␊ - var main;␊ + var main$1;␊ var hasRequiredMain;␊ ␊ function requireMain () {␊ - if (hasRequiredMain) return main;␊ + if (hasRequiredMain) return main$1;␊ hasRequiredMain = 1;␊ - _commonjsHelpers.commonjsGlobal.main = 'main';␊ + commonjsGlobal.main = 'main';␊ console.log('main');␊ ␊ - main = 'main';␊ - return main;␊ + main$1 = 'main';␊ + return main$1;␊ }␊ ␊ - exports.__require = requireMain;␊ + var mainExports = requireMain();␊ + var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊ + ␊ + module.exports = main;␊ `, } @@ -7579,7 +7556,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'entry-b0367e48.js': `'use strict';␊ + 'entry-ig6UcNgX.js': `'use strict';␊ ␊ function _mergeNamespaces(n, m) {␊ m.forEach(function (e) {␊ @@ -7611,7 +7588,7 @@ Generated by [AVA](https://avajs.dev). `, 'entry.js': `'use strict';␊ ␊ - var entry = require('./entry-b0367e48.js');␊ + var entry = require('./entry-ig6UcNgX.js');␊ ␊ ␊ ␊ @@ -7619,7 +7596,7 @@ Generated by [AVA](https://avajs.dev). `, 'main.js': `'use strict';␊ ␊ - var entry = require('./entry-b0367e48.js');␊ + var entry = require('./entry-ig6UcNgX.js');␊ ␊ t.deepEqual(entry.entry, { default: 'default' });␊ `, @@ -7630,7 +7607,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'entry-70303bf1.js': `'use strict';␊ + 'entry-AiU39g3m.js': `'use strict';␊ ␊ function _mergeNamespaces(n, m) {␊ m.forEach(function (e) {␊ @@ -7667,7 +7644,7 @@ Generated by [AVA](https://avajs.dev). ␊ Object.defineProperty(exports, '__esModule', { value: true });␊ ␊ - var entry = require('./entry-70303bf1.js');␊ + var entry = require('./entry-AiU39g3m.js');␊ ␊ ␊ ␊ @@ -7676,7 +7653,7 @@ Generated by [AVA](https://avajs.dev). `, 'main.js': `'use strict';␊ ␊ - var entry = require('./entry-70303bf1.js');␊ + var entry = require('./entry-AiU39g3m.js');␊ ␊ t.deepEqual(entry.entry, { default: 'default', named: 'named' });␊ `, diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 5517bbaaa154e47d36e0b5b9487914b0de0451ad..1d0e1a45e0d598716425df31a8d1431561f9a60e 100644 GIT binary patch delta 18451 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 { } catch (error) { t.is( error.frame, - '1: /* eslint-disable */\n2: export const foo = 2,\n ^' + `1: /* eslint-disable */ +2: export const foo = 2, + ^` ); } }); @@ -665,11 +667,17 @@ test('does not affect subsequently created instances when called with `requireRe const options = { requireReturnsDefault: 'preferred' }; const instance1 = commonjs(options); - const bundle1 = await rollup({ input, plugins: [instance1] }); + const bundle1 = await rollup({ + input, + plugins: [instance1] + }); const code1 = (await bundle1.generate({})).output[0].code; const instance2 = commonjs(options); - const bundle2 = await rollup({ input, plugins: [instance2] }); + const bundle2 = await rollup({ + input, + plugins: [instance2] + }); const code2 = (await bundle2.generate({})).output[0].code; t.is(code1, code2); @@ -1266,12 +1274,18 @@ test('allows the config to be reused', async (t) => { }) ] }; - let bundle = await rollup({ input: 'foo.js', ...config }); + let bundle = await rollup({ + input: 'foo.js', + ...config + }); t.deepEqual( bundle.cache.modules.map(({ id }) => id), ['foo.js'] ); - bundle = await rollup({ input: 'bar.js', ...config }); + bundle = await rollup({ + input: 'bar.js', + ...config + }); t.deepEqual( bundle.cache.modules.map(({ id }) => id), ['bar.js'] diff --git a/packages/data-uri/package.json b/packages/data-uri/package.json index 572038398..5d3376697 100644 --- a/packages/data-uri/package.json +++ b/packages/data-uri/package.json @@ -54,7 +54,7 @@ "url" ], "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": { @@ -66,7 +66,7 @@ }, "devDependencies": { "@rollup/plugin-typescript": "^9.0.1", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/dsv/package.json b/packages/dsv/package.json index c3c0d6a23..ad745809d 100755 --- a/packages/dsv/package.json +++ b/packages/dsv/package.json @@ -41,7 +41,7 @@ "LICENSE" ], "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": { @@ -56,7 +56,7 @@ }, "devDependencies": { "del-cli": "^5.0.0", - "rollup": "^3.2.3" + "rollup": "^4.0.0-24" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/dynamic-import-vars/package.json b/packages/dynamic-import-vars/package.json index d1ab51a0f..8851e1a2c 100644 --- a/packages/dynamic-import-vars/package.json +++ b/packages/dynamic-import-vars/package.json @@ -55,7 +55,7 @@ "interpolation" ], "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": { @@ -72,7 +72,7 @@ "devDependencies": { "acorn": "^8.8.0", "prettier": "^2.7.1", - "rollup": "^3.2.3" + "rollup": "^4.0.0-24" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md index 481b23d30..611c7f70f 100644 --- a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md +++ b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md @@ -10,8 +10,8 @@ Generated by [AVA](https://avajs.dev). `function __variableDynamicImportRuntime0__(path) {␊ switch (path) {␊ - case './module-dir-a/module-a-1.js': return import('./module-a-1-46aeaa54.js');␊ - case './module-dir-a/module-a-2.js': return import('./module-a-2-cf42d8af.js');␊ + case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊ + case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ @@ -33,11 +33,11 @@ Generated by [AVA](https://avajs.dev). `function __variableDynamicImportRuntime0__(path) {␊ switch (path) {␊ - case './module-dir-a/module-a-1.js': return import('./module-a-1-46aeaa54.js');␊ - case './module-dir-a/module-a-2.js': return import('./module-a-2-cf42d8af.js');␊ - case './module-dir-b/module-b-1.js': return import('./module-b-1-7b773b3a.js');␊ - case './module-dir-b/module-b-2.js': return import('./module-b-2-e1209a85.js');␊ - case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-4b2f0419.js');␊ + case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊ + case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊ + case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊ + case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊ + case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-jrfqlYMu.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ @@ -59,8 +59,8 @@ Generated by [AVA](https://avajs.dev). `function __variableDynamicImportRuntime0__(path) {␊ switch (path) {␊ - case '../module-dir-a/module-a-1.js': return import('./module-a-1-46aeaa54.js');␊ - case '../module-dir-a/module-a-2.js': return import('./module-a-2-cf42d8af.js');␊ + case '../module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊ + case '../module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ @@ -82,10 +82,10 @@ Generated by [AVA](https://avajs.dev). `function __variableDynamicImportRuntime0__(path) {␊ switch (path) {␊ - case './module-dir-a/module-a-1.js': return import('./module-a-1-46aeaa54.js');␊ - case './module-dir-a/module-a-2.js': return import('./module-a-2-cf42d8af.js');␊ - case './module-dir-b/module-b-1.js': return import('./module-b-1-7b773b3a.js');␊ - case './module-dir-b/module-b-2.js': return import('./module-b-2-e1209a85.js');␊ + case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊ + case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊ + case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊ + case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ @@ -107,8 +107,8 @@ Generated by [AVA](https://avajs.dev). `function __variableDynamicImportRuntime0__(path) {␊ switch (path) {␊ - case './root-module-a.js': return import('./root-module-a-0debaeb6.js');␊ - case './root-module-b.js': return import('./root-module-b-0da599d4.js');␊ + case './root-module-a.js': return import('./root-module-a-lF5i40jF.js');␊ + case './root-module-b.js': return import('./root-module-b-F1yin99u.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ @@ -130,11 +130,11 @@ Generated by [AVA](https://avajs.dev). `function __variableDynamicImportRuntime2__(path) {␊ switch (path) {␊ - case './module-dir-a/module-a-1.js': return import('./module-a-1-46aeaa54.js');␊ - case './module-dir-a/module-a-2.js': return import('./module-a-2-cf42d8af.js');␊ - case './module-dir-b/module-b-1.js': return import('./module-b-1-7b773b3a.js');␊ - case './module-dir-b/module-b-2.js': return import('./module-b-2-e1209a85.js');␊ - case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-4b2f0419.js');␊ + case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊ + case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊ + case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊ + case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊ + case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-jrfqlYMu.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ @@ -145,8 +145,8 @@ Generated by [AVA](https://avajs.dev). ␊ function __variableDynamicImportRuntime1__(path) {␊ switch (path) {␊ - case './module-dir-a/module-a-1.js': return import('./module-a-1-46aeaa54.js');␊ - case './module-dir-a/module-a-2.js': return import('./module-a-2-cf42d8af.js');␊ + case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊ + case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ @@ -157,8 +157,8 @@ Generated by [AVA](https://avajs.dev). ␊ function __variableDynamicImportRuntime0__(path) {␊ switch (path) {␊ - case './module-dir-a/module-a-1.js': return import('./module-a-1-46aeaa54.js');␊ - case './module-dir-a/module-a-2.js': return import('./module-a-2-cf42d8af.js');␊ + case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊ + case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ @@ -191,7 +191,7 @@ Generated by [AVA](https://avajs.dev). `console.log('a-1');␊ ␊ function importModuleA() {␊ - return import('./module-a-2-cf42d8af.js');␊ + return import('./module-a-2-qepdcyXv.js');␊ }␊ ␊ function importModuleB() {␊ @@ -218,8 +218,8 @@ Generated by [AVA](https://avajs.dev). `function __variableDynamicImportRuntime0__(path) {␊ switch (path) {␊ - case './module-dir-a/module-a-1.js': return import('./module-a-1-46aeaa54.js');␊ - case './module-dir-a/module-a-2.js': return import('./module-a-2-cf42d8af.js');␊ + case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊ + case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊ default: return new Promise(function(resolve, reject) {␊ (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊ reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊ diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap index f6ffcbc43ba62659f455f3ed24fbb4fdf773c4b0..1239582e02b24caa0c221f4050bca72a8f23642d 100644 GIT binary patch literal 976 zcmV;>126nRRzVsFvZKanQyzj=1+{_zha$vF<&>=L zNweu@*V$dS2~iFl`5Ey0_y=5AJ5Fo24oORqs@73*SZDT|_s-1vN7H4(+gIOzqNbW* zTT#Bp5PT}B;v`Tlq1Cq^zE3pyGT&X8yEPYmZrq%^Gw;qfL+)uRIMnM0L{j21e9`Bm zL%lbhKuG;Q8$CVN5x~~{07VnJA%?g^Jt;I%`>?sW3D$VG1XMycL4sa!Dfew2GFFbIc`2ok_We(MpNm5dW4C}m@=K!WI^2h4h&@nB022*|@p`yu zzKcih9c|i)O=BAz9O;x8VY>4hC%mvUh(LzMunoi3aKc`+0|psRFx*&7!m`sbR;R%z zFxBbETo_~`lPz4k$jrfX#|w9woQA-8(DlEP&ktYCj5$S4L*Ue(>;=77RhomTLN@|j zY0{qAk4_jI66q@^vi$_$JW{7En_c#0CoGaQlcdJ9hSj+;b!lKW56_;XLE@JvMPsRR z3W(06DPDL1`7e1|l#okNLjJXegr4Y_3ep2laF1x@BoZvAmaJ!jbh)S{m$jA@sT3dd zZ%rPY@33DQ#OHk@<&^mJj}V8AVZ%setysgew`-BI2FF-L$bL>8a5E|P;o=7gDTH>$ zQ9dEKGBggWJ)#d++j+T_CUj>2bDdhXPx;fQMOShWqeI%XXAZ^Q-Q&?AqespZaeE^Z zmgU4CmghJ?&ieDlk1E^5ZRFQ`1%&Bxk|Hy_5r zo%{i9j&2m(8vp>rCE1by literal 973 zcmV;;12X(URzVr z?*A8g8y|}Z00000000B+SxZmbKoI7ksuj21s-8v&$&QEv3E?eTQMHwNpsM3P*D(U~li31)SMFzC9JJ z#hnkWwhZ*=P-x!5#l1bV&2+N_-5CIN!nMrvFl(bQYnJ2HYwjBJQkX7!EcEr+K7l9jDUdC$ z&>R@U3{Xk`7|TR-fQ}yM2w>{dHcAhULJV<-JAu?p9m3Yu78rxw2E4xb{{|@3U&)R# z)Fm^)f&{%{bK#mI^!;)y&AT9wfjRq4913|NVBi*T`+i9@-GEt`hu8z91TfLC7q5FW z^qo0#Z-3KHY#Nhru&+~Mgwf7#T=2qNHv;LAVH?DjIAJH+0o@EI=xxp2Uib!l_&`Z?N8{1T;TEOkx+ z(U~;GJ1-#rB~ObIaxY5AZEHyA$QD(Q4meUcOrv0tU^%s9BNL?aMJ>6nwWLU;_@Mtt zd2qACey$sz_l=ZO;?qAu>@|7~lFC>xde?8)B4r7OEFy!`oH}4gM|!sR@s z>3*Z?N>swo;53=o$3eFNy2&(9yAk>>2&uuwgu=bli0uB&^dWyHGG?JHGKN}V+svpv zPPz>1*4_+*GNQ2{?O3BfC!`(|n|OK7BDYW5&RX+L%8o}46M!AZ4_yS0`*^uu+dWR3 vX|g$H&zUH4>pSVr%L@%9P!eJgNs!Z97Vl0T*O7b=-ktmd%Woup+#3J@o*3Ay diff --git a/packages/eslint/package.json b/packages/eslint/package.json index 5faceecc4..397b221e4 100755 --- a/packages/eslint/package.json +++ b/packages/eslint/package.json @@ -54,7 +54,7 @@ "lint" ], "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": { @@ -69,7 +69,7 @@ "@rollup/plugin-node-resolve": "^15.0.0", "@rollup/plugin-typescript": "^9.0.1", "@types/eslint": "^8.4.6", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/esm-shim/package.json b/packages/esm-shim/package.json index 2512fb204..7f670ae7f 100644 --- a/packages/esm-shim/package.json +++ b/packages/esm-shim/package.json @@ -52,7 +52,7 @@ "modules" ], "peerDependencies": { - "rollup": "^2.x || ^3.x" + "rollup": "^2.0.0||^3.0.0||^4.0.0" }, "peerDependenciesMeta": { "rollup": { @@ -63,7 +63,7 @@ "magic-string": "^0.30.0" }, "devDependencies": { - "rollup": "^3.0.0-7", + "rollup": "^4.0.0-24", "typescript": "^4.8.3" }, "types": "./types/index.d.ts" diff --git a/packages/graphql/package.json b/packages/graphql/package.json index f4fc4a8d1..4260ffdcd 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -55,7 +55,7 @@ ], "peerDependencies": { "graphql": ">=0.9.0", - "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": { @@ -69,7 +69,7 @@ "devDependencies": { "@rollup/plugin-buble": "^1.0.0", "graphql": "^16.6.0", - "rollup": "^3.2.3" + "rollup": "^4.0.0-24" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/html/package.json b/packages/html/package.json index 22f094b39..7baa94a6b 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -51,7 +51,7 @@ "template" ], "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": { @@ -61,7 +61,7 @@ "devDependencies": { "@rollup/plugin-typescript": "^9.0.1", "postcss": "^8.4.16", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "rollup-plugin-postcss": "^4.0.2", "typescript": "^4.8.3" }, diff --git a/packages/html/test/snapshots/test.js.md b/packages/html/test/snapshots/test.js.md index 7694ad915..39485f833 100644 --- a/packages/html/test/snapshots/test.js.md +++ b/packages/html/test/snapshots/test.js.md @@ -189,13 +189,11 @@ Generated by [AVA](https://avajs.dev). names: [ 'batman', ], - toString: Function {}, }, { code: 'PLUGIN_WARNING', message: 'plugin-html: The output format \'cjs\' is not directly supported. A custom `template` is probably required. Supported formats include: es, esm, iife, umd', plugin: 'html', - toString: Function {}, }, ] diff --git a/packages/html/test/snapshots/test.js.snap b/packages/html/test/snapshots/test.js.snap index 1fdf4d3a09e62cdb10adaf7b83aa18587f3bbc5f..8d01f6b5c7b41ccd803c846940ae1c093c57d6e6 100644 GIT binary patch literal 1452 zcmV;d1ylM#RzVSYy9^m?uXzrYB2^CvG^5gXcI zk|@6}tRIUA00000000B+SxsydRUDtUyZsvI2jGQ};ByS!*3cG=A*Adswt*0|7J@Vc zHKA{3-t4}1KGu0}3acqm^dKf0Z+b8>;6=R{FM5>tb>ME|Q6o1G9y}RM^fx=RTe>VP z69L9|`%1ok z#j==UXH$QtwJt6Ck#3UShvNa@XD5R^ zBmJ;RJwnnN>DWdxCZ07pNxiKN*`a4fk4%SbW-33Z4%1il9#ySy-=@fl@Hoxq^E6vG z%+kTZ^FVb>IAw=En# z&D?sdq^HP~%e>J!*<_h^S*6xa_cq<>lztePaSvU+ZPL-z?0riFy6`N1VYIAV=XN37 z(#g#sAmLwXdhRjHH>3R0sH1|Oiw@LbUMX*I&nW1W=E|H|Q3FkvD@M&S3nW*0BUJXt zK_j_UV{YM;?>J$FPKKW4@Z4B@v1SnUG*<5_SM;rF;wa5PR1}qgnKv3)H43@0_(siq zEVf4nQIv^HO1G6qdS;!;qZiW1Zpvc~<*_A+;9m66NA8b4;>#YQ%Nq-VpRf3VGN|c$ zihD3~g(uw59g!w;cz*w0igP8HvvlFSuv9s3@daV>k=n^})lD*GvW5Sqx5#m9MY^+u zuz8Cy>4Vi0-Cw{SsOWHe(Y*wdBCrU20({f#vNF+;>~cBiJuUPwv>^nsIbN7tx-Dq? z+G^4EN8le|XM5TnfJqKG16%?=yhqxShl7yctz$ycC@2(n-wGXmH}t%)GxTIwi3SI5 zQ9o3bP*K|tT&9*-d#TRacUOzGzXH9WU$#AKkHF*^fCKLVpWP#C`w?lQ205n82>)33uieI;QVL$E`=7J9+x-xyhO7BU4A447*$| zB`Y;-A3w%D9Hjr?E~pMIW=?a`1H9m z6Q`z+PanH;D5>|giW8QEHxj*=aeBJUmlqS7HRoiO3Q0X*QA-5Khf}4E(lbgYs2NJ- zyL49JNgO=YY-C;u{30vDG~h3XaD(OZjd~ULEirdBozUXrl*_$^93pxLkzEo4`lFb>K#` zOUM6rW!XLF&-35`mi(SL0PyQh6(36fJ-wv#B!=}c-u$+f<4w*H-aIV_+|C<~ycsAU zPTr8J>Tp@+T*d#`c3i5z`4tRH8re;!>16h63SxMpBe;@c~pN8mV<;K{$eWiQ$SX73j!=yrF{d zE(+BI-qni$Tf0J45^gksYqf{oy_$RIZvj`^m!+>^@;&e~um$yH&qK6_-i_(D*x-xX zZ`a-8ww~0L@6VL$i=h^Kh|W6u-n98ScH@bKWNXqW#LUgPOn6{ra)__ReEb(41#k2( GAOHYrHP#aV literal 1488 zcmV;>1uyzRRzVxaQ@%w?DRpL# znYygJl<3H-tF!gg}C~KXww= zsT)GlM2)3SJ3IT{?Aw{|d-LNPR^E1vC2{>Gl}y^yHK|2>TVl5)nac$eoRmb-mExTn zrb#5ZnD{%Xv?#$3rBQMOuEzl{0=iLi7iyaDJW@ueQtIgFP>`yigo4@-dL?p%($(OK zf;O7If#NN|JW`bFfG<(pR`Z$sA~hsRREwRRouSKZFu4Qx1#lptC`S`DF3I&S?FvdM zr~_;g&!D7&nz~TRfNza&5+5pkmd}mglX0I#4C#91e*Bi&D$6D6S{QnTaf)?a$C-*@ z1|K~dKNup8iBH5gtNvNFH7@t{kEtvDeQRCcU@C>GLVhRlqq@LTBzyP7!D7PILL zaVoK*);y68;X{j}#xm)UQdmy5*F0$!uJ0L93oY#px}&Am`=JO_#!Y%eXYypM29l#<)F6K(L>*!5XAm`VNl`Jq3zq- zMcbbN{{VU#)Al%+>s7bE-9Nse=t}MLO z?V{y9z!BhAwlOVd!Q>L)eSi*&?uFWgchlx*dEnHmXJ;?YPtMJpoIX`!*y2zjNTF(b zWQua?kwC$OW9pP-8HUQ|OIaNEt2U&dg9yC|K~A9)XGxHZF&dr>jnR;}PiBFZ1?H3py42CX?XNz=wy1^M^QDiU^n7b02%!8h?%eb1H zhVTS7d?8&2FG%=C8@_iTFfVy-p5(#Qqi^`&2A1cm87*pC!0OhpeUoM}6$1bV*1NEt z9KgO~)+!|mv--u6%%GR<)bFJ zYo>-gJrEdIBWjKYy0YppM4cUKYGI8~QZK+Y3pfcl(?~4IP$HMAV)-Z*3lwh$#Y8BA z2T=SIa05he7jVC^ZopG%0ce0}fYo5b3NBZ{mPNfF{it({%h5>bouKq*l|!ied0=O_-_PP>BO|?I zcts6I4%PImnlDQ_O?g2U!>SbOj?>Q~kwEOcFKN9j^zMEZ+Rs8el!XqZc4ZdY@Q@E? zals0lK!R|&7AGaBd;(bs2WlN$W;P={Hr#Zk0yz(GOxAQdr1HjG3Y3VyK`3Z0j&<6RX_bEEfPs6gF?eT5)54&!gUFp=#pA;1Dbp`EAPfzFyNr3QW2JZpWo7V?DKm$8Ozj<_2QFFWF)^2CnPl^NtwRuU1_2ow!L=h=qFk^A zwPRb)toESUg~nx`(;T33uImce761Zv04}PgdTi^f)rZwr)!e)vzp!thwzi(<3D_0j z2yiV^+b>qrYjV|3x$uDj1vj4_a;oe)c0K3{ob9ni{InDDlDN zh%)LpCTOCGmn)1L$tEUN*31`S$SfPcSDDmEwxABB z6X(yJ?L)NiUl-6OZ)grJ* zphCcROz8m11iUs>0u^GBGFN3%1*N2;a?;lu8&=@vav&VNRQ8SAnWs+htu`?RP zsT^O>&O~E``gEm0=ZruT;K&VEG<%s$CNE!Yl!+IAGyVY*#k`9B0RRBVx2L%P diff --git a/packages/node-resolve/test/snapshots/test.mjs.md b/packages/node-resolve/test/snapshots/test.mjs.md index f9eda1d17..7eccb2357 100644 --- a/packages/node-resolve/test/snapshots/test.mjs.md +++ b/packages/node-resolve/test/snapshots/test.mjs.md @@ -19,7 +19,6 @@ Generated by [AVA](https://avajs.dev). code: 'PLUGIN_WARNING', message: 'node-resolve: The `customResolveOptions.moduleDirectory` option has been deprecated. Use `moduleDirectories`, which must be an array.', plugin: 'node-resolve', - toString: Function {}, }, ] diff --git a/packages/node-resolve/test/snapshots/test.mjs.snap b/packages/node-resolve/test/snapshots/test.mjs.snap index 84b2de596e380c8c7ce0eb6ed1b510b03acfc6fb..84c150452384f0b6ee8303f0be5c734a9d30e0a6 100644 GIT binary patch literal 823 zcmV-71IYYARzVEbKoG~h=?n2nD>!f*<;0;45<)_PR?rt!BxtKbRXCB2 zy@|J3d(G~;X^tE?^98t+FT+D1gv2-Ci!gTL^pP6u60420+I4nj_n+U)ICIc!2x+(V z`;W|UBiR0J<0{$Fz?6~-coT4&3g8ZK4Zbv>n3iIXIb8cR(5^K4?SbP^Ltie9SyNW@ zArsaNxwkAs;T&~=O7%`t$_g}<^q>;@$x(Ch9o1c3NmOi7AtDuas14eB(g_7y;fmQt zD$X=?xN$+S7PY&5qpjXy8-d}{*VW@L-66HFh&PaXiIiq>zKi1qnVcaLi%QWhA<3#- zE?eZXMTkYN5Hg=Qjkj@rgX05^CDM1E+-U6Louo8aPESu;c!F+;{} z>9FMC`sUN^wc7gYoyD#7+WOiF(O7C`H?_3|?19;&wsAu6&2N`dGOEokY z^TA;O?oq>>Dr{>!W(anD7CJ7sUGVS%bOP!Fjkr`#sGJN$*y4Wjc=f2pB(kf=@~eqM zF;8L=oE}EhrkUDf&%2)Bep~nD4=3O6K{RiX(tVs4;%H(NCRU@XdV!6XabV+B5*d;c z_vxrlYOVK51}n&KF%?nkiLb&A!|yvlMTd4Zgh<_B0F@LX44^)IPTwzKIG>MUgK8{S zm5T05f#`_HLawhc9ayaiT^WMU@HZNl>sbf{Lnk!A6h=d?b;!;ND4=#5C0}4beT5?f z^e7)7wr`lPqh%_iZ$&baSr{FP92usye3-azi_l@qQn6?8OEewVuOe}EvfvsPJ2Gqw z`LHQQohMwR*WcG7VR>0#B@#!5=wZ&x(tic?xky0mOxdJIisx}&Jc9-&mC^Si83oxG z9cjbPt<*$7v30)Cr4~yZ8KR{#H3OK=hNbsRKZ@j}aX( z(}Vn&(tCkVMH1T0N@#R{|0`!IxEjWX;=3^w)6XI?nH(jTDE)6>e*oHta4LNf002y% Bh4}yg literal 867 zcmV-p1DyOpRzVSAF60SO3c(A;cHm}6>G1r(g zTnxd9?;nc@00000000Bcmd$R{KoG~hY13AGG>PB!vw!;KYGfpgaOE!G}Nyi8tUy7&~#AHZ|DARvT&Mb#`X=@88VWbJVDF zVYbw}4^%VF>ERu1OVLr7N+~2}4GhbKV`gEdup=~5iyu7zi2YDnj$2Q(nN;gYh258ZwMmsK3F)W_=&dMY+MWSS%Xox`DXa5cS~90;pxgc?r5?ViHP119g=lQ(1`vknv3ep&8!#ko3&^Cia{(Ss zQF%ajx^2#!mg+zMXa@ftq{J%e^Y=PuU45+U#H9(J&0iuVR zI?A6$GWwP!BN2zuvB=agttZ389Fuz%T^5o)4c@}hxPE1cs}l#;sMyr7EhNJxDY4cV zkFLM3S;A_^ffY(j4bj7dnWg>;=yR5UTCuW8rHbcqQapnWDU#9mEE&1+7!CDt7glQA zCD4Cg>QW0NriN(gT+INav!>BK(~m4U$pkGyPv=E727aLaLF(cggJY4YVVX;hDY_T< tlqI44xP;RC{I8s=;HnTG0`JC1Oh2>4q!W}}sPw;q{Q=vSZ8^db004SVp7{U( diff --git a/packages/node-resolve/test/test.mjs b/packages/node-resolve/test/test.mjs index dbe574347..9318d4ea4 100755 --- a/packages/node-resolve/test/test.mjs +++ b/packages/node-resolve/test/test.mjs @@ -563,13 +563,13 @@ test('passes on "isEntry" flag and original importee', async (t) => { }); t.deepEqual(resolveOptions, [ - ['other.js', 'main.js', { assertions: {}, custom: {}, isEntry: true }], - ['main.js', void 0, { assertions: {}, custom: {}, isEntry: true }], + ['other.js', 'main.js', { attributes: {}, custom: {}, isEntry: true }], + ['main.js', void 0, { attributes: {}, custom: {}, isEntry: true }], [ 'other.js', 'main.js', { - assertions: {}, + attributes: {}, custom: { 'node-resolve': { resolved: { @@ -586,7 +586,7 @@ test('passes on "isEntry" flag and original importee', async (t) => { 'main.js', void 0, { - assertions: {}, + attributes: {}, custom: { 'node-resolve': { resolved: { @@ -599,12 +599,12 @@ test('passes on "isEntry" flag and original importee', async (t) => { isEntry: true } ], - ['dep.js', 'main.js', { assertions: {}, custom: {}, isEntry: false }], + ['dep.js', 'main.js', { attributes: {}, custom: {}, isEntry: false }], [ 'dep.js', 'main.js', { - assertions: {}, + attributes: {}, custom: { 'node-resolve': { resolved: { @@ -630,7 +630,11 @@ test('passes on custom options', async (t) => { { name: 'test', async buildStart() { - await this.resolve('entry/main.js', void 0, { isEntry: false, custom: { test: 42 } }); + await this.resolve('entry/main.js', void 0, { + isEntry: false, + skipSelf: false, + custom: { test: 42 } + }); }, resolveId(source, importer, options) { resolveOptions.push([ @@ -643,12 +647,12 @@ test('passes on custom options', async (t) => { ] }); t.deepEqual(resolveOptions, [ - ['main.js', void 0, { assertions: {}, custom: { test: 42 }, isEntry: false }], + ['main.js', void 0, { attributes: {}, custom: { test: 42 }, isEntry: false }], [ 'main.js', void 0, { - assertions: {}, + attributes: {}, custom: { test: 42, 'node-resolve': { @@ -662,12 +666,12 @@ test('passes on custom options', async (t) => { isEntry: false } ], - ['other.js', void 0, { assertions: {}, custom: {}, isEntry: true }], + ['other.js', void 0, { attributes: {}, custom: {}, isEntry: true }], [ 'other.js', void 0, { - assertions: {}, + attributes: {}, custom: { 'node-resolve': { resolved: { diff --git a/packages/pluginutils/package.json b/packages/pluginutils/package.json index f149e9d4c..9ab6af2c4 100644 --- a/packages/pluginutils/package.json +++ b/packages/pluginutils/package.json @@ -53,7 +53,7 @@ "utils" ], "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": { @@ -72,7 +72,7 @@ "@types/node": "^14.18.30", "@types/picomatch": "^2.3.0", "acorn": "^8.8.0", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/replace/package.json b/packages/replace/package.json index 8d46239f6..9ac0914d7 100644 --- a/packages/replace/package.json +++ b/packages/replace/package.json @@ -53,7 +53,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": { @@ -68,7 +68,7 @@ "@rollup/plugin-buble": "^1.0.0", "del-cli": "^5.0.0", "locate-character": "^2.0.5", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "source-map": "^0.7.4", "typescript": "^4.8.3" }, diff --git a/packages/replace/test/snapshots/misc.js.md b/packages/replace/test/snapshots/misc.js.md index 36e3d388e..cd85f9ef2 100644 --- a/packages/replace/test/snapshots/misc.js.md +++ b/packages/replace/test/snapshots/misc.js.md @@ -13,7 +13,6 @@ Generated by [AVA](https://avajs.dev). code: 'PLUGIN_WARNING', message: '@rollup/plugin-replace: \'preventAssignment\' currently defaults to false. It is recommended to set this option to `true`, as the next major version will default this option to `true`.', plugin: 'replace', - toString: Function {}, }, ] diff --git a/packages/replace/test/snapshots/misc.js.snap b/packages/replace/test/snapshots/misc.js.snap index 54233216a90ac86895be1ce3a0e1e46a2a3cfd8c..73ae474b85605b98220afdffbb66392a361eb69d 100644 GIT binary patch literal 399 zcmV;A0dW37RzV)PeZT}ukR2}xjU?-m9WixUPKa(gx9 zaOeG(upf&E00000000A(QB6w&F%ZpczeLe((H}72p&n`lkK)0eNnXiKZ#Vwq=YM#1qGaiFsm%%9__j7;?)W;H|(aEL*SzUc=Q>hkYp5pw!Zu&jE7g z`#yth2Ebqk;5;`K$F4p(ygL|JnafxG5d{{!HLX^w40ah582C=(9b~LjgJPgU$~Sx0 zm$&Us_wlZE)9rNI8`8>zjNyY^?R~Nft)xtolSHNi5g%(xBoF8e>p!B`F-Wy`M9wj! zh^NvTv$I literal 436 zcmV;l0ZaZtRzVj zQ0>xP03VA800000000A(QBN;JK@i{RKMkR6xVTN?z@bPS#X&EmiIfn*iS2vScG>Q} z?9QW(;&VvwA^0{vi+!nw6bGA3<~Osy+1dHcQ?ILSbmi}!i4|)atr&|mO0y|3I2zi^ZvL;JiuuJKpi82%q2n~%G zhw{=oye8)}(v8wO@9=x|+Qe9u@$WyU{Fp+(9KdT3G{2~_Jz^L3D_}9JZ;Yj`?xZHl eIzaJT5ab@O`E==P%YQESAJlh_I_(330ssKuI?gfx diff --git a/packages/run/package.json b/packages/run/package.json index 5235b03bc..87429f583 100644 --- a/packages/run/package.json +++ b/packages/run/package.json @@ -49,7 +49,7 @@ "run" ], "peerDependencies": { - "rollup": "^2.0.0||^3.0.0" + "rollup": "^2.0.0||^3.0.0||^4.0.0" }, "peerDependenciesMeta": { "rollup": { @@ -62,7 +62,7 @@ "devDependencies": { "@rollup/plugin-typescript": "^9.0.1", "del": "^6.1.1", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "sinon": "^14.0.0", "typescript": "^4.8.3" }, diff --git a/packages/strip/package.json b/packages/strip/package.json index a769da1a2..c2ba7c740 100644 --- a/packages/strip/package.json +++ b/packages/strip/package.json @@ -47,7 +47,7 @@ "javascript" ], "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": { @@ -61,7 +61,7 @@ }, "devDependencies": { "acorn": "^8.8.0", - "rollup": "^3.2.3" + "rollup": "^4.0.0-24" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/sucrase/package.json b/packages/sucrase/package.json index db07e0acd..6102e4e33 100644 --- a/packages/sucrase/package.json +++ b/packages/sucrase/package.json @@ -54,7 +54,7 @@ "jsx" ], "peerDependencies": { - "rollup": "^2.53.1||^3.0.0" + "rollup": "^2.53.1||^3.0.0||^4.0.0" }, "peerDependenciesMeta": { "rollup": { @@ -67,7 +67,7 @@ }, "devDependencies": { "@rollup/plugin-alias": "^4.0.0", - "rollup": "^3.2.3" + "rollup": "^4.0.0-24" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/swc/package.json b/packages/swc/package.json index 2d4078bfb..1205401b6 100644 --- a/packages/swc/package.json +++ b/packages/swc/package.json @@ -53,8 +53,8 @@ "modules" ], "peerDependencies": { - "@swc/core": "^1.3.x", - "rollup": "^3.x" + "@swc/core": "^1.3.0", + "rollup": "^3.0.0||^4.0.0" }, "peerDependenciesMeta": { "rollup": { @@ -67,7 +67,7 @@ }, "devDependencies": { "@swc/core": "^1.3.78", - "rollup": "^3.0.0-7", + "rollup": "^4.0.0-24", "typescript": "^4.8.3" }, "types": "./types/index.d.ts" diff --git a/packages/terser/package.json b/packages/terser/package.json index b241c2bf5..e5b5cfef9 100644 --- a/packages/terser/package.json +++ b/packages/terser/package.json @@ -53,7 +53,7 @@ "modules" ], "peerDependencies": { - "rollup": "^2.x || ^3.x" + "rollup": "^2.0.0||^3.0.0||^4.0.0" }, "peerDependenciesMeta": { "rollup": { @@ -67,7 +67,7 @@ }, "devDependencies": { "@types/serialize-javascript": "^5.0.2", - "rollup": "^3.0.0-7", + "rollup": "^4.0.0-24", "typescript": "^4.8.3" }, "types": "./types/index.d.ts" diff --git a/packages/typescript/package.json b/packages/typescript/package.json index c43318c2a..590290e1e 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -51,7 +51,7 @@ "es2015" ], "peerDependencies": { - "rollup": "^2.14.0||^3.0.0", + "rollup": "^2.14.0||^3.0.0||^4.0.0", "tslib": "*", "typescript": ">=3.7.0" }, @@ -73,7 +73,7 @@ "@types/node": "^14.18.30", "@types/resolve": "^1.20.2", "buble": "^0.20.0", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "typescript": "^4.8.3" }, "types": "./types/index.d.ts" diff --git a/packages/typescript/src/diagnostics/toWarning.ts b/packages/typescript/src/diagnostics/toWarning.ts index d588472ff..e41e72575 100644 --- a/packages/typescript/src/diagnostics/toWarning.ts +++ b/packages/typescript/src/diagnostics/toWarning.ts @@ -1,7 +1,18 @@ import type typescript from 'typescript'; -import type { RollupWarning } from 'rollup'; import type { Diagnostic, FormatDiagnosticsHost } from 'typescript'; +// TODO Drop rollup@2 compatibility and use native RollupLog type instead +interface RollupLog { + frame?: string; + loc?: { + column: number; + file?: string; + line: number; + }; + message: string; + pluginCode?: unknown; +} + /** * Converts a Typescript type error into an equivalent Rollup warning object. */ @@ -14,7 +25,7 @@ export default function diagnosticToWarning( const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'); // Build a Rollup warning object from the diagnostics object. - const warning: RollupWarning = { + const warning: RollupLog = { pluginCode, message: `@rollup/plugin-typescript ${pluginCode}: ${message}` }; diff --git a/packages/typescript/src/index.ts b/packages/typescript/src/index.ts index bea3e736d..6b0eb2652 100644 --- a/packages/typescript/src/index.ts +++ b/packages/typescript/src/index.ts @@ -2,7 +2,7 @@ import * as path from 'path'; import { createFilter } from '@rollup/pluginutils'; -import type { Plugin, RollupOptions, SourceDescription } from 'rollup'; +import type { Plugin, SourceDescription } from 'rollup'; import type { Watch } from 'typescript'; import type { RollupTypescriptOptions } from '../types'; @@ -55,10 +55,17 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi return { name: 'typescript', - buildStart(rollupOptions: RollupOptions) { + buildStart(rollupOptions) { emitParsedOptionsErrors(ts, this, parsedOptions); - preflight({ config: parsedOptions, context: this, rollupOptions, tslib }); + preflight({ + config: parsedOptions, + context: this, + // TODO drop rollup@3 support and remove + inputPreserveModules: (rollupOptions as unknown as { preserveModules: boolean }) + .preserveModules, + tslib + }); // Fixes a memory leak https://github.com/rollup/plugins/issues/322 if (this.meta.watchMode !== true) { @@ -142,6 +149,7 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi async load(id) { if (!filter(id)) return null; + this.addWatchFile(id); await watchProgramHelper.wait(); const fileName = normalizePath(id); diff --git a/packages/typescript/src/preflight.ts b/packages/typescript/src/preflight.ts index fce693e5e..53d93966e 100644 --- a/packages/typescript/src/preflight.ts +++ b/packages/typescript/src/preflight.ts @@ -1,4 +1,4 @@ -import type { PluginContext, RollupOptions } from 'rollup'; +import type { PluginContext } from 'rollup'; import typescript from 'typescript'; import type { TypeScriptConfig } from './options/tsconfig'; @@ -8,7 +8,7 @@ const { ModuleKind } = typescript; interface PreflightOptions { config: TypeScriptConfig; context: PluginContext; - rollupOptions: RollupOptions; + inputPreserveModules: boolean; tslib: any; } @@ -31,12 +31,12 @@ const validModules = [ ]; // eslint-disable-next-line import/prefer-default-export -export const preflight = ({ config, context, rollupOptions, tslib }: PreflightOptions) => { +export const preflight = ({ config, context, inputPreserveModules, tslib }: PreflightOptions) => { if (!validModules.includes(config.options.module)) { context.warn(moduleErrorMessage); } - if (!rollupOptions.preserveModules && tslib === null) { + if (!inputPreserveModules && tslib === null) { context.error(tsLibErrorMessage); } }; diff --git a/packages/typescript/test/snapshots/warnings.ts.md b/packages/typescript/test/snapshots/warnings.ts.md index a2bcc5acf..0135f2c42 100644 --- a/packages/typescript/test/snapshots/warnings.ts.md +++ b/packages/typescript/test/snapshots/warnings.ts.md @@ -13,6 +13,5 @@ Generated by [AVA](https://avajs.dev). code: 'PLUGIN_WARNING', message: '@rollup/plugin-typescript: Rollup requires that TypeScript produces ES Modules. Unfortunately your configuration specifies a "module" other than "esnext". Unless you know what you\'re doing, please change "module" to "esnext" in the target tsconfig.json file or plugin options.', plugin: 'typescript', - toString: Function {}, }, ] diff --git a/packages/typescript/test/snapshots/warnings.ts.snap b/packages/typescript/test/snapshots/warnings.ts.snap index bb1c93a096226f15acdfd67d24c7b25e98ede4e9..ab7aa56846d881dec5019f8ac035e6bcbcf9f039 100644 GIT binary patch literal 435 zcmV;k0ZjfuRzVs_`@# z2kwY=*dL1s00000000ABQNd0EF%aDW1cOl^`T-LzUJw(H#)BRVAyG6SF`i7>om~oR zTiaQcqyOOr|H$9*WEWgaY%=Lg=gphxn`JynbvSqLpTv?=dYOm_pLCR^gi;~9P^(xb z(kWrwRI__uMv-9g0N>@H7UT!Eq15sBiMM^IwqWbRTCo5qyhfuDKs^8mUcpx7ln4up2-*fQHAE4svg+1(i@oR0MmsSL0rP@OXbQ9P|gh zf6&?!IVX|=?cdL>PSeaBn>0(LI^u;P7g}lf6o;z}T6)f;C5Jo}jCUR|S^>~lFHh(b zmm|DhDdoC2RNl7@u&=)53N5^_Yvs&JikcCZ%H+$^PoS!9@e!JS@ d`tztwKB4RW6Ro;V7h(NRqaQb~w~93a001t=#s~la literal 475 zcmV<10VMuGRzVXQAB@6Jz7 z=U+b`oy||@C-@IM%pw^Tal;ectxRk zz~Ypmr5`+PsDv>#9C&HnHC{LGOZGGn7S7n}5PeNL66Vra(H$MTEzQQj6(Q?T5pTVm zT|}9sG~%!e*nS?JZzhbhd!h~6a+mJiX{2Bu;Blr@R~xchaFEdyJZUHL007a8-!A|F diff --git a/packages/typescript/test/test.js b/packages/typescript/test/test.js index e746680c1..127f98e19 100644 --- a/packages/typescript/test/test.js +++ b/packages/typescript/test/test.js @@ -1058,8 +1058,8 @@ test.serial('normalizes resolved ids to avoid duplicate output on windows', asyn const files = await getCode(bundle, { format: 'es' }, true); t.is(files.length, 2); - t.true(files[1].fileName.includes('two.js'), files[1].fileName); - t.true(files[1].code.includes("import { one } from './one.js';"), files[1].code); + t.true(files[0].fileName.includes('two.js'), files[1].fileName); + t.true(files[0].code.includes("import { one } from './one.js';"), files[1].code); }); test.serial('does it support tsconfig.rootDir for filtering', async (t) => { diff --git a/packages/url/package.json b/packages/url/package.json index 9ea52608d..4627e409d 100644 --- a/packages/url/package.json +++ b/packages/url/package.json @@ -49,7 +49,7 @@ "url" ], "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 @@ "devDependencies": { "del": "^6.1.1", "globby": "^11.1.0", - "rollup": "^3.2.3" + "rollup": "^4.0.0-24" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/url/src/index.js b/packages/url/src/index.js index 214a74789..69c9fab84 100644 --- a/packages/url/src/index.js +++ b/packages/url/src/index.js @@ -31,6 +31,7 @@ export default function url(options = {}) { if (!filter(id)) { return null; } + this.addWatchFile(id); return Promise.all([fsStatPromise(id), fsReadFilePromise(id)]).then(([stats, buffer]) => { let data; if ((limit && stats.size > limit) || limit === 0) { diff --git a/packages/virtual/package.json b/packages/virtual/package.json index 07e622c02..64de82013 100755 --- a/packages/virtual/package.json +++ b/packages/virtual/package.json @@ -53,7 +53,7 @@ "virtual" ], "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": { @@ -63,7 +63,7 @@ "devDependencies": { "@rollup/plugin-node-resolve": "^15.0.0", "@rollup/plugin-typescript": "^9.0.1", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/wasm/package.json b/packages/wasm/package.json index 7e555491b..1fc126fde 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -55,7 +55,7 @@ "emscripten" ], "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": { @@ -68,7 +68,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" }, diff --git a/packages/wasm/src/index.ts b/packages/wasm/src/index.ts index aa0c70b75..28517dbc2 100644 --- a/packages/wasm/src/index.ts +++ b/packages/wasm/src/index.ts @@ -45,6 +45,7 @@ export function wasm(options: RollupWasmOptions = {}): Plugin { if (!/\.wasm$/.test(id)) { return null; } + this.addWatchFile(id); return Promise.all([fs.promises.stat(id), fs.promises.readFile(id)]).then( ([stats, buffer]) => { diff --git a/packages/yaml/package.json b/packages/yaml/package.json index e4d6e2dbc..bf1165b2c 100755 --- a/packages/yaml/package.json +++ b/packages/yaml/package.json @@ -49,7 +49,7 @@ "yaml" ], "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 @@ "devDependencies": { "@rollup/plugin-node-resolve": "^15.0.0", "del-cli": "^5.0.0", - "rollup": "^3.2.3", + "rollup": "^4.0.0-24", "source-map-support": "^0.5.21" }, "types": "./types/index.d.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4cd256063..0102b96b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: version: 2.0.0 '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) '@types/conventional-commits-parser': specifier: ^3.0.2 version: 3.0.2 @@ -110,16 +110,16 @@ importers: devDependencies: '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-24) '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) del-cli: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -128,10 +128,10 @@ importers: devDependencies: '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-24) '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) del: specifier: ^6.1.1 version: 6.1.1 @@ -139,8 +139,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -152,7 +152,7 @@ importers: version: 7.18.6 '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) devDependencies: '@babel/core': specifier: ^7.19.1 @@ -174,16 +174,16 @@ importers: version: 7.19.4(@babel/core@7.19.3) '@rollup/plugin-json': specifier: ^5.0.0 - version: 5.0.0(rollup@3.2.3) + version: 5.0.0(rollup@4.0.0-24) '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-24) '@types/babel__core': specifier: ^7.1.9 version: 7.1.19 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -191,8 +191,8 @@ importers: packages/beep: devDependencies: rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 strip-ansi: specifier: ^7.0.1 version: 7.0.1 @@ -201,7 +201,7 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) '@types/buble': specifier: ^0.19.2 version: 0.19.2 @@ -211,13 +211,13 @@ importers: devDependencies: '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) del-cli: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -229,7 +229,7 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.20.2) + version: 5.0.1(rollup@4.0.0-24) commondir: specifier: ^1.0.1 version: 1.0.1 @@ -248,10 +248,10 @@ importers: devDependencies: '@rollup/plugin-json': specifier: ^5.0.0 - version: 5.0.0(rollup@3.20.2) + version: 5.0.0(rollup@4.0.0-24) '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.20.2) + version: 15.0.0(rollup@4.0.0-24) locate-character: specifier: ^2.0.5 version: 2.0.5 @@ -259,8 +259,8 @@ importers: specifier: ^0.8.7 version: 0.8.7 rollup: - specifier: ^3.19.0 - version: 3.20.2 + specifier: ^4.0.0-24 + version: 4.0.0-24 shx: specifier: ^0.3.4 version: 0.3.4 @@ -278,14 +278,14 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) devDependencies: '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -294,7 +294,7 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) '@types/d3-dsv': specifier: ^3.0.0 version: 3.0.0 @@ -309,14 +309,14 @@ importers: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/dynamic-import-vars: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) astring: specifier: ^1.8.5 version: 1.8.5 @@ -337,30 +337,30 @@ importers: specifier: ^2.7.1 version: 2.7.1 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/eslint: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) eslint: specifier: ^8.24.0 version: 8.25.0 devDependencies: '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-24) '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) '@types/eslint': specifier: ^8.4.6 version: 8.4.6 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -372,8 +372,8 @@ importers: version: 0.30.0 devDependencies: rollup: - specifier: ^3.0.0-7 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -382,32 +382,32 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) graphql-tag: specifier: ^2.12.6 version: 2.12.6(graphql@16.6.0) devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-24) graphql: specifier: ^16.6.0 version: 16.6.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/html: devDependencies: '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) postcss: specifier: ^8.4.16 version: 8.4.17 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 rollup-plugin-postcss: specifier: ^4.0.2 version: 4.0.2(postcss@8.4.17)(ts-node@10.9.1) @@ -419,23 +419,23 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) mini-svg-data-uri: specifier: ^1.4.4 version: 1.4.4 devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-24) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/inject: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) estree-walker: specifier: ^2.0.2 version: 2.0.2 @@ -445,7 +445,7 @@ importers: devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-24) del-cli: specifier: ^5.0.0 version: 5.0.0 @@ -453,8 +453,8 @@ importers: specifier: ^2.0.5 version: 2.0.5 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -466,17 +466,17 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-24) '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-24) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -485,36 +485,36 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-24) del-cli: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/multi-entry: dependencies: '@rollup/plugin-virtual': specifier: ^3.0.0 - version: 3.0.0(rollup@3.2.3) + version: 3.0.0(rollup@4.0.0-24) matched: specifier: ^5.0.1 version: 5.0.1 devDependencies: rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/node-resolve: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) '@types/resolve': specifier: 1.20.2 version: 1.20.2 @@ -539,19 +539,19 @@ importers: version: 7.19.3(@babel/core@7.19.3) '@rollup/plugin-babel': specifier: ^6.0.0 - version: 6.0.0(@babel/core@7.19.3)(rollup@3.2.3) + version: 6.0.0(@babel/core@7.19.3)(rollup@4.0.0-24) '@rollup/plugin-commonjs': specifier: ^23.0.0 - version: 23.0.0(rollup@3.2.3) + version: 23.0.0(rollup@4.0.0-24) '@rollup/plugin-json': specifier: ^5.0.0 - version: 5.0.0(rollup@3.2.3) + version: 5.0.0(rollup@4.0.0-24) es5-ext: specifier: ^0.10.62 version: 0.10.62 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -573,13 +573,13 @@ importers: devDependencies: '@rollup/plugin-commonjs': specifier: ^23.0.0 - version: 23.0.0(rollup@3.2.3) + version: 23.0.0(rollup@4.0.0-24) '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-24) '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) '@types/node': specifier: ^14.18.30 version: 14.18.31 @@ -590,8 +590,8 @@ importers: specifier: ^8.8.0 version: 8.8.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -600,14 +600,14 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) magic-string: specifier: ^0.27.0 version: 0.27.0 devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-24) del-cli: specifier: ^5.0.0 version: 5.0.0 @@ -615,8 +615,8 @@ importers: specifier: ^2.0.5 version: 2.0.5 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -632,13 +632,13 @@ importers: devDependencies: '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) del: specifier: ^6.1.1 version: 6.1.1 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 sinon: specifier: ^14.0.0 version: 14.0.1 @@ -650,7 +650,7 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) estree-walker: specifier: ^2.0.2 version: 2.0.2 @@ -662,30 +662,30 @@ importers: specifier: ^8.8.0 version: 8.8.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/sucrase: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) sucrase: specifier: ^3.27.0 version: 3.28.0 devDependencies: '@rollup/plugin-alias': specifier: ^4.0.0 - version: 4.0.0(rollup@3.2.3) + version: 4.0.0(rollup@4.0.0-24) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/swc: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) smob: specifier: ^1.4.0 version: 1.4.0 @@ -694,8 +694,8 @@ importers: specifier: ^1.3.78 version: 1.3.78 rollup: - specifier: ^3.0.0-7 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -716,8 +716,8 @@ importers: specifier: ^5.0.2 version: 5.0.2 rollup: - specifier: ^3.0.0-7 - version: 3.0.0-7 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -726,7 +726,7 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) resolve: specifier: ^1.22.1 version: 1.22.1 @@ -736,10 +736,10 @@ importers: devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-24) '@rollup/plugin-commonjs': specifier: ^23.0.0 - version: 23.0.0(rollup@3.2.3) + version: 23.0.0(rollup@4.0.0-24) '@types/node': specifier: ^14.18.30 version: 14.18.31 @@ -750,8 +750,8 @@ importers: specifier: ^0.20.0 version: 0.20.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -760,7 +760,7 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) make-dir: specifier: ^3.1.0 version: 3.1.0 @@ -775,20 +775,20 @@ importers: specifier: ^11.1.0 version: 11.1.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 packages/virtual: devDependencies: '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-24) '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -797,17 +797,17 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.2 - version: 5.0.4(rollup@3.2.3) + version: 5.0.4(rollup@4.0.0-24) devDependencies: '@rollup/plugin-typescript': specifier: ^9.0.1 - version: 9.0.1(rollup@3.2.3)(typescript@4.8.4) + version: 9.0.1(rollup@4.0.0-24)(typescript@4.8.4) del-cli: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -819,7 +819,7 @@ importers: dependencies: '@rollup/pluginutils': specifier: ^5.0.1 - version: 5.0.1(rollup@3.2.3) + version: 5.0.1(rollup@4.0.0-24) js-yaml: specifier: ^4.1.0 version: 4.1.0 @@ -829,13 +829,13 @@ importers: devDependencies: '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-24) del-cli: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-24 + version: 4.0.0-24 source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -2230,7 +2230,7 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.13.0 - /@rollup/plugin-alias@4.0.0(rollup@3.2.3): + /@rollup/plugin-alias@4.0.0(rollup@4.0.0-24): resolution: {integrity: sha512-fGRWzM2F6wXnzAqn4Db8SdB/2Ree0u2XOQaaTy9mhqA35NmUzJXevMBUcpZywPF2MIUUAw+SKfWogKxFSPh+Qw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2239,11 +2239,11 @@ packages: rollup: optional: true dependencies: - rollup: 3.2.3 + rollup: 4.0.0-24 slash: 4.0.0 dev: true - /@rollup/plugin-babel@6.0.0(@babel/core@7.19.3)(rollup@3.2.3): + /@rollup/plugin-babel@6.0.0(@babel/core@7.19.3)(rollup@4.0.0-24): resolution: {integrity: sha512-qM8YIt/2fVxw5O0wUgAeglyC+qx9mg3UtCCLoSqetmQOKipmnQ/X3I0L2sjjb6BswaYpv2tun25lHViU7JPxLQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2259,10 +2259,10 @@ packages: '@babel/core': 7.19.3 '@babel/helper-module-imports': 7.18.6 '@rollup/pluginutils': 4.2.1 - rollup: 3.2.3 + rollup: 4.0.0-24 dev: true - /@rollup/plugin-buble@1.0.0(rollup@3.2.3): + /@rollup/plugin-buble@1.0.0(rollup@4.0.0-24): resolution: {integrity: sha512-VDbhsNtC4cXZ20+hhilL0hzUskrTZWhF9PTabCOuye1NK5Ht8LZzpM1Q0S/yo0kMArjrFnIb2P4N8d3uEKuxnA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2274,10 +2274,10 @@ packages: '@rollup/pluginutils': 4.2.1 '@types/buble': 0.19.2 buble: 0.20.0 - rollup: 3.2.3 + rollup: 4.0.0-24 dev: true - /@rollup/plugin-commonjs@23.0.0(rollup@3.2.3): + /@rollup/plugin-commonjs@23.0.0(rollup@4.0.0-24): resolution: {integrity: sha512-JbrTRyDNtLQj/rhl7RFUuYXwQ2fac+33oLDAu2k++WD95zweyo28UAomLVA0JMGx4vmCa7Nw4T6k/1F6lelExg==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2292,10 +2292,10 @@ packages: glob: 8.0.3 is-reference: 1.2.1 magic-string: 0.26.7 - rollup: 3.2.3 + rollup: 4.0.0-24 dev: true - /@rollup/plugin-json@5.0.0(rollup@3.2.3): + /@rollup/plugin-json@5.0.0(rollup@4.0.0-24): resolution: {integrity: sha512-LsWDA5wJs/ggzakVuKQhZo7HPRcQZgBa3jWIVxQSFxaRToUGNi8ZBh3+k/gQ+1eInVYJgn4WBRCUkmoDrmmGzw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2305,23 +2305,10 @@ packages: optional: true dependencies: '@rollup/pluginutils': 4.2.1 - rollup: 3.2.3 + rollup: 4.0.0-24 dev: true - /@rollup/plugin-json@5.0.0(rollup@3.20.2): - resolution: {integrity: sha512-LsWDA5wJs/ggzakVuKQhZo7HPRcQZgBa3jWIVxQSFxaRToUGNi8ZBh3+k/gQ+1eInVYJgn4WBRCUkmoDrmmGzw==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 4.2.1 - rollup: 3.20.2 - dev: true - - /@rollup/plugin-node-resolve@15.0.0(rollup@3.2.3): + /@rollup/plugin-node-resolve@15.0.0(rollup@4.0.0-24): resolution: {integrity: sha512-iwJbzfTzlzDDQcGmkS7EkCKwe2kSkdBrjX87Fy/KrNjr6UNnLpod0t6X66e502LRe5JJCA4FFqrEscWPnZAkig==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2336,28 +2323,10 @@ packages: is-builtin-module: 3.2.0 is-module: 1.0.0 resolve: 1.22.1 - rollup: 3.2.3 + rollup: 4.0.0-24 dev: true - /@rollup/plugin-node-resolve@15.0.0(rollup@3.20.2): - resolution: {integrity: sha512-iwJbzfTzlzDDQcGmkS7EkCKwe2kSkdBrjX87Fy/KrNjr6UNnLpod0t6X66e502LRe5JJCA4FFqrEscWPnZAkig==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.78.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 4.2.1 - '@types/resolve': 1.20.2 - deepmerge: 4.2.2 - is-builtin-module: 3.2.0 - is-module: 1.0.0 - resolve: 1.22.1 - rollup: 3.20.2 - dev: true - - /@rollup/plugin-typescript@9.0.1(rollup@3.2.3)(typescript@4.8.4): + /@rollup/plugin-typescript@9.0.1(rollup@4.0.0-24)(typescript@4.8.4): resolution: {integrity: sha512-fj+CTk8+HvFCEwwDQdNgWd0lIJVXtMQ0Z3vH/ZgzFSbK2s1zs5wjZrjzrhViTTN+UF49+P69/tybgKRdGHpj/Q==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2372,11 +2341,11 @@ packages: dependencies: '@rollup/pluginutils': 4.2.1 resolve: 1.22.1 - rollup: 3.2.3 + rollup: 4.0.0-24 typescript: 4.8.4 dev: true - /@rollup/plugin-virtual@3.0.0(rollup@3.2.3): + /@rollup/plugin-virtual@3.0.0(rollup@4.0.0-24): resolution: {integrity: sha512-K9KORe1myM62o0lKkNR4MmCxjwuAXsZEtIHpaILfv4kILXTOrXt/R2ha7PzMcCHPYdnkWPiBZK8ed4Zr3Ll5lQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2385,7 +2354,7 @@ packages: rollup: optional: true dependencies: - rollup: 3.2.3 + rollup: 4.0.0-24 dev: false /@rollup/pluginutils@4.2.1: @@ -2396,7 +2365,7 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/pluginutils@5.0.1(rollup@3.2.3): + /@rollup/pluginutils@5.0.1(rollup@4.0.0-24): resolution: {integrity: sha512-4HaCVEXXuObvcPUaUlLt4faHYHCeQOOWNj8NKFGaRSrw3ZLD0TWeAFZicV9vXjnE2nkNuaVTfTuwAnjR+6uc9A==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2408,25 +2377,10 @@ packages: '@types/estree': 1.0.0 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.2.3 + rollup: 4.0.0-24 dev: false - /@rollup/pluginutils@5.0.1(rollup@3.20.2): - resolution: {integrity: sha512-4HaCVEXXuObvcPUaUlLt4faHYHCeQOOWNj8NKFGaRSrw3ZLD0TWeAFZicV9vXjnE2nkNuaVTfTuwAnjR+6uc9A==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@types/estree': 1.0.0 - estree-walker: 2.0.2 - picomatch: 2.3.1 - rollup: 3.20.2 - dev: false - - /@rollup/pluginutils@5.0.4(rollup@3.2.3): + /@rollup/pluginutils@5.0.4(rollup@4.0.0-24): resolution: {integrity: sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2438,9 +2392,86 @@ packages: '@types/estree': 1.0.0 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.2.3 + rollup: 4.0.0-24 dev: false + /@rollup/rollup-android-arm-eabi@4.0.0-24: + resolution: {integrity: sha512-19cF3V1fHfzPzwu0cgZEdWLMdNkqSmKOhidqQv1CkUqAMcb7etA7WLx8YrX5ob31ruI0BYYrUDBunlIuMHHUrg==} + cpu: [arm] + os: [android] + requiresBuild: true + optional: true + + /@rollup/rollup-android-arm64@4.0.0-24: + resolution: {integrity: sha512-ftTp5ByyyozDsHfmYGeErrQmBi4ZEVZItC4Siilwretkf+cMv9z0s0Ru8ncd28OZpaO0cr9b7Afm+DIRDyE8Kw==} + cpu: [arm64] + os: [android] + requiresBuild: true + optional: true + + /@rollup/rollup-darwin-arm64@4.0.0-24: + resolution: {integrity: sha512-wYXWdPbMLiIRHQeTF/r9ZoDcf3k1ROR0Kyd/caUtbs5VEZOBfnpZ/FHQPzXW0S1fzxTtD5W4tXULxARMHAlNdQ==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + optional: true + + /@rollup/rollup-darwin-x64@4.0.0-24: + resolution: {integrity: sha512-8tIz6Uga/5XdeRkid7kfNtxrvru7o4lDBxAPooZezKXbyB2ap2yKAKCqTFEXyTuPhl2yxLMa5zqZ91FBEnSbPg==} + cpu: [x64] + os: [darwin] + requiresBuild: true + optional: true + + /@rollup/rollup-linux-arm-gnueabihf@4.0.0-24: + resolution: {integrity: sha512-ZCNBOaw2NV3BnpQ049VCPJSamss3wAoCunFcWYfhWgGyu9C0hiRvZAcKvhd7e/9EhuoIxsNxMLwI46NmZx9WBQ==} + cpu: [arm] + os: [linux] + requiresBuild: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.0.0-24: + resolution: {integrity: sha512-BGnRktAZq4RI6FSicI+F6ws9paiYmjyaXUNKSukLthzgzPC91V4SXVylbFOCKvrhdWAr0lvZgcTrkgYNAmAcuQ==} + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.0.0-24: + resolution: {integrity: sha512-FzhHpp+vRTjIUYXMExj9Ffj2bCQgnRAzlWlsQTdYGYvPQMVadfPMvnlcr4Li8P7Yv1iBFtDzRVfZAgL5glvIAA==} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + + /@rollup/rollup-linux-x64-musl@4.0.0-24: + resolution: {integrity: sha512-0y+oXnCCT5+U5V58bY7dy65yDrWWfopFJwtC2EbFeA9SHrVjG36/TQo535ML3zdFwO+fma8r5FP1os0psbQBXQ==} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + + /@rollup/rollup-win32-arm64-msvc@4.0.0-24: + resolution: {integrity: sha512-xT8djNMxVB84cCm1XILpQXkMcu8S+GBKjurXM4sc6eB1FQpFpcTAOsuQSg9xOhfPqm1xa7qqXA6ZpUhoUMboVQ==} + cpu: [arm64] + os: [win32] + requiresBuild: true + optional: true + + /@rollup/rollup-win32-ia32-msvc@4.0.0-24: + resolution: {integrity: sha512-3gXFBlG5f18xbhVxKTM+zwciJPk097i3YswLI9cajVd4MAqMw5bGbuZkGOZOMnkzeIX0ELxovYWPbGDyUr+f5g==} + cpu: [ia32] + os: [win32] + requiresBuild: true + optional: true + + /@rollup/rollup-win32-x64-msvc@4.0.0-24: + resolution: {integrity: sha512-41+QkzRaKEZwmA14Fa2DI0QKN5hkcN/orA2KOg5vJAtvwSfB1uQTUmf6T4SGZLw/8In2TEmViB9tDVlbnXmH1A==} + cpu: [x64] + os: [win32] + requiresBuild: true + optional: true + /@sindresorhus/is@4.6.0: resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} engines: {node: '>=10'} @@ -7022,26 +7053,22 @@ packages: estree-walker: 0.6.1 dev: true - /rollup@3.0.0-7: - resolution: {integrity: sha512-Hq5hpq9IrR4YfGd4o4zDtsfZnkwoCpjrQ4ZQIZrVF4ryzW6FOgXKBm6N7vJfodIJ6v+51FsqsXD2bxW5wapiuA==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: true - - /rollup@3.2.3: - resolution: {integrity: sha512-qfadtkY5kl0F5e4dXVdj2D+GtOdifasXHFMiL1SMf9ADQDv5Eti6xReef9FKj+iQPR2pvtqWna57s/PjARY4fg==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - - /rollup@3.20.2: - resolution: {integrity: sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} + /rollup@4.0.0-24: + resolution: {integrity: sha512-Tcdk9cYyF5abnUQP68AWuSHahowglrzQH6olnHB4Lxi7VBuflwrlpavK7d046Ep2WmwDN0ey5sr+QzLShQ7Odw==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.0.0-24 + '@rollup/rollup-android-arm64': 4.0.0-24 + '@rollup/rollup-darwin-arm64': 4.0.0-24 + '@rollup/rollup-darwin-x64': 4.0.0-24 + '@rollup/rollup-linux-arm-gnueabihf': 4.0.0-24 + '@rollup/rollup-linux-arm64-gnu': 4.0.0-24 + '@rollup/rollup-linux-x64-gnu': 4.0.0-24 + '@rollup/rollup-linux-x64-musl': 4.0.0-24 + '@rollup/rollup-win32-arm64-msvc': 4.0.0-24 + '@rollup/rollup-win32-ia32-msvc': 4.0.0-24 + '@rollup/rollup-win32-x64-msvc': 4.0.0-24 fsevents: 2.3.2 /run-parallel@1.2.0: From cdf9113a14c116520ef9f937a1151797666bbfa2 Mon Sep 17 00:00:00 2001 From: shellscape Date: Sun, 8 Oct 2023 11:30:39 -0400 Subject: [PATCH 09/20] chore(repo): manually update changelog and package versions after bad release cycle --- packages/alias/CHANGELOG.md | 8 ++++++++ packages/alias/package.json | 2 +- packages/auto-install/CHANGELOG.md | 8 ++++++++ packages/auto-install/package.json | 2 +- packages/babel/CHANGELOG.md | 8 ++++++++ packages/babel/package.json | 2 +- packages/beep/CHANGELOG.md | 8 ++++++++ packages/beep/package.json | 2 +- packages/buble/CHANGELOG.md | 8 ++++++++ packages/buble/package.json | 2 +- packages/commonjs/CHANGELOG.md | 8 ++++++++ packages/commonjs/package.json | 2 +- packages/data-uri/CHANGELOG.md | 8 ++++++++ packages/data-uri/package.json | 2 +- packages/dsv/CHANGELOG.md | 8 ++++++++ packages/dsv/package.json | 2 +- packages/dynamic-import-vars/CHANGELOG.md | 8 ++++++++ packages/dynamic-import-vars/package.json | 2 +- packages/eslint/CHANGELOG.md | 8 ++++++++ packages/eslint/package.json | 2 +- packages/esm-shim/CHANGELOG.md | 8 ++++++++ packages/esm-shim/package.json | 2 +- packages/graphql/CHANGELOG.md | 8 ++++++++ packages/graphql/package.json | 2 +- packages/html/CHANGELOG.md | 8 ++++++++ packages/html/package.json | 2 +- packages/image/CHANGELOG.md | 8 ++++++++ packages/image/package.json | 2 +- packages/inject/CHANGELOG.md | 8 ++++++++ packages/inject/package.json | 2 +- packages/json/CHANGELOG.md | 8 ++++++++ packages/json/package.json | 2 +- packages/legacy/CHANGELOG.md | 8 ++++++++ packages/legacy/package.json | 2 +- packages/multi-entry/CHANGELOG.md | 8 ++++++++ packages/multi-entry/package.json | 2 +- packages/node-resolve/CHANGELOG.md | 8 ++++++++ packages/node-resolve/package.json | 2 +- packages/pluginutils/CHANGELOG.md | 8 ++++++++ packages/pluginutils/package.json | 2 +- packages/replace/CHANGELOG.md | 8 ++++++++ packages/replace/package.json | 2 +- packages/run/CHANGELOG.md | 8 ++++++++ packages/run/package.json | 2 +- packages/strip/CHANGELOG.md | 8 ++++++++ packages/strip/package.json | 2 +- packages/sucrase/CHANGELOG.md | 8 ++++++++ packages/sucrase/package.json | 2 +- packages/swc/CHANGELOG.md | 8 ++++++++ packages/swc/package.json | 2 +- packages/terser/CHANGELOG.md | 8 ++++++++ packages/terser/package.json | 2 +- packages/typescript/CHANGELOG.md | 8 ++++++++ packages/typescript/package.json | 2 +- packages/url/CHANGELOG.md | 10 +++++++++- packages/url/package.json | 2 +- packages/virtual/CHANGELOG.md | 8 ++++++++ packages/virtual/package.json | 2 +- packages/wasm/CHANGELOG.md | 8 ++++++++ packages/wasm/package.json | 2 +- packages/yaml/CHANGELOG.md | 8 ++++++++ packages/yaml/package.json | 2 +- 62 files changed, 280 insertions(+), 32 deletions(-) diff --git a/packages/alias/CHANGELOG.md b/packages/alias/CHANGELOG.md index 63d6e9c56..347f04921 100755 --- a/packages/alias/CHANGELOG.md +++ b/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_ diff --git a/packages/alias/package.json b/packages/alias/package.json index 883198425..f6aef76e8 100755 --- a/packages/alias/package.json +++ b/packages/alias/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-alias", - "version": "5.0.0", + "version": "5.0.1", "publishConfig": { "access": "public" }, diff --git a/packages/auto-install/CHANGELOG.md b/packages/auto-install/CHANGELOG.md index ed7dc65b5..5920f1379 100755 --- a/packages/auto-install/CHANGELOG.md +++ b/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_ diff --git a/packages/auto-install/package.json b/packages/auto-install/package.json index 297a187cc..55a77ca03 100755 --- a/packages/auto-install/package.json +++ b/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" }, diff --git a/packages/babel/CHANGELOG.md b/packages/babel/CHANGELOG.md index b71410cb3..2091e188b 100644 --- a/packages/babel/CHANGELOG.md +++ b/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_ diff --git a/packages/babel/package.json b/packages/babel/package.json index 28afc3110..8e8629e42 100644 --- a/packages/babel/package.json +++ b/packages/babel/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-babel", - "version": "6.0.3", + "version": "6.0.4", "publishConfig": { "access": "public" }, diff --git a/packages/beep/CHANGELOG.md b/packages/beep/CHANGELOG.md index ce173ee4a..fe0610649 100644 --- a/packages/beep/CHANGELOG.md +++ b/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_ diff --git a/packages/beep/package.json b/packages/beep/package.json index e87210fe0..a839fd171 100644 --- a/packages/beep/package.json +++ b/packages/beep/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-beep", - "version": "1.0.2", + "version": "1.0.3", "publishConfig": { "access": "public" }, diff --git a/packages/buble/CHANGELOG.md b/packages/buble/CHANGELOG.md index 28f068474..eca10fb6c 100644 --- a/packages/buble/CHANGELOG.md +++ b/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_ diff --git a/packages/buble/package.json b/packages/buble/package.json index 2cc4036f8..d53ba64d2 100644 --- a/packages/buble/package.json +++ b/packages/buble/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-buble", - "version": "1.0.2", + "version": "1.0.3", "publishConfig": { "access": "public" }, diff --git a/packages/commonjs/CHANGELOG.md b/packages/commonjs/CHANGELOG.md index 2d887c229..b46b809bd 100644 --- a/packages/commonjs/CHANGELOG.md +++ b/packages/commonjs/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-commonjs ChangeLog +## 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_ diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index bd189461b..f9e74731a 100644 --- a/packages/commonjs/package.json +++ b/packages/commonjs/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-commonjs", - "version": "25.0.4", + "version": "25.0.5", "publishConfig": { "access": "public" }, diff --git a/packages/data-uri/CHANGELOG.md b/packages/data-uri/CHANGELOG.md index 5084008ff..d14d74ed9 100644 --- a/packages/data-uri/CHANGELOG.md +++ b/packages/data-uri/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-data-uri 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_ diff --git a/packages/data-uri/package.json b/packages/data-uri/package.json index 5d3376697..fbeb8fa9a 100644 --- a/packages/data-uri/package.json +++ b/packages/data-uri/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-data-uri", - "version": "1.0.2", + "version": "1.0.3", "publishConfig": { "access": "public" }, diff --git a/packages/dsv/CHANGELOG.md b/packages/dsv/CHANGELOG.md index 1d2f0fe28..92f135e10 100755 --- a/packages/dsv/CHANGELOG.md +++ b/packages/dsv/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-dsv ChangeLog +## v3.0.4 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v3.0.3 _2023-09-25_ diff --git a/packages/dsv/package.json b/packages/dsv/package.json index ad745809d..cc4a174f2 100755 --- a/packages/dsv/package.json +++ b/packages/dsv/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-dsv", - "version": "3.0.3", + "version": "3.0.4", "publishConfig": { "access": "public" }, diff --git a/packages/dynamic-import-vars/CHANGELOG.md b/packages/dynamic-import-vars/CHANGELOG.md index 45326fc2c..37f0e55bb 100644 --- a/packages/dynamic-import-vars/CHANGELOG.md +++ b/packages/dynamic-import-vars/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-dynamic-import-vars ChangeLog +## v2.0.6 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v2.0.5 _2023-08-11_ diff --git a/packages/dynamic-import-vars/package.json b/packages/dynamic-import-vars/package.json index 8851e1a2c..84f91939f 100644 --- a/packages/dynamic-import-vars/package.json +++ b/packages/dynamic-import-vars/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-dynamic-import-vars", - "version": "2.0.5", + "version": "2.0.6", "publishConfig": { "access": "public" }, diff --git a/packages/eslint/CHANGELOG.md b/packages/eslint/CHANGELOG.md index 58d093c0a..786e3dd6d 100755 --- a/packages/eslint/CHANGELOG.md +++ b/packages/eslint/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-eslint ChangeLog +## v9.0.5 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v9.0.4 _2023-05-12_ diff --git a/packages/eslint/package.json b/packages/eslint/package.json index 397b221e4..6579779e1 100755 --- a/packages/eslint/package.json +++ b/packages/eslint/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-eslint", - "version": "9.0.4", + "version": "9.0.5", "publishConfig": { "access": "public" }, diff --git a/packages/esm-shim/CHANGELOG.md b/packages/esm-shim/CHANGELOG.md index 8474c57c4..279d5ac8d 100644 --- a/packages/esm-shim/CHANGELOG.md +++ b/packages/esm-shim/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-esm-shim ChangeLog +## v1.0.3 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v0.1.2 _2023-08-26_ diff --git a/packages/esm-shim/package.json b/packages/esm-shim/package.json index 7f670ae7f..3839e5d0d 100644 --- a/packages/esm-shim/package.json +++ b/packages/esm-shim/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-esm-shim", - "version": "0.1.2", + "version": "0.1.3", "publishConfig": { "access": "public" }, diff --git a/packages/graphql/CHANGELOG.md b/packages/graphql/CHANGELOG.md index 08d6a5853..20d2516d4 100644 --- a/packages/graphql/CHANGELOG.md +++ b/packages/graphql/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-graphql ChangeLog +## v2.0.4 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v2.0.3 _2023-01-20_ diff --git a/packages/graphql/package.json b/packages/graphql/package.json index 4260ffdcd..b6e5cf69f 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-graphql", - "version": "2.0.3", + "version": "2.0.4", "publishConfig": { "access": "public" }, diff --git a/packages/html/CHANGELOG.md b/packages/html/CHANGELOG.md index c2d377588..5a113334a 100644 --- a/packages/html/CHANGELOG.md +++ b/packages/html/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-html 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_ diff --git a/packages/html/package.json b/packages/html/package.json index 7baa94a6b..8d2be9417 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-html", - "version": "1.0.2", + "version": "1.0.3", "publishConfig": { "access": "public" }, diff --git a/packages/image/CHANGELOG.md b/packages/image/CHANGELOG.md index 85be3ff2c..611d98de9 100755 --- a/packages/image/CHANGELOG.md +++ b/packages/image/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-image ChangeLog +## v3.0.3 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v3.0.2 _2023-01-20_ diff --git a/packages/image/package.json b/packages/image/package.json index 1dc89e134..d80fb57aa 100644 --- a/packages/image/package.json +++ b/packages/image/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-image", - "version": "3.0.2", + "version": "3.0.3", "publishConfig": { "access": "public" }, diff --git a/packages/inject/CHANGELOG.md b/packages/inject/CHANGELOG.md index 61fd3517d..a6dbb3fc6 100644 --- a/packages/inject/CHANGELOG.md +++ b/packages/inject/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-inject ChangeLog +## v5.0.4 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v5.0.3 _2022-12-17_ diff --git a/packages/inject/package.json b/packages/inject/package.json index 08ce5a078..78b7ccf44 100644 --- a/packages/inject/package.json +++ b/packages/inject/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-inject", - "version": "5.0.3", + "version": "5.0.4", "publishConfig": { "access": "public" }, diff --git a/packages/json/CHANGELOG.md b/packages/json/CHANGELOG.md index f754c5adc..0f412eb44 100755 --- a/packages/json/CHANGELOG.md +++ b/packages/json/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-json ChangeLog +## v6.0.1 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v6.0.0 _2022-12-17_ diff --git a/packages/json/package.json b/packages/json/package.json index 5a3764789..8ef14c842 100755 --- a/packages/json/package.json +++ b/packages/json/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-json", - "version": "6.0.0", + "version": "6.0.1", "publishConfig": { "access": "public" }, diff --git a/packages/legacy/CHANGELOG.md b/packages/legacy/CHANGELOG.md index e1c1f2b54..0f0514a0c 100644 --- a/packages/legacy/CHANGELOG.md +++ b/packages/legacy/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-legacy ChangeLog +## v3.0.2 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v3.0.1 _2022-10-21_ diff --git a/packages/legacy/package.json b/packages/legacy/package.json index a015db6f7..8b5dc7a15 100644 --- a/packages/legacy/package.json +++ b/packages/legacy/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-legacy", - "version": "3.0.1", + "version": "3.0.2", "publishConfig": { "access": "public" }, diff --git a/packages/multi-entry/CHANGELOG.md b/packages/multi-entry/CHANGELOG.md index b9bf78401..f751864df 100644 --- a/packages/multi-entry/CHANGELOG.md +++ b/packages/multi-entry/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-multi-entry ChangeLog +## v6.0.1 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v6.0.0 _2022-10-24_ diff --git a/packages/multi-entry/package.json b/packages/multi-entry/package.json index 35a24a35f..71beb2f70 100755 --- a/packages/multi-entry/package.json +++ b/packages/multi-entry/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-multi-entry", - "version": "6.0.0", + "version": "6.0.1", "publishConfig": { "access": "public" }, diff --git a/packages/node-resolve/CHANGELOG.md b/packages/node-resolve/CHANGELOG.md index 14ff622bd..655c2af8b 100755 --- a/packages/node-resolve/CHANGELOG.md +++ b/packages/node-resolve/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-node-resolve ChangeLog +## v15.2.2 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v15.2.1 _2023-08-22_ diff --git a/packages/node-resolve/package.json b/packages/node-resolve/package.json index a8251e24f..52b734df7 100644 --- a/packages/node-resolve/package.json +++ b/packages/node-resolve/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-node-resolve", - "version": "15.2.1", + "version": "15.2.2", "publishConfig": { "access": "public" }, diff --git a/packages/pluginutils/CHANGELOG.md b/packages/pluginutils/CHANGELOG.md index 4756f631d..f1af3f625 100755 --- a/packages/pluginutils/CHANGELOG.md +++ b/packages/pluginutils/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/pluginutils ChangeLog +## v5.0.5 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v5.0.4 _2023-08-26_ diff --git a/packages/pluginutils/package.json b/packages/pluginutils/package.json index 9ab6af2c4..3960efe50 100644 --- a/packages/pluginutils/package.json +++ b/packages/pluginutils/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/pluginutils", - "version": "5.0.4", + "version": "5.0.5", "publishConfig": { "access": "public" }, diff --git a/packages/replace/CHANGELOG.md b/packages/replace/CHANGELOG.md index f5c8db66c..9a2b96933 100755 --- a/packages/replace/CHANGELOG.md +++ b/packages/replace/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-replace ChangeLog +## v5.0.3 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v5.0.2 _2022-12-17_ diff --git a/packages/replace/package.json b/packages/replace/package.json index 9ac0914d7..4926a92e5 100644 --- a/packages/replace/package.json +++ b/packages/replace/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-replace", - "version": "5.0.2", + "version": "5.0.3", "publishConfig": { "access": "public" }, diff --git a/packages/run/CHANGELOG.md b/packages/run/CHANGELOG.md index f9e0da3d9..887ec6183 100644 --- a/packages/run/CHANGELOG.md +++ b/packages/run/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-run ChangeLog +## v3.0.2 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v3.0.1 _2022-10-21_ diff --git a/packages/run/package.json b/packages/run/package.json index 87429f583..b73efa197 100644 --- a/packages/run/package.json +++ b/packages/run/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-run", - "version": "3.0.1", + "version": "3.0.2", "publishConfig": { "access": "public" }, diff --git a/packages/strip/CHANGELOG.md b/packages/strip/CHANGELOG.md index e40acec26..6c0e6b4c9 100755 --- a/packages/strip/CHANGELOG.md +++ b/packages/strip/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-strip ChangeLog +## v3.0.3 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v3.0.2 _2022-12-17_ diff --git a/packages/strip/package.json b/packages/strip/package.json index c2ba7c740..f9f282b3b 100644 --- a/packages/strip/package.json +++ b/packages/strip/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-strip", - "version": "3.0.2", + "version": "3.0.3", "publishConfig": { "access": "public" }, diff --git a/packages/sucrase/CHANGELOG.md b/packages/sucrase/CHANGELOG.md index acf336996..469da1eec 100644 --- a/packages/sucrase/CHANGELOG.md +++ b/packages/sucrase/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-sucrase ChangeLog +## v5.0.2 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v5.0.1 _2022-10-21_ diff --git a/packages/sucrase/package.json b/packages/sucrase/package.json index 6102e4e33..3100fbcc6 100644 --- a/packages/sucrase/package.json +++ b/packages/sucrase/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-sucrase", - "version": "5.0.1", + "version": "5.0.2", "publishConfig": { "access": "public" }, diff --git a/packages/swc/CHANGELOG.md b/packages/swc/CHANGELOG.md index 9878b6e32..d62598d1f 100644 --- a/packages/swc/CHANGELOG.md +++ b/packages/swc/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-swc ChangeLog +## v0.2.1 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v0.2.0 _2023-08-29_ diff --git a/packages/swc/package.json b/packages/swc/package.json index 1205401b6..7c6beb041 100644 --- a/packages/swc/package.json +++ b/packages/swc/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-swc", - "version": "0.2.0", + "version": "0.2.1", "publishConfig": { "access": "public" }, diff --git a/packages/terser/CHANGELOG.md b/packages/terser/CHANGELOG.md index d9f230a60..2efd122e6 100644 --- a/packages/terser/CHANGELOG.md +++ b/packages/terser/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-terser ChangeLog +## v0.4.4 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v0.4.3 _2023-05-17_ diff --git a/packages/terser/package.json b/packages/terser/package.json index e5b5cfef9..b37298508 100644 --- a/packages/terser/package.json +++ b/packages/terser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-terser", - "version": "0.4.3", + "version": "0.4.4", "publishConfig": { "access": "public" }, diff --git a/packages/typescript/CHANGELOG.md b/packages/typescript/CHANGELOG.md index fc740bc93..9ec69af85 100644 --- a/packages/typescript/CHANGELOG.md +++ b/packages/typescript/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-typescript ChangeLog +## v11.1.5 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v11.1.4 _2023-09-25_ diff --git a/packages/typescript/package.json b/packages/typescript/package.json index 590290e1e..6b9c87da7 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-typescript", - "version": "11.1.4", + "version": "11.1.5", "publishConfig": { "access": "public" }, diff --git a/packages/url/CHANGELOG.md b/packages/url/CHANGELOG.md index e0606e76b..4ddbc3f03 100644 --- a/packages/url/CHANGELOG.md +++ b/packages/url/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-url ChangeLog +## v8.0.2 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v8.0.1 _2022-10-21_ @@ -153,7 +161,7 @@ _2018-10-01_ ### Breaking Changes -- Version 2.0.0 requires rollup@0.60 and higher – deprecated `onwrite` hook replaced with new `generateBundle` hook, so plugin will not work with earlier versions of Rollup. +- Version 2.0.0 requires rollup@0.60 and higher – deprecated `onwrite` hook replaced with new `generateBundle` hook, so plugin will not work with earlier versions of Rollup. Use version 1.4 with rollup<0.60 ## 1.4.0 diff --git a/packages/url/package.json b/packages/url/package.json index 4627e409d..38cdfdabe 100644 --- a/packages/url/package.json +++ b/packages/url/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-url", - "version": "8.0.1", + "version": "8.0.2", "publishConfig": { "access": "public" }, diff --git a/packages/virtual/CHANGELOG.md b/packages/virtual/CHANGELOG.md index be59bdbfc..aba1b2e3f 100755 --- a/packages/virtual/CHANGELOG.md +++ b/packages/virtual/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-virtual ChangeLog +## v3.0.2 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v3.0.1 _2022-10-21_ diff --git a/packages/virtual/package.json b/packages/virtual/package.json index 64de82013..60c1cb929 100755 --- a/packages/virtual/package.json +++ b/packages/virtual/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-virtual", - "version": "3.0.1", + "version": "3.0.2", "publishConfig": { "access": "public" }, diff --git a/packages/wasm/CHANGELOG.md b/packages/wasm/CHANGELOG.md index 64919513f..4afdecf3c 100644 --- a/packages/wasm/CHANGELOG.md +++ b/packages/wasm/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-wasm ChangeLog +## v6.2.2 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v6.2.1 _2023-09-25_ diff --git a/packages/wasm/package.json b/packages/wasm/package.json index 1fc126fde..eaf06cdab 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-wasm", - "version": "6.2.1", + "version": "6.2.2", "publishConfig": { "access": "public" }, diff --git a/packages/yaml/CHANGELOG.md b/packages/yaml/CHANGELOG.md index b6ded56a8..686b7d6b5 100755 --- a/packages/yaml/CHANGELOG.md +++ b/packages/yaml/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-yaml ChangeLog +## v4.1.2 + +_2023-10-05_ + +### Bugfixes + +- fix: ensure rollup 4 compatibility [#1595](https://github.com/rollup/plugins/pull/1595) + ## v4.1.1 _2023-06-19_ diff --git a/packages/yaml/package.json b/packages/yaml/package.json index bf1165b2c..f8b76bccc 100755 --- a/packages/yaml/package.json +++ b/packages/yaml/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-yaml", - "version": "4.1.1", + "version": "4.1.2", "publishConfig": { "access": "public" }, From ab3f45d07f4501f7d97f34865cf6f1938783522d Mon Sep 17 00:00:00 2001 From: Kieran Date: Sun, 8 Oct 2023 20:15:15 +0100 Subject: [PATCH 10/20] fix(node-resolve): modulePaths default is not set (#1534) * fix(node-resolve): modulePaths default is not set * test: add a test for defaults --------- Co-authored-by: shellscape --- packages/node-resolve/src/index.js | 1 + .../node-resolve/test/snapshots/test.mjs.md | 21 ++++++++++++++++++ .../node-resolve/test/snapshots/test.mjs.snap | Bin 823 -> 1077 bytes packages/node-resolve/test/test.mjs | 6 ++++- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/packages/node-resolve/src/index.js b/packages/node-resolve/src/index.js index 09ce84cd8..3d389383d 100644 --- a/packages/node-resolve/src/index.js +++ b/packages/node-resolve/src/index.js @@ -37,6 +37,7 @@ const defaults = { extensions: ['.mjs', '.js', '.json', '.node'], resolveOnly: [], moduleDirectories: ['node_modules'], + modulePaths: [], ignoreSideEffectsForRoot: false, // TODO: set to false in next major release or remove allowExportsFolderMapping: true diff --git a/packages/node-resolve/test/snapshots/test.mjs.md b/packages/node-resolve/test/snapshots/test.mjs.md index 7eccb2357..ab64d89de 100644 --- a/packages/node-resolve/test/snapshots/test.mjs.md +++ b/packages/node-resolve/test/snapshots/test.mjs.md @@ -4,6 +4,27 @@ The actual snapshot is saved in `test.mjs.snap`. Generated by [AVA](https://avajs.dev). +## has default config + +> Snapshot 1 + + { + allowExportsFolderMapping: true, + dedupe: [], + extensions: [ + '.mjs', + '.js', + '.json', + '.node', + ], + ignoreSideEffectsForRoot: false, + moduleDirectories: [ + 'node_modules', + ], + modulePaths: [], + resolveOnly: [], + } + ## throws error if local id is not resolved > Snapshot 1 diff --git a/packages/node-resolve/test/snapshots/test.mjs.snap b/packages/node-resolve/test/snapshots/test.mjs.snap index 84c150452384f0b6ee8303f0be5c734a9d30e0a6..e8af19cf355b7af30cfc13e11c3659c7c76ce39b 100644 GIT binary patch literal 1077 zcmV-51j_qCRzVd<-{l_4#^@RB&5=+G|h*C+B8b3 zT29@GJzh_CJY#0Y-K@lg0|#y#IC3d}0OG#@DiA{A&H;%Ne+188`{AwIbyzEn^knDF zdo$0!_n!UsnRm>kGtl3BPYpAiDxYZVQjbL3U`Gm%^_dnV)V?(O%V(}j4EfCNH>?#a z{zDhggbqqq|+tt-o3%y~X6$^F1#(onu zEYw;EiS0MMbsbPw9QZM*uBl(z>k_86i8r>vTFX(AGcT_%8^uE$c0iP1~ArXcQdmZ7}$x zVAPy7nptbTWUW23cF{sj3tf)cji0624Ni2XL@3ubx)bG?a|@JG46-BEG( z%kk2al%>v!^7LKfD>>AdDkT+W9)_AF95WX)jfFHg!|Tq~>f^0(skW>&^uZk&ad+AU zuXo?`q+G|Ik^x?iM84H#at1uWdLG4LQkfb%kv3pER}y&0jE_0(6K9ke9c5_`OU&y~Zw z5BK&Do;fEv2fMd{hdy(B9KZqKgo(f;=F%-h*$#QsXJV$l@)+~X?#$Ge2cl>op$J}_ zMu<&Q^^`ss1)Pb2&cdHBzQ4!WyoT%#;d(R4X58^R@lk1FliMV*$z7fqR1x=!Q5R$F zr7Z&;B>Ggv)Y9O)_z?yD5EDKmBaI`VZXkh5avp`aH@{EjmovOkjo~rT(5|W!-7htw zLwpf(S%l@l_B}k35f&7l(fCYn;E+>r0s|;vFl1Us^sInF;tU|<*BDS1;nD!zss?EC zbuVS~Yn_bbB8(xCpNKV3&sNW;JYz5_gyJ z^8R~XC#+x*Sb2y`L-bL_%F-_d^mCnn1`Ab_UMilCtKu0CIHin!tCLZ<7^A5%?A%(7 zhw!uM^=`E!#HAtHI@2%!V7Ix(3FEtg07zk&S+)>4ha5)=Rc94HQF literal 823 zcmV-71IYYARzVEbKoG~h=?n2nD>!f*<;0;45<)_PR?rt!BxtKbRXCB2 zy@|J3d(G~;X^tE?^98t+FT+D1gv2-Ci!gTL^pP6u60420+I4nj_n+U)ICIc!2x+(V z`;W|UBiR0J<0{$Fz?6~-coT4&3g8ZK4Zbv>n3iIXIb8cR(5^K4?SbP^Ltie9SyNW@ zArsaNxwkAs;T&~=O7%`t$_g}<^q>;@$x(Ch9o1c3NmOi7AtDuas14eB(g_7y;fmQt zD$X=?xN$+S7PY&5qpjXy8-d}{*VW@L-66HFh&PaXiIiq>zKi1qnVcaLi%QWhA<3#- zE?eZXMTkYN5Hg=Qjkj@rgX05^CDM1E+-U6Louo8aPESu;c!F+;{} z>9FMC`sUN^wc7gYoyD#7+WOiF(O7C`H?_3|?19;&wsAu6&2N`dGOEokY z^TA;O?oq>>Dr{>!W(anD7CJ7sUGVS%bOP!Fjkr`#sGJN$*y4Wjc=f2pB(kf=@~eqM zF;8L=oE}EhrkUDf&%2)Bep~nD4=3O6K{RiX(tVs4;%H(NCRU@XdV!6XabV+B5*d;c z_vxrlYOVK51}n&KF%?nkiLb&A!|yvlMTd4Zgh<_B0F@LX44^)IPTwzKIG>MUgK8{S zm5T05f#`_HLawhc9ayaiT^WMU@HZNl>sbf{Lnk!A6h=d?b;!;ND4=#5C0}4beT5?f z^e7)7wr`lPqh%_iZ$&baSr{FP92usye3-azi_l@qQn6?8OEewVuOe}EvfvsPJ2Gqw z`LHQQohMwR*WcG7VR>0#B@#!5=wZ&x(tic?xky0mOxdJIisx}&Jc9-&mC^Si83oxG z9cjbPt<*$7v30)Cr4~yZ8KR{#H3OK=hNbsRKZ@j}aX( z(}Vn&(tCkVMH1T0N@#R{|0`!IxEjWX;=3^w)6XI?nH(jTDE)6>e*oHta4LNf002y% Bh4}yg diff --git a/packages/node-resolve/test/test.mjs b/packages/node-resolve/test/test.mjs index 9318d4ea4..64cabc347 100755 --- a/packages/node-resolve/test/test.mjs +++ b/packages/node-resolve/test/test.mjs @@ -6,7 +6,7 @@ import commonjs from '@rollup/plugin-commonjs'; import test from 'ava'; import { rollup } from 'rollup'; -import { nodeResolve } from 'current-package'; +import { nodeResolve, DEFAULTS } from 'current-package'; import { evaluateBundle, getCode, getImports, testBundle } from '../../../util/test.js'; @@ -23,6 +23,10 @@ test('exposes plugin version', (t) => { t.regex(plugin.version, /^\d+\.\d+\.\d+/); }); +test('has default config', (t) => { + t.snapshot(DEFAULTS); +}); + test('finds a module with jsnext:main', async (t) => { const bundle = await rollup({ input: 'jsnext.js', From 1caee897866eeab5f56bd50e35fda71635a57fdb Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 8 Oct 2023 19:23:45 +0000 Subject: [PATCH 11/20] chore(release): node-resolve v15.2.3 --- packages/node-resolve/CHANGELOG.md | 8 ++++++++ packages/node-resolve/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/node-resolve/CHANGELOG.md b/packages/node-resolve/CHANGELOG.md index 655c2af8b..b0515adc8 100755 --- a/packages/node-resolve/CHANGELOG.md +++ b/packages/node-resolve/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-node-resolve ChangeLog +## v15.2.3 + +_2023-10-08_ + +### Bugfixes + +- fix: modulePaths default is not set [#1534](https://github.com/rollup/plugins/pull/1534) + ## v15.2.2 _2023-10-05_ diff --git a/packages/node-resolve/package.json b/packages/node-resolve/package.json index 52b734df7..79728585b 100644 --- a/packages/node-resolve/package.json +++ b/packages/node-resolve/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-node-resolve", - "version": "15.2.2", + "version": "15.2.3", "publishConfig": { "access": "public" }, From cb579c8ab61aaace9bd748f7f3f3755a9bf052c1 Mon Sep 17 00:00:00 2001 From: XiaoPi <530257315@qq.com> Date: Sun, 15 Oct 2023 23:36:33 +0800 Subject: [PATCH 12/20] fix(commonjs): Keep the shebang at the top of the file content (#1610) --- packages/commonjs/src/index.js | 11 ++++++++++- packages/commonjs/src/proxies.js | 10 +++++++--- packages/commonjs/src/transform-commonjs.js | 11 +++++++++-- .../test/fixtures/samples/shebang/main.js | 2 ++ packages/commonjs/test/test.js | 15 +++++++++++++++ 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 packages/commonjs/test/fixtures/samples/shebang/main.js diff --git a/packages/commonjs/src/index.js b/packages/commonjs/src/index.js index da40131b5..a7fb65938 100644 --- a/packages/commonjs/src/index.js +++ b/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)) { diff --git a/packages/commonjs/src/proxies.js b/packages/commonjs/src/proxies.js index 1cad2e0d5..57b71b867 100644 --- a/packages/commonjs/src/proxies.js +++ b/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) { diff --git a/packages/commonjs/src/transform-commonjs.js b/packages/commonjs/src/transform-commonjs.js index 892e3b943..fd0fe0a9d 100644 --- a/packages/commonjs/src/transform-commonjs.js +++ b/packages/commonjs/src/transform-commonjs.js @@ -478,6 +478,13 @@ export default 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 @@ -561,13 +568,13 @@ 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 } } }; } diff --git a/packages/commonjs/test/fixtures/samples/shebang/main.js b/packages/commonjs/test/fixtures/samples/shebang/main.js new file mode 100644 index 000000000..f36482021 --- /dev/null +++ b/packages/commonjs/test/fixtures/samples/shebang/main.js @@ -0,0 +1,2 @@ +#!/usr/bin/env node +module.exports = 1; diff --git a/packages/commonjs/test/test.js b/packages/commonjs/test/test.js index 1367e9a8a..deb0a810c 100644 --- a/packages/commonjs/test/test.js +++ b/packages/commonjs/test/test.js @@ -1291,3 +1291,18 @@ test('allows the config to be reused', async (t) => { ['bar.js'] ); }); + +test('keep the shebang at the top of the file content', async (t) => { + const bundle = await rollup({ + input: ['fixtures/samples/shebang/main.js'], + plugins: [commonjs()] + }); + + const { output } = await bundle.generate({ + exports: 'auto', + format: 'cjs', + chunkFileNames: '[name].js' + }); + + t.is(output[0].code.startsWith('#!/usr/bin/env node\n'), true); +}); From 88687f0eb7db8eeb5ad29e20a70572f131af1c27 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 15 Oct 2023 15:39:09 +0000 Subject: [PATCH 13/20] chore(release): commonjs v25.0.6 --- packages/commonjs/CHANGELOG.md | 8 ++++++++ packages/commonjs/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/commonjs/CHANGELOG.md b/packages/commonjs/CHANGELOG.md index b46b809bd..954599e61 100644 --- a/packages/commonjs/CHANGELOG.md +++ b/packages/commonjs/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-commonjs ChangeLog +## 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_ diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index f9e74731a..65f0ae47c 100644 --- a/packages/commonjs/package.json +++ b/packages/commonjs/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-commonjs", - "version": "25.0.5", + "version": "25.0.6", "publishConfig": { "access": "public" }, From 8e2ed59472d7fe55a667fcad66c8c64a7864cc7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0=20/=20green?= Date: Mon, 16 Oct 2023 00:43:32 +0900 Subject: [PATCH 14/20] fix(commonjs,dynamic-import-vars,esm-shim,inject,replace,strip): bump magic-string version (#1596) --- packages/commonjs/package.json | 2 +- packages/dynamic-import-vars/package.json | 2 +- packages/esm-shim/package.json | 2 +- packages/inject/package.json | 2 +- packages/replace/package.json | 2 +- packages/strip/package.json | 2 +- pnpm-lock.yaml | 54 +++++++++++------------ 7 files changed, 31 insertions(+), 35 deletions(-) diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index 65f0ae47c..7ddfeeaa1 100644 --- a/packages/commonjs/package.json +++ b/packages/commonjs/package.json @@ -67,7 +67,7 @@ "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", diff --git a/packages/dynamic-import-vars/package.json b/packages/dynamic-import-vars/package.json index 84f91939f..78e6a2c7e 100644 --- a/packages/dynamic-import-vars/package.json +++ b/packages/dynamic-import-vars/package.json @@ -67,7 +67,7 @@ "astring": "^1.8.5", "estree-walker": "^2.0.2", "fast-glob": "^3.2.12", - "magic-string": "^0.27.0" + "magic-string": "^0.30.3" }, "devDependencies": { "acorn": "^8.8.0", diff --git a/packages/esm-shim/package.json b/packages/esm-shim/package.json index 3839e5d0d..3705d5540 100644 --- a/packages/esm-shim/package.json +++ b/packages/esm-shim/package.json @@ -60,7 +60,7 @@ } }, "dependencies": { - "magic-string": "^0.30.0" + "magic-string": "^0.30.3" }, "devDependencies": { "rollup": "^4.0.0-24", diff --git a/packages/inject/package.json b/packages/inject/package.json index 78b7ccf44..d7b8308ee 100644 --- a/packages/inject/package.json +++ b/packages/inject/package.json @@ -63,7 +63,7 @@ "dependencies": { "@rollup/pluginutils": "^5.0.1", "estree-walker": "^2.0.2", - "magic-string": "^0.27.0" + "magic-string": "^0.30.3" }, "devDependencies": { "@rollup/plugin-buble": "^1.0.0", diff --git a/packages/replace/package.json b/packages/replace/package.json index 4926a92e5..3b03ff293 100644 --- a/packages/replace/package.json +++ b/packages/replace/package.json @@ -62,7 +62,7 @@ }, "dependencies": { "@rollup/pluginutils": "^5.0.1", - "magic-string": "^0.27.0" + "magic-string": "^0.30.3" }, "devDependencies": { "@rollup/plugin-buble": "^1.0.0", diff --git a/packages/strip/package.json b/packages/strip/package.json index f9f282b3b..7bb0c97cd 100644 --- a/packages/strip/package.json +++ b/packages/strip/package.json @@ -57,7 +57,7 @@ "dependencies": { "@rollup/pluginutils": "^5.0.1", "estree-walker": "^2.0.2", - "magic-string": "^0.27.0" + "magic-string": "^0.30.3" }, "devDependencies": { "acorn": "^8.8.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0102b96b7..25637f26c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,9 +1,5 @@ lockfileVersion: '6.0' -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - importers: .: @@ -243,8 +239,8 @@ importers: specifier: 1.2.1 version: 1.2.1 magic-string: - specifier: ^0.27.0 - version: 0.27.0 + specifier: ^0.30.3 + version: 0.30.3 devDependencies: '@rollup/plugin-json': specifier: ^5.0.0 @@ -327,8 +323,8 @@ importers: specifier: ^3.2.12 version: 3.2.12 magic-string: - specifier: ^0.27.0 - version: 0.27.0 + specifier: ^0.30.3 + version: 0.30.3 devDependencies: acorn: specifier: ^8.8.0 @@ -368,8 +364,8 @@ importers: packages/esm-shim: dependencies: magic-string: - specifier: ^0.30.0 - version: 0.30.0 + specifier: ^0.30.3 + version: 0.30.3 devDependencies: rollup: specifier: ^4.0.0-24 @@ -440,8 +436,8 @@ importers: specifier: ^2.0.2 version: 2.0.2 magic-string: - specifier: ^0.27.0 - version: 0.27.0 + specifier: ^0.30.3 + version: 0.30.3 devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 @@ -602,8 +598,8 @@ importers: specifier: ^5.0.1 version: 5.0.1(rollup@4.0.0-24) magic-string: - specifier: ^0.27.0 - version: 0.27.0 + specifier: ^0.30.3 + version: 0.30.3 devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 @@ -655,8 +651,8 @@ importers: specifier: ^2.0.2 version: 2.0.2 magic-string: - specifier: ^0.27.0 - version: 0.27.0 + specifier: ^0.30.3 + version: 0.30.3 devDependencies: acorn: specifier: ^8.8.0 @@ -2170,7 +2166,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@jridgewell/set-array': 1.1.2 - '@jridgewell/sourcemap-codec': 1.4.14 + '@jridgewell/sourcemap-codec': 1.4.15 dev: true /@jridgewell/gen-mapping@0.3.2: @@ -2178,7 +2174,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@jridgewell/set-array': 1.1.2 - '@jridgewell/sourcemap-codec': 1.4.14 + '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.16 /@jridgewell/resolve-uri@3.1.0: @@ -2199,6 +2195,9 @@ packages: /@jridgewell/sourcemap-codec@1.4.14: resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} + /@jridgewell/sourcemap-codec@1.4.15: + resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + /@jridgewell/trace-mapping@0.3.16: resolution: {integrity: sha512-LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA==} dependencies: @@ -2209,7 +2208,7 @@ packages: resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} dependencies: '@jridgewell/resolve-uri': 3.1.0 - '@jridgewell/sourcemap-codec': 1.4.14 + '@jridgewell/sourcemap-codec': 1.4.15 dev: true /@nodelib/fs.scandir@2.1.5: @@ -5675,18 +5674,11 @@ packages: sourcemap-codec: 1.4.8 dev: true - /magic-string@0.27.0: - resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.14 - dev: false - - /magic-string@0.30.0: - resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} + /magic-string@0.30.3: + resolution: {integrity: sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==} engines: {node: '>=12'} dependencies: - '@jridgewell/sourcemap-codec': 1.4.14 + '@jridgewell/sourcemap-codec': 1.4.15 dev: false /make-dir@2.1.0: @@ -8005,3 +7997,7 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} dev: true + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false From ad406ba364bc39b4f1f5517292ee722a5862b97d Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 15 Oct 2023 15:46:13 +0000 Subject: [PATCH 15/20] chore(release): commonjs v25.0.7 --- packages/commonjs/CHANGELOG.md | 8 ++++++++ packages/commonjs/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/commonjs/CHANGELOG.md b/packages/commonjs/CHANGELOG.md index 954599e61..2fd268cf7 100644 --- a/packages/commonjs/CHANGELOG.md +++ b/packages/commonjs/CHANGELOG.md @@ -1,5 +1,13 @@ # @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_ diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index 7ddfeeaa1..af564922a 100644 --- a/packages/commonjs/package.json +++ b/packages/commonjs/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-commonjs", - "version": "25.0.6", + "version": "25.0.7", "publishConfig": { "access": "public" }, From c990329d31c211494733760fd8335e7c23f1f64b Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 15 Oct 2023 15:46:34 +0000 Subject: [PATCH 16/20] chore(release): dynamic-import-vars v2.0.7 --- packages/dynamic-import-vars/CHANGELOG.md | 8 ++++++++ packages/dynamic-import-vars/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/dynamic-import-vars/CHANGELOG.md b/packages/dynamic-import-vars/CHANGELOG.md index 37f0e55bb..3dd70f433 100644 --- a/packages/dynamic-import-vars/CHANGELOG.md +++ b/packages/dynamic-import-vars/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-dynamic-import-vars ChangeLog +## v2.0.7 + +_2023-10-15_ + +### Bugfixes + +- fix: bump magic-string version [#1596](https://github.com/rollup/plugins/pull/1596) + ## v2.0.6 _2023-10-05_ diff --git a/packages/dynamic-import-vars/package.json b/packages/dynamic-import-vars/package.json index 78e6a2c7e..b5b2e8f4e 100644 --- a/packages/dynamic-import-vars/package.json +++ b/packages/dynamic-import-vars/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-dynamic-import-vars", - "version": "2.0.6", + "version": "2.0.7", "publishConfig": { "access": "public" }, From 60da0c268ecc264f50bb260f24e126fa1762f1e2 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 15 Oct 2023 15:46:45 +0000 Subject: [PATCH 17/20] chore(release): esm-shim v0.1.4 --- packages/esm-shim/CHANGELOG.md | 8 ++++++++ packages/esm-shim/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/esm-shim/CHANGELOG.md b/packages/esm-shim/CHANGELOG.md index 279d5ac8d..5d7f26ab9 100644 --- a/packages/esm-shim/CHANGELOG.md +++ b/packages/esm-shim/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-esm-shim ChangeLog +## v0.1.4 + +_2023-10-15_ + +### Bugfixes + +- fix: bump magic-string version [#1596](https://github.com/rollup/plugins/pull/1596) + ## v1.0.3 _2023-10-05_ diff --git a/packages/esm-shim/package.json b/packages/esm-shim/package.json index 3705d5540..e9a2eaad3 100644 --- a/packages/esm-shim/package.json +++ b/packages/esm-shim/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-esm-shim", - "version": "0.1.3", + "version": "0.1.4", "publishConfig": { "access": "public" }, From d55ce9c6d76a008b0d0bcec86b310e1e51636384 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 15 Oct 2023 15:46:55 +0000 Subject: [PATCH 18/20] chore(release): inject v5.0.5 --- packages/inject/CHANGELOG.md | 8 ++++++++ packages/inject/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/inject/CHANGELOG.md b/packages/inject/CHANGELOG.md index a6dbb3fc6..3c001f001 100644 --- a/packages/inject/CHANGELOG.md +++ b/packages/inject/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-inject ChangeLog +## v5.0.5 + +_2023-10-15_ + +### Bugfixes + +- fix: bump magic-string version [#1596](https://github.com/rollup/plugins/pull/1596) + ## v5.0.4 _2023-10-05_ diff --git a/packages/inject/package.json b/packages/inject/package.json index d7b8308ee..6bdcbffb8 100644 --- a/packages/inject/package.json +++ b/packages/inject/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-inject", - "version": "5.0.4", + "version": "5.0.5", "publishConfig": { "access": "public" }, From 563d83a5294299f40ad1ed18c4124f5a01435d8d Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 15 Oct 2023 15:47:05 +0000 Subject: [PATCH 19/20] chore(release): replace v5.0.4 --- packages/replace/CHANGELOG.md | 8 ++++++++ packages/replace/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/replace/CHANGELOG.md b/packages/replace/CHANGELOG.md index 9a2b96933..6d7721315 100755 --- a/packages/replace/CHANGELOG.md +++ b/packages/replace/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-replace ChangeLog +## v5.0.4 + +_2023-10-15_ + +### Bugfixes + +- fix: bump magic-string version [#1596](https://github.com/rollup/plugins/pull/1596) + ## v5.0.3 _2023-10-05_ diff --git a/packages/replace/package.json b/packages/replace/package.json index 3b03ff293..70c542e8b 100644 --- a/packages/replace/package.json +++ b/packages/replace/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-replace", - "version": "5.0.3", + "version": "5.0.4", "publishConfig": { "access": "public" }, From c72cf7c3a17c75332eeb3470d08b14f7eb1e47dc Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 15 Oct 2023 15:47:15 +0000 Subject: [PATCH 20/20] chore(release): strip v3.0.4 --- packages/strip/CHANGELOG.md | 8 ++++++++ packages/strip/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/strip/CHANGELOG.md b/packages/strip/CHANGELOG.md index 6c0e6b4c9..da5712a9d 100755 --- a/packages/strip/CHANGELOG.md +++ b/packages/strip/CHANGELOG.md @@ -1,5 +1,13 @@ # @rollup/plugin-strip ChangeLog +## v3.0.4 + +_2023-10-15_ + +### Bugfixes + +- fix: bump magic-string version [#1596](https://github.com/rollup/plugins/pull/1596) + ## v3.0.3 _2023-10-05_ diff --git a/packages/strip/package.json b/packages/strip/package.json index 7bb0c97cd..574280622 100644 --- a/packages/strip/package.json +++ b/packages/strip/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/plugin-strip", - "version": "3.0.3", + "version": "3.0.4", "publishConfig": { "access": "public" },