From d4688ee6915fd5da09cb012b69d0629c8a08e75e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sun, 24 Sep 2023 20:39:45 +0200 Subject: [PATCH] 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 --- packages/alias/package.json | 4 +- packages/alias/test/test.mjs | 10 +- packages/auto-install/package.json | 4 +- packages/babel/package.json | 4 +- 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 | 115 ++--- .../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 +- 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/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 | 4 +- packages/typescript/src/index.ts | 6 +- packages/typescript/src/preflight.ts | 7 +- .../typescript/test/snapshots/tslib.ts.md | 1 - .../typescript/test/snapshots/tslib.ts.snap | Bin 597 -> 575 bytes .../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/virtual/package.json | 4 +- packages/wasm/package.json | 4 +- packages/yaml/package.json | 4 +- pnpm-lock.yaml | 432 ++++++++++-------- 58 files changed, 403 insertions(+), 375 deletions(-) diff --git a/packages/alias/package.json b/packages/alias/package.json index 214031d79..3973c79f4 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-23", "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..c0fa423ee 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-23", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/babel/package.json b/packages/babel/package.json index 88e94728e..c37befd2a 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-23", "source-map": "^0.7.4" }, "types": "./types/index.d.ts", diff --git a/packages/beep/package.json b/packages/beep/package.json index 4b6c21c73..1d325b794 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-23", "strip-ansi": "^7.0.1" }, "types": "types/index.d.ts", diff --git a/packages/buble/package.json b/packages/buble/package.json index 7965d3fa2..059fd4a62 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-23", "source-map": "^0.7.4", "typescript": "^4.8.3" }, diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index 1cff5476a..e1ba670b0 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-23", "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..c671d8bc3 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 () {␊ @@ -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;␊ `, } diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 5517bbaaa154e47d36e0b5b9487914b0de0451ad..afefc2250b2cd21b79abc3fead355634f8efb862 100644 GIT binary patch delta 19086 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 delta 19275 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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..8e8f30e92 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-23", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/dsv/package.json b/packages/dsv/package.json index c3c0d6a23..b1951fa19 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-23" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/dynamic-import-vars/package.json b/packages/dynamic-import-vars/package.json index d1ab51a0f..104484fac 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-23" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/eslint/package.json b/packages/eslint/package.json index 5faceecc4..21386f6ef 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-23", "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..bae5b4608 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-23", "typescript": "^4.8.3" }, "types": "./types/index.d.ts" diff --git a/packages/graphql/package.json b/packages/graphql/package.json index f4fc4a8d1..5080c4af5 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-23" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/html/package.json b/packages/html/package.json index 22f094b39..a5263cb93 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-23", "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..b1b25c5d9 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-23", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/replace/package.json b/packages/replace/package.json index 8d46239f6..771502e3d 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-23", "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..875863384 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-23", "sinon": "^14.0.0", "typescript": "^4.8.3" }, diff --git a/packages/strip/package.json b/packages/strip/package.json index a769da1a2..73406bff5 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-23" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/sucrase/package.json b/packages/sucrase/package.json index db07e0acd..871e7abd6 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-23" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/swc/package.json b/packages/swc/package.json index 2d4078bfb..60f8ff311 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-23", "typescript": "^4.8.3" }, "types": "./types/index.d.ts" diff --git a/packages/terser/package.json b/packages/terser/package.json index b241c2bf5..f8501fe30 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-23", "typescript": "^4.8.3" }, "types": "./types/index.d.ts" diff --git a/packages/typescript/package.json b/packages/typescript/package.json index c43318c2a..1c12feb9e 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-23", "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..dce6e1bf8 100644 --- a/packages/typescript/src/diagnostics/toWarning.ts +++ b/packages/typescript/src/diagnostics/toWarning.ts @@ -1,5 +1,5 @@ import type typescript from 'typescript'; -import type { RollupWarning } from 'rollup'; +import type { RollupLog } from 'rollup'; import type { Diagnostic, FormatDiagnosticsHost } from 'typescript'; /** @@ -14,7 +14,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..e39960017 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,10 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi return { name: 'typescript', - buildStart(rollupOptions: RollupOptions) { + buildStart() { emitParsedOptionsErrors(ts, this, parsedOptions); - preflight({ config: parsedOptions, context: this, rollupOptions, tslib }); + preflight({ config: parsedOptions, context: this, tslib }); // Fixes a memory leak https://github.com/rollup/plugins/issues/322 if (this.meta.watchMode !== true) { diff --git a/packages/typescript/src/preflight.ts b/packages/typescript/src/preflight.ts index fce693e5e..4aa770765 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,6 @@ const { ModuleKind } = typescript; interface PreflightOptions { config: TypeScriptConfig; context: PluginContext; - rollupOptions: RollupOptions; tslib: any; } @@ -31,12 +30,12 @@ const validModules = [ ]; // eslint-disable-next-line import/prefer-default-export -export const preflight = ({ config, context, rollupOptions, tslib }: PreflightOptions) => { +export const preflight = ({ config, context, tslib }: PreflightOptions) => { if (!validModules.includes(config.options.module)) { context.warn(moduleErrorMessage); } - if (!rollupOptions.preserveModules && tslib === null) { + if (tslib === null) { context.error(tsLibErrorMessage); } }; diff --git a/packages/typescript/test/snapshots/tslib.ts.md b/packages/typescript/test/snapshots/tslib.ts.md index 3c45cf42f..fefa3c392 100644 --- a/packages/typescript/test/snapshots/tslib.ts.md +++ b/packages/typescript/test/snapshots/tslib.ts.md @@ -14,7 +14,6 @@ Generated by [AVA](https://avajs.dev). path: 'fixtures/joker/tslib.js', syscall: 'open', watchFiles: [ - 'packages/typescript/test/fixtures/overriding-tslib/main.ts', 'fixtures/joker/tslib.js', ], message: 'Could not load fixtures/joker/tslib.js (imported by fixtures/overriding-tslib/main.ts): ENOENT: no such file or directory, open \'fixtures/joker/tslib.js\'', diff --git a/packages/typescript/test/snapshots/tslib.ts.snap b/packages/typescript/test/snapshots/tslib.ts.snap index e9e3b85012a5dde7801b91ade66a2aa8b78b00ba..64a8ae45e4bc68ba560b072cf7b62281910b0948 100644 GIT binary patch literal 575 zcmV-F0>J%2RzV|oVqA}DkQ&@ zKjYTYNzr!YGkKy@$xvyBQu~!&(FQ&cvqT%m8HUR(NuT=x1rus=oHIK!DpcFqhh1Fl zqw6c9O{3W7NRHYd6NX1lo8=K^y<_W&FSZEWfXYul)$d%ROqj>U&}FVx9yJ;b0=oo& zz+N^axo(+j6D{tqTr?Lh)~Q?DNGR+4W;wg;B{==ZOF`eCLyv{W7mpug?V+0^EoGWq z@1*MgoV54y#hYjS!MomQG#r(QvDVX#%3&%bd+n%kC0Z?!=|rdv(Jd2hBO{VBv1A93 zk4!#7XI0>Mo7lyzQN}_soN1PNMO*puT1PmKg;!ZvH2i()HO`Ha{g}9_)yBR>;kIi& N`3v-NcjVjy006Rz8yf%s literal 597 zcmV-b0;>H%RzVHQX!P1ytb=P7q55zm!8LQ> zb!AQVspN+6U2C$#Zy z;%zowvpXiq5#E3!Csba96B3UC7ajpIcH#u3YGdiIowa7h^YQcfXlQIW@t?ja)M(Uf zB((9|#(XFwM{o3yCjukwW0CmCqW^d-74a-szT0RXG>i{8oX# z+woc9#pU)$&oOn%2WNJoT#&bRa^|;U>VDxvVaz&*O;pU_Cct;-mX<{8J$%l)Lll?#qYN_M#aqbyRg^o|q-*5Bf zJld3*`!tLw#wczbm)fZity>)NtajeIlw5Y5l*O6AK)TUK6E<40F}pJXZ5R80K1m6f^vR$N##sqWK&#Wsbi0{ zDJ3tm38(+DS?$ukJ0{!M0;$?PN{O zFx5uBM&WSFt(KT{tmC!gW};W)1?G{`VF+cnVX1&9s_`@# 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..52f2d4294 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-23" }, "types": "./types/index.d.ts", "ava": { diff --git a/packages/virtual/package.json b/packages/virtual/package.json index 07e622c02..1617f129f 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-23", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/wasm/package.json b/packages/wasm/package.json index 7e555491b..051e8ee6a 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-23", "source-map": "^0.7.4", "typescript": "^4.8.3" }, diff --git a/packages/yaml/package.json b/packages/yaml/package.json index e4d6e2dbc..0aaa04cda 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-23", "source-map-support": "^0.5.21" }, "types": "./types/index.d.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4cd256063..fe4efbb1e 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-23)(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-23) '@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-23)(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-23 + version: 4.0.0-23 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-23) '@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-23)(typescript@4.8.4) del: specifier: ^6.1.1 version: 6.1.1 @@ -139,12 +139,18 @@ importers: specifier: ^1.0.0 version: 1.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 + packages/auto-install/test/fixtures/pnpm-bare: + dependencies: + node-noop: + specifier: ^1.0.0 + version: 1.0.0 + packages/babel: dependencies: '@babel/helper-module-imports': @@ -152,7 +158,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-23) devDependencies: '@babel/core': specifier: ^7.19.1 @@ -174,16 +180,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-23) '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-23) '@types/babel__core': specifier: ^7.1.9 version: 7.1.19 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -191,8 +197,8 @@ importers: packages/beep: devDependencies: rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 strip-ansi: specifier: ^7.0.1 version: 7.0.1 @@ -201,7 +207,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-23) '@types/buble': specifier: ^0.19.2 version: 0.19.2 @@ -211,13 +217,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-23)(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-23 + version: 4.0.0-23 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -229,7 +235,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-23) commondir: specifier: ^1.0.1 version: 1.0.1 @@ -248,10 +254,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-23) '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.20.2) + version: 15.0.0(rollup@4.0.0-23) locate-character: specifier: ^2.0.5 version: 2.0.5 @@ -259,8 +265,8 @@ importers: specifier: ^0.8.7 version: 0.8.7 rollup: - specifier: ^3.19.0 - version: 3.20.2 + specifier: ^4.0.0-23 + version: 4.0.0-23 shx: specifier: ^0.3.4 version: 0.3.4 @@ -278,14 +284,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-23) 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-23)(typescript@4.8.4) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -294,7 +300,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-23) '@types/d3-dsv': specifier: ^3.0.0 version: 3.0.0 @@ -309,14 +315,14 @@ importers: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23) astring: specifier: ^1.8.5 version: 1.8.5 @@ -337,30 +343,30 @@ importers: specifier: ^2.7.1 version: 2.7.1 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23) 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-23) '@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-23)(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-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -372,8 +378,8 @@ importers: version: 0.30.0 devDependencies: rollup: - specifier: ^3.0.0-7 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -382,32 +388,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-23) 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-23) graphql: specifier: ^16.6.0 version: 16.6.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23)(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-23 + version: 4.0.0-23 rollup-plugin-postcss: specifier: ^4.0.2 version: 4.0.2(postcss@8.4.17)(ts-node@10.9.1) @@ -419,23 +425,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-23) 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-23) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23) estree-walker: specifier: ^2.0.2 version: 2.0.2 @@ -445,7 +451,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-23) del-cli: specifier: ^5.0.0 version: 5.0.0 @@ -453,8 +459,8 @@ importers: specifier: ^2.0.5 version: 2.0.5 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -466,17 +472,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-23) devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-23) '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-23) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -485,36 +491,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-23) devDependencies: '@rollup/plugin-buble': specifier: ^1.0.0 - version: 1.0.0(rollup@3.2.3) + version: 1.0.0(rollup@4.0.0-23) del-cli: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23) matched: specifier: ^5.0.1 version: 5.0.1 devDependencies: rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23) '@types/resolve': specifier: 1.20.2 version: 1.20.2 @@ -539,19 +545,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-23) '@rollup/plugin-commonjs': specifier: ^23.0.0 - version: 23.0.0(rollup@3.2.3) + version: 23.0.0(rollup@4.0.0-23) '@rollup/plugin-json': specifier: ^5.0.0 - version: 5.0.0(rollup@3.2.3) + version: 5.0.0(rollup@4.0.0-23) es5-ext: specifier: ^0.10.62 version: 0.10.62 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -573,13 +579,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-23) '@rollup/plugin-node-resolve': specifier: ^15.0.0 - version: 15.0.0(rollup@3.2.3) + version: 15.0.0(rollup@4.0.0-23) '@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-23)(typescript@4.8.4) '@types/node': specifier: ^14.18.30 version: 14.18.31 @@ -590,8 +596,8 @@ importers: specifier: ^8.8.0 version: 8.8.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -600,14 +606,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-23) 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-23) del-cli: specifier: ^5.0.0 version: 5.0.0 @@ -615,8 +621,8 @@ importers: specifier: ^2.0.5 version: 2.0.5 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -632,13 +638,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-23)(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-23 + version: 4.0.0-23 sinon: specifier: ^14.0.0 version: 14.0.1 @@ -650,7 +656,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-23) estree-walker: specifier: ^2.0.2 version: 2.0.2 @@ -662,30 +668,30 @@ importers: specifier: ^8.8.0 version: 8.8.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23) 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-23) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23) smob: specifier: ^1.4.0 version: 1.4.0 @@ -694,8 +700,8 @@ importers: specifier: ^1.3.78 version: 1.3.78 rollup: - specifier: ^3.0.0-7 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -716,8 +722,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-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -726,7 +732,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-23) resolve: specifier: ^1.22.1 version: 1.22.1 @@ -736,10 +742,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-23) '@rollup/plugin-commonjs': specifier: ^23.0.0 - version: 23.0.0(rollup@3.2.3) + version: 23.0.0(rollup@4.0.0-23) '@types/node': specifier: ^14.18.30 version: 14.18.31 @@ -750,8 +756,8 @@ importers: specifier: ^0.20.0 version: 0.20.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -760,7 +766,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-23) make-dir: specifier: ^3.1.0 version: 3.1.0 @@ -775,20 +781,20 @@ importers: specifier: ^11.1.0 version: 11.1.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 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-23) '@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-23)(typescript@4.8.4) rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 typescript: specifier: ^4.8.3 version: 4.8.4 @@ -801,13 +807,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-23)(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-23 + version: 4.0.0-23 source-map: specifier: ^0.7.4 version: 0.7.4 @@ -819,7 +825,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-23) js-yaml: specifier: ^4.1.0 version: 4.1.0 @@ -829,13 +835,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-23) del-cli: specifier: ^5.0.0 version: 5.0.0 rollup: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^4.0.0-23 + version: 4.0.0-23 source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -2230,7 +2236,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-23): resolution: {integrity: sha512-fGRWzM2F6wXnzAqn4Db8SdB/2Ree0u2XOQaaTy9mhqA35NmUzJXevMBUcpZywPF2MIUUAw+SKfWogKxFSPh+Qw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2239,11 +2245,11 @@ packages: rollup: optional: true dependencies: - rollup: 3.2.3 + rollup: 4.0.0-23 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-23): resolution: {integrity: sha512-qM8YIt/2fVxw5O0wUgAeglyC+qx9mg3UtCCLoSqetmQOKipmnQ/X3I0L2sjjb6BswaYpv2tun25lHViU7JPxLQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2259,10 +2265,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-23 dev: true - /@rollup/plugin-buble@1.0.0(rollup@3.2.3): + /@rollup/plugin-buble@1.0.0(rollup@4.0.0-23): resolution: {integrity: sha512-VDbhsNtC4cXZ20+hhilL0hzUskrTZWhF9PTabCOuye1NK5Ht8LZzpM1Q0S/yo0kMArjrFnIb2P4N8d3uEKuxnA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2274,10 +2280,10 @@ packages: '@rollup/pluginutils': 4.2.1 '@types/buble': 0.19.2 buble: 0.20.0 - rollup: 3.2.3 + rollup: 4.0.0-23 dev: true - /@rollup/plugin-commonjs@23.0.0(rollup@3.2.3): + /@rollup/plugin-commonjs@23.0.0(rollup@4.0.0-23): resolution: {integrity: sha512-JbrTRyDNtLQj/rhl7RFUuYXwQ2fac+33oLDAu2k++WD95zweyo28UAomLVA0JMGx4vmCa7Nw4T6k/1F6lelExg==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2292,10 +2298,10 @@ packages: glob: 8.0.3 is-reference: 1.2.1 magic-string: 0.26.7 - rollup: 3.2.3 + rollup: 4.0.0-23 dev: true - /@rollup/plugin-json@5.0.0(rollup@3.2.3): + /@rollup/plugin-json@5.0.0(rollup@4.0.0-23): resolution: {integrity: sha512-LsWDA5wJs/ggzakVuKQhZo7HPRcQZgBa3jWIVxQSFxaRToUGNi8ZBh3+k/gQ+1eInVYJgn4WBRCUkmoDrmmGzw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2305,41 +2311,10 @@ packages: optional: true dependencies: '@rollup/pluginutils': 4.2.1 - rollup: 3.2.3 - 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): - 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.2.3 + rollup: 4.0.0-23 dev: true - /@rollup/plugin-node-resolve@15.0.0(rollup@3.20.2): + /@rollup/plugin-node-resolve@15.0.0(rollup@4.0.0-23): resolution: {integrity: sha512-iwJbzfTzlzDDQcGmkS7EkCKwe2kSkdBrjX87Fy/KrNjr6UNnLpod0t6X66e502LRe5JJCA4FFqrEscWPnZAkig==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2354,10 +2329,10 @@ packages: is-builtin-module: 3.2.0 is-module: 1.0.0 resolve: 1.22.1 - rollup: 3.20.2 + rollup: 4.0.0-23 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-23)(typescript@4.8.4): resolution: {integrity: sha512-fj+CTk8+HvFCEwwDQdNgWd0lIJVXtMQ0Z3vH/ZgzFSbK2s1zs5wjZrjzrhViTTN+UF49+P69/tybgKRdGHpj/Q==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2372,11 +2347,11 @@ packages: dependencies: '@rollup/pluginutils': 4.2.1 resolve: 1.22.1 - rollup: 3.2.3 + rollup: 4.0.0-23 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-23): resolution: {integrity: sha512-K9KORe1myM62o0lKkNR4MmCxjwuAXsZEtIHpaILfv4kILXTOrXt/R2ha7PzMcCHPYdnkWPiBZK8ed4Zr3Ll5lQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2385,7 +2360,7 @@ packages: rollup: optional: true dependencies: - rollup: 3.2.3 + rollup: 4.0.0-23 dev: false /@rollup/pluginutils@4.2.1: @@ -2396,7 +2371,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-23): resolution: {integrity: sha512-4HaCVEXXuObvcPUaUlLt4faHYHCeQOOWNj8NKFGaRSrw3ZLD0TWeAFZicV9vXjnE2nkNuaVTfTuwAnjR+6uc9A==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2408,23 +2383,85 @@ packages: '@types/estree': 1.0.0 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.2.3 + rollup: 4.0.0-23 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/rollup-android-arm-eabi@4.0.0-23: + resolution: {integrity: sha512-bFVjyz+f4ICADXH6NmEthwLa6LeP0oHSlh5UGDZnGptPzAjMH/gQ3Bo1kFzG0p9xUNW22/uwHb9gnrLGQjgSBA==} + cpu: [arm] + os: [android] + requiresBuild: true + optional: true + + /@rollup/rollup-android-arm64@4.0.0-23: + resolution: {integrity: sha512-iyygT9P3wLXqVnKFE7OpteL32ijdZOnDbJhQ4vsOMfyZyE7ce0fEDMM/VsLirUMHqCH8sQO6lxFq/qBkj3sPLQ==} + cpu: [arm64] + os: [android] + requiresBuild: true + optional: true + + /@rollup/rollup-darwin-arm64@4.0.0-23: + resolution: {integrity: sha512-2Vnxl0XiBxgyk8BDgkZF/AkP17bB8YpfUg73MjLVHzv4Kls9MHUAQLaanDZzqrsyXZpJb0f2+2oALoDK9+lRuA==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + optional: true + + /@rollup/rollup-darwin-x64@4.0.0-23: + resolution: {integrity: sha512-xyZ1WHFgp3xttutYFnk5AMqEGK42uSW6elI11tGi6x3OcQG8WkE6Vq2GQnFNoA8dv0QlZZjldFMBYEQ/ksvBPw==} + cpu: [x64] + os: [darwin] + requiresBuild: true + optional: true + + /@rollup/rollup-linux-arm-gnueabihf@4.0.0-23: + resolution: {integrity: sha512-+eCcJMaejbxvKSBTGMAlYVRk/qYnKENJUvrDVSQGALZPuqALWgI7kdI/MJkfV4aUTyvf5ejb5lkX6/wPoMp38w==} + cpu: [arm] + os: [linux] + requiresBuild: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.0.0-23: + resolution: {integrity: sha512-R4ffdK1hkjqqh8RSYOi06tztZPnbExh8ppNL1m5HgwaQhrmcUd3wgBJScaZXmetHUrunWfShxtbQCdZoTp8A2A==} + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.0.0-23: + resolution: {integrity: sha512-ZB7Sl94bhM4sg5ZVOWKg0MfakJ6W4kDTZNUufteK83eTVHDMtGqCDTxBfMOAT3lDgkK+H6b1txaKgSht72Ss8A==} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + + /@rollup/rollup-linux-x64-musl@4.0.0-23: + resolution: {integrity: sha512-LKpQT5+PsXrOUyeuVVvPC1PC0lhSNeBYPF6Q9FgjYosxE+cdFSisU+rCxkRJwYX8fXmcK8/vuMkqPpUP6xCuog==} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + + /@rollup/rollup-win32-arm64-msvc@4.0.0-23: + resolution: {integrity: sha512-pEWZzHhioEt8HrM5PV7YiDbPmrZ8ceWtmoL/7xhvOgQ4xD3SCr5kych1gv1YKuWxLNKVl2S3SanARSvPQVcdog==} + cpu: [arm64] + os: [win32] + requiresBuild: true + optional: true + + /@rollup/rollup-win32-ia32-msvc@4.0.0-23: + resolution: {integrity: sha512-oPbbAitsulZ1czKOp7KTOdOVgMw9rFt1AC5+vKXCwEp+7rBFDuehX7dWEGyogsgMevW8oMfrQHBjxIj9tdKIkg==} + cpu: [ia32] + os: [win32] + requiresBuild: true + optional: true + + /@rollup/rollup-win32-x64-msvc@4.0.0-23: + resolution: {integrity: sha512-O4vk4bBXS5Hnla8Mmx1rP+X1SerP0Obl4HqgeluKqon1b8l6kHvS4sXSQuSMw7+VH4NFOEqfV7ES6cObwhSjSA==} + cpu: [x64] + os: [win32] + requiresBuild: true + optional: true /@rollup/pluginutils@5.0.4(rollup@3.2.3): resolution: {integrity: sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==} @@ -5884,7 +5921,6 @@ packages: /node-noop@1.0.0: resolution: {integrity: sha512-1lpWqKwZ9yUosQfW1uy3jm6St4ZbmeDKKGmdzwzedbyBI4LgHtGyL1ofDdqiSomgaYaSERi+qWtj64huJQjl7g==} - dev: true /node-preload@0.2.1: resolution: {integrity: sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==} @@ -7022,26 +7058,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-23: + resolution: {integrity: sha512-a5YMr7oRSMsslt101mwitUo1RR2IcS/3tnWB4GZ4zMSg4NskKu6b7HEe6uZdsTGz2JUWL0ahBpdJ/WOz0lyJ1Q==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.0.0-23 + '@rollup/rollup-android-arm64': 4.0.0-23 + '@rollup/rollup-darwin-arm64': 4.0.0-23 + '@rollup/rollup-darwin-x64': 4.0.0-23 + '@rollup/rollup-linux-arm-gnueabihf': 4.0.0-23 + '@rollup/rollup-linux-arm64-gnu': 4.0.0-23 + '@rollup/rollup-linux-x64-gnu': 4.0.0-23 + '@rollup/rollup-linux-x64-musl': 4.0.0-23 + '@rollup/rollup-win32-arm64-msvc': 4.0.0-23 + '@rollup/rollup-win32-ia32-msvc': 4.0.0-23 + '@rollup/rollup-win32-x64-msvc': 4.0.0-23 fsevents: 2.3.2 /run-parallel@1.2.0: