From 7fff95f35e8eeee69dbdbcb5ff191069c96b1ff0 Mon Sep 17 00:00:00 2001 From: Fabian Meyer <3982806+meyfa@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:38:23 +0200 Subject: [PATCH 01/29] chore(repo): Update dev dependency @rollup/plugin-typescript --- package.json | 2 +- pnpm-lock.yaml | 34 ++++++++++++---------------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 2e07cb5fa..7d14be451 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@ava/babel": "2.0.0", - "@rollup/plugin-typescript": "^8.5.0", + "@rollup/plugin-typescript": "^9.0.1", "@types/conventional-commits-parser": "^3.0.2", "@types/node": "14.18.30", "@types/semver": "^7.3.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 534a7a1ca..592c8b3a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ importers: .: specifiers: '@ava/babel': 2.0.0 - '@rollup/plugin-typescript': ^8.5.0 + '@rollup/plugin-typescript': ^9.0.1 '@types/conventional-commits-parser': ^3.0.2 '@types/node': 14.18.30 '@types/semver': ^7.3.7 @@ -39,7 +39,7 @@ importers: yargs-parser: ^20.2.9 devDependencies: '@ava/babel': 2.0.0 - '@rollup/plugin-typescript': 8.5.0_typescript@4.8.4 + '@rollup/plugin-typescript': 9.0.1_typescript@4.8.4 '@types/conventional-commits-parser': 3.0.2 '@types/node': 14.18.30 '@types/semver': 7.3.12 @@ -2070,7 +2070,7 @@ packages: rollup: 3.0.0-7 dev: true - /@rollup/plugin-typescript/8.5.0_typescript@4.8.4: + /@rollup/plugin-typescript/8.5.0_wkkufgeabp7wfx7iyk42bruffi: resolution: {integrity: sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==} engines: {node: '>=8.0.0'} peerDependencies: @@ -2081,25 +2081,27 @@ packages: tslib: optional: true dependencies: - '@rollup/pluginutils': 3.1.0 + '@rollup/pluginutils': 3.1.0_rollup@3.0.0-7 resolve: 1.22.1 + rollup: 3.0.0-7 typescript: 4.8.4 dev: true - /@rollup/plugin-typescript/8.5.0_wkkufgeabp7wfx7iyk42bruffi: - resolution: {integrity: sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==} - engines: {node: '>=8.0.0'} + /@rollup/plugin-typescript/9.0.1_typescript@4.8.4: + resolution: {integrity: sha512-fj+CTk8+HvFCEwwDQdNgWd0lIJVXtMQ0Z3vH/ZgzFSbK2s1zs5wjZrjzrhViTTN+UF49+P69/tybgKRdGHpj/Q==} + engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^2.14.0 + rollup: ^2.14.0||^3.0.0 tslib: '*' typescript: '>=3.7.0' peerDependenciesMeta: + rollup: + optional: true tslib: optional: true dependencies: - '@rollup/pluginutils': 3.1.0_rollup@3.0.0-7 + '@rollup/pluginutils': 4.2.1 resolve: 1.22.1 - rollup: 3.0.0-7 typescript: 4.8.4 dev: true @@ -2112,17 +2114,6 @@ packages: rollup: 3.0.0-7 dev: false - /@rollup/pluginutils/3.1.0: - resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} - engines: {node: '>= 8.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0 - dependencies: - '@types/estree': 0.0.39 - estree-walker: 1.0.1 - picomatch: 2.3.1 - dev: true - /@rollup/pluginutils/3.1.0_rollup@2.79.1: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} @@ -2153,7 +2144,6 @@ packages: dependencies: estree-walker: 2.0.2 picomatch: 2.3.1 - dev: false /@sindresorhus/is/4.6.0: resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} From 33b5fa4191035c697e5d425ba7131b6550a8b7cc Mon Sep 17 00:00:00 2001 From: Fabian Meyer <3982806+meyfa@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:49:34 +0200 Subject: [PATCH 02/29] fix(alias): Update Rollup dependencies --- packages/alias/package.json | 6 ++-- packages/alias/test/test.mjs | 6 +++- pnpm-lock.yaml | 58 +++++++++++++++++++++++++++++++----- 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/packages/alias/package.json b/packages/alias/package.json index 59398953e..c82daa654 100755 --- a/packages/alias/package.json +++ b/packages/alias/package.json @@ -62,10 +62,10 @@ "slash": "^4.0.0" }, "devDependencies": { - "@rollup/plugin-node-resolve": "^14.1.0", - "@rollup/plugin-typescript": "^8.5.0", + "@rollup/plugin-node-resolve": "^15.0.0", + "@rollup/plugin-typescript": "^9.0.1", "del-cli": "^5.0.0", - "rollup": "^3.0.0-7", + "rollup": "^3.2.3", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/packages/alias/test/test.mjs b/packages/alias/test/test.mjs index 9479715b6..9e9752a75 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: { isEntry: false, custom: { test: 42 } } + options: { assertions: {}, isEntry: false, custom: { test: 42 } } } ] ).then((result) => { @@ -464,6 +464,7 @@ test('Forwards isEntry and custom options to a custom resolver', (t) => { 'entry-point', '/src/importer.js', { + assertions: {}, custom: void 0, isEntry: true } @@ -472,6 +473,7 @@ test('Forwards isEntry and custom options to a custom resolver', (t) => { 'non-entry-point', '/src/importer.js', { + assertions: {}, custom: { test: 42 }, isEntry: false } @@ -512,6 +514,7 @@ test('Forwards isEntry and custom options to other plugins', (t) => { 'entry-point', '/src/importer.js', { + assertions: {}, custom: void 0, isEntry: true } @@ -520,6 +523,7 @@ test('Forwards isEntry and custom options to other plugins', (t) => { 'non-entry-point', '/src/importer.js', { + assertions: {}, custom: { test: 42 }, isEntry: false } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 592c8b3a4..cae91b4d9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -74,19 +74,19 @@ importers: packages/alias: specifiers: - '@rollup/plugin-node-resolve': ^14.1.0 - '@rollup/plugin-typescript': ^8.5.0 + '@rollup/plugin-node-resolve': ^15.0.0 + '@rollup/plugin-typescript': ^9.0.1 del-cli: ^5.0.0 - rollup: ^3.0.0-7 + rollup: ^3.2.3 slash: ^4.0.0 typescript: ^4.8.3 dependencies: slash: 4.0.0 devDependencies: - '@rollup/plugin-node-resolve': 14.1.0_rollup@3.0.0-7 - '@rollup/plugin-typescript': 8.5.0_wkkufgeabp7wfx7iyk42bruffi + '@rollup/plugin-node-resolve': 15.0.0_rollup@3.2.3 + '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve del-cli: 5.0.0 - rollup: 3.0.0-7 + rollup: 3.2.3 typescript: 4.8.4 packages/auto-install: @@ -2070,6 +2070,24 @@ packages: rollup: 3.0.0-7 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 + dev: true + /@rollup/plugin-typescript/8.5.0_wkkufgeabp7wfx7iyk42bruffi: resolution: {integrity: sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==} engines: {node: '>=8.0.0'} @@ -2087,6 +2105,25 @@ packages: typescript: 4.8.4 dev: true + /@rollup/plugin-typescript/9.0.1_655ssj4e7sdqlljrreeiqtltve: + resolution: {integrity: sha512-fj+CTk8+HvFCEwwDQdNgWd0lIJVXtMQ0Z3vH/ZgzFSbK2s1zs5wjZrjzrhViTTN+UF49+P69/tybgKRdGHpj/Q==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.14.0||^3.0.0 + tslib: '*' + typescript: '>=3.7.0' + peerDependenciesMeta: + rollup: + optional: true + tslib: + optional: true + dependencies: + '@rollup/pluginutils': 4.2.1 + resolve: 1.22.1 + rollup: 3.2.3 + typescript: 4.8.4 + dev: true + /@rollup/plugin-typescript/9.0.1_typescript@4.8.4: resolution: {integrity: sha512-fj+CTk8+HvFCEwwDQdNgWd0lIJVXtMQ0Z3vH/ZgzFSbK2s1zs5wjZrjzrhViTTN+UF49+P69/tybgKRdGHpj/Q==} engines: {node: '>=14.0.0'} @@ -2322,7 +2359,6 @@ packages: /@types/resolve/1.20.2: resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} - dev: false /@types/responselike/1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} @@ -6625,6 +6661,14 @@ packages: optionalDependencies: fsevents: 2.3.2 + /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 + dev: true + /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: From 05dcffbc04e838a83445d53a9ded4869f925c6fa Mon Sep 17 00:00:00 2001 From: Fabian Meyer <3982806+meyfa@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:55:27 +0200 Subject: [PATCH 03/29] fix(auto-install): Update Rollup dependencies --- packages/auto-install/package.json | 6 +++--- pnpm-lock.yaml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/auto-install/package.json b/packages/auto-install/package.json index fee6348f3..843abb433 100755 --- a/packages/auto-install/package.json +++ b/packages/auto-install/package.json @@ -61,11 +61,11 @@ } }, "devDependencies": { - "@rollup/plugin-node-resolve": "^14.1.0", - "@rollup/plugin-typescript": "^8.5.0", + "@rollup/plugin-node-resolve": "^15.0.0", + "@rollup/plugin-typescript": "^9.0.1", "del": "^6.1.1", "node-noop": "^1.0.0", - "rollup": "^3.0.0-7", + "rollup": "^3.2.3", "typescript": "^4.8.3" }, "types": "./types/index.d.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cae91b4d9..acb98dae4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -91,18 +91,18 @@ importers: packages/auto-install: specifiers: - '@rollup/plugin-node-resolve': ^14.1.0 - '@rollup/plugin-typescript': ^8.5.0 + '@rollup/plugin-node-resolve': ^15.0.0 + '@rollup/plugin-typescript': ^9.0.1 del: ^6.1.1 node-noop: ^1.0.0 - rollup: ^3.0.0-7 + rollup: ^3.2.3 typescript: ^4.8.3 devDependencies: - '@rollup/plugin-node-resolve': 14.1.0_rollup@3.0.0-7 - '@rollup/plugin-typescript': 8.5.0_wkkufgeabp7wfx7iyk42bruffi + '@rollup/plugin-node-resolve': 15.0.0_rollup@3.2.3 + '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve del: 6.1.1 node-noop: 1.0.0 - rollup: 3.0.0-7 + rollup: 3.2.3 typescript: 4.8.4 packages/babel: From f6c825e996b62b7599f947676dd487800b13e73b Mon Sep 17 00:00:00 2001 From: Fabian Meyer <3982806+meyfa@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:57:45 +0200 Subject: [PATCH 04/29] fix(babel): Update Rollup dependencies --- packages/babel/package.json | 8 ++--- packages/babel/test/as-output-plugin.mjs | 9 +---- pnpm-lock.yaml | 45 +++++++++++++++++++----- 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/packages/babel/package.json b/packages/babel/package.json index af4170259..7c31299de 100644 --- a/packages/babel/package.json +++ b/packages/babel/package.json @@ -66,7 +66,7 @@ }, "dependencies": { "@babel/helper-module-imports": "^7.18.6", - "@rollup/pluginutils": "^4.2.1" + "@rollup/pluginutils": "^5.0.1" }, "devDependencies": { "@babel/core": "^7.19.1", @@ -75,10 +75,10 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-transform-runtime": "^7.19.1", "@babel/preset-env": "^7.19.1", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^14.1.0", + "@rollup/plugin-json": "^5.0.0", + "@rollup/plugin-node-resolve": "^15.0.0", "@types/babel__core": "^7.1.9", - "rollup": "^3.0.0-7", + "rollup": "^3.2.3", "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 fbb64bbea..b9ac6d091 100644 --- a/packages/babel/test/as-output-plugin.mjs +++ b/packages/babel/test/as-output-plugin.mjs @@ -87,13 +87,10 @@ test("allows transform-runtime to be used with `useESModules: false` (the defaul `'use strict'; var _createClass = require("@babel/runtime/helpers/createClass"); - var _classCallCheck = require("@babel/runtime/helpers/classCallCheck"); - var Foo = /*#__PURE__*/_createClass(function Foo() { _classCallCheck(this, Foo); }); - module.exports = Foo; ` ); @@ -112,11 +109,9 @@ test("allows transform-runtime to be used with `useESModules: true` and `format: code, `import _createClass from "@babel/runtime/helpers/esm/createClass"; import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck"; - var Foo = /*#__PURE__*/_createClass(function Foo() { _classCallCheck(this, Foo); }); - export { Foo as default }; ` ); @@ -227,14 +222,13 @@ test('transforms all chunks in a code-splitting setup', async (t) => { t.deepEqual( output.map(({ code }) => code), [ - `import('./dep-0fdca0d5.js').then(function (result) { + `import('./dep-20aaf50b.js').then(function (result) { return console.log(result); }); `, `var dep = function dep() { return 42; }; - export { dep as default }; ` ] @@ -269,7 +263,6 @@ console.log(getResult(value)); `var getResult = function getResult(value) { return value + 1; }; - export { getResult as default }; ` ] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index acb98dae4..04353d8ba 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -114,15 +114,15 @@ importers: '@babel/plugin-syntax-dynamic-import': ^7.8.3 '@babel/plugin-transform-runtime': ^7.19.1 '@babel/preset-env': ^7.19.1 - '@rollup/plugin-json': ^4.1.0 - '@rollup/plugin-node-resolve': ^14.1.0 - '@rollup/pluginutils': ^4.2.1 + '@rollup/plugin-json': ^5.0.0 + '@rollup/plugin-node-resolve': ^15.0.0 + '@rollup/pluginutils': ^5.0.1 '@types/babel__core': ^7.1.9 - rollup: ^3.0.0-7 + rollup: ^3.2.3 source-map: ^0.7.4 dependencies: '@babel/helper-module-imports': 7.18.6 - '@rollup/pluginutils': 4.2.1 + '@rollup/pluginutils': 5.0.1_rollup@3.2.3 devDependencies: '@babel/core': 7.19.3 '@babel/plugin-external-helpers': 7.18.6_@babel+core@7.19.3 @@ -130,10 +130,10 @@ importers: '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.19.3 '@babel/plugin-transform-runtime': 7.19.1_@babel+core@7.19.3 '@babel/preset-env': 7.19.4_@babel+core@7.19.3 - '@rollup/plugin-json': 4.1.0_rollup@3.0.0-7 - '@rollup/plugin-node-resolve': 14.1.0_rollup@3.0.0-7 + '@rollup/plugin-json': 5.0.0_rollup@3.2.3 + '@rollup/plugin-node-resolve': 15.0.0_rollup@3.2.3 '@types/babel__core': 7.1.19 - rollup: 3.0.0-7 + rollup: 3.2.3 source-map: 0.7.4 packages/beep: @@ -2055,6 +2055,19 @@ packages: rollup: 3.0.0-7 dev: true + /@rollup/plugin-json/5.0.0_rollup@3.2.3: + 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.2.3 + dev: true + /@rollup/plugin-node-resolve/14.1.0_rollup@3.0.0-7: resolution: {integrity: sha512-5G2niJroNCz/1zqwXtk0t9+twOSDlG00k1Wfd7bkbbXmwg8H8dvgHdIWAun53Ps/rckfvOC7scDBjuGFg5OaWw==} engines: {node: '>= 10.0.0'} @@ -2182,6 +2195,21 @@ packages: estree-walker: 2.0.2 picomatch: 2.3.1 + /@rollup/pluginutils/5.0.1_rollup@3.2.3: + 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.2.3 + dev: false + /@sindresorhus/is/4.6.0: resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} engines: {node: '>=10'} @@ -6667,7 +6695,6 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 - dev: true /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} From d284b0434c16d45ed499d2504fc1d8bfe17d40a8 Mon Sep 17 00:00:00 2001 From: Fabian Meyer <3982806+meyfa@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:59:00 +0200 Subject: [PATCH 05/29] fix(beep): Update Rollup dependencies --- packages/beep/package.json | 2 +- packages/beep/test/test.js | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/beep/package.json b/packages/beep/package.json index 46772a9a3..2eb485aa8 100644 --- a/packages/beep/package.json +++ b/packages/beep/package.json @@ -45,7 +45,7 @@ } }, "devDependencies": { - "rollup": "^3.0.0-7", + "rollup": "^3.2.3", "strip-ansi": "^7.0.1" }, "types": "types/index.d.ts", diff --git a/packages/beep/test/test.js b/packages/beep/test/test.js index 3838d7c8e..cf80cc5e7 100644 --- a/packages/beep/test/test.js +++ b/packages/beep/test/test.js @@ -8,7 +8,7 @@ test('pass', async (t) => { const { stderr } = await execa('rollup', args, options); const { default: strip } = await import('strip-ansi'); - t.snapshot(strip(stderr.replace(/\d+ms/, '