From bc133a42c7a8e35df1a4e8a1da49902e28154243 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Thu, 6 Jul 2023 14:16:20 +0200 Subject: [PATCH 1/2] expand svelte dep to 4.0.0 --- code/frameworks/svelte-webpack5/package.json | 8 ++--- code/presets/svelte-webpack/package.json | 6 ++-- code/yarn.lock | 31 +++++++------------- 3 files changed, 17 insertions(+), 28 deletions(-) diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index 4eb5c8c5b474..952ff4345fb3 100644 --- a/code/frameworks/svelte-webpack5/package.json +++ b/code/frameworks/svelte-webpack5/package.json @@ -53,15 +53,13 @@ "@storybook/svelte": "7.1.0-beta.0" }, "devDependencies": { - "svelte": "^3.48.0", - "svelte-loader": "^3.1.2", + "svelte": "^4.0.0", + "svelte-loader": "^3.1.9", "typescript": "~4.9.3" }, "peerDependencies": { "@babel/core": "*", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", - "svelte": "^3.48.0", + "svelte": "^3.48.0 || ^4.0.0", "svelte-loader": "*" }, "engines": { diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json index 15d505d183b1..0b6976b78612 100644 --- a/code/presets/svelte-webpack/package.json +++ b/code/presets/svelte-webpack/package.json @@ -69,13 +69,13 @@ "ts-dedent": "^2.0.0" }, "devDependencies": { - "svelte": "^3.31.2", - "svelte-loader": "^3.1.2", + "svelte": "^4.0.0", + "svelte-loader": "^3.1.9", "typescript": "~4.9.3" }, "peerDependencies": { "@babel/core": "*", - "svelte": "^3.1.0", + "svelte": "^3.1.0 || ^4.0.0", "svelte-loader": "*" }, "engines": { diff --git a/code/yarn.lock b/code/yarn.lock index 2af092d7df55..0da555a61acc 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6804,14 +6804,14 @@ __metadata: dependencies: "@storybook/core-webpack": 7.1.0-beta.0 "@storybook/node-logger": 7.1.0-beta.0 - svelte: ^3.31.2 - svelte-loader: ^3.1.2 + svelte: ^4.0.0 + svelte-loader: ^3.1.9 sveltedoc-parser: ^4.2.1 ts-dedent: ^2.0.0 typescript: ~4.9.3 peerDependencies: "@babel/core": "*" - svelte: ^3.1.0 + svelte: ^3.1.0 || ^4.0.0 svelte-loader: "*" languageName: unknown linkType: soft @@ -7343,14 +7343,12 @@ __metadata: "@storybook/core-common": 7.1.0-beta.0 "@storybook/preset-svelte-webpack": 7.1.0-beta.0 "@storybook/svelte": 7.1.0-beta.0 - svelte: ^3.48.0 - svelte-loader: ^3.1.2 + svelte: ^4.0.0 + svelte-loader: ^3.1.9 typescript: ~4.9.3 peerDependencies: "@babel/core": "*" - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - svelte: ^3.48.0 + svelte: ^3.48.0 || ^4.0.0 svelte-loader: "*" languageName: unknown linkType: soft @@ -28683,16 +28681,16 @@ __metadata: languageName: node linkType: hard -"svelte-loader@npm:^3.1.2": - version: 3.1.8 - resolution: "svelte-loader@npm:3.1.8" +"svelte-loader@npm:^3.1.9": + version: 3.1.9 + resolution: "svelte-loader@npm:3.1.9" dependencies: loader-utils: ^2.0.4 svelte-dev-helper: ^1.1.9 svelte-hmr: ^0.14.2 peerDependencies: - svelte: ^3.0.0 || 4.0.0-next.0 || 4.0.0-next.1 || ^4.0.0 - checksum: a0a1da03dbac8f708f621c7934f7a9b0b7ae06f52c07a1703bb330068ced0fd710492c7fa134f6f6267d0eb1e3b002f805b3d54e1c614a4f9fe968f45ffeecb3 + svelte: ^3.0.0 || ^4.0.0-next.0 + checksum: b71593c06756882f0d6e690d050af497dd4b51074699d33dbc7016c7ea21858619d55fc087c7a205178f92e0ded7b3c3f68ec1a7645847098199d40377afb1ef languageName: node linkType: hard @@ -28742,13 +28740,6 @@ __metadata: languageName: node linkType: hard -"svelte@npm:^3.31.2, svelte@npm:^3.48.0": - version: 3.59.1 - resolution: "svelte@npm:3.59.1" - checksum: 12a250de5c359d3a184f15727d5e61e45103a795adb32e8c4100a40929d987832ab7edcbfe357d86863c0819ad4edbd69bfc83ac33bf9b5e47a233a621fbcc3e - languageName: node - linkType: hard - "svelte@npm:^4.0.0": version: 4.0.0 resolution: "svelte@npm:4.0.0" From ea48d3afd5a39a8dd8bc3ccedc8dbe8248cc8ce9 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Mon, 10 Jul 2023 10:04:38 +0200 Subject: [PATCH 2/2] add react peer deps back --- code/frameworks/svelte-webpack5/package.json | 2 ++ code/yarn.lock | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index b68739e3ea35..28cbeaa36dc8 100644 --- a/code/frameworks/svelte-webpack5/package.json +++ b/code/frameworks/svelte-webpack5/package.json @@ -59,6 +59,8 @@ }, "peerDependencies": { "@babel/core": "*", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", "svelte": "^3.48.0 || ^4.0.0", "svelte-loader": "*" }, diff --git a/code/yarn.lock b/code/yarn.lock index 746a8facfa4a..60a439ea0701 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7349,6 +7349,8 @@ __metadata: typescript: ~4.9.3 peerDependencies: "@babel/core": "*" + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 svelte: ^3.48.0 || ^4.0.0 svelte-loader: "*" languageName: unknown