refactor(multi-env): remove createBuilder from build mode, require createBuilder+buildApp in tests

Agent-Logs-Url: https://github.com/electron-vite/vite-plugin-electron/sessions/df671b54-d1ab-4460-9d3a-dc7a9a3fcf49

Co-authored-by: subframe7536 <78338239+subframe7536@users.noreply.github.com>

Author: Copilot

src/multi-env.ts

@@ -116,11 +116,6 @@ export default function electron(
       }),
     )
 
-  // Set to true when buildApp takes ownership of the electron builds so that
-  // the closeBundle-based fallback (used by the programmatic build() API) skips
-  // them and avoids a double-build.
-  let electronBuiltViaApp = false
-
   // Build each electron environment from the given builder in declaration order.
   const buildElectronEnvironments = async (builder: ViteBuilder): Promise<void> => {
     for (const name of envNames) {
@@ -153,10 +148,6 @@ export default function electron(
         const prevBuildApp = config.builder?.buildApp
         config.builder ??= {}
         config.builder.buildApp = async (builder) => {
-          // Claim ownership of the electron builds up-front so that the
-          // closeBundle-based fallback (below) does not run them a second time.
-          electronBuiltViaApp = true
-
           if (prevBuildApp) {
             // Delegate all builds (renderer + any user-defined environments) to
             // the existing handler, then append the electron builds. The user's
@@ -225,27 +216,8 @@ export default function electron(
 
         await buildElectronEnvironments(builder)
       },
-      // Fallback for Vite's programmatic build() API, which skips buildApp and
-      // only builds the first (client) environment via closeBundle. When the
-      // CLI-driven buildApp path already ran, this is a no-op.
-      async build(userConfig, configEnv) {
-        if (electronBuiltViaApp || optionsArray.length === 0) {
-          return
-        }
-
-        const envsCfg = withExternalBuiltins({ environments: createEnvironments() })
-        const builder = await createBuilder({
-          configFile: false,
-          publicDir: false,
-          mode: configEnv.mode,
-          root: userConfig.root,
-          envDir: userConfig.envDir,
-          envPrefix: userConfig.envPrefix,
-          environments: envsCfg.environments,
-        })
-
-        await buildElectronEnvironments(builder)
-      },
+      // Build is fully handled by the config() hook and builder.buildApp above.
+      async build() {},
     }),
   ]
 }

test/multi-env.test.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
-import { build } from 'vite'
+import { createBuilder } from 'vite'
 import type { Plugin } from 'vite'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
@@ -147,7 +147,7 @@ describe('src/multi-env', () => {
 
     expect(fs.existsSync(mockHtmlPath)).toBe(false)
 
-    await build({
+    const builder = await createBuilder({
       configFile: false,
       root: mockHtmlRoot,
       build: {
@@ -158,6 +158,7 @@ describe('src/multi-env', () => {
       plugins: electron([]),
       logLevel: 'silent',
     })
+    await builder.buildApp()
 
     expect(fs.existsSync(mockHtmlPath)).toBe(false)
     expect(fs.existsSync(mockHtmlDistPath)).toBe(false)
@@ -202,7 +203,7 @@ describe('src/multi-env', () => {
 
     await resetDirs(appOutDir, electronOutDir)
 
-    await build({
+    const builder = await createBuilder({
       configFile: false,
       root,
       build: {
@@ -227,6 +228,7 @@ describe('src/multi-env', () => {
       ],
       logLevel: 'silent',
     })
+    await builder.buildApp()
 
     expect(fs.existsSync(path.join(appOutDir, 'index.html'))).toBe(true)
     expect(fs.existsSync(path.join(electronOutDir, 'main.js'))).toBe(true)
@@ -247,7 +249,7 @@ describe('src/multi-env', () => {
 
     await resetDirs(appOutDir, electronOutDir)
 
-    await build({
+    const builder = await createBuilder({
       configFile: false,
       root,
       build: {
@@ -273,6 +275,7 @@ describe('src/multi-env', () => {
       ]),
       logLevel: 'silent',
     })
+    await builder.buildApp()
 
     const mainCode = fs
       .readFileSync(path.join(electronOutDir, 'env-status.js'), 'utf-8')
@@ -289,7 +292,7 @@ describe('src/multi-env', () => {
 
     await resetDirs(appOutDir, electronOutDir)
 
-    await build({
+    const builder = await createBuilder({
       configFile: false,
       root,
       build: {
@@ -319,6 +322,7 @@ describe('src/multi-env', () => {
       ]),
       logLevel: 'silent',
     })
+    await builder.buildApp()
 
     const mainCode = fs
       .readFileSync(path.join(electronOutDir, 'env-main.js'), 'utf-8')
@@ -336,7 +340,7 @@ describe('src/multi-env', () => {
 
     await resetDirs(appOutDir, mainOutDir, preloadOutDir)
 
-    await build({
+    const builder = await createBuilder({
       configFile: false,
       root,
       build: {
@@ -377,6 +381,7 @@ describe('src/multi-env', () => {
       ]),
       logLevel: 'silent',
     })
+    await builder.buildApp()
 
     const mainCode = fs
       .readFileSync(path.join(mainOutDir, 'env-main.js'), 'utf-8')
@@ -416,7 +421,7 @@ describe('src/multi-env', () => {
 
     await resetDirs(appOutDir, mainOutDir, preloadOutDir)
 
-    await build({
+    const builder = await createBuilder({
       configFile: false,
       root,
       build: {
@@ -450,6 +455,7 @@ describe('src/multi-env', () => {
       ]),
       logLevel: 'silent',
     })
+    await builder.buildApp()
 
     const mainCode = fs
       .readFileSync(path.join(mainOutDir, 'env-main.js'), 'utf-8')
@@ -476,7 +482,7 @@ describe('src/multi-env', () => {
 
     await resetDirs(appOutDir, mainOutDir, preloadOutDir, logsDir)
 
-    await build({
+    const builder = await createBuilder({
       configFile: false,
       root,
       build: {
@@ -510,6 +516,7 @@ describe('src/multi-env', () => {
       ]),
       logLevel: 'silent',
     })
+    await builder.buildApp()
 
     const mainCode = fs
       .readFileSync(path.join(mainOutDir, 'env-main.js'), 'utf-8')
@@ -555,7 +562,7 @@ describe('src/multi-env', () => {
 
     await resetDirs(appOutDir, electronOutDir)
 
-    await build({
+    const builder = await createBuilder({
       configFile: false,
       root,
       build: {
@@ -609,6 +616,7 @@ describe('src/multi-env', () => {
       ]),
       logLevel: 'silent',
     })
+    await builder.buildApp()
 
     const mainCode = fs
       .readFileSync(path.join(electronOutDir, 'env-main.js'), 'utf-8')