fix: Use Vite's mergeConfig to merge values instead of overwriting (#…

…12302)
vaadin · Nov 9, 2021 · 8dcafc1 · 8dcafc1
1 parent 654a7d4
commit 8dcafc1
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/flow-server/src/main/resources/vite.generated.ts b/flow-server/src/main/resources/vite.generated.ts
@@ -9,7 +9,7 @@ import * as net from 'net';
 
 import { processThemeResources } from '@vaadin/application-theme-plugin/theme-handle.js';
 import settings from '#settingsImport#';
-import { UserConfigFn, defineConfig, HtmlTagDescriptor } from 'vite';
+import { UserConfigFn, defineConfig, HtmlTagDescriptor, mergeConfig } from 'vite';
 
 const frontendFolder = path.resolve(__dirname, settings.frontendFolder);
 const themeFolder = path.resolve(frontendFolder, settings.themeFolder);
@@ -120,8 +120,5 @@ export const vaadinConfig: UserConfigFn = (env) => {
 };
 
 export const overrideVaadinConfig = (customConfig: UserConfigFn) => {
-  return defineConfig((env) => ({
-    ...vaadinConfig(env),
-    ...customConfig(env)
-  }));
+  return defineConfig((env) => mergeConfig(vaadinConfig(env), customConfig(env)));
 };