Merge pull request #29731 from storybookjs/jeppe/support-svelte-vite-…

…plugin-5 Svelte: Support `@sveltejs/vite-plugin-svelte` v5
storybookjs · Nov 28, 2024 · e870c8c · e870c8c
2 parents 4d08f6d + ce85320
commit e870c8c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
@@ -64,7 +64,7 @@
     "vite": "^4.0.0"
   },
   "peerDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^2.0.0 || ^3.0.0 || ^4.0.0",
+    "@sveltejs/vite-plugin-svelte": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
     "storybook": "workspace:^",
     "svelte": "^4.0.0 || ^5.0.0",
     "vite": "^4.0.0 || ^5.0.0 || ^6.0.0"

diff --git a/code/yarn.lock b/code/yarn.lock
@@ -7430,7 +7430,7 @@ __metadata:
     typescript: "npm:^5.3.2"
     vite: "npm:^4.0.0"
   peerDependencies:
-    "@sveltejs/vite-plugin-svelte": ^2.0.0 || ^3.0.0 || ^4.0.0
+    "@sveltejs/vite-plugin-svelte": ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
     storybook: "workspace:^"
     svelte: ^4.0.0 || ^5.0.0
     vite: ^4.0.0 || ^5.0.0 || ^6.0.0

diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts
@@ -89,7 +89,7 @@ export const install: Task['run'] = async ({ sandboxDir, key }, { link, dryRun,
       dryRun,
       debug,
     });
-    await addWorkaroundResolutions({ cwd, dryRun, debug });
+    await addWorkaroundResolutions({ cwd, dryRun, debug, key });
   } else {
     // We need to add package resolutions to ensure that we only ever install the latest version
     // of any storybook packages as verdaccio is not able to both proxy to npm and publish over

diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts
@@ -94,7 +94,7 @@ export const addWorkaroundResolutions = async ({
     '@testing-library/user-event': '^14.5.2',
   };
 
-  if (key.includes('svelte-kit')) {
+  if (key?.includes('svelte-kit')) {
     packageJson.resolutions['@sveltejs/vite-plugin-svelte'] = '^3.0.0';
   }