@electron-forge/plugin-vite 8.0.0-alpha.7 → 8.0.0-alpha.9

package/dist/subprocess-worker.js

@@ -1,9 +1,13 @@
+import { styleText } from 'node:util';
 import { build } from 'vite';
+import { viteDevServerUrls } from './config/vite.base.config.js';
 import ViteConfigGenerator from './ViteConfig.js';
 const projectDir = process.env.FORGE_VITE_PROJECT_DIR;
 const kind = process.env.FORGE_VITE_KIND;
 const index = Number(process.env.FORGE_VITE_INDEX);
 const rawConfig = process.env.FORGE_VITE_CONFIG;
+const watch = process.env.FORGE_VITE_WATCH === '1';
+const rawDevServerUrls = process.env.FORGE_VITE_DEV_SERVER_URLS;
 if (!projectDir || !kind || !rawConfig || !Number.isInteger(index)) {
     console.error('subprocess-worker: missing one of FORGE_VITE_PROJECT_DIR, FORGE_VITE_KIND, FORGE_VITE_INDEX, FORGE_VITE_CONFIG');
     process.exit(1);
@@ -12,7 +16,7 @@ if (!projectDir || !kind || !rawConfig || !Number.isInteger(index)) {
 // getBuildDefine() reads forgeConfig.renderer to generate ${NAME}_VITE_NAME
 // defines when building main targets.
 const pluginConfig = JSON.parse(rawConfig);
-const generator = new ViteConfigGenerator(pluginConfig, projectDir, true);
+const generator = new ViteConfigGenerator(pluginConfig, projectDir, !watch);
 let spec;
 let target;
 if (kind === 'build') {
@@ -23,11 +27,93 @@ else {
     spec = pluginConfig.renderer[index];
     target = 'renderer';
 }
+// Seed the module-level URL map so getBuildDefine() produces the same
+// *_VITE_DEV_SERVER_URL defines the in-process path would have.
+if (rawDevServerUrls) {
+    Object.assign(viteDevServerUrls, JSON.parse(rawDevServerUrls));
+}
 const resolved = await generator.resolveConfig(spec, target);
-await build({
-    configFile: false,
-    logLevel: 'error',
-    ...resolved,
-    clearScreen: false,
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3VicHJvY2Vzcy13b3JrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc3VicHJvY2Vzcy13b3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU3QixPQUFPLG1CQUFtQixNQUFNLGlCQUFpQixDQUFDO0FBUWxELE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUM7QUFDdEQsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUF1QyxDQUFDO0FBQ2pFLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFDbkQsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQztBQUVoRCxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsU0FBUyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO0lBQ25FLE9BQU8sQ0FBQyxLQUFLLENBQ1gsZ0hBQWdILENBQ2pILENBQUM7SUFDRixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUM7QUFFRCx5RUFBeUU7QUFDekUsNEVBQTRFO0FBQzVFLHNDQUFzQztBQUN0QyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBcUIsQ0FBQztBQUUvRCxNQUFNLFNBQVMsR0FBRyxJQUFJLG1CQUFtQixDQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFFMUUsSUFBSSxJQUFzRCxDQUFDO0FBQzNELElBQUksTUFBdUMsQ0FBQztBQUM1QyxJQUFJLElBQUksS0FBSyxPQUFPLEVBQUUsQ0FBQztJQUNyQixJQUFJLEdBQUcsWUFBWSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNqQyxNQUFNLEdBQUksSUFBOEIsQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDO0FBQzVELENBQUM7S0FBTSxDQUFDO0lBQ04sSUFBSSxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDcEMsTUFBTSxHQUFHLFVBQVUsQ0FBQztBQUN0QixDQUFDO0FBRUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxTQUFTLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztBQUU3RCxNQUFNLEtBQUssQ0FBQztJQUNWLFVBQVUsRUFBRSxLQUFLO0lBQ2pCLFFBQVEsRUFBRSxPQUFPO0lBQ2pCLEdBQUcsUUFBUTtJQUNYLFdBQVcsRUFBRSxLQUFLO0NBQ25CLENBQUMsQ0FBQyJ9
+if (!watch) {
+    await build({
+        configFile: false,
+        logLevel: 'error',
+        ...resolved,
+        clearScreen: false,
+    });
+}
+else {
+    // Matches the format of the default Vite logger
+    const timeFormatter = new Intl.DateTimeFormat(undefined, {
+        hour: 'numeric',
+        minute: 'numeric',
+        second: 'numeric',
+    });
+    // Rollup's `input` can be a string, an array of strings, or an object.
+    // https://rollupjs.org/configuration-options/#input
+    const input = resolved.build?.rollupOptions?.input ??
+        (typeof resolved.build?.lib !== 'boolean'
+            ? resolved.build?.lib?.entry
+            : undefined);
+    const targetDisplay = !input
+        ? ''
+        : typeof input === 'string'
+            ? input
+            : Array.isArray(input)
+                ? input.join(' ')
+                : Object.keys(input).join(' ');
+    let firstBuildSent = false;
+    const sendOnce = (msg) => {
+        if (firstBuildSent)
+            return;
+        firstBuildSent = true;
+        process.send?.(msg);
+    };
+    const result = await build({
+        // Avoid recursive builds caused by users configuring @electron-forge/plugin-vite in Vite config file.
+        configFile: false,
+        // We suppress Vite output and instead log lines using RollupWatcher events
+        logLevel: 'silent',
+        ...resolved,
+        plugins: [
+            // `buildEnd` and `closeBundle` are Rollup output generation hooks.
+            // https://rollupjs.org/plugin-development/#output-generation-hooks
+            {
+                name: '@electron-forge/plugin-vite:build-done',
+                buildEnd(err) {
+                    if (err instanceof Error) {
+                        sendOnce({ type: 'first-build-error', message: err.message });
+                    }
+                },
+                closeBundle() {
+                    sendOnce({ type: 'first-build-done' });
+                    if (target === 'preload') {
+                        // pluginHotRestart('reload') is a no-op here because viteDevServers
+                        // lives in the parent; ask the parent to fan out the ws full-reload.
+                        process.send?.({ type: 'reload-renderers' });
+                    }
+                },
+            },
+            ...(resolved.plugins ?? []),
+        ],
+        clearScreen: false,
+    });
+    const isRollupWatcher = (x) => !!x &&
+        typeof x === 'object' &&
+        'on' in x &&
+        typeof x.on === 'function' &&
+        'close' in x &&
+        typeof x.close === 'function';
+    if (isRollupWatcher(result)) {
+        // The Rollup watcher emits events for subsequent builds.
+        result.on('event', (event) => {
+            if (event.code === 'ERROR' && resolved.logLevel !== 'silent') {
+                console.error(`\n${styleText('dim', timeFormatter.format(new Date()))} ${event.error.message}`);
+            }
+            else if (event.code === 'BUNDLE_END' &&
+                (!resolved.logLevel || resolved.logLevel === 'info')) {
+                console.log(`${styleText('dim', timeFormatter.format(new Date()))} ${styleText(['cyan', 'bold'], '[@electron-forge/plugin-vite]')} ${styleText('green', 'target built')} ${styleText('dim', targetDisplay)}`);
+            }
+        });
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3VicHJvY2Vzcy13b3JrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc3VicHJvY2Vzcy13b3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUV0QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTdCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ2pFLE9BQU8sbUJBQW1CLE1BQU0saUJBQWlCLENBQUM7QUFTbEQsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQztBQUN0RCxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQXVDLENBQUM7QUFDakUsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUNuRCxNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDO0FBQ2hELE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLEtBQUssR0FBRyxDQUFDO0FBQ25ELE1BQU0sZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQywwQkFBMEIsQ0FBQztBQUVoRSxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsU0FBUyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO0lBQ25FLE9BQU8sQ0FBQyxLQUFLLENBQ1gsZ0hBQWdILENBQ2pILENBQUM7SUFDRixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUM7QUFFRCx5RUFBeUU7QUFDekUsNEVBQTRFO0FBQzVFLHNDQUFzQztBQUN0QyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsS0FBSyxD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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electron-forge/plugin-vite",
-  "version": "8.0.0-alpha.7",
+  "version": "8.0.0-alpha.9",
   "type": "module",
   "description": "Vite plugin for Electron Forge, lets you use Vite directly in your tooling",
   "repository": {
@@ -18,15 +18,14 @@
     "./forge-vite-env": "./forge-vite-env.d.ts"
   },
   "dependencies": {
-    "@electron-forge/plugin-base": "8.0.0-alpha.7",
-    "@electron-forge/shared-types": "8.0.0-alpha.7",
-    "chalk": "^4.0.0",
+    "@electron-forge/plugin-base": "8.0.0-alpha.9",
+    "@electron-forge/shared-types": "8.0.0-alpha.9",
     "debug": "^4.3.1",
     "fs-extra": "^10.0.0",
     "listr2": "^7.0.2"
   },
   "devDependencies": {
-    "@electron/packager": "^19.0.1",
+    "@electron/packager": "^20.0.0",
     "@types/node": "^22.10.7",
     "vite": "^8.0.0",
     "vitest": "catalog:",
@@ -43,5 +42,5 @@
     "src",
     "forge-vite-env.d.ts"
   ],
-  "gitHead": "2f61a07d341c7a5b79052f1a3dbe9dab903a1b3e"
+  "gitHead": "8d048358c5e5f0b5a09e03740687aa7f0c63d027"
 }

package/src/VitePlugin.ts

@@ -1,13 +1,14 @@
 import { spawn } from 'node:child_process';
 import path from 'node:path';
+import { styleText } from 'node:util';
 
 import { namedHookWithTaskFn, PluginBase } from '@electron-forge/plugin-base';
-import chalk from 'chalk';
 import debug from 'debug';
 import fs from 'fs-extra';
 import { Listr, PRESET_TIMER } from 'listr2';
 import * as vite from 'vite';
 
+import { viteDevServerUrls } from './config/vite.base.config.js';
 import ViteConfigGenerator from './ViteConfig.js';
 
 import type { VitePluginConfig } from './Config.js';
@@ -16,6 +17,7 @@ import type {
   ForgeMultiHookMap,
   ResolvedForgeConfig,
 } from '@electron-forge/shared-types';
+import type { ChildProcess } from 'node:child_process';
 import type { AddressInfo } from 'node:net';
 import type { LibraryOptions } from 'vite';
 
@@ -76,6 +78,72 @@ function spawnViteBuild(
   });
 }
 
+function spawnViteBuildWatch(
+  pluginConfig: Pick<VitePluginConfig, 'build' | 'renderer'>,
+  index: number,
+  projectDir: string,
+  devServerUrls: Record<string, string>,
+  onReloadRenderers: () => void,
+): { child: ChildProcess; firstBuild: Promise<void> } {
+  const child = spawn(process.execPath, [subprocessWorkerPath], {
+    cwd: projectDir,
+    env: {
+      ...process.env,
+      FORGE_VITE_PROJECT_DIR: projectDir,
+      FORGE_VITE_KIND: 'build',
+      FORGE_VITE_INDEX: String(index),
+      FORGE_VITE_CONFIG: JSON.stringify(pluginConfig),
+      FORGE_VITE_WATCH: '1',
+      FORGE_VITE_DEV_SERVER_URLS: JSON.stringify(devServerUrls),
+    },
+    stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+  });
+
+  let settled = false;
+  let stderr = '';
+  child.stderr!.setEncoding('utf8');
+  child.stderr!.on('data', (chunk) => {
+    if (!settled) stderr += chunk;
+    process.stderr.write(chunk);
+  });
+  child.stdout!.setEncoding('utf8');
+  child.stdout!.on('data', (chunk) => process.stdout.write(chunk));
+
+  const firstBuild = new Promise<void>((resolve, reject) => {
+    const settle = (fn: () => void) => {
+      if (settled) return;
+      settled = true;
+      stderr = '';
+      fn();
+    };
+
+    child.on('message', (msg: { type: string; message?: string }) => {
+      if (msg.type === 'first-build-done') {
+        settle(resolve);
+      } else if (msg.type === 'first-build-error') {
+        settle(() => reject(new Error(msg.message)));
+      } else if (msg.type === 'reload-renderers') {
+        onReloadRenderers();
+      }
+    });
+    child.on('error', (err) => settle(() => reject(err)));
+    child.on('close', (code, signal) => {
+      const reason = signal
+        ? `killed by signal ${signal}`
+        : `exited with code ${code}`;
+      settle(() =>
+        reject(
+          new Error(
+            `Vite watch subprocess ${reason} before first build completed${stderr ? `:\n${stderr}` : ''}`,
+          ),
+        ),
+      );
+    });
+  });
+
+  return { child, firstBuild };
+}
+
 function entryToDisplay(entry: LibraryOptions['entry']): string {
   if (typeof entry === 'string') return entry;
   if (Array.isArray(entry)) return entry.join(' ');
@@ -101,17 +169,10 @@ export default class VitePlugin extends PluginBase<VitePluginConfig> {
 
   private configGeneratorCache!: ViteConfigGenerator;
 
-  private watchers: vite.Rollup.RollupWatcher[] = [];
+  private watchChildren: ChildProcess[] = [];
 
   private servers: vite.ViteDevServer[] = [];
 
-  // Matches the format of the default Vite logger
-  private timeFormatter = new Intl.DateTimeFormat(undefined, {
-    hour: 'numeric',
-    minute: 'numeric',
-    second: 'numeric',
-  });
-
   init = (dir: string): void => {
     this.setDirectories(dir);
 
@@ -227,9 +288,12 @@ export default class VitePlugin extends PluginBase<VitePluginConfig> {
     if (forgeConfig.packagerConfig.ignore) {
       if (typeof forgeConfig.packagerConfig.ignore !== 'function') {
         console.error(
-          chalk.yellow(`You have set packagerConfig.ignore, the Electron Forge Vite plugin normally sets this automatically.
+          styleText(
+            'yellow',
+            `You have set packagerConfig.ignore, the Electron Forge Vite plugin normally sets this automatically.
 
-Your packaged app may be larger than expected if you dont ignore everything other than the '.vite' folder`),
+Your packaged app may be larger than expected if you dont ignore everything other than the '.vite' folder`,
+          ),
         );
       }
       return forgeConfig;
@@ -285,13 +349,14 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
 
   // Main process, Preload scripts and Worker process, etc.
   build = async (task?: ForgeListrTask<null>): Promise<Listr | void> => {
+    const targets = this.config.build
+      .map((spec, index) => ({ spec, index }))
+      .filter(({ spec }) => spec.config);
+
     if (this.isProd) {
-      const targets = this.config.build
-        .map((spec, index) => ({ spec, index }))
-        .filter(({ spec }) => spec.config);
       return task?.newListr(
         targets.map(({ spec, index }) => ({
-          title: `Building ${chalk.green(entryToDisplay(spec.entry))}`,
+          title: `Building ${styleText('green', entryToDisplay(spec.entry))}`,
           task: async (_ctx, subtask) => {
             await spawnViteBuild(
               this.serializableConfig,
@@ -299,7 +364,7 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
               index,
               this.projectDir,
             );
-            subtask.title = `Built target ${chalk.dim(entryToDisplay(spec.entry))}`;
+            subtask.title = `Built target ${styleText('dim', entryToDisplay(spec.entry))}`;
           },
         })),
         {
@@ -309,129 +374,28 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
       );
     }
 
-    const configs = await this.configGenerator.getBuildConfigs();
-    /**
-     * Checks if the result of the Vite build is a Rollup watcher.
-     * This should happen iff we're running `electron-forge start`.
-     */
-    const isRollupWatcher = (
-      x:
-        | vite.Rollup.RollupWatcher
-        | vite.Rollup.RollupOutput
-        | vite.Rollup.RollupOutput[],
-    ): x is vite.Rollup.RollupWatcher =>
-      x &&
-      typeof x === 'object' &&
-      'on' in x &&
-      typeof x.on === 'function' &&
-      'close' in x &&
-      typeof x.close === 'function';
-
-    /**
-     * Rollup's `input` can be a string, an array of strings, or an object.
-     * This function converts the input to a string for the Forge CLI to consume.
-     *
-     * @see https://rollupjs.org/configuration-options/#input
-     */
-    const parseInputOptionToString = (input: vite.Rollup.InputOption) => {
-      if (typeof input === 'string') {
-        return input;
-      } else if (Array.isArray(input)) {
-        return input.join(' ');
-      } else {
-        return Object.keys(input).join(' ');
-      }
-    };
-
     return task?.newListr(
-      configs.map((userConfig) => {
-        let target = '';
-        const input = userConfig.build?.rollupOptions?.input;
-        if (input) {
-          target = parseInputOptionToString(input);
-        } else if (
-          typeof userConfig.build?.lib !== 'boolean' &&
-          userConfig.build?.lib?.entry
-        ) {
-          target = parseInputOptionToString(userConfig.build.lib.entry);
-        }
-
-        return {
-          title: `Building ${chalk.green(target)} target`,
-          task: async (_ctx, subtask) => {
-            // We wrap this function in a Promise to ensure that the task is marked as completed
-            // only after all bundles are done generated. This is done in the `closeBundle` Rollup hook
-            // rather than when the `vite.build` promise resolves.
-            await new Promise<void>((resolve, reject) => {
-              vite
-                .build({
-                  // Avoid recursive builds caused by users configuring @electron-forge/plugin-vite in Vite config file.
-                  configFile: false,
-                  // We suppress Vite output and instead log lines using RollupWatcher events
-                  logLevel: 'silent',
-                  ...userConfig,
-                  plugins: [
-                    // This plugin controls the output of the first-time Vite build that happens.
-                    // `buildEnd` and `closeBundle` are Rollup output generation hooks.
-                    // See https://rollupjs.org/plugin-development/#output-generation-hooks
-                    {
-                      name: '@electron-forge/plugin-vite:build-done',
-                      buildEnd(err) {
-                        if (err instanceof Error) {
-                          d(
-                            'buildEnd rollup hook called with error so build failed',
-                          );
-                          reject(err);
-                        }
-                      },
-                      closeBundle() {
-                        d(
-                          'no error in buildEnd and reached closeBundle so build succeeded',
-                        );
-                        resolve();
-                      },
-                    },
-                    ...(userConfig.plugins ?? []),
-                  ],
-                  clearScreen: false,
-                })
-                .then((result) => {
-                  // When running `start` and enabling watch mode in Vite, the Rollup watcher
-                  // emits events for subsequent builds.
-                  if (isRollupWatcher(result)) {
-                    result.on('event', (event) => {
-                      if (
-                        event.code === 'ERROR' &&
-                        userConfig.logLevel !== 'silent'
-                      ) {
-                        console.error(
-                          `\n${chalk.dim(this.timeFormatter.format(new Date()))} ${event.error.message}`,
-                        );
-                      } else if (
-                        event.code === 'BUNDLE_END' &&
-                        (!userConfig.logLevel || userConfig.logLevel === 'info')
-                      ) {
-                        console.log(
-                          `${chalk.dim(this.timeFormatter.format(new Date()))} ${chalk.cyan.bold('[@electron-forge/plugin-vite]')} ${chalk.green(
-                            'target built',
-                          )} ${chalk.dim(target)}`,
-                        );
-                      }
-                    });
-                    this.watchers.push(result);
-                  } else {
-                    subtask.title = `Built target ${chalk.dim(target)}`;
-                  }
-                  return result;
-                })
-                .catch(reject);
-            });
-          },
-        };
-      }),
+      targets.map(({ spec, index }) => ({
+        title: `Building ${styleText('green', entryToDisplay(spec.entry))} target`,
+        task: async () => {
+          const { child, firstBuild } = spawnViteBuildWatch(
+            this.serializableConfig,
+            index,
+            this.projectDir,
+            viteDevServerUrls,
+            () => {
+              for (const server of this.servers) {
+                server.ws.send({ type: 'full-reload' });
+              }
+            },
+          );
+          this.watchChildren.push(child);
+          await firstBuild;
+        },
+      })),
       {
         concurrent: this.config.concurrent ?? true,
-        exitOnError: this.isProd,
+        exitOnError: false,
       },
     );
   };
@@ -444,7 +408,7 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
         .filter(({ spec }) => spec.config);
       return task?.newListr(
         targets.map(({ spec, index }) => ({
-          title: `Building ${chalk.green(spec.name)}`,
+          title: `Building ${styleText('green', spec.name)}`,
           task: async (_ctx, subtask) => {
             await spawnViteBuild(
               this.serializableConfig,
@@ -452,7 +416,7 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
               index,
               this.projectDir,
             );
-            subtask.title = `Built target ${chalk.dim(spec.name)}`;
+            subtask.title = `Built target ${styleText('dim', spec.name)}`;
           },
         })),
         {
@@ -471,7 +435,7 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
             logLevel: 'error',
             ...userConfig,
           });
-          subtask.title = `Built target ${chalk.dim(path.basename(userConfig.build?.outDir ?? ''))}`;
+          subtask.title = `Built target ${styleText('dim', path.basename(userConfig.build?.outDir ?? ''))}`;
         },
       })),
       {
@@ -484,7 +448,7 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
     const rendererConfigs = await this.configGenerator.getRendererConfig();
     return task?.newListr(
       rendererConfigs.map((userConfig) => ({
-        title: `Target ${chalk.cyan(path.basename(userConfig.build?.outDir ?? ''))}`,
+        title: `Target ${styleText('cyan', path.basename(userConfig.build?.outDir ?? ''))}`,
         task: async (_ctx, subtask) => {
           const viteDevServer = await vite.createServer({
             configFile: false,
@@ -524,11 +488,11 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
   ): void => {
     d('handling process exit with:', options);
     if (options.cleanup) {
-      for (const watcher of this.watchers) {
-        d('cleaning vite watcher');
-        watcher.close();
+      for (const child of this.watchChildren) {
+        d('killing vite watch subprocess');
+        child.kill();
       }
-      this.watchers = [];
+      this.watchChildren = [];
 
       for (const server of this.servers) {
         d('cleaning http server');
@@ -549,18 +513,24 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
 function getServerURLs(urls: vite.ResolvedServerUrls) {
   let output = '';
   const colorUrl = (url: string) =>
-    chalk.cyan(url.replace(/:(\d+)\//, (_, port) => `:${chalk.bold(port)}/`));
+    styleText(
+      'cyan',
+      url.replace(/:(\d+)\//, (_, port) => `:${styleText('bold', port)}/`),
+    );
   for (const url of urls.local) {
-    output += `  ${chalk.green('➜')}  ${chalk.bold('Local')}:   ${colorUrl(url)}`;
+    output += `  ${styleText('green', '➜')}  ${styleText('bold', 'Local')}:   ${colorUrl(url)}`;
   }
   for (const url of urls.network) {
-    output += `  \n${chalk.green('➜')}  ${chalk.bold('Network')}: ${colorUrl(url)}`;
+    output += `  \n${styleText('green', '➜')}  ${styleText('bold', 'Network')}: ${colorUrl(url)}`;
   }
   if (urls.network.length === 0) {
     output +=
-      chalk.dim(`  \n${chalk.green('➜')}  ${chalk.bold('Network')}: use `) +
-      chalk.bold('--host') +
-      chalk.dim(' to expose');
+      styleText(
+        'dim',
+        `  \n${styleText('green', '➜')}  ${styleText('bold', 'Network')}: use `,
+      ) +
+      styleText('bold', '--host') +
+      styleText('dim', ' to expose');
   }
 
   return output;

package/src/config/vite.base.config.ts

@@ -11,7 +11,7 @@ export const external = [
 
 // Used for hot reload after preload scripts.
 const viteDevServers: Record<string, ViteDevServer> = {};
-const viteDevServerUrls: Record<string, string> = {};
+export const viteDevServerUrls: Record<string, string> = {};
 
 export function getBuildConfig(env: ConfigEnv<'build'>): UserConfig {
   const { root, mode, command } = env;
@@ -24,7 +24,7 @@ export function getBuildConfig(env: ConfigEnv<'build'>): UserConfig {
       emptyOutDir: false,
       // 🚧 Multiple builds may conflict.
       outDir: '.vite/build',
-      watch: command === 'serve' ? {} : null,
+      watch: command === 'serve' ? { exclude: '**/.git/**' } : null,
       minify: command === 'build',
     },
     clearScreen: false,

package/src/config/vite.preload.config.ts

@@ -20,8 +20,8 @@ export function getConfig(
         input: forgeConfigSelf.entry,
         output: {
           format: 'cjs',
-          // It should not be split chunks.
-          inlineDynamicImports: true,
+          // Preload scripts require a single entrypoint.
+          codeSplitting: false,
           entryFileNames: '[name].js',
           chunkFileNames: '[name].js',
           assetFileNames: '[name].[ext]',