Only apply workarounds for sandboxes that need it

storybookjs · Nov 21, 2023 · 34a449d · 34a449d
1 parent 73e7bc5
commit 34a449d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts
@@ -93,6 +93,25 @@ export const install: Task['run'] = async ({ sandboxDir }, { link, dryRun, debug
     await addPackageResolutions({ cwd, dryRun, debug });
     await configureYarn2ForVerdaccio({ cwd, dryRun, debug });
 
+    // Add vite plugin workarounds for frameworks that need it
+    // (to support vite 5 without peer dep errors)
+    if (
+      [
+        'bench-react-vite-default-ts',
+        'bench-react-vite-default-ts-nodocs',
+        'bench-react-vite-default-ts-test-build',
+        'internal-ssv6-vite',
+        'react-vite-default-js',
+        'react-vite-default-ts',
+        'svelte-vite-default-js',
+        'svelte-vite-default-ts',
+        'vue3-vite-default-js',
+        'vue3-vite-default-ts',
+      ].includes(sandboxDir.split(sep).at(-1))
+    ) {
+      await addWorkaroundResolutions({ cwd, dryRun, debug });
+    }
+
     await exec(
       'yarn install',
       { cwd },

diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts
@@ -27,11 +27,6 @@ export const addPackageResolutions = async ({ cwd, dryRun }: YarnOptions) => {
     playwright: '1.36.0',
     'playwright-core': '1.36.0',
     '@playwright/test': '1.36.0',
-
-    // Due to support of older vite versions
-    '@vitejs/plugin-react': '4.2.0',
-    '@sveltejs/vite-plugin-svelte': '3.0.1',
-    '@vitejs/plugin-vue': '4.5.0',
   };
   await writeJSON(packageJsonPath, packageJson, { spaces: 2 });
 };
@@ -72,7 +67,10 @@ export const addWorkaroundResolutions = async ({ cwd, dryRun }: YarnOptions) =>
   const packageJson = await readJSON(packageJsonPath);
   packageJson.resolutions = {
     ...packageJson.resolutions,
-    '@vitejs/plugin-react': '4.2.0', // due to conflicting version in @storybook/vite-react
+    // Due to our support of older vite versions
+    '@vitejs/plugin-react': '4.2.0',
+    '@sveltejs/vite-plugin-svelte': '3.0.1',
+    '@vitejs/plugin-vue': '4.5.0',
   };
   await writeJSON(packageJsonPath, packageJson, { spaces: 2 });
 };