Merge 25b10f3c3dfbe6003de98b826253e230b03239e1 into 31965d29724313f84d505e5ba0e493279a895d7b

src/config.ts

@@ -96,6 +96,13 @@ export interface PreloadViteConfig extends BaseViteConfig<PreloadBuildOptions> {
 export interface RendererViteConfig extends BaseViteConfig<RendererBuildOptions> {}
 
 export interface UserConfig {
+  /**
+   * Custom Electron package name (e.g., '@overwolf/ow-electron').
+   * Can also be set via ELECTRON_PKG_NAME environment variable.
+   *
+   * @default 'electron'
+   */
+  electronPackage?: string
   /**
    * Vite config options for electron main process
    *
@@ -195,20 +202,14 @@ export async function resolveConfig(
       const { main, preload, renderer } = loadResult.config
 
       if (main) {
-        main.build ??= {}
-        setupRollupOptionCompat(main.build)
         userConfig.main = await new MainConfigFactory(main, config, { outDir, root }).build()
       }
 
       if (preload) {
-        preload.build ??= {}
-        setupRollupOptionCompat(preload.build)
         userConfig.preload = await new PreloadConfigFactory(preload, config, { outDir, root }).build()
       }
 
       if (renderer) {
-        renderer.build ??= {}
-        setupRollupOptionCompat(renderer.build)
         userConfig.renderer = await new RendererConfigFactory(renderer, config, { outDir, root }).build()
       }
 
@@ -217,6 +218,16 @@ export async function resolveConfig(
     }
   }
 
+  // Set ELECTRON_PKG_NAME from config or environment variable
+  // Priority: existing env var > config file > default to 'electron'
+  if (!process.env.ELECTRON_PKG_NAME) {
+    if (userConfig?.electronPackage) {
+      process.env.ELECTRON_PKG_NAME = userConfig.electronPackage
+    } else {
+      process.env.ELECTRON_PKG_NAME = 'electron'
+    }
+  }
+
   const resolved: ResolvedConfig = {
     config: userConfig,
     configFile: configFile ? normalizePath(configFile) : undefined,
@@ -226,20 +237,15 @@ export async function resolveConfig(
   return resolved
 }
 
-function setupRollupOptionCompat<T extends Pick<ViteBuildOptions, 'rollupOptions' | 'rolldownOptions'>>(
-  buildConfig: T
-): asserts buildConfig is T & {
-  rolldownOptions: Exclude<T['rolldownOptions'], undefined>
-} {
-  buildConfig.rolldownOptions ??= buildConfig.rollupOptions
-}
-
 export abstract class ConfigFactory<T extends MainViteConfig | PreloadViteConfig | RendererViteConfig> {
   constructor(
     protected readonly baseConfig: T,
     protected readonly inlineConfig: InlineConfig,
     protected readonly options: { outDir?: string; root?: string }
-  ) {}
+  ) {
+    baseConfig.build ??= {}
+    baseConfig.build.rolldownOptions ??= baseConfig.build.rollupOptions
+  }
 
   async build(cleanMode?: boolean): Promise<T> {
     /* eslint-disable-next-line @typescript-eslint/no-explicit-any */

src/electron.ts

@@ -6,6 +6,10 @@ import { loadPackageData } from './utils'
 
 const _require = createRequire(import.meta.url)
 
+const getElectronPackageName = (): string => {
+  return process.env.ELECTRON_PKG_NAME || 'electron'
+}
+
 const ensureElectronEntryFile = (root = process.cwd()): void => {
   if (process.env.ELECTRON_ENTRY) return
   const pkg = loadPackageData()
@@ -26,7 +30,8 @@ const ensureElectronEntryFile = (root = process.cwd()): void => {
 const getElectronMajorVer = (): string => {
   let majorVer = process.env.ELECTRON_MAJOR_VER || ''
   if (!majorVer) {
-    const pkg = _require.resolve('electron/package.json')
+    const electronPkgName = getElectronPackageName()
+    const pkg = _require.resolve(`${electronPkgName}/package.json`)
     if (fs.existsSync(pkg)) {
       const version = _require(pkg).version
       majorVer = version.split('.')[0]
@@ -49,7 +54,8 @@ export function supportImportMetaPaths(): boolean {
 export function getElectronPath(): string {
   let electronExecPath = process.env.ELECTRON_EXEC_PATH || ''
   if (!electronExecPath) {
-    const electronModulePath = path.dirname(_require.resolve('electron'))
+    const electronPkgName = getElectronPackageName()
+    const electronModulePath = path.dirname(_require.resolve(electronPkgName))
     const pathFile = path.join(electronModulePath, 'path.txt')
     let executablePath
     if (fs.existsSync(pathFile)) {
@@ -59,7 +65,7 @@ export function getElectronPath(): string {
       electronExecPath = path.join(electronModulePath, 'dist', executablePath)
       process.env.ELECTRON_EXEC_PATH = electronExecPath
     } else {
-      throw new Error('Electron uninstall')
+      throw new Error(`Electron package "${electronPkgName}" not found or uninstalled`)
     }
   }
   return electronExecPath

src/plugins/electron.ts

@@ -2,7 +2,7 @@ import path from 'node:path'
 import fs from 'node:fs'
 import { builtinModules } from 'node:module'
 import colors from 'picocolors'
-import { type Plugin, type LibraryOptions, type Rolldown, mergeConfig, normalizePath } from 'vite'
+import { type Plugin, type LibraryOptions, type Rolldown, type UserConfig, mergeConfig, normalizePath } from 'vite'
 import { getElectronNodeTarget, getElectronChromeTarget, supportESM } from '../electron'
 import { loadPackageData } from '../utils'
 
@@ -64,11 +64,6 @@ export function electronMainConfigPresetPlugin(options?: ElectronPluginOptions):
       const format = pkg.type && pkg.type === 'module' && supportESM() ? 'es' : 'cjs'
 
       const defaultConfig = {
-        resolve: {
-          browserField: false,
-          mainFields: ['module', 'jsnext:main', 'jsnext'],
-          conditions: ['node']
-        },
         build: {
           outDir: path.resolve(root, 'out', 'main'),
           target: nodeTarget,
@@ -80,7 +75,7 @@ export function electronMainConfigPresetPlugin(options?: ElectronPluginOptions):
           reportCompressedSize: false,
           minify: false
         }
-      }
+      } satisfies UserConfig
 
       const build = config.build || {}
       const rolldownOptions = build.rolldownOptions || {}
@@ -106,8 +101,6 @@ export function electronMainConfigPresetPlugin(options?: ElectronPluginOptions):
       const buildConfig = mergeConfig(defaultConfig.build, build)
       config.build = buildConfig
 
-      config.resolve = mergeConfig(defaultConfig.resolve, config.resolve || {})
-
       config.define = config.define || {}
       config.define = { ...processEnvDefine(), ...config.define }
 
@@ -213,7 +206,7 @@ export function electronPreloadConfigPresetPlugin(options?: ElectronPluginOption
           reportCompressedSize: false,
           minify: false
         }
-      }
+      } satisfies UserConfig
 
       const build = config.build || {}
       const rolldownOptions = build.rolldownOptions || {}
@@ -372,7 +365,7 @@ export function electronRendererConfigPresetPlugin(options?: ElectronPluginOptio
           minify: false,
           emptyOutDir: emptyOutDir()
         }
-      }
+      } satisfies UserConfig
 
       if (config.build?.outDir) {
         config.build.outDir = path.resolve(root, config.build.outDir)