refactor(v0.4.0): better code logic

Author: caoxiemeihao

src/build.ts

@@ -1,34 +1,15 @@
 import { builtinModules } from 'module'
-import { build as viteBuild, mergeConfig } from 'vite'
-import type { ResolvedConfig, UserConfig } from 'vite'
+import { build as viteBuild, InlineConfig, mergeConfig } from 'vite'
+import type { ResolvedConfig } from 'vite'
 import type { Configuration } from './types'
 
 const isProduction = process.env./* from mode option */NODE_ENV === 'production'
 
 export async function build(config: Configuration, viteConfig: ResolvedConfig) {
   if (config.preload) {
-    const preloadConfig = resolveBuildConfig(
-      'preload',
-      config,
-      viteConfig,
-      config.preload.vite,
-    )
-    await viteBuild({
-      configFile: false,
-      ...preloadConfig,
-    })
+    await viteBuild(resolveBuildConfig('preload', config, viteConfig))
   }
-
-  const mainConfig = resolveBuildConfig(
-    'main',
-    config,
-    viteConfig,
-    config.main.vite,
-  )
-  await viteBuild({
-    configFile: false,
-    ...mainConfig,
-  })
+  await viteBuild(resolveBuildConfig('main', config, viteConfig))
 }
 
 // -------------------------------------------------
@@ -37,10 +18,13 @@ export function resolveBuildConfig(
   proc: 'main' | 'preload',
   config: Configuration,
   viteConfig: ResolvedConfig,
-  overrides: Parameters<typeof mergeConfig>[1] = {},
-) {
-  const conf: UserConfig = {
+): InlineConfig {
+  const conf: InlineConfig = {
+    // 🚧 Avoid recursive build caused by load config file
+    configFile: false,
+    envFile: false,
     publicDir: false,
+
     build: {
       minify: isProduction,
       sourcemap: true,
@@ -79,5 +63,5 @@ export function resolveBuildConfig(
   // Assign default dir
   conf.build.outDir = `${viteConfig.build.outDir}/electron-${proc}`
 
-  return mergeConfig(conf, overrides) as UserConfig
+  return mergeConfig(conf, config[proc]?.vite || {}) as InlineConfig
 }

src/index.ts

@@ -1,6 +1,5 @@
 import type { Configuration } from './types'
 import type { Plugin } from 'vite'
-import renderer from '../renderer'
 import { bootstrap } from './serve'
 import { build } from './build'
 
@@ -30,6 +29,5 @@ export default function electron(config: Configuration): Plugin[] {
         await build(config, viteConfig)
       },
     },
-    ...(config.main.nodeIntegration ? renderer() : []),
   ]
 }

src/serve.ts

@@ -2,7 +2,7 @@ import path from 'path'
 import { spawn } from 'child_process'
 import type { ChildProcessWithoutNullStreams } from 'child_process'
 import type { AddressInfo } from 'net'
-import type { ViteDevServer, UserConfig } from 'vite'
+import type { ViteDevServer, UserConfig, InlineConfig } from 'vite'
 import { build as viteBuild, mergeConfig } from 'vite'
 import { resolveBuildConfig } from './build'
 import type { Configuration } from './types'
@@ -12,31 +12,23 @@ export async function bootstrap(config: Configuration, server: ViteDevServer) {
   const { config: viteConfig } = server
 
   if (config.preload) {
-    const preloadConfig = resolveBuildConfig(
-      'preload',
-      config,
-      viteConfig,
-      mergeConfig(
-        {
-          mode: 'development',
-          build: {
-            watch: true,
+    const preloadConfig = mergeConfig(
+      resolveBuildConfig('preload', config, viteConfig),
+      {
+        mode: 'development',
+        build: {
+          watch: true,
+        },
+        plugins: [{
+          name: 'electron-preload-watcher',
+          writeBundle() {
+            server.ws.send({ type: 'full-reload' })
           },
-          plugins: [{
-            name: 'electron-preload-watcher',
-            writeBundle() {
-              server.ws.send({ type: 'full-reload' })
-            },
-          }],
-        } as UserConfig,
-        config.preload.vite || {},
-      )
-    )
+        }],
+      } as UserConfig,
+    ) as InlineConfig
 
-    await viteBuild({
-      configFile: false,
-      ...preloadConfig,
-    })
+    await viteBuild(preloadConfig)
   }
 
   // ----------------------------------------------------------------
@@ -48,33 +40,26 @@ export async function bootstrap(config: Configuration, server: ViteDevServer) {
     VITE_DEV_SERVER_PORT: address.port,
   })
 
-  const mainConfig = resolveBuildConfig(
-    'main',
-    config,
-    viteConfig,
-    mergeConfig(
-      {
-        mode: 'development',
-        build: {
-          watch: true,
+  const mainConfig = mergeConfig(
+    resolveBuildConfig('main', config, viteConfig),
+    {
+      mode: 'development',
+      build: {
+        watch: true,
+      },
+      plugins: [{
+        name: 'electron-main-watcher',
+        writeBundle() {
+          electronProcess && electronProcess.kill()
+
+          // TODO: Check if electronEntry is a directory
+          let electronEntry = path.join(mainConfig.build.outDir, path.parse(config.main.entry).name)
+          // Start Electron App
+          electronProcess = spawn(electronPath, [electronEntry], { stdio: 'inherit', env })
         },
-        plugins: [{
-          name: 'electron-main-watcher',
-          writeBundle() {
-            electronProcess && electronProcess.kill()
+      }],
+    } as UserConfig,
+  ) as InlineConfig
 
-            // TODO: Check if electronEntry is a directory
-            let electronEntry = path.join(mainConfig.build.outDir, path.parse(config.main.entry).name)
-            // Start Electron App
-            electronProcess = spawn(electronPath, [electronEntry], { stdio: 'inherit', env })
-          },
-        }],
-      } as UserConfig,
-      config.main.vite || {},
-    )
-  )
-  await viteBuild({
-    configFile: false,
-    ...mainConfig,
-  })
+  await viteBuild(mainConfig)
 }

src/types.ts

@@ -1,27 +1,19 @@
-import type {
-  LibraryOptions,
-  UserConfig,
-} from 'vite'
+import type { LibraryOptions, UserConfig } from 'vite'
 import type { InputOption } from 'rollup'
 
-export interface MainConfig {
-  /**
-   * Shortcut of `build.lib.entry`
-   */
-  entry: LibraryOptions['entry']
-  vite?: UserConfig
-  nodeIntegration?: boolean
-}
-
-export interface PreloadConfig {
-  /**
-   * Shortcut of `build.rollupOptions.input`
-   */
-  input?: InputOption
-  vite?: UserConfig
-}
-
 export interface Configuration {
-  main: MainConfig
-  preload?: PreloadConfig
+  main: {
+    /**
+     * Shortcut of `build.lib.entry`
+     */
+    entry: LibraryOptions['entry']
+    vite?: UserConfig
+  }
+  preload?: {
+    /**
+     * Shortcut of `build.rollupOptions.input`
+     */
+    input: InputOption
+    vite?: UserConfig
+  }
 }