Merge pull request #119 from electron-vite/v0.11.0-beta1

V0.11.0 beta1

Author: caoxiemeihao

README.md

@@ -84,7 +84,7 @@ export interface Configuration {
     startup: (argv?: string[]) => Promise<void>
     /** Reload Electron-Renderer */
     reload: () => void
-  }) => void
+  }) => void | Promise<void>
 }
 ```
 

src/build.ts

@@ -6,11 +6,6 @@ import {
 } from './config'
 
 /** Work on the `vite build` command */
-export async function build(config: Configuration | Configuration[]) {
-  const configArray = Array.isArray(config) ? config : [config]
-
-  for (const config of configArray) {
-    const inlineConfig = withExternalBuiltins(resolveViteConfig(config))
-    await viteBuild(inlineConfig)
-  }
+export function build(config: Configuration) {
+  return viteBuild(withExternalBuiltins(resolveViteConfig(config)))
 }

src/config.ts

@@ -27,7 +27,7 @@ export interface Configuration {
     startup: (argv?: string[]) => Promise<void>
     /** Reload Electron-Renderer */
     reload: () => void
-  }) => void
+  }) => void | Promise<void>
 }
 
 export function defineConfig(config: Configuration) {

src/index.ts

@@ -4,17 +4,26 @@ import { bootstrap } from './serve'
 import type { Configuration } from './config'
 
 // public
-export { type Configuration, defineConfig, resolveViteConfig, withExternalBuiltins } from './config'
+export {
+  type Configuration,
+  defineConfig,
+  resolveViteConfig,
+  withExternalBuiltins,
+} from './config'
 export { build }
 
 export default function electron(config: Configuration | Configuration[]): Plugin[] {
+  const configArray = Array.isArray(config) ? config : [config]
+
   return [
     {
       name: 'vite-plugin-electron',
       apply: 'serve',
       configureServer(server) {
         server.httpServer?.once('listening', () => {
-          bootstrap(config, server)
+          for (const config of configArray) {
+            bootstrap(config, server)
+          }
         })
         server.httpServer?.once('close', () => {
           if (process.electronApp) {
@@ -32,7 +41,9 @@ export default function electron(config: Configuration | Configuration[]): Plugi
         config.base ??= './'
       },
       async closeBundle() {
-        await build(config)
+        for (const config of configArray) {
+          await build(config)
+        }
       }
     },
   ]

src/serve.ts

@@ -13,48 +13,44 @@ import {
 } from './config'
 
 /** Work on the `vite serve` command */
-export async function bootstrap(config: Configuration | Configuration[], server: ViteDevServer) {
+export function bootstrap(config: Configuration, server: ViteDevServer) {
   Object.assign(process.env, {
     VITE_DEV_SERVER_URL: resolveServerUrl(server)
   })
 
-  const configArray = Array.isArray(config) ? config : [config]
-
-  for (const config of configArray) {
-    const inlineConfig = withExternalBuiltins(resolveViteConfig(config))
-    await viteBuild(mergeConfig(
-      {
-        mode: server.config.mode,
-        build: {
-          watch: {},
-        },
-        plugins: [{
-          name: ':startup',
-          closeBundle() {
-            if (config.onstart) {
-              config.onstart.call(this, {
-                startup,
-                reload() {
-                  server.ws.send({ type: 'full-reload' })
-                },
-              })
-            } else {
-              // TODO: 2022-10-12 Rollup can't accurately distinguish a file with multiple entries
-              if (false/* path.parse(filename).name.endsWith('reload') */) {
-                // Bundle filename that ends with `reload` will trigger the Electron-Renderer process to reload, 
-                // instead of restarting the entire Electron App.
-                // e.g.
-                //   dist/electron/preload.ts
-                //   dist/electron/foo.reload.js
+  const inlineConfig = withExternalBuiltins(resolveViteConfig(config))
+  return viteBuild(mergeConfig(
+    <UserConfig>{
+      mode: server.config.mode,
+      build: {
+        watch: {},
+      },
+      plugins: [{
+        name: ':startup',
+        closeBundle() {
+          if (config.onstart) {
+            config.onstart.call(this, {
+              startup,
+              reload() {
                 server.ws.send({ type: 'full-reload' })
-              } else {
-                startup()
-              }
+              },
+            })
+          } else {
+            // TODO: 2022-10-12 Rollup can't accurately distinguish a file with multiple entries
+            if (false/* path.parse(filename).name.endsWith('reload') */) {
+              // Bundle filename that ends with `reload` will trigger the Electron-Renderer process to reload, 
+              // instead of restarting the entire Electron App.
+              // e.g.
+              //   dist/electron/preload.ts
+              //   dist/electron/foo.reload.js
+              server.ws.send({ type: 'full-reload' })
+            } else {
+              startup()
             }
-          },
-        }],
-      } as UserConfig,
-      inlineConfig,
-    ))
-  }
+          }
+        },
+      }],
+    },
+    inlineConfig,
+  ))
 }