fix(plugin-vite): merge Vite build.lib config

electron · Nov 8, 2024 · 10624d1 · 10624d1
1 parent cbb6416
commit 10624d1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/packages/plugin/vite/src/ViteConfig.ts b/packages/plugin/vite/src/ViteConfig.ts
@@ -1,5 +1,5 @@
 import debug from 'debug';
-import { loadConfigFromFile, mergeConfig } from 'vite';
+import { loadConfigFromFile } from 'vite';
 
 import { getConfig as getMainViteConfig } from './config/vite.main.config';
 import { getConfig as getPreloadViteConfig } from './config/vite.preload.config';
@@ -31,14 +31,14 @@ export default class ViteConfigGenerator {
     };
 
     // `configEnv` is to be passed as an arguments when the user export a function in `vite.config.js`.
-    const userConfig = (await loadConfigFromFile(configEnv, buildConfig.config))?.config ?? {};
+    const userConfig = (await loadConfigFromFile(configEnv, buildConfig.config))?.config;
     switch (target) {
       case 'main':
-        return mergeConfig(getMainViteConfig(configEnv as ConfigEnv<'build'>), userConfig);
+        return getMainViteConfig(configEnv as ConfigEnv<'build'>, userConfig);
       case 'preload':
-        return mergeConfig(getPreloadViteConfig(configEnv as ConfigEnv<'build'>), userConfig);
+        return getPreloadViteConfig(configEnv as ConfigEnv<'build'>, userConfig);
       case 'renderer':
-        return mergeConfig(getRendererViteConfig(configEnv as ConfigEnv<'renderer'>), userConfig);
+        return getRendererViteConfig(configEnv as ConfigEnv<'renderer'>, userConfig);
       default:
         throw new Error(`Unknown target: ${target}, expected 'main', 'preload' or 'renderer'`);
     }

diff --git a/packages/plugin/vite/src/config/vite.main.config.ts b/packages/plugin/vite/src/config/vite.main.config.ts
@@ -2,16 +2,11 @@ import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
 
 import { external, getBuildConfig, getBuildDefine, pluginHotRestart } from './vite.base.config';
 
-export function getConfig(forgeEnv: ConfigEnv<'build'>): UserConfig {
+export function getConfig(forgeEnv: ConfigEnv<'build'>, userConfig: UserConfig = {}): UserConfig {
   const { forgeConfigSelf } = forgeEnv;
   const define = getBuildDefine(forgeEnv);
   const config: UserConfig = {
     build: {
-      lib: {
-        entry: forgeConfigSelf.entry,
-        fileName: () => '[name].js',
-        formats: ['cjs'],
-      },
       rollupOptions: {
         external,
       },
@@ -24,6 +19,15 @@ export function getConfig(forgeEnv: ConfigEnv<'build'>): UserConfig {
       mainFields: ['module', 'jsnext:main', 'jsnext'],
     },
   };
+  const buildConfig = getBuildConfig(forgeEnv);
+
+  if (userConfig.build?.lib == null) {
+    config.build!.lib = {
+      entry: forgeConfigSelf.entry,
+      fileName: () => '[name].js',
+      formats: ['cjs'],
+    };
+  }
 
-  return mergeConfig(getBuildConfig(forgeEnv), config);
+  return mergeConfig(mergeConfig(buildConfig, config), userConfig);
 }
diff --git a/packages/plugin/vite/src/config/vite.preload.config.ts b/packages/plugin/vite/src/config/vite.preload.config.ts
@@ -2,7 +2,7 @@ import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
 
 import { external, getBuildConfig, pluginHotRestart } from './vite.base.config';
 
-export function getConfig(forgeEnv: ConfigEnv<'build'>): UserConfig {
+export function getConfig(forgeEnv: ConfigEnv<'build'>, userConfig: UserConfig = {}): UserConfig {
   const { forgeConfigSelf } = forgeEnv;
   const config: UserConfig = {
     build: {
@@ -22,6 +22,7 @@ export function getConfig(forgeEnv: ConfigEnv<'build'>): UserConfig {
     },
     plugins: [pluginHotRestart('reload')],
   };
+  const buildConfig = getBuildConfig(forgeEnv);
 
-  return mergeConfig(getBuildConfig(forgeEnv), config);
+  return mergeConfig(mergeConfig(buildConfig, config), userConfig);
 }
diff --git a/packages/plugin/vite/src/config/vite.renderer.config.ts b/packages/plugin/vite/src/config/vite.renderer.config.ts
@@ -1,13 +1,13 @@
-import { type ConfigEnv, type UserConfig } from 'vite';
+import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
 
 import { pluginExposeRenderer } from './vite.base.config';
 
 // https://vitejs.dev/config
-export function getConfig(forgeEnv: ConfigEnv<'renderer'>) {
+export function getConfig(forgeEnv: ConfigEnv<'renderer'>, userConfig: UserConfig = {}) {
   const { root, mode, forgeConfigSelf } = forgeEnv;
   const name = forgeConfigSelf.name ?? '';
 
-  return {
+  const config: UserConfig = {
     root,
     mode,
     base: './',
@@ -19,5 +19,7 @@ export function getConfig(forgeEnv: ConfigEnv<'renderer'>) {
       preserveSymlinks: true,
     },
     clearScreen: false,
-  } as UserConfig;
+  };
+
+  return mergeConfig(config, userConfig);
 }