From 3a9e78086bde4e6a3e656da2771bfdbe51e50fdf Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Sat, 3 Jun 2023 23:31:26 +0200
Subject: [PATCH 01/10] expand dep range to support svelte 4

---
 code/frameworks/svelte-vite/package.json |  2 +-
 code/lib/cli/src/sandbox-templates.ts    | 10 +--
 code/renderers/svelte/package.json       |  4 +-
 code/yarn.lock                           | 83 ++++++++++++++++++++++--
 4 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
index 27fddbe4ed7a..9917e3b7e3b2 100644
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@@ -52,7 +52,7 @@
     "@storybook/svelte": "7.1.0-alpha.26",
     "@sveltejs/vite-plugin-svelte": "^2.0.0",
     "magic-string": "^0.27.0",
-    "svelte": "^3.0.0",
+    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0",
     "sveltedoc-parser": "^4.2.1",
     "ts-dedent": "^2.2.0"
   },
diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts
index 20032b2db74b..1688c22c1251 100644
--- a/code/lib/cli/src/sandbox-templates.ts
+++ b/code/lib/cli/src/sandbox-templates.ts
@@ -248,7 +248,8 @@ const baseTemplates = {
   },
   'svelte-vite/default-js': {
     name: 'Svelte Vite (JS)',
-    script: 'npm create vite@latest --yes {{beforeDir}} -- --template svelte',
+    script:
+      'npm create vite@latest --yes {{beforeDir}} -- --template svelte && cd {{beforeDir}} && npm install --save-dev svelte@next',
     expected: {
       framework: '@storybook/svelte-vite',
       renderer: '@storybook/svelte',
@@ -258,7 +259,8 @@ const baseTemplates = {
   },
   'svelte-vite/default-ts': {
     name: 'Svelte Vite (TS)',
-    script: 'npm create vite@latest --yes {{beforeDir}} -- --template svelte-ts',
+    script:
+      'npm create vite@latest --yes {{beforeDir}} -- --template svelte-ts && cd {{beforeDir}} && npm install --save-dev svelte@next',
     expected: {
       framework: '@storybook/svelte-vite',
       renderer: '@storybook/svelte',
@@ -303,7 +305,7 @@ const baseTemplates = {
   'svelte-kit/skeleton-js': {
     name: 'Svelte Kit (JS)',
     script:
-      'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest',
+      'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest && cd {{beforeDir}} && npm install --save-dev svelte@next',
     expected: {
       framework: '@storybook/sveltekit',
       renderer: '@storybook/svelte',
@@ -314,7 +316,7 @@ const baseTemplates = {
   'svelte-kit/skeleton-ts': {
     name: 'Svelte Kit (TS)',
     script:
-      'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest',
+      'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest && cd {{beforeDir}} && npm install --save-dev svelte@next',
     expected: {
       framework: '@storybook/sveltekit',
       renderer: '@storybook/svelte',
diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
index b361358ba475..efb76f2eadc4 100644
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@@ -64,12 +64,12 @@
   },
   "devDependencies": {
     "expect-type": "^0.14.2",
-    "svelte": "^3.59.1",
+    "svelte": "^4.0.0-next.0",
     "svelte-check": "^3.4.3",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "svelte": "^3.1.0"
+    "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.0"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/code/yarn.lock b/code/yarn.lock
index 267a38ca50bc..1e67cd1f350f 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -12,7 +12,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ampproject/remapping@npm:2.2.1, @ampproject/remapping@npm:^2.2.0":
+"@ampproject/remapping@npm:2.2.1, @ampproject/remapping@npm:^2.2.0, @ampproject/remapping@npm:^2.2.1":
   version: 2.2.1
   resolution: "@ampproject/remapping@npm:2.2.1"
   dependencies:
@@ -3814,7 +3814,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.14":
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
   checksum: 0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5
@@ -7582,13 +7582,13 @@ __metadata:
     "@storybook/preview-api": 7.1.0-alpha.26
     "@storybook/types": 7.1.0-alpha.26
     expect-type: ^0.14.2
-    svelte: ^3.59.1
+    svelte: ^4.0.0-next.0
     svelte-check: ^3.4.3
     sveltedoc-parser: ^4.2.1
     type-fest: 2.19.0
     typescript: ^5.0.4
   peerDependencies:
-    svelte: ^3.1.0
+    svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.0
   languageName: unknown
   linkType: soft
 
@@ -10074,7 +10074,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.0, acorn@npm:^8.1.0, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.6.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.1":
+"acorn@npm:^8.0.0, acorn@npm:^8.1.0, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.6.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.1, acorn@npm:^8.8.2":
   version: 8.8.2
   resolution: "acorn@npm:8.8.2"
   bin:
@@ -12636,6 +12636,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"code-red@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "code-red@npm:1.0.0"
+  dependencies:
+    "@jridgewell/sourcemap-codec": ^1.4.14
+    "@types/estree": ^1.0.0
+    acorn: ^8.8.2
+    estree-walker: ^3.0.3
+    periscopic: ^3.1.0
+  checksum: 584bad8f23b4aa13b9b7ce043fb92d3165aaa0a3bfd058b9cb9ec4cb7b2b3f1289abbc353cf62f353e05463c3f323560dfe1e4cb680d2900a7b85a549ab9206c
+  languageName: node
+  linkType: hard
+
 "collapse-white-space@npm:^1.0.4":
   version: 1.0.6
   resolution: "collapse-white-space@npm:1.0.6"
@@ -13431,7 +13444,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-tree@npm:^2.0.1":
+"css-tree@npm:^2.0.1, css-tree@npm:^2.3.1":
   version: 2.3.1
   resolution: "css-tree@npm:2.3.1"
   dependencies:
@@ -15652,6 +15665,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"estree-walker@npm:^3.0.0, estree-walker@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "estree-walker@npm:3.0.3"
+  dependencies:
+    "@types/estree": ^1.0.0
+  checksum: c12e3c2b2642d2bcae7d5aa495c60fa2f299160946535763969a1c83fc74518ffa9c2cd3a8b69ac56aea547df6a8aac25f729a342992ef0bbac5f1c73e78995d
+  languageName: node
+  linkType: hard
+
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
@@ -19035,6 +19057,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-reference@npm:^3.0.0, is-reference@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "is-reference@npm:3.0.1"
+  dependencies:
+    "@types/estree": "*"
+  checksum: 003af01fd96c4300111853d68b048e2f094e27ccd70eb66fdb7bb3cd7f7a9e6ad3f633387b2b453c85134fcc1ba0473dca55349a0162312d9fd127306d9f5a9b
+  languageName: node
+  linkType: hard
+
 "is-regex@npm:^1.0.3, is-regex@npm:^1.0.5, is-regex@npm:^1.1.0, is-regex@npm:^1.1.4":
   version: 1.1.4
   resolution: "is-regex@npm:1.1.4"
@@ -21142,6 +21173,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"locate-character@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "locate-character@npm:2.0.5"
+  checksum: 134d79b3494a4c56b91d2cee3cb333bcec1acdf145bf9a73e8bf03a917c0f1e0c6b2a4f7ce0fc550af494dec29835c0aa81f6d9836c30031b40faf2fe94aeaae
+  languageName: node
+  linkType: hard
+
 "locate-path@npm:^2.0.0":
   version: 2.0.0
   resolution: "locate-path@npm:2.0.0"
@@ -24961,6 +24999,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"periscopic@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "periscopic@npm:3.1.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    estree-walker: ^3.0.0
+    is-reference: ^3.0.0
+  checksum: fb5ce7cd810c49254cdf1cd3892811e6dd1a1dfbdf5f10a0a33fb7141baac36443c4cad4f0e2b30abd4eac613f6ab845c2bc1b7ce66ae9694c7321e6ada5bd96
+  languageName: node
+  linkType: hard
+
 "picocolors@npm:^0.2.1":
   version: 0.2.1
   resolution: "picocolors@npm:0.2.1"
@@ -29281,13 +29330,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svelte@npm:^3.0.0, svelte@npm:^3.31.2, svelte@npm:^3.48.0, svelte@npm:^3.59.1":
+"svelte@npm:^3.0.0, 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-next.0":
+  version: 4.0.0-next.0
+  resolution: "svelte@npm:4.0.0-next.0"
+  dependencies:
+    "@ampproject/remapping": ^2.2.1
+    "@jridgewell/sourcemap-codec": ^1.4.15
+    acorn: ^8.8.2
+    aria-query: ^5.1.3
+    axobject-query: ^3.1.1
+    code-red: ^1.0.0
+    css-tree: ^2.3.1
+    estree-walker: ^3.0.3
+    is-reference: ^3.0.1
+    locate-character: ^2.0.5
+    magic-string: ^0.30.0
+    periscopic: ^3.1.0
+  checksum: 8dade0d28c01310a1f35fe8b08edbd17286110f11291c962f10b7566ec20752a9fe65ee4ca01b522741e3037f71c02eb78b67fed8b98ae5417af0d323c2d18b0
+  languageName: node
+  linkType: hard
+
 "sveltedoc-parser@npm:^4.2.1":
   version: 4.3.1
   resolution: "sveltedoc-parser@npm:4.3.1"

From 80e514313f6084376cabe277427f37c4edd15fc3 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Sat, 3 Jun 2023 23:42:10 +0200
Subject: [PATCH 02/10] update yarn.lock

---
 code/yarn.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/yarn.lock b/code/yarn.lock
index 1e67cd1f350f..9cabd0597fe0 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -7538,7 +7538,7 @@ __metadata:
     "@sveltejs/vite-plugin-svelte": ^2.0.0
     "@types/node": ^16.0.0
     magic-string: ^0.27.0
-    svelte: ^3.0.0
+    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0
     sveltedoc-parser: ^4.2.1
     ts-dedent: ^2.2.0
     typescript: ~4.9.3
@@ -29330,14 +29330,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svelte@npm:^3.0.0, 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-next.0":
+"svelte@npm:^3.0.0 || ^4.0.0 || ^4.0.0-next.0, svelte@npm:^4.0.0-next.0":
   version: 4.0.0-next.0
   resolution: "svelte@npm:4.0.0-next.0"
   dependencies:
@@ -29357,6 +29350,13 @@ __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
+
 "sveltedoc-parser@npm:^4.2.1":
   version: 4.3.1
   resolution: "sveltedoc-parser@npm:4.3.1"

From f372e89eed949e795ca0eeb26b1ca6606a42a135 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Mon, 5 Jun 2023 07:51:44 +0200
Subject: [PATCH 03/10] use internal ComponentType

---
 code/renderers/svelte/src/public-types.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/renderers/svelte/src/public-types.ts b/code/renderers/svelte/src/public-types.ts
index 4bd30feb1c38..03959818e781 100644
--- a/code/renderers/svelte/src/public-types.ts
+++ b/code/renderers/svelte/src/public-types.ts
@@ -12,7 +12,9 @@ import type {
   ProjectAnnotations,
 } from '@storybook/types';
 
-import type { ComponentProps, ComponentType, SvelteComponentTyped } from 'svelte';
+// TODO: don't use internal type when https://github.com/sveltejs/svelte/issues/8692 has been resolved
+import type { ComponentType } from 'svelte/types/runtime/internal';
+import type { ComponentProps, SvelteComponentTyped } from 'svelte';
 import type { SetOptional, Simplify } from 'type-fest';
 import type { SvelteRenderer } from './types';
 

From 681ad608be8ac50cabc68077c0ce9cea0f9709f7 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Thu, 8 Jun 2023 00:11:40 +0200
Subject: [PATCH 04/10] fix svelte-vite dependencies on svelte

---
 code/frameworks/svelte-vite/package.json |  5 ++---
 code/frameworks/sveltekit/package.json   |  1 +
 code/yarn.lock                           | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
index a9cabfcf688f..a65c21f9c766 100644
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@@ -52,18 +52,17 @@
     "@storybook/svelte": "7.1.0-alpha.27",
     "@sveltejs/vite-plugin-svelte": "^2.0.0",
     "magic-string": "^0.27.0",
-    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0",
     "sveltedoc-parser": "^4.2.1",
     "ts-dedent": "^2.2.0"
   },
   "devDependencies": {
     "@types/node": "^16.0.0",
+    "svelte": "^4.0.0-next.0",
     "typescript": "~4.9.3",
     "vite": "^4.0.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
+    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0",
     "vite": "^3.0.0 || ^4.0.0"
   },
   "engines": {
diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
index f6b154bf24e1..443a1c89bffe 100644
--- a/code/frameworks/sveltekit/package.json
+++ b/code/frameworks/sveltekit/package.json
@@ -60,6 +60,7 @@
     "vite": "^4.0.0"
   },
   "peerDependencies": {
+    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0",
     "vite": "^4.0.0"
   },
   "engines": {
diff --git a/code/yarn.lock b/code/yarn.lock
index 6013193776a0..c0ae5bd708ba 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -7539,14 +7539,13 @@ __metadata:
     "@sveltejs/vite-plugin-svelte": ^2.0.0
     "@types/node": ^16.0.0
     magic-string: ^0.27.0
-    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0
+    svelte: ^4.0.0-next.0
     sveltedoc-parser: ^4.2.1
     ts-dedent: ^2.2.0
     typescript: ~4.9.3
     vite: ^4.0.0
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0
     vite: ^3.0.0 || ^4.0.0
   languageName: unknown
   linkType: soft
@@ -7604,6 +7603,7 @@ __metadata:
     typescript: ^4.9.3
     vite: ^4.0.0
   peerDependencies:
+    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0
     vite: ^4.0.0
   languageName: unknown
   linkType: soft
@@ -29331,7 +29331,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svelte@npm:^3.0.0 || ^4.0.0 || ^4.0.0-next.0, svelte@npm:^4.0.0-next.0":
+"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-next.0":
   version: 4.0.0-next.0
   resolution: "svelte@npm:4.0.0-next.0"
   dependencies:
@@ -29351,13 +29358,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
-
 "sveltedoc-parser@npm:^4.2.1":
   version: 4.3.1
   resolution: "sveltedoc-parser@npm:4.3.1"

From 5183b34b80224e12dc18d1b73512b842f8c50fa3 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Thu, 15 Jun 2023 21:46:27 +0200
Subject: [PATCH 05/10] upgrade to svelte@4.0.0-next.1

---
 code/frameworks/svelte-vite/package.json  |  4 ++--
 code/frameworks/sveltekit/package.json    |  2 +-
 code/renderers/svelte/package.json        |  4 ++--
 code/renderers/svelte/src/public-types.ts |  4 +---
 code/yarn.lock                            | 18 +++++++++---------
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
index a65c21f9c766..dbe9a5633c57 100644
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@@ -57,12 +57,12 @@
   },
   "devDependencies": {
     "@types/node": "^16.0.0",
-    "svelte": "^4.0.0-next.0",
+    "svelte": "^4.0.0-next.1",
     "typescript": "~4.9.3",
     "vite": "^4.0.0"
   },
   "peerDependencies": {
-    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0",
+    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.1",
     "vite": "^3.0.0 || ^4.0.0"
   },
   "engines": {
diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
index 443a1c89bffe..416ba7c6892b 100644
--- a/code/frameworks/sveltekit/package.json
+++ b/code/frameworks/sveltekit/package.json
@@ -60,7 +60,7 @@
     "vite": "^4.0.0"
   },
   "peerDependencies": {
-    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0",
+    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.1",
     "vite": "^4.0.0"
   },
   "engines": {
diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
index 6c2a6a38a54c..73d2ee2213ed 100644
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@@ -64,12 +64,12 @@
   },
   "devDependencies": {
     "expect-type": "^0.14.2",
-    "svelte": "^4.0.0-next.0",
+    "svelte": "^4.0.0-next.1",
     "svelte-check": "^3.4.3",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.0"
+    "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.1"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/code/renderers/svelte/src/public-types.ts b/code/renderers/svelte/src/public-types.ts
index 03959818e781..3e5abbb28678 100644
--- a/code/renderers/svelte/src/public-types.ts
+++ b/code/renderers/svelte/src/public-types.ts
@@ -12,9 +12,7 @@ import type {
   ProjectAnnotations,
 } from '@storybook/types';
 
-// TODO: don't use internal type when https://github.com/sveltejs/svelte/issues/8692 has been resolved
-import type { ComponentType } from 'svelte/types/runtime/internal';
-import type { ComponentProps, SvelteComponentTyped } from 'svelte';
+import type { ComponentType, ComponentProps, SvelteComponentTyped } from 'svelte';
 import type { SetOptional, Simplify } from 'type-fest';
 import type { SvelteRenderer } from './types';
 
diff --git a/code/yarn.lock b/code/yarn.lock
index c0ae5bd708ba..0e62a1855468 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -7539,13 +7539,13 @@ __metadata:
     "@sveltejs/vite-plugin-svelte": ^2.0.0
     "@types/node": ^16.0.0
     magic-string: ^0.27.0
-    svelte: ^4.0.0-next.0
+    svelte: ^4.0.0-next.1
     sveltedoc-parser: ^4.2.1
     ts-dedent: ^2.2.0
     typescript: ~4.9.3
     vite: ^4.0.0
   peerDependencies:
-    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0
+    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.1
     vite: ^3.0.0 || ^4.0.0
   languageName: unknown
   linkType: soft
@@ -7582,13 +7582,13 @@ __metadata:
     "@storybook/preview-api": 7.1.0-alpha.27
     "@storybook/types": 7.1.0-alpha.27
     expect-type: ^0.14.2
-    svelte: ^4.0.0-next.0
+    svelte: ^4.0.0-next.1
     svelte-check: ^3.4.3
     sveltedoc-parser: ^4.2.1
     type-fest: 2.19.0
     typescript: ^5.0.4
   peerDependencies:
-    svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.0
+    svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.1
   languageName: unknown
   linkType: soft
 
@@ -7603,7 +7603,7 @@ __metadata:
     typescript: ^4.9.3
     vite: ^4.0.0
   peerDependencies:
-    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0
+    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.1
     vite: ^4.0.0
   languageName: unknown
   linkType: soft
@@ -29338,9 +29338,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svelte@npm:^4.0.0-next.0":
-  version: 4.0.0-next.0
-  resolution: "svelte@npm:4.0.0-next.0"
+"svelte@npm:^4.0.0-next.1":
+  version: 4.0.0-next.1
+  resolution: "svelte@npm:4.0.0-next.1"
   dependencies:
     "@ampproject/remapping": ^2.2.1
     "@jridgewell/sourcemap-codec": ^1.4.15
@@ -29354,7 +29354,7 @@ __metadata:
     locate-character: ^2.0.5
     magic-string: ^0.30.0
     periscopic: ^3.1.0
-  checksum: 8dade0d28c01310a1f35fe8b08edbd17286110f11291c962f10b7566ec20752a9fe65ee4ca01b522741e3037f71c02eb78b67fed8b98ae5417af0d323c2d18b0
+  checksum: 4283979acb7be64e8dfdf29d2f843b4d6150d604fbfceb8702b7df3225deb325dc8984603127cba126a9151cfb40c62a1429abf55716065ea00696c3d73ccb7a
   languageName: node
   linkType: hard
 

From 1bcda19f4909c2ab106e1b870da7a509e370a584 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Mon, 19 Jun 2023 08:09:32 +0200
Subject: [PATCH 06/10] Upgrade to svelte@4.0.0-next.2

---
 code/frameworks/svelte-vite/package.json |  4 +-
 code/frameworks/sveltekit/package.json   |  2 +-
 code/renderers/svelte/package.json       |  4 +-
 code/yarn.lock                           | 52 ++++++++++++++++--------
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
index aee4c1576a3f..77a92fb18d73 100644
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@@ -57,12 +57,12 @@
   },
   "devDependencies": {
     "@types/node": "^16.0.0",
-    "svelte": "^4.0.0-next.1",
+    "svelte": "^4.0.0-next.2",
     "typescript": "~4.9.3",
     "vite": "^4.0.0"
   },
   "peerDependencies": {
-    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.1",
+    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.2",
     "vite": "^3.0.0 || ^4.0.0"
   },
   "engines": {
diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
index 6575eba338bf..60e0db7e388e 100644
--- a/code/frameworks/sveltekit/package.json
+++ b/code/frameworks/sveltekit/package.json
@@ -60,7 +60,7 @@
     "vite": "^4.0.0"
   },
   "peerDependencies": {
-    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.1",
+    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.2",
     "vite": "^4.0.0"
   },
   "engines": {
diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
index faa62a447f86..3cd914cf45b5 100644
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@@ -64,12 +64,12 @@
   },
   "devDependencies": {
     "expect-type": "^0.15.0",
-    "svelte": "^4.0.0-next.1",
+    "svelte": "^4.0.0-next.2",
     "svelte-check": "^3.4.3",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.1"
+    "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.2"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/code/yarn.lock b/code/yarn.lock
index 1f35bdb8a981..a3fed0036e2f 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -7399,13 +7399,13 @@ __metadata:
     "@sveltejs/vite-plugin-svelte": ^2.0.0
     "@types/node": ^16.0.0
     magic-string: ^0.30.0
-    svelte: ^4.0.0-next.1
+    svelte: ^4.0.0-next.2
     sveltedoc-parser: ^4.2.1
     ts-dedent: ^2.2.0
     typescript: ~4.9.3
     vite: ^4.0.0
   peerDependencies:
-    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.1
+    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.2
     vite: ^3.0.0 || ^4.0.0
   languageName: unknown
   linkType: soft
@@ -7442,13 +7442,13 @@ __metadata:
     "@storybook/preview-api": 7.1.0-alpha.36
     "@storybook/types": 7.1.0-alpha.36
     expect-type: ^0.15.0
-    svelte: ^4.0.0-next.1
+    svelte: ^4.0.0-next.2
     svelte-check: ^3.4.3
     sveltedoc-parser: ^4.2.1
     type-fest: ^3.11.0
     typescript: ^5.0.4
   peerDependencies:
-    svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.1
+    svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.2
   languageName: unknown
   linkType: soft
 
@@ -7463,7 +7463,7 @@ __metadata:
     typescript: ^4.9.3
     vite: ^4.0.0
   peerDependencies:
-    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.1
+    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.2
     vite: ^4.0.0
   languageName: unknown
   linkType: soft
@@ -10312,6 +10312,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aria-query@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "aria-query@npm:5.2.1"
+  dependencies:
+    dequal: ^2.0.3
+  checksum: 898031f69f8e9d63c914b73f45e50316fef157aae41af682fe64e8f10c9a9d623952929df01f6524b4ce37c3b21806b04e7617e38909720fbc0fad3f207d9e09
+  languageName: node
+  linkType: hard
+
 "arr-diff@npm:^4.0.0":
   version: 4.0.0
   resolution: "arr-diff@npm:4.0.0"
@@ -10743,6 +10752,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"axobject-query@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "axobject-query@npm:3.2.1"
+  dependencies:
+    dequal: ^2.0.3
+  checksum: f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7
+  languageName: node
+  linkType: hard
+
 "babel-core@npm:^7.0.0-bridge.0":
   version: 7.0.0-bridge.0
   resolution: "babel-core@npm:7.0.0-bridge.0"
@@ -13838,7 +13856,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dequal@npm:^2.0.0, dequal@npm:^2.0.2":
+"dequal@npm:^2.0.0, dequal@npm:^2.0.2, dequal@npm:^2.0.3":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
   checksum: f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888
@@ -20731,10 +20749,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"locate-character@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "locate-character@npm:2.0.5"
-  checksum: 134d79b3494a4c56b91d2cee3cb333bcec1acdf145bf9a73e8bf03a917c0f1e0c6b2a4f7ce0fc550af494dec29835c0aa81f6d9836c30031b40faf2fe94aeaae
+"locate-character@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "locate-character@npm:3.0.0"
+  checksum: 9da917622395002eb1336fca8cbef1c19904e3dc0b3b8078abe8ff390106d947a86feccecd0346f0e0e19fa017623fb4ccb65263d72a76dfa36e20cc18766b6c
   languageName: node
   linkType: hard
 
@@ -28806,23 +28824,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svelte@npm:^4.0.0-next.1":
-  version: 4.0.0-next.1
-  resolution: "svelte@npm:4.0.0-next.1"
+"svelte@npm:^4.0.0-next.2":
+  version: 4.0.0-next.2
+  resolution: "svelte@npm:4.0.0-next.2"
   dependencies:
     "@ampproject/remapping": ^2.2.1
     "@jridgewell/sourcemap-codec": ^1.4.15
     acorn: ^8.8.2
-    aria-query: ^5.1.3
-    axobject-query: ^3.1.1
+    aria-query: ^5.2.1
+    axobject-query: ^3.2.1
     code-red: ^1.0.0
     css-tree: ^2.3.1
     estree-walker: ^3.0.3
     is-reference: ^3.0.1
-    locate-character: ^2.0.5
+    locate-character: ^3.0.0
     magic-string: ^0.30.0
     periscopic: ^3.1.0
-  checksum: 4283979acb7be64e8dfdf29d2f843b4d6150d604fbfceb8702b7df3225deb325dc8984603127cba126a9151cfb40c62a1429abf55716065ea00696c3d73ccb7a
+  checksum: ce14a2d3de37d80831b66a5eb2ab8129a8bd9578d4dafb70f66e47e6580f6ce7c1705094781b30b97572f2adef15d72938ca192aae00585feb945fa1ff41654c
   languageName: node
   linkType: hard
 

From d74ef29284d074574b9d849c285103b0cc1ebd40 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Wed, 21 Jun 2023 10:43:40 +0200
Subject: [PATCH 07/10] silent internal type error

---
 .../addons/storyshots-core/src/frameworks/svelte/renderTree.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/addons/storyshots-core/src/frameworks/svelte/renderTree.ts b/code/addons/storyshots-core/src/frameworks/svelte/renderTree.ts
index 78c19bd1ab66..d39cf95008e9 100644
--- a/code/addons/storyshots-core/src/frameworks/svelte/renderTree.ts
+++ b/code/addons/storyshots-core/src/frameworks/svelte/renderTree.ts
@@ -1,4 +1,7 @@
 import { global } from '@storybook/global';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore - types are removed in Svelte 4 but it still works. ts-ignore is safer than ts-expect-error because it's not an error in Svelte 3
+// eslint-disable-next-line import/no-unresolved
 import { set_current_component } from 'svelte/internal';
 
 const { document } = global;

From ef9fa44c4ff3dd97cb600d4791c0439b0a3d0a52 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Thu, 22 Jun 2023 17:51:02 +0200
Subject: [PATCH 08/10] remove prerelease versions of svelte 4

---
 code/frameworks/svelte-vite/package.json |  6 ++--
 code/frameworks/sveltekit/package.json   |  2 +-
 code/renderers/svelte/package.json       |  4 +--
 code/yarn.lock                           | 35 ++++++++++++------------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
index 79bb6612d3a7..7e6fc28664d8 100644
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@@ -50,19 +50,19 @@
     "@storybook/builder-vite": "7.1.0-alpha.38",
     "@storybook/node-logger": "7.1.0-alpha.38",
     "@storybook/svelte": "7.1.0-alpha.38",
-    "@sveltejs/vite-plugin-svelte": "^2.0.0",
+    "@sveltejs/vite-plugin-svelte": "^2.4.1",
     "magic-string": "^0.30.0",
     "sveltedoc-parser": "^4.2.1",
     "ts-dedent": "^2.2.0"
   },
   "devDependencies": {
     "@types/node": "^16.0.0",
-    "svelte": "^4.0.0-next.2",
+    "svelte": "^4.0.0",
     "typescript": "~4.9.3",
     "vite": "^4.0.0"
   },
   "peerDependencies": {
-    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.2",
+    "svelte": "^3.0.0 || ^4.0.0",
     "vite": "^3.0.0 || ^4.0.0"
   },
   "engines": {
diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
index e9cf3f3dccb0..29f1f9b9209d 100644
--- a/code/frameworks/sveltekit/package.json
+++ b/code/frameworks/sveltekit/package.json
@@ -60,7 +60,7 @@
     "vite": "^4.0.0"
   },
   "peerDependencies": {
-    "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.2",
+    "svelte": "^3.0.0 || ^4.0.0",
     "vite": "^4.0.0"
   },
   "engines": {
diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
index 188ed931a2f0..b75695e1464e 100644
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@@ -64,12 +64,12 @@
   },
   "devDependencies": {
     "expect-type": "^0.15.0",
-    "svelte": "^4.0.0-next.2",
+    "svelte": "^4.0.0",
     "svelte-check": "^3.4.3",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.2"
+    "svelte": "^3.59.1 || ^4.0.0"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/code/yarn.lock b/code/yarn.lock
index 06876a1fa5ae..5b216fbff059 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -3786,7 +3786,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
   version: 0.3.18
   resolution: "@jridgewell/trace-mapping@npm:0.3.18"
   dependencies:
@@ -7321,16 +7321,16 @@ __metadata:
     "@storybook/builder-vite": 7.1.0-alpha.38
     "@storybook/node-logger": 7.1.0-alpha.38
     "@storybook/svelte": 7.1.0-alpha.38
-    "@sveltejs/vite-plugin-svelte": ^2.0.0
+    "@sveltejs/vite-plugin-svelte": ^2.4.1
     "@types/node": ^16.0.0
     magic-string: ^0.30.0
-    svelte: ^4.0.0-next.2
+    svelte: ^4.0.0
     sveltedoc-parser: ^4.2.1
     ts-dedent: ^2.2.0
     typescript: ~4.9.3
     vite: ^4.0.0
   peerDependencies:
-    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.2
+    svelte: ^3.0.0 || ^4.0.0
     vite: ^3.0.0 || ^4.0.0
   languageName: unknown
   linkType: soft
@@ -7367,13 +7367,13 @@ __metadata:
     "@storybook/preview-api": 7.1.0-alpha.38
     "@storybook/types": 7.1.0-alpha.38
     expect-type: ^0.15.0
-    svelte: ^4.0.0-next.2
+    svelte: ^4.0.0
     svelte-check: ^3.4.3
     sveltedoc-parser: ^4.2.1
     type-fest: ^3.11.0
     typescript: ^5.0.4
   peerDependencies:
-    svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.2
+    svelte: ^3.59.1 || ^4.0.0
   languageName: unknown
   linkType: soft
 
@@ -7388,7 +7388,7 @@ __metadata:
     typescript: ^4.9.3
     vite: ^4.0.0
   peerDependencies:
-    svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.2
+    svelte: ^3.0.0 || ^4.0.0
     vite: ^4.0.0
   languageName: unknown
   linkType: soft
@@ -7680,7 +7680,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sveltejs/vite-plugin-svelte@npm:^2.0.0":
+"@sveltejs/vite-plugin-svelte@npm:^2.4.1":
   version: 2.4.1
   resolution: "@sveltejs/vite-plugin-svelte@npm:2.4.1"
   dependencies:
@@ -12456,16 +12456,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"code-red@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "code-red@npm:1.0.0"
+"code-red@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "code-red@npm:1.0.3"
   dependencies:
     "@jridgewell/sourcemap-codec": ^1.4.14
     "@types/estree": ^1.0.0
     acorn: ^8.8.2
     estree-walker: ^3.0.3
     periscopic: ^3.1.0
-  checksum: 584bad8f23b4aa13b9b7ce043fb92d3165aaa0a3bfd058b9cb9ec4cb7b2b3f1289abbc353cf62f353e05463c3f323560dfe1e4cb680d2900a7b85a549ab9206c
+  checksum: d8722c5bb5898fe0723211d07067179cd0befe70b4b4115752d207b4703816bf146298fa0bfe6b1aaa94e16387bd80945bba2b7271d0ebd3b2e9d10e0b9f1e2a
   languageName: node
   linkType: hard
 
@@ -28746,23 +28746,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svelte@npm:^4.0.0-next.2":
-  version: 4.0.0-next.2
-  resolution: "svelte@npm:4.0.0-next.2"
+"svelte@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "svelte@npm:4.0.0"
   dependencies:
     "@ampproject/remapping": ^2.2.1
     "@jridgewell/sourcemap-codec": ^1.4.15
+    "@jridgewell/trace-mapping": ^0.3.18
     acorn: ^8.8.2
     aria-query: ^5.2.1
     axobject-query: ^3.2.1
-    code-red: ^1.0.0
+    code-red: ^1.0.3
     css-tree: ^2.3.1
     estree-walker: ^3.0.3
     is-reference: ^3.0.1
     locate-character: ^3.0.0
     magic-string: ^0.30.0
     periscopic: ^3.1.0
-  checksum: ce14a2d3de37d80831b66a5eb2ab8129a8bd9578d4dafb70f66e47e6580f6ce7c1705094781b30b97572f2adef15d72938ca192aae00585feb945fa1ff41654c
+  checksum: fb0bf76904d3f5c4a72a91d6db7fbbabf1bfbeaeb99e4cd29a90bfc5d9cb784f994fc4249c7635f27cb1890e7313de533e0d7931ff409297cdd2a2374d0f9d53
   languageName: node
   linkType: hard
 

From 2f4481a690e1ed04bdcf354f449faf4258545dd0 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Thu, 22 Jun 2023 17:54:40 +0200
Subject: [PATCH 09/10] don't install svelte@next in templates

---
 code/lib/cli/src/sandbox-templates.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts
index b1408f0037d5..832c80e96523 100644
--- a/code/lib/cli/src/sandbox-templates.ts
+++ b/code/lib/cli/src/sandbox-templates.ts
@@ -248,8 +248,7 @@ const baseTemplates = {
   },
   'svelte-vite/default-js': {
     name: 'Svelte Vite (JS)',
-    script:
-      'npm create vite@latest --yes {{beforeDir}} -- --template svelte && cd {{beforeDir}} && npm install --save-dev svelte@next',
+    script: 'npm create vite@latest --yes {{beforeDir}} -- --template svelte',
     expected: {
       framework: '@storybook/svelte-vite',
       renderer: '@storybook/svelte',
@@ -259,8 +258,7 @@ const baseTemplates = {
   },
   'svelte-vite/default-ts': {
     name: 'Svelte Vite (TS)',
-    script:
-      'npm create vite@latest --yes {{beforeDir}} -- --template svelte-ts && cd {{beforeDir}} && npm install --save-dev svelte@next',
+    script: 'npm create vite@latest --yes {{beforeDir}} -- --template svelte-ts',
     expected: {
       framework: '@storybook/svelte-vite',
       renderer: '@storybook/svelte',
@@ -305,7 +303,7 @@ const baseTemplates = {
   'svelte-kit/skeleton-js': {
     name: 'Svelte Kit (JS)',
     script:
-      'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest && cd {{beforeDir}} && npm install --save-dev svelte@next',
+      'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest',
     expected: {
       framework: '@storybook/sveltekit',
       renderer: '@storybook/svelte',
@@ -316,7 +314,7 @@ const baseTemplates = {
   'svelte-kit/skeleton-ts': {
     name: 'Svelte Kit (TS)',
     script:
-      'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest && cd {{beforeDir}} && npm install --save-dev svelte@next',
+      'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest',
     expected: {
       framework: '@storybook/sveltekit',
       renderer: '@storybook/svelte',

From 6b252298a9039a7f8a89ae734c01a569a2a31198 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@reinhold.is>
Date: Fri, 23 Jun 2023 12:23:26 +0200
Subject: [PATCH 10/10] still support svelte 3.1.0

---
 code/renderers/svelte/package.json | 2 +-
 code/yarn.lock                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
index b78970060d87..b15cc60e9743 100644
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@@ -69,7 +69,7 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "svelte": "^3.59.1 || ^4.0.0"
+    "svelte": "^3.1.0 || ^4.0.0"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/code/yarn.lock b/code/yarn.lock
index 050b5974bede..db2f297265d8 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -7373,7 +7373,7 @@ __metadata:
     type-fest: ^3.11.0
     typescript: ^5.0.4
   peerDependencies:
-    svelte: ^3.59.1 || ^4.0.0
+    svelte: ^3.1.0 || ^4.0.0
   languageName: unknown
   linkType: soft