electron-incremental-update 3.0.0-beta.3 → 3.0.0-beta.4

package/dist/{electron-OKQIYbcw.mjs → electron-BJCk7uxG.mjs}

@@ -171,7 +171,7 @@ function handleUnexpectedErrors(callback) {
 	process.on("unhandledRejection", callback);
 }
 /**
-* @deprecated No longer needed. It is embeded in `startupWithUpdater()
+* @deprecated No longer needed. It is embeded in `startupWithUpdater()`
 */
 function reloadOnPreloadScriptChanged() {
 	console.warn("`reloadOnPreloadScriptChange()` is no longer needed. It is embeded in `startupWithUpdater()`");

package/dist/{electron-DH-Uyikp.cjs → electron-C-qmVhAt.cjs}

@@ -174,7 +174,7 @@ function handleUnexpectedErrors(callback) {
 	process.on("unhandledRejection", callback);
 }
 /**
-* @deprecated No longer needed. It is embeded in `startupWithUpdater()
+* @deprecated No longer needed. It is embeded in `startupWithUpdater()`
 */
 function reloadOnPreloadScriptChanged() {
 	console.warn("`reloadOnPreloadScriptChange()` is no longer needed. It is embeded in `startupWithUpdater()`");

package/dist/index.cjs

@@ -1,5 +1,5 @@
 const require_version = require('./version-aPrLuz_-.cjs');
-const require_electron = require('./electron-DH-Uyikp.cjs');
+const require_electron = require('./electron-C-qmVhAt.cjs');
 let electron = require("electron");
 let node_fs = require("node:fs");
 node_fs = require_version.__toESM(node_fs);

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as getPathFromAppNameAsar, f as isDev, i as getEntryVersion, r as getAppVersion, y as restartApp } from "./electron-OKQIYbcw.mjs";
+import { a as getPathFromAppNameAsar, f as isDev, i as getEntryVersion, r as getAppVersion, y as restartApp } from "./electron-BJCk7uxG.mjs";
 import { r as isUpdateJSON } from "./version--eVB2A7n.mjs";
 import { BrowserWindow, app } from "electron";
 import fs from "node:fs";

package/dist/utils.cjs

@@ -1,5 +1,5 @@
 const require_version = require('./version-aPrLuz_-.cjs');
-const require_electron = require('./electron-DH-Uyikp.cjs');
+const require_electron = require('./electron-C-qmVhAt.cjs');
 const require_zip = require('./zip-BCC7FAQ_.cjs');
 
 exports.aesDecrypt = require_zip.aesDecrypt;

package/dist/utils.d.cts

@@ -145,7 +145,7 @@ declare function getPathFromEntryAsar(...paths: string[]): string;
 */
 declare function handleUnexpectedErrors(callback: (err: unknown) => void): void;
 /**
-* @deprecated No longer needed. It is embeded in `startupWithUpdater()
+* @deprecated No longer needed. It is embeded in `startupWithUpdater()`
 */
 declare function reloadOnPreloadScriptChanged(): void;
 //#endregion

package/dist/utils.d.mts

@@ -145,7 +145,7 @@ declare function getPathFromEntryAsar(...paths: string[]): string;
 */
 declare function handleUnexpectedErrors(callback: (err: unknown) => void): void;
 /**
-* @deprecated No longer needed. It is embeded in `startupWithUpdater()
+* @deprecated No longer needed. It is embeded in `startupWithUpdater()`
 */
 declare function reloadOnPreloadScriptChanged(): void;
 //#endregion

package/dist/utils.mjs

@@ -1,4 +1,4 @@
-import { C as singleInstance, S as setPortableDataPath, _ as reloadOnPreloadScriptChanged, a as getPathFromAppNameAsar, b as setAppUserModelId, c as getPathFromPreload, d as importNative, f as isDev, g as loadPage, h as isWin, i as getEntryVersion, l as getPathFromPublic, m as isMac, n as disableHWAccForWin7, o as getPathFromEntryAsar, p as isLinux, r as getAppVersion, s as getPathFromMain, t as beautifyDevTools, u as handleUnexpectedErrors, v as requireNative, x as setPortableAppDataPath, y as restartApp } from "./electron-OKQIYbcw.mjs";
+import { C as singleInstance, S as setPortableDataPath, _ as reloadOnPreloadScriptChanged, a as getPathFromAppNameAsar, b as setAppUserModelId, c as getPathFromPreload, d as importNative, f as isDev, g as loadPage, h as isWin, i as getEntryVersion, l as getPathFromPublic, m as isMac, n as disableHWAccForWin7, o as getPathFromEntryAsar, p as isLinux, r as getAppVersion, s as getPathFromMain, t as beautifyDevTools, u as handleUnexpectedErrors, v as requireNative, x as setPortableAppDataPath, y as restartApp } from "./electron-BJCk7uxG.mjs";
 import { i as parseVersion, n as defaultVersionJsonGenerator, r as isUpdateJSON, t as defaultIsLowerVersion } from "./version--eVB2A7n.mjs";
 import { a as defaultDownloadUpdateJSON, c as resolveJson, d as defaultSignature, f as defaultVerifySignature, i as defaultDownloadText, l as aesDecrypt, n as defaultZipFile, o as downloadUtil, p as hashBuffer, r as defaultDownloadAsar, s as getHeader, t as defaultUnzipFile, u as aesEncrypt } from "./zip-Dwm7s1C9.mjs";
 

package/dist/vite.d.mts

@@ -34,9 +34,9 @@ interface ElectronOptions {
     /**
     * Electron App startup function.
     * It will mount the Electron App child-process to `process.electronApp`.
-    * @param argv default value `['.', '--no-sandbox']`
-    * @param options options for `child_process.spawn`
-    * @param customElectronPkg custom electron package name (default: 'electron')
+    * - argv: electron startup arguments (default `['.', '--no-sandbox']`)
+    * - options: options for `child_process.spawn`
+    * - customElectronPkg: custom electron package name (default: `'electron'`)
     */
     startup: (argv?: string[], options?: SpawnOptions, customElectronPkg?: string) => Promise<void>; /** Reload Electron-Renderer */
     reload: () => void;
@@ -141,8 +141,14 @@ interface ElectronWithUpdaterOptions {
   */
   isBuild: boolean;
   /**
+  * Project root directory. Can be an absolute path, or a path relative from
+  * the location of the config file itself.
+  * @default process.cwd()
+  */
+  root?: string;
+  /**
   * Whether to generate sourcemap
-  * @default !isBuild
+  * @default !isBuild || !!process.env.VSCODE_DEBUG
   */
   sourcemap?: boolean;
   /**
@@ -169,13 +175,12 @@ interface ElectronWithUpdaterOptions {
   */
   buildVersionJson?: boolean;
   /**
-  * `external` option in `build.rolldownOptions`,
-  * default is node built-in modules or native modules.
+  * Addtional `external` option in `build.rolldownOptions`,
   *
-  * If is in dev and `entry.postBuild` is not setup, will also
-  * external `dependencies` in `package.json`
+  * If is in dev and `entry.postBuild` is not setup,
+  * external `dependencies` in `package.json` by default
   */
-  external?: NonNullable<NonNullable<InlineConfig["build"]>["rolldownOptions"]>["external"];
+  external?: (string | RegExp)[];
   /**
   * Options for entry (app.asar)
   *
@@ -483,7 +488,7 @@ interface ElectronViteHelperOptions extends MakeOptional<ElectronWithUpdaterOpti
   /**
   * Config for renderer process
   */
-  renderer?: UserConfig;
+  renderer?: Omit<UserConfig, "root">;
 }
 /**
 * Vite config helper

package/dist/vite.mjs

@@ -404,49 +404,6 @@ function resolveViteConfig(isESM, options) {
 		define: { "process.env": "process.env" }
 	}, options?.vite || {});
 }
-/** @see https://github.com/vitejs/vite/blob/v5.4.9/packages/vite/src/node/build.ts#L489-L504 */
-function resolveInput(config) {
-	const options = config.build;
-	const { root } = config;
-	const libOptions = options.lib;
-	const resolve = (p) => path.resolve(root, p);
-	const input = libOptions ? options.rolldownOptions?.input || (typeof libOptions.entry === "string" ? resolve(libOptions.entry) : Array.isArray(libOptions.entry) ? libOptions.entry.map(resolve) : Object.fromEntries(Object.entries(libOptions.entry).map(([alias, file]) => [alias, resolve(file)]))) : options.rolldownOptions?.input;
-	if (input) return input;
-	const indexHtml = resolve("index.html");
-	return fs.existsSync(indexHtml) ? indexHtml : void 0;
-}
-/**
-* When run the `vite build` command, there must be an entry file.
-* If the user does not need Renderer, we need to create a temporary entry file to avoid Vite throw error.
-* @see https://github.com/vitejs/vite/blob/v5.4.9/packages/vite/src/node/config.ts#L1234-L1236
-*/
-async function mockIndexHtml(config) {
-	const { root, build } = config;
-	const output = path.resolve(root, build.outDir);
-	const content = `
-<!doctype html>
-<html lang="en">
-  <head>
-    <title>vite-plugin-electron</title>
-  </head>
-  <body>
-    <div>An entry file for electron renderer process.</div>
-  </body>
-</html>
-`.trim();
-	const index = "index.html";
-	const filepath = path.join(root, index);
-	const distpath = path.join(output, index);
-	await fs.promises.writeFile(filepath, content);
-	return {
-		async remove() {
-			await fs.promises.unlink(filepath);
-			await fs.promises.unlink(distpath);
-		},
-		filepath,
-		distpath
-	};
-}
 /**
 * Inspired `tree-kill`, implemented based on sync-api. #168
 * @see https://github.com/pkrumins/node-tree-kill/blob/v1.2.2/index.js
@@ -481,26 +438,32 @@ function killTree(tree) {
 function build$1(isESM, options) {
 	return build(resolveViteConfig(isESM, options));
 }
-function electron(isESM, options) {
+function electron(isESM, root, options) {
 	const optionsArray = Array.isArray(options) ? options : [options];
 	let userConfig;
 	let configEnv;
-	let mockdInput;
 	if (!version.startsWith("8.")) throw new Error(`[vite-plugin-electron] Vite v${version} does not support \`rolldownOptions\`, please install \`vite@>=8\` or use an earlier version of \`vite-plugin-electron\`.`);
+	async function parallelBuild(options) {
+		await Promise.all(options.map(build$1.bind(build$1, isESM)));
+	}
 	return [{
 		name: "vite-plugin-electron:dev",
 		apply: "serve",
+		configResolved(config) {
+			if (config.root !== root) throw new Error(`Renderer's root (${config.root}) is not same as electron's root (${root}). Please setup \`root\` in electron plugin`);
+		},
 		configureServer(server) {
 			server.httpServer?.once("listening", () => {
 				Object.assign(process.env, { VITE_DEV_SERVER_URL: server.resolvedUrls?.local[0] });
 				const entryCount = optionsArray.length;
 				let closeBundleCount = 0;
-				for (const options of optionsArray) {
+				parallelBuild(optionsArray.map((options) => {
 					options.vite ??= {};
 					options.vite.mode ??= server.config.mode;
 					options.vite.root ??= server.config.root;
 					options.vite.envDir ??= server.config.envDir;
 					options.vite.envPrefix ??= server.config.envPrefix;
+					const defaultArgs = [options.vite.root || ".", "--no-sandbox"];
 					options.vite.build ??= {};
 					if (!Object.keys(options.vite.build).includes("watch")) options.vite.build.watch = {};
 					options.vite.build.minify ??= false;
@@ -510,19 +473,21 @@ function electron(isESM, options) {
 						closeBundle() {
 							if (++closeBundleCount < entryCount) return;
 							if (options.onstart) options.onstart.call(this, {
-								startup,
+								async startup(args = defaultArgs, ...opt) {
+									await startup(args, ...opt);
+								},
 								reload() {
 									if (process.electronApp) {
 										(server.hot || server.ws).send({ type: "full-reload" });
 										startup.send("electron-vite&type=hot-reload");
-									} else startup();
+									} else startup(defaultArgs);
 								}
 							});
-							else startup();
+							else startup(defaultArgs);
 						}
 					});
-					build$1(isESM, options);
-				}
+					return options;
+				}));
 			});
 		}
 	}, {
@@ -533,19 +498,15 @@ function electron(isESM, options) {
 			configEnv = env;
 			config.base ??= "./";
 		},
-		async configResolved(config) {
-			if (resolveInput(config) == null) mockdInput = await mockIndexHtml(config);
-		},
 		async closeBundle() {
-			mockdInput?.remove();
-			for (const options of optionsArray) {
+			await parallelBuild(optionsArray.map((options) => {
 				options.vite ??= {};
 				options.vite.mode ??= configEnv.mode;
 				options.vite.root ??= userConfig.root;
 				options.vite.envDir ??= userConfig.envDir;
 				options.vite.envPrefix ??= userConfig.envPrefix;
-				await build$1(isESM, options);
-			}
+				return options;
+			}));
 		}
 	}];
 }
@@ -721,7 +682,7 @@ function parseSubjects(subject) {
 
 //#endregion
 //#region src/vite/option.ts
-async function parseOptions(pkg, options = {}) {
+async function parseUpdaterOption(pkg, options = {}) {
 	const { minimumVersion = "0.0.0", paths: { asarOutputPath = `release/${pkg.name}.asar`, gzipPath = `release/${pkg.name}-${pkg.version}.asar.gz`, entryOutDir = "dist-entry", electronDistPath = "dist-electron", rendererDistPath = "dist", versionPath = "version.json" } = {}, keys: { privateKeyPath = "keys/private.pem", certPath = "keys/cert.pem", keyLength = 2048, certInfo: { subject = {
 		commonName: pkg.name,
 		organizationName: `org.${pkg.name}`
@@ -850,6 +811,13 @@ function parseVersionPath(versionPath) {
 	if (!versionPath.startsWith("./")) versionPath = `./${versionPath}`;
 	return new URL(versionPath, "file://").pathname.slice(1);
 }
+const defaultExternal = [
+	...builtinModules,
+	"electron",
+	/^node:/,
+	/.*\.(node|dll|dylib|so)$/,
+	"original-fs"
+];
 /**
 * Base on `./electron/simple`
 * - integrate with updater
@@ -897,33 +865,22 @@ function parseVersionPath(versionPath) {
 * ```
 */
 async function electronWithUpdater(options) {
-	let { isBuild, entry: _entry, main: _main, preload: _preload, sourcemap = !isBuild, minify = isBuild, buildVersionJson, updater, bytecode, useNotBundle = true } = options;
-	const pkg = await loadPackageJSON();
+	let { isBuild, root = process.cwd(), external, entry: _entry, main: _main, preload: _preload, sourcemap = !isBuild || !!process.env.VSCODE_DEBUG, minify = isBuild, buildVersionJson, updater, bytecode, useNotBundle = true } = options;
+	const pkg = await loadPackageJSON(root);
 	if (!pkg || !pkg.version || !pkg.name || !pkg.main) throw new Error("package.json not found or invalid, must contains version, name and main field");
-	log.info(`Clear cache files`, { timestamp: true });
 	const isESM = pkg.type === "module";
-	const external = [
-		...builtinModules,
-		"electron",
-		/^node:/,
-		/.*\.(node|dll|dylib|so)$/,
-		"original-fs",
-		...isBuild || _entry.postBuild ? [] : Object.keys(pkg.dependencies || {})
-	];
+	const finalExternal = [...defaultExternal, ...isBuild || _entry.postBuild ? [] : external || Object.keys(pkg.dependencies || {})];
 	let bytecodeOptions = typeof bytecode === "object" ? bytecode : bytecode === true ? { enable: true } : void 0;
 	if (isESM && bytecodeOptions?.enable) throw new Error("`bytecodePlugin` does not support ES module, please remove \"type\": \"module\" in package.json");
-	const { buildAsarOption, buildVersionOption, cert, entryOutDir } = await parseOptions(pkg, updater);
-	sourcemap ??= isBuild || !!process.env.VSCODE_DEBUG;
-	try {
-		fs.rmSync(buildAsarOption.electronDistPath, {
-			recursive: true,
-			force: true
-		});
-		fs.rmSync(entryOutDir, {
-			recursive: true,
-			force: true
-		});
-	} catch {}
+	const { buildAsarOption, buildVersionOption, cert, entryOutDir } = await parseUpdaterOption(pkg, updater);
+	log.info(`Clear cache files`, { timestamp: true });
+	await Promise.all([fs.promises.rm(buildAsarOption.electronDistPath, {
+		recursive: true,
+		force: true
+	}), fs.promises.rm(entryOutDir, {
+		recursive: true,
+		force: true
+	})]).catch(() => {});
 	const define = {
 		__EIU_ASAR_BASE_NAME__: JSON.stringify(path.basename(buildAsarOption.asarOutputPath)),
 		__EIU_ELECTRON_DIST_PATH__: JSON.stringify(normalizePath(buildAsarOption.electronDistPath)),
@@ -936,10 +893,7 @@ async function electronWithUpdater(options) {
 	};
 	const _electronOptions = [{
 		entry: _main.files,
-		onstart: async (args) => {
-			if (_main.onstart) await _main.onstart(args);
-			else await args.startup();
-		},
+		onstart: _main.onstart,
 		vite: mergeConfig({
 			plugins: [!isBuild && useNotBundle && notBundle(), bytecodeOptions && bytecodePlugin("main", bytecodeOptions)],
 			build: {
@@ -947,12 +901,9 @@ async function electronWithUpdater(options) {
 				minify,
 				outDir: `${buildAsarOption.electronDistPath}/main`,
 				rolldownOptions: {
-					external,
+					external: finalExternal,
 					platform: "node",
-					output: {
-						cleanDir: true,
-						polyfillRequire: false
-					}
+					output: { polyfillRequire: false }
 				}
 			},
 			define
@@ -969,7 +920,7 @@ async function electronWithUpdater(options) {
 				minify,
 				outDir: `${buildAsarOption.electronDistPath}/preload`,
 				rolldownOptions: {
-					external,
+					external: finalExternal,
 					input: _preload.files,
 					output: {
 						format: "cjs",
@@ -987,50 +938,54 @@ async function electronWithUpdater(options) {
 	_electronOptions.push({
 		entry: _entry.files,
 		vite: mergeConfig({
-			plugins: [bytecodeOptions && bytecodePlugin("main", bytecodeOptions), {
-				name: `${id}:entry`,
-				enforce: "post",
-				async closeBundle() {
-					log.info(`Build entry to '${entryOutDir}'`, { timestamp: true });
-					await _entry.postBuild?.({
-						isBuild,
-						getPathFromEntryOutputDir(...paths) {
-							return path.join(entryOutDir, ...paths);
-						},
-						copyToEntryOutputDir({ from, to = path.basename(from), skipIfExist = true }) {
-							if (!fs.existsSync(from)) {
-								log.warn(`${from} not found`, { timestamp: true });
-								return;
-							}
-							copyAndSkipIfExist(from, path.join(entryOutDir, to), skipIfExist);
-						},
-						copyModules({ modules, skipIfExist = true }) {
-							const nodeModulesPath = path.join(entryOutDir, "node_modules");
-							for (const m of modules) {
-								const { rootPath } = getPackageInfoSync(m) || {};
-								if (!rootPath) {
-									log.warn(`Package '${m}' not found`, { timestamp: true });
-									continue;
+			plugins: [
+				bytecodeOptions && bytecodePlugin("main", bytecodeOptions),
+				!isBuild && useNotBundle && notBundle(),
+				{
+					name: `${id}:entry`,
+					enforce: "post",
+					async closeBundle() {
+						log.info(`Build entry to '${entryOutDir}'`, { timestamp: true });
+						await _entry.postBuild?.({
+							isBuild,
+							getPathFromEntryOutputDir(...paths) {
+								return path.join(entryOutDir, ...paths);
+							},
+							copyToEntryOutputDir({ from, to = path.basename(from), skipIfExist = true }) {
+								if (!fs.existsSync(from)) {
+									log.warn(`${from} not found`, { timestamp: true });
+									return;
+								}
+								copyAndSkipIfExist(from, path.join(entryOutDir, to), skipIfExist);
+							},
+							copyModules({ modules, skipIfExist = true }) {
+								const nodeModulesPath = path.join(entryOutDir, "node_modules");
+								for (const m of modules) {
+									const { rootPath } = getPackageInfoSync(m) || {};
+									if (!rootPath) {
+										log.warn(`Package '${m}' not found`, { timestamp: true });
+										continue;
+									}
+									copyAndSkipIfExist(rootPath, path.join(nodeModulesPath, m), skipIfExist);
 								}
-								copyAndSkipIfExist(rootPath, path.join(nodeModulesPath, m), skipIfExist);
 							}
+						});
+						if (isBuild) try {
+							const buffer = await buildAsar(buildAsarOption);
+							if (!buildVersionJson && !isCI) log.warn("No `buildVersionJson` option setup, skip build version json. Only build in CI by default", { timestamp: true });
+							else await buildUpdateJson(buildVersionOption, buffer);
+						} catch (error) {
+							console.error(error);
 						}
-					});
-					if (isBuild) try {
-						const buffer = await buildAsar(buildAsarOption);
-						if (!buildVersionJson && !isCI) log.warn("No `buildVersionJson` option setup, skip build version json. Only build in CI by default", { timestamp: true });
-						else await buildUpdateJson(buildVersionOption, buffer);
-					} catch (error) {
-						console.error(error);
 					}
 				}
-			}],
+			],
 			build: {
 				sourcemap,
 				minify,
 				outDir: entryOutDir,
 				rolldownOptions: {
-					external,
+					external: finalExternal,
 					platform: "node",
 					output: { polyfillRequire: false }
 				}
@@ -1038,7 +993,7 @@ async function electronWithUpdater(options) {
 			define
 		}, _entry.vite || {})
 	});
-	return electron(isESM, _electronOptions);
+	return electron(isESM, normalizePath(path.resolve(root)), _electronOptions);
 }
 
 //#endregion
@@ -1081,6 +1036,7 @@ function defineElectronConfig(options) {
 		const result = options.renderer ?? {};
 		result.plugins ??= [];
 		result.plugins.push(electronPlugin);
+		result.root = options.root;
 		const rendererDistPath = options.updater?.paths?.rendererDistPath;
 		if (rendererDistPath) {
 			result.build ??= {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-incremental-update",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
   "description": "Electron incremental update tools with Vite plugin, support bytecode protection",
   "keywords": [
     "bytecode",
@@ -60,7 +60,7 @@
   "scripts": {
     "dev": "tsdown --watch",
     "build": "tsdown",
-    "play": "cd ./playground && vite",
+    "play": "vite",
     "release": "bun run format && bun run lint && bun run test && bun run build && bumpp --all",
     "test": "bun test",
     "test:dev": "bun test --watch",