Merge pull request #26860 from yuemori/fix-vite-builder-override-asse…

…tsinclude Vite: Merge assetsInclude property with Storybook default values
storybookjs · Apr 29, 2024 · f6ecc28 · f6ecc28
2 parents 7e1ee32 + 435407d
commit f6ecc28
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/code/builders/builder-vite/src/assetsInclude.ts b/code/builders/builder-vite/src/assetsInclude.ts
@@ -0,0 +1,15 @@
+import type { InlineConfig as ViteInlineConfig } from 'vite';
+
+export function getAssetsInclude(config: ViteInlineConfig, newPath: string[]): (string | RegExp)[] {
+  const { assetsInclude } = config;
+
+  if (!assetsInclude) {
+    return newPath;
+  }
+
+  if (Array.isArray(assetsInclude)) {
+    return [...assetsInclude, ...newPath];
+  } else {
+    return [assetsInclude, ...newPath];
+  }
+}
diff --git a/code/builders/builder-vite/src/vite-server.ts b/code/builders/builder-vite/src/vite-server.ts
@@ -3,6 +3,7 @@ import type { Options } from '@storybook/types';
 import { commonConfig } from './vite-config';
 import { getOptimizeDeps } from './optimizeDeps';
 import { sanitizeEnvVars } from './envs';
+import { getAssetsInclude } from './assetsInclude';
 
 export async function createViteServer(options: Options, devServer: Server) {
   const { presets } = options;
@@ -12,7 +13,7 @@ export async function createViteServer(options: Options, devServer: Server) {
   const config = {
     ...commonCfg,
     // Needed in Vite 5: https://github.com/storybookjs/storybook/issues/25256
-    assetsInclude: ['/sb-preview/**'],
+    assetsInclude: getAssetsInclude(commonCfg, ['/sb-preview/**']),
     // Set up dev server
     server: {
       middlewareMode: true,