@cordy/electro-cli 1.2.13 → 1.2.16

package/dist/index.mjs

@@ -491,7 +491,7 @@ const cac = (name = "") => new CAC(name);
 
 //#endregion
 //#region package.json
-var version$1 = "1.2.13";
+var version$1 = "1.2.16";
 
 //#endregion
 //#region src/dev/logger.ts
@@ -3039,7 +3039,7 @@ async function buildMain(args) {
 		id: v.name,
 		hasRenderer: !!v.entry,
 		features: v.features ?? [],
-		webPreferences: v.webPreferences ?? {}
+		webPreferences: sanitizeRuntimeWebPreferences$1(v.webPreferences)
 	}));
 	await build(createNodeConfig({
 		scope: "main",
@@ -3116,6 +3116,11 @@ async function buildPreload(args) {
 	};
 	await build(baseConfig);
 }
+function sanitizeRuntimeWebPreferences$1(webPreferences) {
+	const prefs = { ...webPreferences ?? {} };
+	delete prefs.preload;
+	return prefs;
+}
 /**
 * Flatten renderer HTML output from source-relative paths
 * (e.g., `src/windows/main/index.html`) to `{name}/index.html`.
@@ -3174,6 +3179,8 @@ var DevServer = class {
 	nodeFormat = "es";
 	mainInitialBuildPromise = null;
 	resolveMainInitialBuild = null;
+	preloadInitialBuildPromise = null;
+	resolvePreloadInitialBuild = null;
 	logLevel;
 	clearScreen;
 	rendererOnly;
@@ -3265,6 +3272,7 @@ var DevServer = class {
 		}
 		const electronTimer = startTimer();
 		try {
+			await this.waitForPreloadInitialBuild();
 			await this.waitForMainInitialBuild();
 			await this.attachElectronProcess();
 			step("electron", electronTimer());
@@ -3296,6 +3304,8 @@ var DevServer = class {
 		this.preloadWatch = null;
 		this.resolveMainInitialBuild = null;
 		this.mainInitialBuildPromise = null;
+		this.resolvePreloadInitialBuild = null;
+		this.preloadInitialBuildPromise = null;
 		if (this.mainRestartFlushTimer) {
 			clearTimeout(this.mainRestartFlushTimer);
 			this.mainRestartFlushTimer = null;
@@ -3362,6 +3372,12 @@ var DevServer = class {
 	async buildPreload(externals, cjsInteropDeps) {
 		const views = (this.config.views ?? []).filter((v) => v.entry);
 		const preloadOutDir = resolve(this.outputDir, "preload");
+		this.preloadInitialBuildPromise = new Promise((resolve) => {
+			this.resolvePreloadInitialBuild = () => {
+				resolve();
+				this.resolvePreloadInitialBuild = null;
+			};
+		});
 		const input = {};
 		for (const view of views) input[view.name] = resolve(this.outputDir, `generated/preload/${view.name}.gen.ts`);
 		const firstEntry = Object.values(input)[0];
@@ -3419,6 +3435,7 @@ var DevServer = class {
 			closeBundle() {
 				if (firstBuild) {
 					firstBuild = false;
+					self.resolvePreloadInitialBuild?.();
 					return;
 				}
 				if (self.rendererServer) self.rendererServer.ws.send({ type: "full-reload" });
@@ -3439,7 +3456,7 @@ var DevServer = class {
 			id: v.name,
 			hasRenderer: !!v.entry,
 			features: v.features ?? [],
-			webPreferences: v.webPreferences ?? {}
+			webPreferences: sanitizeRuntimeWebPreferences(v.webPreferences)
 		}));
 		const mainConfig = createNodeConfig({
 			scope: "main",
@@ -3503,6 +3520,19 @@ var DevServer = class {
 		this.mainInitialBuildPromise = null;
 		await Promise.race([promise, timeout]);
 	}
+	/**
+	* Wait until the initial preload watch build has completed.
+	* Prevents launching Electron before `window.electro` bridge is injected.
+	*/
+	async waitForPreloadInitialBuild() {
+		if (!this.preloadInitialBuildPromise) return;
+		const timeout = setTimeout$1(MAIN_ENTRY_WAIT_TIMEOUT_MS).then(() => {
+			throw new Error(`Preload initial build did not finish in ${MAIN_ENTRY_WAIT_TIMEOUT_MS}ms.`);
+		});
+		const promise = this.preloadInitialBuildPromise;
+		this.preloadInitialBuildPromise = null;
+		await Promise.race([promise, timeout]);
+	}
 	async attachElectronProcess() {
 		const mainEntry = await this.waitForMainEntry();
 		const env = { ELECTRO_DEV: "true" };
@@ -3628,6 +3658,11 @@ async function writeFileIfChanged$1(filePath, content) {
 	} catch {}
 	await writeFile(filePath, content);
 }
+function sanitizeRuntimeWebPreferences(webPreferences) {
+	const prefs = { ...webPreferences ?? {} };
+	delete prefs.preload;
+	return prefs;
+}
 
 //#endregion
 //#region src/commands/dev.ts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cordy/electro-cli",
-    "version": "1.2.13",
+    "version": "1.2.16",
     "description": "CLI for @cordy/electro — dev server, build, and code generation commands",
     "license": "MIT",
     "type": "module",
@@ -47,15 +47,15 @@
         "prepublishOnly": "bun run build"
     },
     "peerDependencies": {
-        "@cordy/electro": "1.2.8",
+        "@cordy/electro": "1.2.16",
         "electron": ">=40.4.1",
         "vite": ">=8.0.0"
     },
     "dependencies": {
-        "@cordy/electro-generator": "1.2.8"
+        "@cordy/electro-generator": "1.2.16"
     },
     "devDependencies": {
-        "@cordy/electro": "1.2.9",
+        "@cordy/electro": "1.2.16",
         "@types/node": "^25.2.3",
         "cac": "^6.7.14",
         "electron": "^40.4.1",