@cordy/electro-cli 1.2.19 → 1.2.20

package/dist/index.mjs

@@ -491,7 +491,36 @@ const cac = (name = "") => new CAC(name);
 
 //#endregion
 //#region package.json
-var version$1 = "1.2.19";
+var version$1 = "1.2.20";
+
+//#endregion
+//#region src/dev/bridge-types.ts
+const GENERATED_BRIDGE_DIRS = ["views", "windows"];
+const VIEW_BRIDGE_MODULE_FILE = "bridge.gen.ts";
+/**
+* Resolve generated bridge declaration file for a view.
+* Supports both historical `generated/windows/*` and current `generated/views/*`.
+*/
+function findBridgeTypesForView(files, viewName) {
+	const byPath = files.find((f) => f.path === `generated/views/${viewName}.bridge.d.ts`) ?? files.find((f) => f.path === `generated/windows/${viewName}.bridge.d.ts`);
+	if (byPath) return byPath;
+	return files.find((f) => f.path.endsWith(`/${viewName}.bridge.d.ts`)) ?? null;
+}
+/** Target location for per-view bridge types next to the config file. */
+function resolveViewBridgePath(view) {
+	if (!view.__source) return null;
+	return resolve(dirname(view.__source), VIEW_BRIDGE_MODULE_FILE);
+}
+/** Convert generated bridge declaration content into runtime-accessible bridge module. */
+function createViewBridgeModuleContent(bridgeTypesContent) {
+	return `${bridgeTypesContent.trimEnd()}\n\nexport const electro = window.electro as ElectroBridge;\n`;
+}
+function isGeneratedBridgeTypesPath(path) {
+	return GENERATED_BRIDGE_DIRS.some((dir) => path.startsWith(`generated/${dir}/`) && path.endsWith(".bridge.d.ts"));
+}
+function generatedBridgeTypesPaths(viewName) {
+	return GENERATED_BRIDGE_DIRS.map((dir) => `generated/${dir}/${viewName}.bridge.d.ts`);
+}
 
 //#endregion
 //#region src/dev/logger.ts
