@cordy/electro-cli 1.2.7 → 1.2.8

package/dist/index.mjs

@@ -8,6 +8,7 @@ import { build, createLogger, createServer, mergeConfig, version } from "vite";
 import { existsSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { spawn } from "node:child_process";
+import { setTimeout as setTimeout$1 } from "node:timers/promises";
 
 //#region ../../node_modules/.bun/cac@6.7.14/node_modules/cac/dist/index.mjs
 function toArr(any) {
@@ -490,7 +491,7 @@ const cac = (name = "") => new CAC(name);
 
 //#endregion
 //#region package.json
-var version$1 = "1.2.7";
+var version$1 = "1.2.8";
 
 //#endregion
 //#region src/dev/logger.ts
@@ -752,7 +753,7 @@ function validateMergedNodeConfig(config, scope) {
 		const output = rolldownOpts.output;
 		if (output && typeof output === "object" && !Array.isArray(output)) {
 			const fmt = output.format;
-			if (fmt && fmt !== "es") throw new Error(`[electro] ${scope}: invalid output format "${fmt}". Electro is ESM-only (format: "es"). Remove the format override from your config.`);
+			if (fmt && fmt !== "es" && fmt !== "cjs") throw new Error(`[electro] ${scope}: invalid output format "${fmt}". Electro supports "es" and "cjs" for Node scopes. Update build.rolldownOptions.output.format in your config.`);
 		}
 	}
 	if (config.ssr === false || config.build?.ssr === false) throw new Error(`[electro] ${scope}: SSR cannot be disabled in Node scopes. SSR mode is required for correct Node.js module resolution.`);
@@ -766,11 +767,6 @@ function enforceMergedNodeConfig(config, _scope) {
 	const build = config.build;
 	if (!build) return;
 	if (build.target !== "esnext") build.target = "esnext";
-	const rolldownOpts = build.rolldownOptions;
-	if (rolldownOpts) {
-		const output = rolldownOpts.output;
-		if (output && output.format !== "es") output.format = "es";
-	}
 	if (!build.ssr) build.ssr = true;
 }
 /** Validate that installed Vite version is within the supported range. */
@@ -805,15 +801,69 @@ async function loadConfig(configPath) {
 /**
 * Resolve externals for Node scope builds (main/preload).
 *
-* Only externalizes electron and Node builtins.
-* All npm dependencies are bundled by Vite (handles CJS→ESM conversion).
+* Auto-externalizes: electron, Node builtins (bare + node: prefixed),
+* package.json dependencies + optionalDependencies, and deep imports (pkg/subpath).
 */
-function resolveExternals() {
-	return [
+async function resolveExternals(root) {
+	const pkgPath = resolve(root, "package.json");
+	const pkg = JSON.parse(await readFile(pkgPath, "utf-8"));
+	const deps = new Set([
 		"electron",
-		/^electron\/.+/,
-		...builtinModules.flatMap((m) => [m, `node:${m}`])
-	];
+		...Object.keys(pkg.dependencies ?? {}),
+		...Object.keys(pkg.optionalDependencies ?? {})
+	]);
+	deps.delete("@cordy/electro");
+	const builtins = builtinModules.flatMap((m) => [m, `node:${m}`]);
+	const depsArray = [...deps];
+	const deepPattern = depsArray.length > 0 ? new RegExp(`^(${depsArray.map(escapeRegExp).join("|")})/.+`) : null;
+	return deepPattern ? [
+		...depsArray,
+		...builtins,
+		deepPattern
+	] : [...depsArray, ...builtins];
+}
+function escapeRegExp(str) {
+	return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+//#endregion
+//#region src/dev/node-format.ts
+/**
+* Mirrors Node package behavior:
+* - package.json "type": "module" => ESM output
+* - otherwise => CJS output
+*/
+async function resolveNodeOutputFormat(root) {
+	const pkgPath = resolve(root, "package.json");
+	try {
+		const raw = await readFile(pkgPath, "utf-8");
+		return JSON.parse(raw).type === "module" ? "es" : "cjs";
+	} catch {
+		return "cjs";
+	}
+}
+const MAIN_ENTRY_CANDIDATES = [
+	"index.mjs",
+	"index.cjs",
+	"index.js"
+];
+/**
+* Find built main entry regardless of selected output format.
+*/
+async function resolveMainEntryPath(mainOutDir) {
+	for (const candidate of MAIN_ENTRY_CANDIDATES) {
+		const fullPath = resolve(mainOutDir, candidate);
+		if (await pathExists(fullPath)) return fullPath;
+	}
+	throw new Error(`Main entry not found in ${mainOutDir}. Expected one of: ${MAIN_ENTRY_CANDIDATES.join(", ")}`);
+}
+async function pathExists(filePath) {
+	try {
+		await access(filePath);
+		return true;
+	} catch {
+		return false;
+	}
 }
 
 //#endregion
@@ -1830,29 +1880,26 @@ var MagicString = class MagicString {
 
 //#endregion
 //#region src/plugins/esm-shim.ts
-/**
-* ESM Shim Plugin — injects CommonJS shims into ESM output.
-*
-* When bundling CJS dependencies into ESM format, the output may contain
-* references to `__filename`, `__dirname`, or `require()` which don't exist
-* in ES modules. This plugin detects those references and injects shims.
-*
-* Based on electron-vite's esmShimPlugin (from unbuild).
-*/
-const CJSyntaxRe = /__filename|__dirname|require\(|require\.resolve\(/;
-const CJSShim = `
+const CJSYNTAX_RE = /__filename|__dirname|require\(|require\.resolve\(/;
+const CJS_SHIM = `
 // -- CommonJS Shims --
-import __cjs_mod__ from 'node:module';
-const __filename = import.meta.filename;
-const __dirname = import.meta.dirname;
+import __cjs_url__ from "node:url";
+import __cjs_path__ from "node:path";
+import __cjs_mod__ from "node:module";
+const __filename = __cjs_url__.fileURLToPath(import.meta.url);
+const __dirname = __cjs_path__.dirname(__filename);
 const require = __cjs_mod__.createRequire(import.meta.url);
 `;
-const ESMStaticImportRe = /(?<=\s|^|;)import\s*([\s"']*(?<imports>[\p{L}\p{M}\w\t\n\r $*,/{}@.]+)from\s*)?["']\s*(?<specifier>(?<="\s*)[^"]*[^\s"](?=\s*")|(?<='\s*)[^']*[^\s'](?=\s*'))\s*["'][\s;]*/gmu;
+const ESM_STATIC_IMPORT_RE = /(?<=\s|^|;)import\s*([\s"']*(?<imports>[\p{L}\p{M}\w\t\n\r $*,/{}@.]+)from\s*)?["']\s*(?<specifier>(?<="\s*)[^"]*[^\s"](?=\s*")|(?<='\s*)[^']*[^\s'](?=\s*'))\s*["'][\s;]*/gmu;
 function findStaticImports(code) {
 	const matches = [];
-	for (const match of code.matchAll(ESMStaticImportRe)) matches.push({ end: (match.index || 0) + match[0].length });
+	for (const match of code.matchAll(ESM_STATIC_IMPORT_RE)) matches.push({ end: (match.index || 0) + match[0].length });
 	return matches;
 }
+/**
+* Inject CommonJS shims into ESM output when bundled code contains
+* require/__dirname/__filename references.
+*/
 function esmShimPlugin() {
 	return {
 		name: "electro:esm-shim",
@@ -1860,11 +1907,11 @@ function esmShimPlugin() {
 		enforce: "post",
 		renderChunk(code, _chunk, { format, sourcemap }) {
 			if (format !== "es") return null;
-			if (code.includes(CJSShim) || !CJSyntaxRe.test(code)) return null;
-			const lastESMImport = findStaticImports(code).pop();
-			const indexToAppend = lastESMImport ? lastESMImport.end : 0;
+			if (code.includes(CJS_SHIM) || !CJSYNTAX_RE.test(code)) return null;
+			const lastImport = findStaticImports(code).pop();
+			const indexToAppend = lastImport ? lastImport.end : 0;
 			const s = new MagicString(code);
-			s.appendRight(indexToAppend, CJSShim);
+			s.appendRight(indexToAppend, CJS_SHIM);
 			return {
 				code: s.toString(),
 				map: sourcemap ? s.generateMap({ hires: "boundary" }) : null
@@ -1873,6 +1920,26 @@ function esmShimPlugin() {
 	};
 }
 
+//#endregion
+//#region src/plugins/import-meta.ts
+/**
+* Rewrites import.meta.* expressions for CommonJS output format.
+*/
+function importMetaPlugin() {
+	return {
+		name: "electro:import-meta",
+		apply: "build",
+		enforce: "pre",
+		resolveImportMeta(property, { format }) {
+			if (format !== "cjs") return null;
+			if (property === "url") return `require("node:url").pathToFileURL(__filename).href`;
+			if (property === "filename") return `__filename`;
+			if (property === "dirname") return `__dirname`;
+			return null;
+		}
+	};
+}
+
 //#endregion
 //#region src/dev/vite-node-config.ts
 function resolveSourcemap$1(mode) {
@@ -1882,16 +1949,23 @@ function resolveSourcemap$1(mode) {
 	return true;
 }
 function createNodeConfig(opts) {
+	const format = opts.format ?? "es";
+	const moduleCondition = format === "cjs" ? "require" : "import";
 	const resolveConditions = opts.scope === "preload" ? [
 		"node",
-		"import",
+		moduleCondition,
 		"default"
-	] : ["node", "import"];
+	] : ["node", moduleCondition];
 	const envPrefix = opts.scope === "main" ? ["MAIN_VITE_", "VITE_"] : ["PRELOAD_VITE_", "VITE_"];
+	const entryExt = format === "cjs" ? "cjs" : "mjs";
 	const config = {
 		configFile: false,
 		root: opts.root,
-		plugins: [esmShimPlugin(), ...opts.plugins ?? []],
+		plugins: [
+			importMetaPlugin(),
+			...opts.plugins ?? [],
+			esmShimPlugin()
+		],
 		customLogger: opts.customLogger,
 		envPrefix,
 		define: {
@@ -1905,8 +1979,8 @@ function createNodeConfig(opts) {
 			emptyOutDir: true,
 			rolldownOptions: {
 				output: {
-					format: "es",
-					entryFileNames: "index.mjs"
+					format,
+					entryFileNames: `index.${entryExt}`
 				},
 				external: opts.externals
 			},
@@ -1919,7 +1993,7 @@ function createNodeConfig(opts) {
 		},
 		ssr: {
 			target: "node",
-			noExternal: true
+			noExternal: ["@cordy/electro"]
 		},
 		resolve: { conditions: resolveConditions },
 		logLevel: opts.logLevel ?? "warn",
@@ -2689,6 +2763,7 @@ async function build$1(options) {
 	const root = loaded.root;
 	const outDir = resolve(root, options.outDir);
 	const codegenDir = resolve(root, ".electro");
+	const nodeFormat = await resolveNodeOutputFormat(root);
 	const views = config.views ?? [];
 	const rendererViews = views.filter((v) => v.entry);
 	const srcDir = resolve(root, "src");
@@ -2725,7 +2800,7 @@ async function build$1(options) {
 		stepFail("codegen", err instanceof Error ? err.message : String(err));
 		process.exit(1);
 	}
-	const externals = resolveExternals();
+	const externals = await resolveExternals(root);
 	const logger = createBuildLogger();
 	try {
 		buildScope("main");
@@ -2736,7 +2811,8 @@ async function build$1(options) {
 			externals,
 			sourcemap: options.sourcemap,
 			logger,
-			bytecode: options.bytecode
+			bytecode: options.bytecode,
+			format: nodeFormat
 		});
 	} catch (err) {
 		stepFail("main", err instanceof Error ? err.message : String(err));
@@ -2752,7 +2828,8 @@ async function build$1(options) {
 			externals,
 			sourcemap: options.sourcemap,
 			logger,
-			bytecode: options.bytecode
+			bytecode: options.bytecode,
+			format: nodeFormat
 		});
 	} catch (err) {
 		stepFail("preload", err instanceof Error ? err.message : String(err));
@@ -2804,6 +2881,7 @@ async function buildMain(args) {
 		sourcemap: args.sourcemap,
 		customLogger: args.logger,
 		logLevel: "info",
+		format: args.format,
 		define: { __ELECTRO_VIEW_REGISTRY__: JSON.stringify(viewRegistry) }
 	}));
 }
@@ -2829,7 +2907,8 @@ async function buildPreload(args) {
 		plugins: preloadPlugins,
 		sourcemap: args.sourcemap,
 		customLogger: args.logger,
-		logLevel: "info"
+		logLevel: "info",
+		format: args.format
 	});
 	if (Object.keys(input).length > 1) {
 		const subBuildConfig = createNodeConfig({
@@ -2846,7 +2925,8 @@ async function buildPreload(args) {
 			],
 			sourcemap: args.sourcemap,
 			customLogger: args.logger,
-			logLevel: "info"
+			logLevel: "info",
+			format: args.format
 		});
 		baseConfig.plugins.push(isolateEntriesPlugin(subBuildConfig));
 	}
@@ -2891,6 +2971,8 @@ async function flattenRendererOutput(rendererDir, views, root) {
 //#region src/dev/dev-server.ts
 const MAIN_RESTART_DEBOUNCE_MS = 80;
 const CONFIG_DEBOUNCE_MS = 300;
+const MAIN_ENTRY_WAIT_TIMEOUT_MS = 1e4;
+const MAIN_ENTRY_WAIT_INTERVAL_MS = 50;
 var DevServer = class {
 	rendererServer = null;
 	electronProcess = null;
@@ -2909,6 +2991,9 @@ var DevServer = class {
 	mainWatch = null;
 	preloadWatch = null;
 	outputDir = "";
+	nodeFormat = "es";
+	mainInitialBuildPromise = null;
+	resolveMainInitialBuild = null;
 	logLevel;
 	clearScreen;
 	rendererOnly;
@@ -2936,6 +3021,7 @@ var DevServer = class {
 		this.config = loaded.config;
 		this.root = loaded.root;
 		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);
 		const views = this.config.views ?? [];
@@ -2976,7 +3062,7 @@ var DevServer = class {
 			this.attachConfigWatcher();
 			return;
 		}
-		const externals = resolveExternals();
+		const externals = await resolveExternals(this.root);
 		if (views.length > 0) {
 			const preloadTimer = startTimer();
 			try {
@@ -2997,6 +3083,7 @@ var DevServer = class {
 		}
 		const electronTimer = startTimer();
 		try {
+			await this.waitForMainInitialBuild();
 			await this.attachElectronProcess();
 			step("electron", electronTimer());
 		} catch (err) {
@@ -3025,6 +3112,8 @@ var DevServer = class {
 		this.mainWatch = null;
 		this.preloadWatch?.close();
 		this.preloadWatch = null;
+		this.resolveMainInitialBuild = null;
+		this.mainInitialBuildPromise = null;
 		if (this.mainRestartFlushTimer) {
 			clearTimeout(this.mainRestartFlushTimer);
 			this.mainRestartFlushTimer = null;
@@ -3093,7 +3182,8 @@ var DevServer = class {
 			],
 			logLevel: this.logLevel,
 			clearScreen: this.clearScreen,
-			sourcemap: this.sourcemap
+			sourcemap: this.sourcemap,
+			format: this.nodeFormat
 		});
 		if (Object.keys(input).length > 1) {
 			const subBuildConfig = createNodeConfig({
@@ -3110,7 +3200,8 @@ var DevServer = class {
 				],
 				logLevel: this.logLevel,
 				clearScreen: this.clearScreen,
-				sourcemap: this.sourcemap
+				sourcemap: this.sourcemap,
+				format: this.nodeFormat
 			});
 			baseConfig.plugins.push(isolateEntriesPlugin(subBuildConfig));
 		}
@@ -3139,6 +3230,12 @@ var DevServer = class {
 	async buildMain(externals) {
 		const runtimeEntry = this.config.runtime.entry;
 		const entry = resolve(dirname(this.config.runtime.__source), runtimeEntry);
+		this.mainInitialBuildPromise = new Promise((resolve) => {
+			this.resolveMainInitialBuild = () => {
+				resolve();
+				this.resolveMainInitialBuild = null;
+			};
+		});
 		const viewRegistry = (this.config.views ?? []).map((v) => ({
 			id: v.name,
 			hasRenderer: !!v.entry,
@@ -3161,6 +3258,7 @@ var DevServer = class {
 			clearScreen: this.clearScreen,
 			userViteConfig: this.config.runtime.vite,
 			sourcemap: this.sourcemap,
+			format: this.nodeFormat,
 			define: { __ELECTRO_VIEW_REGISTRY__: JSON.stringify(viewRegistry) }
 		});
 		const self = this;
@@ -3176,6 +3274,7 @@ var DevServer = class {
 				if (firstBuild) {
 					firstBuild = false;
 					changedFile = null;
+					self.resolveMainInitialBuild?.();
 					return;
 				}
 				const currentChanged = changedFile;
@@ -3191,8 +3290,21 @@ var DevServer = class {
 		});
 		this.mainWatch = await build(mainConfig);
 	}
+	/**
+	* Primary startup synchronization for dev mode:
+	* wait until the initial main watch build has completed.
+	*/
+	async waitForMainInitialBuild() {
+		if (!this.mainInitialBuildPromise) return;
+		const timeout = setTimeout$1(MAIN_ENTRY_WAIT_TIMEOUT_MS).then(() => {
+			throw new Error(`Main initial build did not finish in ${MAIN_ENTRY_WAIT_TIMEOUT_MS}ms.`);
+		});
+		const promise = this.mainInitialBuildPromise;
+		this.mainInitialBuildPromise = null;
+		await Promise.race([promise, timeout]);
+	}
 	async attachElectronProcess() {
-		const mainEntry = resolve(this.outputDir, "main/index.mjs");
+		const mainEntry = await this.waitForMainEntry();
 		const env = { ELECTRO_DEV: "true" };
 		if (this.rendererServer) {
 			const addr = this.rendererServer.httpServer?.address();
@@ -3221,6 +3333,23 @@ var DevServer = class {
 		});
 	}
 	/**
+	* In watch mode, Vite can return the watcher before the first output file
+	* is written. Wait for the built main entry to appear before spawning Electron.
+	*/
+	async waitForMainEntry() {
+		const mainOutDir = resolve(this.outputDir, "main");
+		const deadline = Date.now() + MAIN_ENTRY_WAIT_TIMEOUT_MS;
+		let lastError;
+		while (Date.now() < deadline) try {
+			return await resolveMainEntryPath(mainOutDir);
+		} catch (err) {
+			lastError = err;
+			await setTimeout$1(MAIN_ENTRY_WAIT_INTERVAL_MS);
+		}
+		const detail = lastError instanceof Error ? ` Last error: ${lastError.message}` : "";
+		throw new Error(`Main entry was not generated in time (${MAIN_ENTRY_WAIT_TIMEOUT_MS}ms). Checked in: ${mainOutDir}.${detail}`);
+	}
+	/**
 	* Restart Electron — handles queued restarts if another rebuild
 	* arrives while restart is in flight.
 	*/
@@ -3374,7 +3503,7 @@ async function preview(options) {
 	if (!options.skipBuild) await build$1(options);
 	else note("Skipped build (--skip-build)");
 	const root = process.cwd();
-	const mainEntry = resolve(resolve(root, options.outDir), "main/index.mjs");
+	const mainEntry = await resolveMainEntryPath(resolve(resolve(root, options.outDir), "main"));
 	const launchTimer = startTimer();
 	try {
 		const proc = await launchElectron({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cordy/electro-cli",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "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.7",
+        "@cordy/electro": "1.2.8",
         "electron": ">=40.4.1",
         "vite": ">=8.0.0"
     },
     "dependencies": {
-        "@cordy/electro-generator": "1.2.7"
+        "@cordy/electro-generator": "1.2.8"
     },
     "devDependencies": {
-        "@cordy/electro": "1.2.7",
+        "@cordy/electro": "1.2.6",
         "@types/node": "^25.2.3",
         "cac": "^6.7.14",
         "electron": "^40.4.1",