From f5bc2323149eba9c5dce586ee95c7665014e9fa9 Mon Sep 17 00:00:00 2001 From: SebastianKapunkt Date: Wed, 11 Jan 2023 14:28:58 +0100 Subject: [PATCH 1/2] Upgrade babel-loader to ^9.0.0 for /vue --- code/renderers/vue/package.json | 2 +- code/yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/renderers/vue/package.json b/code/renderers/vue/package.json index 8a3043975ac5..f75a54280799 100644 --- a/code/renderers/vue/package.json +++ b/code/renderers/vue/package.json @@ -70,7 +70,7 @@ }, "peerDependencies": { "@babel/core": "*", - "babel-loader": "^7.0.0 || ^8.0.0", + "babel-loader": "^7.0.0 || ^8.0.0 || ^9.0.0", "css-loader": "*", "vue": "^2.6.8" }, diff --git a/code/yarn.lock b/code/yarn.lock index f4ece33b6da7..0e592d2262f6 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -8054,7 +8054,7 @@ __metadata: vue-tsc: ^1.0.9 peerDependencies: "@babel/core": "*" - babel-loader: ^7.0.0 || ^8.0.0 + babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0 css-loader: "*" vue: ^2.6.8 peerDependenciesMeta: From a229f9e375a16d0262488aa9faac917730b58c73 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 16 Jan 2023 10:13:01 +0100 Subject: [PATCH 2/2] more upgrades --- code/addons/storyshots-core/package.json | 2 +- code/frameworks/vue3-webpack5/package.json | 2 +- code/lib/builder-webpack5/package.json | 2 +- code/presets/vue-webpack/package.json | 2 +- code/presets/vue3-webpack/package.json | 2 +- .../web-components-webpack/package.json | 2 +- code/yarn.lock | 29 ++++-- scripts/package.json | 2 +- scripts/yarn.lock | 94 +++++++++---------- 9 files changed, 70 insertions(+), 67 deletions(-) diff --git a/code/addons/storyshots-core/package.json b/code/addons/storyshots-core/package.json index 686f530ddd5d..7f7250ad249c 100644 --- a/code/addons/storyshots-core/package.json +++ b/code/addons/storyshots-core/package.json @@ -63,7 +63,7 @@ "@storybook/react": "7.0.0-beta.28", "@storybook/vue": "7.0.0-beta.28", "@storybook/vue3": "7.0.0-beta.28", - "babel-loader": "^8.3.0", + "babel-loader": "^9.1.2", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5", "enzyme-to-json": "^3.6.1", diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json index 99f9d2c357fc..7b90d54dfe84 100644 --- a/code/frameworks/vue3-webpack5/package.json +++ b/code/frameworks/vue3-webpack5/package.json @@ -62,7 +62,7 @@ "peerDependencies": { "@babel/core": "*", "@vue/compiler-sfc": "^3.0.0", - "babel-loader": "^7.0.0 || ^8.0.0", + "babel-loader": "^7.0.0 || ^8.0.0 || ^9.0.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", "vue": "^3.0.0" diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json index e52c5a567e19..93dc80dadfa2 100644 --- a/code/lib/builder-webpack5/package.json +++ b/code/lib/builder-webpack5/package.json @@ -79,7 +79,7 @@ "@storybook/theming": "7.0.0-beta.28", "@types/node": "^16.0.0", "@types/semver": "^7.3.4", - "babel-loader": "^8.3.0", + "babel-loader": "^9.0.0", "babel-plugin-named-exports-order": "^0.0.2", "browser-assert": "^1.2.1", "case-sensitive-paths-webpack-plugin": "^2.4.0", diff --git a/code/presets/vue-webpack/package.json b/code/presets/vue-webpack/package.json index fed2f81368dc..423d530660de 100644 --- a/code/presets/vue-webpack/package.json +++ b/code/presets/vue-webpack/package.json @@ -75,7 +75,7 @@ }, "peerDependencies": { "@babel/core": "*", - "babel-loader": "^7.0.0 || ^8.0.0", + "babel-loader": "^7.0.0 || ^8.0.0 || ^9.0.0", "css-loader": "*", "vue": "^2.6.8", "vue-loader": "^15.7.0", diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json index 3a4705be1af6..f4b605bcb577 100644 --- a/code/presets/vue3-webpack/package.json +++ b/code/presets/vue3-webpack/package.json @@ -75,7 +75,7 @@ "peerDependencies": { "@babel/core": "*", "@vue/compiler-sfc": "^3.0.0", - "babel-loader": "^7.0.0 || ^8.0.0", + "babel-loader": "^7.0.0 || ^8.0.0 || ^9.0.0", "vue": "^3.0.0" }, "engines": { diff --git a/code/presets/web-components-webpack/package.json b/code/presets/web-components-webpack/package.json index 1164d84ddbe4..cc5333a791ac 100644 --- a/code/presets/web-components-webpack/package.json +++ b/code/presets/web-components-webpack/package.json @@ -55,7 +55,7 @@ "@babel/preset-env": "^7.20.2", "@storybook/core-webpack": "7.0.0-beta.28", "@types/node": "^16.0.0", - "babel-loader": "^7.0.0 || ^8.0.0", + "babel-loader": "^7.0.0 || ^8.0.0 || ^9.0.0", "babel-plugin-bundled-import-meta": "^0.3.1" }, "devDependencies": { diff --git a/code/yarn.lock b/code/yarn.lock index 54b02b8f0f4f..b6649b7467c1 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5749,7 +5749,7 @@ __metadata: "@storybook/vue3": 7.0.0-beta.28 "@types/glob": ^7.1.3 "@types/jest-specific-snapshot": ^0.5.6 - babel-loader: ^8.3.0 + babel-loader: ^9.1.2 core-js: ^3.8.2 enzyme: ^3.11.0 enzyme-adapter-react-16: ^1.15.5 @@ -6130,7 +6130,7 @@ __metadata: "@types/webpack-dev-middleware": ^5.3.0 "@types/webpack-hot-middleware": ^2.25.6 "@types/webpack-virtual-modules": ^0.1.1 - babel-loader: ^8.3.0 + babel-loader: ^9.0.0 babel-plugin-named-exports-order: ^0.0.2 browser-assert: ^1.2.1 case-sensitive-paths-webpack-plugin: ^2.4.0 @@ -7043,7 +7043,7 @@ __metadata: webpack: 5 peerDependencies: "@babel/core": "*" - babel-loader: ^7.0.0 || ^8.0.0 + babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0 css-loader: "*" vue: ^2.6.8 vue-loader: ^15.7.0 @@ -7069,7 +7069,7 @@ __metadata: peerDependencies: "@babel/core": "*" "@vue/compiler-sfc": ^3.0.0 - babel-loader: ^7.0.0 || ^8.0.0 + babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0 vue: ^3.0.0 languageName: unknown linkType: soft @@ -7083,7 +7083,7 @@ __metadata: "@babel/preset-env": ^7.20.2 "@storybook/core-webpack": 7.0.0-beta.28 "@types/node": ^16.0.0 - babel-loader: ^7.0.0 || ^8.0.0 + babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0 babel-plugin-bundled-import-meta: ^0.3.1 lit-html: 2.0.2 typescript: ~4.9.3 @@ -7779,7 +7779,7 @@ __metadata: peerDependencies: "@babel/core": "*" "@vue/compiler-sfc": ^3.0.0 - babel-loader: ^7.0.0 || ^8.0.0 + babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 vue: ^3.0.0 @@ -10824,7 +10824,20 @@ __metadata: languageName: node linkType: hard -"babel-loader@npm:^7.0.0 || ^8.0.0, babel-loader@npm:^8.3.0": +"babel-loader@npm:^7.0.0 || ^8.0.0 || ^9.0.0, babel-loader@npm:^9.0.0, babel-loader@npm:^9.1.2": + version: 9.1.2 + resolution: "babel-loader@npm:9.1.2" + dependencies: + find-cache-dir: ^3.3.2 + schema-utils: ^4.0.0 + peerDependencies: + "@babel/core": ^7.12.0 + webpack: ">=5" + checksum: e62ca6af7dec5e9138908ca23f0f29b0865f733d76680b0b0ebc97b1ae18dc6e9cf887c02439ee0634a16eaaef0dc000d78d20c30c348f651a55f50aea5a62ff + languageName: node + linkType: hard + +"babel-loader@npm:^8.3.0": version: 8.3.0 resolution: "babel-loader@npm:8.3.0" dependencies: @@ -15813,7 +15826,7 @@ __metadata: languageName: node linkType: hard -"find-cache-dir@npm:^3.0.0, find-cache-dir@npm:^3.3.1": +"find-cache-dir@npm:^3.0.0, find-cache-dir@npm:^3.3.1, find-cache-dir@npm:^3.3.2": version: 3.3.2 resolution: "find-cache-dir@npm:3.3.2" dependencies: diff --git a/scripts/package.json b/scripts/package.json index 63f57a4ba9cd..9e4199481201 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -72,7 +72,7 @@ "@typescript-eslint/experimental-utils": "^5.45.0", "@typescript-eslint/parser": "^5.45.0", "babel-eslint": "^10.1.0", - "babel-loader": "^8.3.0", + "babel-loader": "^9.1.2", "boxen": "^5.1.2", "chalk": "^4.1.0", "codecov": "^3.8.1", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 0fadd91901c9..93dcaf2db268 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2765,7 +2765,7 @@ __metadata: "@typescript-eslint/parser": ^5.45.0 "@verdaccio/types": ^10.2.0 babel-eslint: ^10.1.0 - babel-loader: ^8.3.0 + babel-loader: ^9.1.2 boxen: ^5.1.2 chalk: ^4.1.0 codecov: ^3.8.1 @@ -3299,7 +3299,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:^7.0.9": version: 7.0.11 resolution: "@types/json-schema@npm:7.0.11" checksum: bd1f9a7b898ff15c4bb494eb19124f2d688b804c39f07cbf135ac73f35324970e9e8329b72aae1fb543d925ea295a1568b23056c26658cecec4741fa28c3b81a @@ -3925,12 +3925,28 @@ __metadata: languageName: node linkType: hard -"ajv-keywords@npm:^3.5.2": - version: 3.5.2 - resolution: "ajv-keywords@npm:3.5.2" +"ajv-formats@npm:^2.1.1": + version: 2.1.1 + resolution: "ajv-formats@npm:2.1.1" + dependencies: + ajv: ^8.0.0 peerDependencies: - ajv: ^6.9.1 - checksum: 0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360 + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: e43ba22e91b6a48d96224b83d260d3a3a561b42d391f8d3c6d2c1559f9aa5b253bfb306bc94bbeca1d967c014e15a6efe9a207309e95b3eaae07fcbcdc2af662 + languageName: node + linkType: hard + +"ajv-keywords@npm:^5.0.0": + version: 5.1.0 + resolution: "ajv-keywords@npm:5.1.0" + dependencies: + fast-deep-equal: ^3.1.3 + peerDependencies: + ajv: ^8.8.2 + checksum: 18bec51f0171b83123ba1d8883c126e60c6f420cef885250898bf77a8d3e65e3bfb9e8564f497e30bdbe762a83e0d144a36931328616a973ee669dc74d4a9590 languageName: node linkType: hard @@ -3946,7 +3962,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^8.2.0": +"ajv@npm:^8.0.0, ajv@npm:^8.2.0, ajv@npm:^8.8.0": version: 8.12.0 resolution: "ajv@npm:8.12.0" dependencies: @@ -4382,18 +4398,16 @@ __metadata: languageName: node linkType: hard -"babel-loader@npm:^8.3.0": - version: 8.3.0 - resolution: "babel-loader@npm:8.3.0" +"babel-loader@npm:^9.1.2": + version: 9.1.2 + resolution: "babel-loader@npm:9.1.2" dependencies: - find-cache-dir: ^3.3.1 - loader-utils: ^2.0.0 - make-dir: ^3.1.0 - schema-utils: ^2.6.5 + find-cache-dir: ^3.3.2 + schema-utils: ^4.0.0 peerDependencies: - "@babel/core": ^7.0.0 - webpack: ">=2" - checksum: 7b83bae35a12fbc5cdf250e2d36a288305fe5b6d20ab044ab7c09bbf456c8895b80af7a4f1e8b64b5c07a4fd48d4b5144dab40b4bc72a4fed532dc000362f38f + "@babel/core": ^7.12.0 + webpack: ">=5" + checksum: e62ca6af7dec5e9138908ca23f0f29b0865f733d76680b0b0ebc97b1ae18dc6e9cf887c02439ee0634a16eaaef0dc000d78d20c30c348f651a55f50aea5a62ff languageName: node linkType: hard @@ -4558,13 +4572,6 @@ __metadata: languageName: node linkType: hard -"big.js@npm:^5.2.2": - version: 5.2.2 - resolution: "big.js@npm:5.2.2" - checksum: 230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f - languageName: node - linkType: hard - "binary-extensions@npm:^2.0.0": version: 2.2.0 resolution: "binary-extensions@npm:2.2.0" @@ -6036,13 +6043,6 @@ __metadata: languageName: node linkType: hard -"emojis-list@npm:^3.0.0": - version: 3.0.0 - resolution: "emojis-list@npm:3.0.0" - checksum: 7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b - languageName: node - linkType: hard - "encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -7293,7 +7293,7 @@ __metadata: languageName: node linkType: hard -"find-cache-dir@npm:^3.3.1": +"find-cache-dir@npm:^3.3.2": version: 3.3.2 resolution: "find-cache-dir@npm:3.3.2" dependencies: @@ -9756,7 +9756,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.0.0, json5@npm:^2.1.0, json5@npm:^2.1.2, json5@npm:^2.2.2": +"json5@npm:^2.0.0, json5@npm:^2.1.0, json5@npm:^2.2.2": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -10077,17 +10077,6 @@ __metadata: languageName: node linkType: hard -"loader-utils@npm:^2.0.0": - version: 2.0.4 - resolution: "loader-utils@npm:2.0.4" - dependencies: - big.js: ^5.2.2 - emojis-list: ^3.0.0 - json5: ^2.1.2 - checksum: d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100 - languageName: node - linkType: hard - "locate-path@npm:^3.0.0": version: 3.0.0 resolution: "locate-path@npm:3.0.0" @@ -12957,14 +12946,15 @@ __metadata: languageName: node linkType: hard -"schema-utils@npm:^2.6.5": - version: 2.7.1 - resolution: "schema-utils@npm:2.7.1" +"schema-utils@npm:^4.0.0": + version: 4.0.0 + resolution: "schema-utils@npm:4.0.0" dependencies: - "@types/json-schema": ^7.0.5 - ajv: ^6.12.4 - ajv-keywords: ^3.5.2 - checksum: f484f34464edd8758712d5d3ba25a306e367dac988aecaf4ce112e99baae73f33a807b5cf869240bb6648c80720b36af2d7d72be3a27faa49a2d4fc63fa3f85f + "@types/json-schema": ^7.0.9 + ajv: ^8.8.0 + ajv-formats: ^2.1.1 + ajv-keywords: ^5.0.0 + checksum: d76f1b0724fb74fa9da19d4f98ebe89c2703d8d28df9dc44d66ab9a9cbca869b434181a36a2bc00ec53980f27e8fabe143759bdc8754692bbf7ef614fc6e9da4 languageName: node linkType: hard