From 2256fe0418bc3e5c9d50980fc7f9130afd938b75 Mon Sep 17 00:00:00 2001 From: Tomasz Szuba Date: Fri, 15 Mar 2024 11:21:35 +0100 Subject: [PATCH] Make rollup v4 work Signed-off-by: Tomasz Szuba --- packages/cli/package.json | 4 +- packages/cli/src/lib/builder/config.ts | 8 ++- yarn.lock | 90 ++++++++++---------------- 3 files changed, 41 insertions(+), 61 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 46429fdf0c..0d820e73d3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -120,8 +120,8 @@ "react-refresh": "^0.14.0", "recursive-readdir": "^2.2.2", "rollup": "^4.0.0", - "rollup-plugin-dts": "^4.0.1", - "rollup-plugin-esbuild": "^4.7.2", + "rollup-plugin-dts": "^6.1.0", + "rollup-plugin-esbuild": "^6.1.1", "rollup-plugin-postcss": "^4.0.0", "rollup-pluginutils": "^2.8.2", "run-script-webpack-plugin": "^0.2.0", diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts index 41e9dd6906..9f27688a1f 100644 --- a/packages/cli/src/lib/builder/config.ts +++ b/packages/cli/src/lib/builder/config.ts @@ -25,7 +25,11 @@ import svgr from '@svgr/rollup'; import dts from 'rollup-plugin-dts'; import json from '@rollup/plugin-json'; import yaml from '@rollup/plugin-yaml'; -import { RollupOptions, OutputOptions, RollupWarning } from 'rollup'; +import { + RollupOptions, + OutputOptions, + WarningHandlerWithDefault, +} from 'rollup'; import { forwardFileImports } from './plugins'; import { BuildOptions, Output } from './types'; @@ -61,7 +65,7 @@ export async function makeRollupConfigs( targetPkg = (await fs.readJson(packagePath)) as BackstagePackageJson; } - const onwarn = ({ code, message }: RollupWarning) => { + const onwarn: WarningHandlerWithDefault = ({ code, message }) => { if (code === 'EMPTY_BUNDLE') { return; // We don't care about this one } diff --git a/yarn.lock b/yarn.lock index 6ec2aaf711..aed26ea688 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1680,7 +1680,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.8.3": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.8.3": version: 7.23.5 resolution: "@babel/code-frame@npm:7.23.5" dependencies: @@ -3699,8 +3699,8 @@ __metadata: react-refresh: ^0.14.0 recursive-readdir: ^2.2.2 rollup: ^4.0.0 - rollup-plugin-dts: ^4.0.1 - rollup-plugin-esbuild: ^4.7.2 + rollup-plugin-dts: ^6.1.0 + rollup-plugin-esbuild: ^6.1.1 rollup-plugin-postcss: ^4.0.0 rollup-pluginutils: ^2.8.2 run-script-webpack-plugin: ^0.2.0 @@ -16008,7 +16008,7 @@ __metadata: languageName: node linkType: hard -"@rollup/pluginutils@npm:^4.1.1, @rollup/pluginutils@npm:^4.2.0, @rollup/pluginutils@npm:^4.2.1": +"@rollup/pluginutils@npm:^4.2.0, @rollup/pluginutils@npm:^4.2.1": version: 4.2.1 resolution: "@rollup/pluginutils@npm:4.2.1" dependencies: @@ -16018,7 +16018,7 @@ __metadata: languageName: node linkType: hard -"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.1.0": +"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.5, @rollup/pluginutils@npm:^5.1.0": version: 5.1.0 resolution: "@rollup/pluginutils@npm:5.1.0" dependencies: @@ -26639,17 +26639,10 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^0.9.3": - version: 0.9.3 - resolution: "es-module-lexer@npm:0.9.3" - checksum: 84bbab23c396281db2c906c766af58b1ae2a1a2599844a504df10b9e8dc77ec800b3211fdaa133ff700f5703d791198807bba25d9667392d27a5e9feda344da8 - languageName: node - linkType: hard - -"es-module-lexer@npm:^1.2.1": - version: 1.2.1 - resolution: "es-module-lexer@npm:1.2.1" - checksum: c4145b853e1491eaa5d591e4580926d242978c38071ad3d09165c3b6d50314cc0ae3bf6e1dec81a9e53768b9299df2063d2e4a67d7742a5029ddeae6c4fc26f0 +"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.3.1": + version: 1.4.1 + resolution: "es-module-lexer@npm:1.4.1" + checksum: a11b5a256d4e8e9c7d94c2fd87415ccd1591617b6edd847e064503f8eaece2d25e2e9078a02c5ce3ed5e83bb748f5b4820efbe78072c8beb07ac619c2edec35d languageName: node linkType: hard @@ -32594,13 +32587,6 @@ __metadata: languageName: node linkType: hard -"joycon@npm:^3.0.1": - version: 3.1.0 - resolution: "joycon@npm:3.1.0" - checksum: f21f17b46142f14c92cc99f5a157ebf224717a284c45e870452be5c5ebc3bb7e07e66692fc9da3a40f6b08106ac986dc9eae2f77977db62416fe47a99b0de0ac - languageName: node - linkType: hard - "js-base64@npm:^3.6.0": version: 3.7.7 resolution: "js-base64@npm:3.7.7" @@ -33027,7 +33013,7 @@ __metadata: languageName: node linkType: hard -"jsonc-parser@npm:^3.0.0, jsonc-parser@npm:^3.2.0": +"jsonc-parser@npm:^3.2.0": version: 3.2.0 resolution: "jsonc-parser@npm:3.2.0" checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7 @@ -34388,21 +34374,12 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.26.6": - version: 0.26.7 - resolution: "magic-string@npm:0.26.7" - dependencies: - sourcemap-codec: ^1.4.8 - checksum: 89b0d60cbb32bbf3d1e23c46ea93db082d18a8230b972027aecb10a40bba51be519ecce0674f995571e3affe917b76b09f59d8dbc9a1b2c9c4102a2b6e8a2b01 - languageName: node - linkType: hard - -"magic-string@npm:^0.30.3": - version: 0.30.5 - resolution: "magic-string@npm:0.30.5" +"magic-string@npm:^0.30.3, magic-string@npm:^0.30.4": + version: 0.30.8 + resolution: "magic-string@npm:0.30.8" dependencies: "@jridgewell/sourcemap-codec": ^1.4.15 - checksum: da10fecff0c0a7d3faf756913ce62bd6d5e7b0402be48c3b27bfd651b90e29677e279069a63b764bcdc1b8ecdcdb898f29a5c5ec510f2323e8d62ee057a6eb18 + checksum: 79922f4500d3932bb587a04440d98d040170decf432edc0f91c0bf8d41db16d364189bf800e334170ac740918feda62cd39dcc170c337dc18050cfcf00a5f232 languageName: node linkType: hard @@ -41240,35 +41217,34 @@ __metadata: languageName: node linkType: hard -"rollup-plugin-dts@npm:^4.0.1": - version: 4.2.3 - resolution: "rollup-plugin-dts@npm:4.2.3" +"rollup-plugin-dts@npm:^6.1.0": + version: 6.1.0 + resolution: "rollup-plugin-dts@npm:6.1.0" dependencies: - "@babel/code-frame": ^7.18.6 - magic-string: ^0.26.6 + "@babel/code-frame": ^7.22.13 + magic-string: ^0.30.4 peerDependencies: - rollup: ^2.55 - typescript: ^4.1 + rollup: ^3.29.4 || ^4 + typescript: ^4.5 || ^5.0 dependenciesMeta: "@babel/code-frame": optional: true - checksum: b1de94202d0574e7c12105bf0d013e7142c1b9b74d6b83d194d870dcdc281e90cff45ed47a0ab1c62280cc25e75f522e1278ec0ba89c8f75b8bcb56dc98c2c63 + checksum: a90f8e975e4515734c84fa17e0feaf8fdd9ed9368722c3908687875903a393cba4d07d9934bae9b91a0c1b6c63ac1ef0ccd7363d3e6e4dc10eabca3540be9f11 languageName: node linkType: hard -"rollup-plugin-esbuild@npm:^4.7.2": - version: 4.10.3 - resolution: "rollup-plugin-esbuild@npm:4.10.3" +"rollup-plugin-esbuild@npm:^6.1.1": + version: 6.1.1 + resolution: "rollup-plugin-esbuild@npm:6.1.1" dependencies: - "@rollup/pluginutils": ^4.1.1 - debug: ^4.3.3 - es-module-lexer: ^0.9.3 - joycon: ^3.0.1 - jsonc-parser: ^3.0.0 + "@rollup/pluginutils": ^5.0.5 + debug: ^4.3.4 + es-module-lexer: ^1.3.1 + get-tsconfig: ^4.7.2 peerDependencies: - esbuild: ">=0.10.1" - rollup: ^1.20.0 || ^2.0.0 - checksum: 490a6a77573672cfda64a0222bb0dc2c202060bf4e9162571e24f2c26689e0e9faffced9c409eac80b35943dab06d1f0bd8bb3e2d3c6957b6bac1c0d6e5155cc + esbuild: ">=0.18.0" + rollup: ^1.20.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 + checksum: b027ddfbc9519f6f6aa41537b102ea23a38df588686b86d62ebd40441dd7cc8ca8e227dcaea92fc7ae8a42dc57a9975a3b184771e0eeb4c1fbe6296f10ef9da5 languageName: node linkType: hard @@ -42470,7 +42446,7 @@ __metadata: languageName: node linkType: hard -"sourcemap-codec@npm:^1.4.4, sourcemap-codec@npm:^1.4.8": +"sourcemap-codec@npm:^1.4.4": version: 1.4.8 resolution: "sourcemap-codec@npm:1.4.8" checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316