Merge pull request #22905 from storybookjs/svelte-4

Svelte: Support v4 (cherry picked from commit 96b838b)
storybookjs · Jun 27, 2023 · 8ae1fd2 · 8ae1fd2
1 parent 3b9f187
commit 8ae1fd2
Show file tree

Hide file tree

Showing 6 changed files with 191 additions and 86 deletions.
diff --git 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;

diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
@@ -50,20 +50,19 @@
     "@storybook/builder-vite": "7.0.24",
     "@storybook/node-logger": "7.0.24",
     "@storybook/svelte": "7.0.24",
-    "@sveltejs/vite-plugin-svelte": "^2.0.0",
-    "magic-string": "^0.27.0",
-    "svelte": "^3.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",
     "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",
     "vite": "^3.0.0 || ^4.0.0"
   },
   "engines": {

diff --git 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",
     "vite": "^4.0.0"
   },
   "engines": {

diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
@@ -64,12 +64,12 @@
   },
   "devDependencies": {
     "expect-type": "^0.14.2",
-    "svelte": "^3.31.2",
-    "svelte-check": "^2.9.2",
+    "svelte": "^4.0.0",
+    "svelte-check": "^3.4.3",
     "typescript": "~4.9.3"
   },
   "peerDependencies": {
-    "svelte": "^3.1.0"
+    "svelte": "^3.1.0 || ^4.0.0"
   },
   "engines": {
     "node": ">=16.0.0"

diff --git a/code/renderers/svelte/src/public-types.ts b/code/renderers/svelte/src/public-types.ts
@@ -12,7 +12,7 @@ import type {
   ProjectAnnotations,
 } from '@storybook/types';
 
-import type { ComponentProps, ComponentType, SvelteComponentTyped } from 'svelte';
+import type { ComponentType, ComponentProps, SvelteComponentTyped } from 'svelte';
 import type { SetOptional, Simplify } from 'type-fest';
 import type { SvelteRenderer } from './types';