@@ -587,29 +616,47 @@ function footer(message, url) {
 function toProjectRelative(root, absolutePath) {
 	return relative(root, absolutePath) || ".";
 }
-function session(meta) {
+function logSession(meta) {
 	if (levels[currentLevel] > levels.info) return;
 	const isBuild = meta.mode === "build";
 	const projectName = basename(meta.root);
-	const mainEntry = toProjectRelative(meta.root, meta.main);
+	const runtimeEntry = toProjectRelative(meta.root, meta.runtime);
 	const preloadEntry = meta.preload ? toProjectRelative(meta.root, meta.preload) : `${dim$1}(none)${reset$1}`;
-	const rendererEntry = meta.renderer ? toProjectRelative(meta.root, meta.renderer) : `${dim$1}(none)${reset$1}`;
+	const firstView = meta.views?.[0] ?? null;
+	const viewEntry = firstView ? toProjectRelative(meta.root, firstView.entry) : `${dim$1}(none)${reset$1}`;
 	const command = isBuild ? "build" : "dev";
 	console.log(`\n${bold}${yellow$1}⚡ electro ${command}${reset$1} → ${cyan}${projectName}${reset$1}\n`);
-	const mainMode = isBuild ? "build" : "watch";
+	const runtimeMode = isBuild ? "build" : "watch";
 	const preloadMode = isBuild ? "build" : "watch";
-	const rendererMode = isBuild ? "build" : "dev server";
-	const entryWidth = Math.max(14, mainEntry.length, preloadEntry.length, rendererEntry.length) + 2;
-	console.log(`  ${dim$1}Scope      ${"Entry".padEnd(entryWidth)}Mode${reset$1}`);
-	console.log(`  ${cyan}main${reset$1}       ${mainEntry.padEnd(entryWidth)}${dim$1}${mainMode}${reset$1}`);
-	console.log(`  ${yellow$1}preload${reset$1}    ${preloadEntry.padEnd(entryWidth)}${dim$1}${preloadMode}${reset$1}`);
-	console.log(`  ${green}renderer${reset$1}   ${rendererEntry.padEnd(entryWidth)}${dim$1}${rendererMode}${reset$1}`);
-	if (meta.windows && meta.windows.length > 0) {
+	const viewsMode = isBuild ? "build" : "dev server";
+	const rows = [
+		{
+			scope: `${cyan}runtime${reset$1}`,
+			entry: runtimeEntry,
+			mode: `${dim$1}${runtimeMode}${reset$1}`
+		},
+		{
+			scope: `${yellow$1}preload${reset$1}`,
+			entry: preloadEntry,
+			mode: `${dim$1}${preloadMode}${reset$1}`
+		},
+		{
+			scope: `${green}view${reset$1}`,
+			entry: viewEntry,
+			mode: `${dim$1}${viewsMode}${reset$1}`
+		}
+	];
+	const scopeWidth = Math.max(5, ...rows.map((r) => visibleLength(r.scope))) + 2;
+	const entryWidth = Math.max(5, ...rows.map((r) => visibleLength(r.entry))) + 2;
+	console.log(`  ${dim$1}${padVisible("Scope", scopeWidth)}${padVisible("Entry", entryWidth)}Mode${reset$1}`);
+	for (const row of rows) console.log(`  ${padVisible(row.scope, scopeWidth)}${padVisible(row.entry, entryWidth)}${row.mode}`);
+	if (meta.views && meta.views.length > 0) {
 		console.log("");
-		console.log(`  ${dim$1}Windows${reset$1}    ${meta.windows.length} configured`);
-		for (const win of meta.windows) {
-			const winEntry = toProjectRelative(meta.root, win.entry);
-			console.log(`  ${win.name.padEnd(10)} ${dim$1}${winEntry}${reset$1}`);
+		console.log(`  ${dim$1}Views${reset$1}    ${meta.views.length} configured`);
+		const viewNameWidth = Math.max(4, ...meta.views.map((v) => v.name.length)) + 2;
+		for (const view of meta.views) {
+			const entry = toProjectRelative(meta.root, view.entry);
+			console.log(`  ${padVisible(view.name, viewNameWidth)}${dim$1}${entry}${reset$1}`);
 		}
 	}
 	console.log("");
@@ -619,6 +666,13 @@ const VITE_TAG_RE = new RegExp(String.raw`(?:\x1b\[[0-9;]*m)*\[(vite(?:-plugin-[
 function retagMessage(msg) {
 	return msg.replace(VITE_TAG_RE, `[${bold}${yellow$1}electro${reset$1}]`);
 }
+function visibleLength(value) {
+	return value.replace(ANSI_RE, "").length;
+}
+function padVisible(value, width) {
+	const len = visibleLength(value);
+	return value + " ".repeat(Math.max(0, width - len));
+}
 /**
 * Patch a Vite logger to rebrand `[vite]` → `[electro]`,
 * suppress startup noise ("ready in", "➜"), and extract
@@ -788,6 +842,10 @@ async function loadConfig(configPath) {
 	const config = (await import(absolutePath)).default;
 	if (!config) throw new Error(`${configPath} must have a default export`);
 	if (!config.runtime) throw new Error(`${configPath} must define a runtime via defineRuntime()`);
+	if (!config.codegen || !config.codegen?.scanDir) config.codegen = { scanDir: resolve(root, "src") };
+	if (config.views && config.views?.length > 0) {
+		for (const view of config.views) if (!view.entry) view.entry = "./index.html";
+	}
 	validateConfig(config);
 	return {
 		config,
@@ -2145,10 +2203,7 @@ function resolveSourcemap(mode) {
 }
 function createRendererConfig(opts) {
 	const input = {};
-	for (const view of opts.views) {
-		const sourceDir = dirname(view.__source);
-		input[view.name] = resolve(sourceDir, view.entry);
-	}
+	for (const view of opts.views) input[view.name] = resolve(view.root, view.entry);
 	const isBuild = !!opts.outDir;
 	const config = {
 		configFile: false,
@@ -2201,35 +2256,6 @@ function deduplicatePlugins(plugins) {
 	return result;
 }
 
-//#endregion
-//#region src/dev/bridge-types.ts
-const GENERATED_BRIDGE_DIRS = ["views", "windows"];
-const VIEW_BRIDGE_MODULE_FILE = "bridge.gen.ts";
-/**
-* Resolve generated bridge declaration file for a view.
-* Supports both historical `generated/windows/*` and current `generated/views/*`.
-*/
-function findBridgeTypesForView(files, viewName) {
-	const byPath = files.find((f) => f.path === `generated/views/${viewName}.bridge.d.ts`) ?? files.find((f) => f.path === `generated/windows/${viewName}.bridge.d.ts`);
-	if (byPath) return byPath;
-	return files.find((f) => f.path.endsWith(`/${viewName}.bridge.d.ts`)) ?? null;
-}
-/** Target location for per-view bridge types next to the config file. */
-function resolveViewBridgePath(view) {
-	if (!view.__source) return null;
-	return resolve(dirname(view.__source), VIEW_BRIDGE_MODULE_FILE);
-}
-/** Convert generated bridge declaration content into runtime-accessible bridge module. */
-function createViewBridgeModuleContent(bridgeTypesContent) {
-	return `${bridgeTypesContent.trimEnd()}\n\nexport const electro = window.electro as ElectroBridge;\n`;
-}
-function isGeneratedBridgeTypesPath(path) {
-	return GENERATED_BRIDGE_DIRS.some((dir) => path.startsWith(`generated/${dir}/`) && path.endsWith(".bridge.d.ts"));
-}
-function generatedBridgeTypesPaths(viewName) {
-	return GENERATED_BRIDGE_DIRS.map((dir) => `generated/${dir}/${viewName}.bridge.d.ts`);
-}
-
 //#endregion
 //#region src/plugins/utils.ts
 /** Strip query and hash from a URL/path. */
@@ -2312,7 +2338,7 @@ async function findElectronBin(root) {
 		const electronDir = resolve(root, "node_modules/electron");
 		const pathTxtPath = resolve(electronDir, "path.txt");
 		if (await fileExists(pathTxtPath)) {
-			const resolved = resolve(electronDir, (await readFile(pathTxtPath, "utf-8")).trim());
+			const resolved = resolve(electronDir, "dist", (await readFile(pathTxtPath, "utf-8")).trim());
 			if (await fileExists(resolved)) return resolved;
 		}
 	} catch {}
@@ -2919,9 +2945,9 @@ async function build$1(options) {
 	const views = config.views ?? [];
 	const rendererViews = views.filter((v) => v.entry);
 	const srcDir = resolve(root, "src");
-	session({
+	logSession({
 		root,
-		main: resolve(dirname(config.runtime.__source), config.runtime.entry),
+		runtime: resolve(dirname(config.runtime.__source), config.runtime.entry),
 		preload: rendererViews.length > 0 ? resolve(codegenDir, "generated/preload") : null,
 		renderer: rendererViews.length > 0 ? resolve(root, dirname(relative(root, rendererViews[0].__source))) : null,
 		mode: "build",
@@ -3210,24 +3236,26 @@ var DevServer = class {
 		this.outputDir = this.outDirOverride ? resolve(this.root, this.outDirOverride) : resolve(this.root, ".electro");
 		this.nodeFormat = await resolveNodeOutputFormat(this.root);
 		this.configPaths.add(loaded.configPath);
-		for (const view of this.config.views ?? []) this.configPaths.add(view.__source);
+		for (const view of this.config.views ?? []) {
+			view.root = dirname(view.__source);
+			this.configPaths.add(view.__source);
+		}
 		const views = this.config.views ?? [];
 		const rendererViews = views.filter((v) => v.entry);
-		const srcDir = resolve(this.root, "src");
-		const mainEntry = resolve(dirname(this.config.runtime.__source), this.config.runtime.entry);
-		session({
+		const runtimeEntry = resolve(dirname(this.config.runtime.__source), this.config.runtime.entry);
+		logSession({
 			root: this.root,
-			main: mainEntry,
+			runtime: runtimeEntry,
 			preload: rendererViews.length > 0 ? resolve(this.outputDir, "generated/preload") : null,
-			renderer: rendererViews.length > 0 ? resolve(this.root, dirname(relative(this.root, rendererViews[0].__source))) : null,
-			windows: rendererViews.map((w) => ({
+			views: rendererViews.map((w) => ({
 				name: w.name,
-				entry: resolve(dirname(w.__source), w.entry)
+				root: w.root,
+				entry: resolve(w.root, w.entry)
 			}))
 		});
 		const codegenTimer = startTimer();
 		try {
-			await this.runCodegen(this.outputDir, srcDir);
+			await this.runCodegen(this.outputDir, this.config.codegen.scanDir);
 			step("codegen", codegenTimer());
 		} catch (err) {
 			stepFail("codegen", err instanceof Error ? err.message : String(err));
@@ -3667,7 +3695,19 @@ function sanitizeRuntimeWebPreferences(webPreferences) {
 //#endregion
 //#region src/commands/dev.ts
 async function dev(options) {
+	if (options.remoteDebuggingPort) process.env.REMOTE_DEBUGGING_PORT = options.remoteDebuggingPort;
+	if (options.inspect) {
+		const port = typeof options.inspect === "number" ? options.inspect : 9229;
+		process.env.NODE_OPTIONS = `--inspect=${port}`;
+	}
+	if (options.inspectBrk) {
+		const port = typeof options.inspectBrk === "number" ? options.inspectBrk : 9229;
+		process.env.NODE_OPTIONS = `--inspect-brk=${port}`;
+	}
+	if (options.noSandbox) process.env.NO_SANDBOX = "1";
+	if (options["--"]) process.env.ELECTRON_CLI_ARGS = JSON.stringify(options["--"]);
 	if (options.sourcemap) validateSourcemap(options.sourcemap);
+	process.env.ELECTRO_MODE = "development";
 	const createServer = () => new DevServer(options.config, {
 		logLevel: options.logLevel,
 		clearScreen: options.clearScreen,
@@ -3798,7 +3838,7 @@ const cli = cac("electro");
 cli.command("generate", "Generate preload scripts, bridge types, and context types").option("-c, --config <path>", "Path to electro.config.ts", { default: "electro.config.ts" }).option("-o, --output <dir>", "Output directory", { default: ".electro" }).action(generate$1);
 cli.command("build", "Build for production").option("-c, --config <path>", "Path to electro.config.ts", { default: "electro.config.ts" }).option("-o, --outDir <dir>", "Output directory", { default: "dist" }).option("--sourcemap <mode>", "Sourcemap mode (linked | inline | external | none)").option("--minify", "Minify output (default: true)", { default: true }).option("--no-minify", "Disable minification").option("--bytecode", "Compile main/preload to V8 bytecode for source protection").option("-l, --logLevel <level>", "Log level (info | warn | error | silent)").action(build$1);
 cli.command("preview", "Build and preview in Electron").option("-c, --config <path>", "Path to electro.config.ts", { default: "electro.config.ts" }).option("-o, --outDir <dir>", "Output directory", { default: "dist" }).option("--sourcemap <mode>", "Sourcemap mode (linked | inline | external | none)").option("--minify", "Minify output (default: true)", { default: true }).option("--no-minify", "Disable minification").option("--bytecode", "Compile main/preload to V8 bytecode for source protection").option("--skip-build", "Skip build step and launch from existing output").option("-l, --logLevel <level>", "Log level (info | warn | error | silent)").action(preview);
-cli.command("dev", "Start development server with Electron").option("-c, --config <path>", "Path to electro.config.ts", { default: "electro.config.ts" }).option("--clearScreen", "Clear screen on rebuild", { default: true }).option("-l, --logLevel <level>", "Log level (info | warn | error | silent)").option("--renderer-only", "Start only the renderer dev server (no Electron)").option("--sourcemap <mode>", "Sourcemap mode (linked | inline | external | none)").option("--outDir <dir>", "Output directory override (default: .electro)").action(dev);
+cli.command("dev", "Start development server with Electron").option("--config <path>", "Path to electro.config.ts", { default: "electro.config.ts" }).option("--clearScreen", "Clear screen on rebuild", { default: true }).option("--logLevel <level>", "Log level (info | warn | error | silent)").option("--sourcemap <mode>", "Sourcemap mode (linked | inline | external | none)").option("--outDir <dir>", "Output directory override (default: .electro)").option("--inspect [port]", `[boolean | number] enable V8 inspector on the specified port`).option("--inspectBrk [port]", `[boolean | number] enable V8 inspector on the specified port`).option("--remoteDebuggingPort <port>", `[string] port for remote debugging`).option("--noSandbox", `[boolean] forces renderer process to run un-sandboxed`).option("--rendererOnly", `[boolean] only dev server for the renderer`).action(dev);
 cli.help();
 cli.version(version$1);
 cli.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cordy/electro-cli",
-    "version": "1.2.19",
+    "version": "1.2.20",
     "description": "CLI for @cordy/electro — dev server, build, and code generation commands",
     "license": "MIT",
     "type": "module",
@@ -30,10 +30,11 @@
     "main": "./dist/index.mjs",
     "types": "./dist/index.d.mts",
     "files": [
+        "bin",
         "dist"
     ],
     "bin": {
-        "electro": "./dist/index.mjs"
+        "electro": "bin/cli.js"
     },
     "exports": {
         ".": {
@@ -48,19 +49,19 @@
     },
     "peerDependencies": {
         "@cordy/electro": "1.2.19",
-        "electron": ">=40.4.1",
+        "electron": ">=40.6.0",
         "vite": ">=8.0.0"
     },
     "dependencies": {
         "@cordy/electro-generator": "1.2.19"
     },
     "devDependencies": {
-        "@cordy/electro": "1.2.19",
-        "@types/node": "^25.2.3",
+        "@cordy/electro": "1.2.20",
+        "@types/node": "^25.3.0",
         "cac": "^6.7.14",
-        "electron": "^40.4.1",
+        "electron": "^40.6.0",
         "magic-string": "^0.30.21",
         "tsdown": "^0.20.3",
-        "vite": "^8.0.0-beta.14"
+        "vite": "^8.0.0-beta.15"
     }
 }