Merge branch 'norbert/cli-with-ink' of https://github.com/storybookjs…

…/storybook into norbert/cli-with-ink
storybookjs · Feb 5, 2025 · 566c28c · 566c28c
2 parents ce2f2ae + e4c4b31
commit 566c28c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/code/addons/test/src/postinstall.ts b/code/addons/test/src/postinstall.ts
@@ -488,10 +488,13 @@ export default async function postInstall(options: PostinstallOptions) {
       const newWorkspaceFile = resolve(dirname(rootConfig), `vitest.workspace${extension}`);
       const workspaceTemplate = await loadTemplate('vitest.workspace.template.ts', {
         ROOT_CONFIG: relative(dirname(newWorkspaceFile), rootConfig),
+        EXTENDS_WORKSPACE: viteConfigFile
+          ? relative(dirname(newWorkspaceFile), viteConfigFile)
+          : '',
         CONFIG_DIR: options.configDir,
         BROWSER_CONFIG: browserConfig,
         SETUP_FILE: relative(dirname(newWorkspaceFile), vitestSetupFile),
-      });
+      }).then((t) => t.replace(/\s+extends: '',/, ''));
 
       logger.line(1);
       logger.plain(`${step} Creating a Vitest workspace file:`);