@cordy/electro-cli 1.0.9 → 1.1.1

package/dist/index.mjs

@@ -490,7 +490,7 @@ const cac = (name = "") => new CAC(name);
 
 //#endregion
 //#region package.json
-var version$1 = "1.0.9";
+var version$1 = "1.1.1";
 
 //#endregion
 //#region src/dev/logger.ts
@@ -714,23 +714,23 @@ function validateConfig(config) {
 		error(`Main entry not found: ${mainEntry}`);
 		process.exit(1);
 	}
-	const windows = config.windows ?? [];
+	const views = config.views ?? [];
 	const names = /* @__PURE__ */ new Set();
-	for (const win of windows) {
-		if (names.has(win.name)) {
-			error(`Duplicate window name "${win.name}". Window names must be unique.`);
+	for (const view of views) {
+		if (names.has(view.name)) {
+			error(`Duplicate view name "${view.name}". View names must be unique.`);
 			process.exit(1);
 		}
-		names.add(win.name);
+		names.add(view.name);
 	}
-	for (const win of windows) {
-		const winEntry = resolve(dirname(win.__source), win.entry);
-		if (!existsSync(winEntry)) {
-			error(`Window "${win.name}" entry not found: ${winEntry}`);
+	for (const view of views) {
+		const viewEntry = resolve(dirname(view.__source), view.entry);
+		if (!existsSync(viewEntry)) {
+			error(`View "${view.name}" entry not found: ${viewEntry}`);
 			process.exit(1);
 		}
 	}
-	for (const win of windows) if (win.features && win.features.length === 0) warn(`Window "${win.name}" has an empty features array — it won't have access to any services.`);
+	for (const view of views) if (view.features && view.features.length === 0) warn(`View "${view.name}" has an empty features array — it won't have access to any services.`);
 }
 /** Validate --sourcemap CLI value. Warns on unrecognized values. */
 function validateSourcemap(value) {
@@ -905,9 +905,9 @@ function resolveSourcemap(mode) {
 }
 function createRendererConfig(opts) {
 	const input = {};
-	for (const win of opts.windows) {
-		const sourceDir = dirname(win.__source);
-		input[win.name] = resolve(sourceDir, win.entry);
+	for (const view of opts.views) {
+		const sourceDir = dirname(view.__source);
+		input[view.name] = resolve(sourceDir, view.entry);
 	}
 	const isBuild = !!opts.outDir;
 	const config = {
@@ -934,10 +934,32 @@ function createRendererConfig(opts) {
 	if (opts.userViteConfigs?.length) {
 		let merged = config;
 		for (const userConfig of opts.userViteConfigs) merged = mergeConfig(merged, userConfig);
+		merged.plugins = deduplicatePlugins(merged.plugins);
 		return merged;
 	}
 	return config;
 }
+/**
+* Deduplicate plugins by name — keeps the first occurrence of each named plugin.
+* This allows multiple views to declare the same plugins (e.g. react()) without
+* causing duplicate injection errors when configs are merged.
+*/
+function deduplicatePlugins(plugins) {
+	if (!plugins) return [];
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const plugin of plugins.flat(Infinity)) {
+		const name = plugin?.name;
+		if (!name) {
+			result.push(plugin);
+			continue;
+		}
+		if (seen.has(name)) continue;
+		seen.add(name);
+		result.push(plugin);
+	}
+	return result;
+}
 
 //#endregion
 //#region ../../node_modules/.bun/@jridgewell+sourcemap-codec@1.5.5/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
@@ -2636,15 +2658,15 @@ async function build$1(options) {
 	const root = loaded.root;
 	const outDir = resolve(root, options.outDir);
 	const codegenDir = resolve(root, ".electro");
-	const windows = config.windows ?? [];
+	const views = config.views ?? [];
 	const srcDir = resolve(root, "src");
 	session({
 		root,
 		main: resolve(dirname(config.runtime.__source), config.runtime.entry),
-		preload: windows.length > 0 ? resolve(codegenDir, "generated/preload") : null,
-		renderer: windows.length > 0 ? resolve(root, dirname(relative(root, windows[0].__source))) : null,
+		preload: views.length > 0 ? resolve(codegenDir, "generated/preload") : null,
+		renderer: views.length > 0 ? resolve(root, dirname(relative(root, views[0].__source))) : null,
 		mode: "build",
-		windows: windows.map((w) => ({
+		windows: views.map((w) => ({
 			name: w.name,
 			entry: resolve(dirname(w.__source), w.entry)
 		}))
@@ -2653,7 +2675,7 @@ async function build$1(options) {
 	try {
 		const { files, envTypes } = generate({
 			scanResult: await scan(srcDir),
-			windows,
+			views,
 			outputDir: codegenDir,
 			srcDir
 		});
@@ -2688,7 +2710,7 @@ async function build$1(options) {
 		stepFail("main", err instanceof Error ? err.message : String(err));
 		process.exit(1);
 	}
-	if (windows.length > 0) try {
+	if (views.length > 0) try {
 		buildScope("preload");
 		await buildPreload({
 			config,
@@ -2704,12 +2726,12 @@ async function build$1(options) {
 		stepFail("preload", err instanceof Error ? err.message : String(err));
 		process.exit(1);
 	}
-	if (windows.length > 0) try {
+	if (views.length > 0) try {
 		buildScope("renderer");
-		const userViteConfigs = windows.filter((w) => w.vite).map((w) => w.vite);
+		const userViteConfigs = views.filter((w) => w.vite).map((w) => w.vite);
 		await build(createRendererConfig({
 			root,
-			windows,
+			views,
 			userViteConfigs: userViteConfigs.length > 0 ? userViteConfigs : void 0,
 			logLevel: "info",
 			customLogger: logger,
@@ -2717,7 +2739,7 @@ async function build$1(options) {
 			minify: options.minify,
 			sourcemap: options.sourcemap
 		}));
-		await flattenRendererOutput(resolve(outDir, "renderer"), windows, root);
+		await flattenRendererOutput(resolve(outDir, "renderer"), views, root);
 	} catch (err) {
 		stepFail("renderer", err instanceof Error ? err.message : String(err));
 		process.exit(1);
@@ -2727,14 +2749,6 @@ async function build$1(options) {
 async function buildMain(args) {
 	const runtimeEntry = args.config.runtime.entry;
 	const entry = resolve(dirname(args.config.runtime.__source), runtimeEntry);
-	const windowDefs = (args.config.windows ?? []).map((w) => ({
-		name: w.name,
-		type: w.type,
-		lifecycle: w.lifecycle,
-		autoShow: w.autoShow,
-		behavior: w.behavior,
-		window: w.window
-	}));
 	await build(createNodeConfig({
 		scope: "main",
 		root: args.root,
@@ -2751,14 +2765,13 @@ async function buildMain(args) {
 		userViteConfig: args.config.runtime.vite,
 		sourcemap: args.sourcemap,
 		customLogger: args.logger,
-		logLevel: "info",
-		define: { __ELECTRO_WINDOW_DEFINITIONS__: JSON.stringify(windowDefs) }
+		logLevel: "info"
 	}));
 }
 async function buildPreload(args) {
-	const windows = args.config.windows ?? [];
+	const views = args.config.views ?? [];
 	const input = {};
-	for (const win of windows) input[win.name] = resolve(args.codegenDir, `generated/preload/${win.name}.gen.ts`);
+	for (const view of views) input[view.name] = resolve(args.codegenDir, `generated/preload/${view.name}.gen.ts`);
 	const firstEntry = Object.values(input)[0];
 	const preloadOutDir = resolve(args.outDir, "preload");
 	const preloadPlugins = [
@@ -2809,12 +2822,12 @@ async function buildPreload(args) {
 * (e.g., `src/windows/main/index.html`) to `{name}/index.html`.
 * Adjusts relative asset references to match the new depth.
 */
-async function flattenRendererOutput(rendererDir, windows, root) {
+async function flattenRendererOutput(rendererDir, views, root) {
 	const dirsToClean = /* @__PURE__ */ new Set();
-	for (const win of windows) {
-		const relPath = relative(root, resolve(dirname(win.__source), win.entry));
+	for (const view of views) {
+		const relPath = relative(root, resolve(dirname(view.__source), view.entry));
 		const oldHtmlPath = resolve(rendererDir, relPath);
-		const newHtmlPath = resolve(rendererDir, win.name, "index.html");
+		const newHtmlPath = resolve(rendererDir, view.name, "index.html");
 		if (oldHtmlPath === newHtmlPath) continue;
 		let html = await readFile(oldHtmlPath, "utf-8");
 		const depthDiff = relPath.split("/").length - 1 - 1;
@@ -2827,7 +2840,7 @@ async function flattenRendererOutput(rendererDir, windows, root) {
 		await writeFile(newHtmlPath, html);
 		await unlink(oldHtmlPath);
 		const topDir = relPath.split("/")[0];
-		if (topDir !== win.name) dirsToClean.add(resolve(rendererDir, topDir));
+		if (topDir !== view.name) dirsToClean.add(resolve(rendererDir, topDir));
 	}
 	for (const dir of dirsToClean) await rm(dir, {
 		recursive: true,
@@ -2885,16 +2898,16 @@ var DevServer = class {
 		this.root = loaded.root;
 		this.outputDir = this.outDirOverride ? resolve(this.root, this.outDirOverride) : resolve(this.root, ".electro");
 		this.configPaths.add(loaded.configPath);
-		for (const win of this.config.windows ?? []) this.configPaths.add(win.__source);
-		const windows = this.config.windows ?? [];
+		for (const view of this.config.views ?? []) this.configPaths.add(view.__source);
+		const views = this.config.views ?? [];
 		const srcDir = resolve(this.root, "src");
 		const mainEntry = resolve(dirname(this.config.runtime.__source), this.config.runtime.entry);
 		session({
 			root: this.root,
 			main: mainEntry,
-			preload: windows.length > 0 ? resolve(this.outputDir, "generated/preload") : null,
-			renderer: windows.length > 0 ? resolve(this.root, dirname(relative(this.root, windows[0].__source))) : null,
-			windows: windows.map((w) => ({
+			preload: views.length > 0 ? resolve(this.outputDir, "generated/preload") : null,
+			renderer: views.length > 0 ? resolve(this.root, dirname(relative(this.root, views[0].__source))) : null,
+			windows: views.map((w) => ({
 				name: w.name,
 				entry: resolve(dirname(w.__source), w.entry)
 			}))
@@ -2907,7 +2920,7 @@ var DevServer = class {
 			stepFail("codegen", err instanceof Error ? err.message : String(err));
 			throw err;
 		}
-		if (windows.length > 0) {
+		if (views.length > 0) {
 			const rendererTimer = startTimer();
 			try {
 				await this.startRenderer();
@@ -2924,7 +2937,7 @@ var DevServer = class {
 			return;
 		}
 		const externals = await resolveExternals(this.root);
-		if (windows.length > 0) {
+		if (views.length > 0) {
 			const preloadTimer = startTimer();
 			try {
 				await this.buildPreload(externals);
@@ -2991,7 +3004,7 @@ var DevServer = class {
 		this.lastScanResult = scanResult;
 		const { files, envTypes } = generate({
 			scanResult,
-			windows: this.config.windows ?? [],
+			views: this.config.views ?? [],
 			outputDir,
 			srcDir
 		});
@@ -3006,11 +3019,11 @@ var DevServer = class {
 		await writeFile(envTypesPath, envTypes.content);
 	}
 	async startRenderer() {
-		const windows = this.config.windows ?? [];
-		const userViteConfigs = windows.filter((w) => w.vite).map((w) => w.vite);
+		const views = this.config.views ?? [];
+		const userViteConfigs = views.filter((w) => w.vite).map((w) => w.vite);
 		this.rendererServer = await createServer(createRendererConfig({
 			root: this.root,
-			windows,
+			views,
 			userViteConfigs: userViteConfigs.length > 0 ? userViteConfigs : void 0,
 			logLevel: this.logLevel,
 			clearScreen: this.clearScreen
@@ -3021,10 +3034,10 @@ var DevServer = class {
 		this.rendererUrl = `http://localhost:${typeof addr === "object" && addr ? addr.port : 5173}`;
 	}
 	async buildPreload(externals) {
-		const windows = this.config.windows ?? [];
+		const views = this.config.views ?? [];
 		const preloadOutDir = resolve(this.outputDir, "preload");
 		const input = {};
-		for (const win of windows) input[win.name] = resolve(this.outputDir, `generated/preload/${win.name}.gen.ts`);
+		for (const view of views) input[view.name] = resolve(this.outputDir, `generated/preload/${view.name}.gen.ts`);
 		const firstEntry = Object.values(input)[0];
 		const baseConfig = createNodeConfig({
 			scope: "preload",
@@ -3086,14 +3099,6 @@ var DevServer = class {
 	async buildMain(externals) {
 		const runtimeEntry = this.config.runtime.entry;
 		const entry = resolve(dirname(this.config.runtime.__source), runtimeEntry);
-		const windowDefs = (this.config.windows ?? []).map((w) => ({
-			name: w.name,
-			type: w.type,
-			lifecycle: w.lifecycle,
-			autoShow: w.autoShow,
-			behavior: w.behavior,
-			window: w.window
-		}));
 		const mainConfig = createNodeConfig({
 			scope: "main",
 			root: this.root,
@@ -3109,8 +3114,7 @@ var DevServer = class {
 			logLevel: this.logLevel,
 			clearScreen: this.clearScreen,
 			userViteConfig: this.config.runtime.vite,
-			sourcemap: this.sourcemap,
-			define: { __ELECTRO_WINDOW_DEFINITIONS__: JSON.stringify(windowDefs) }
+			sourcemap: this.sourcemap
 		});
 		const self = this;
 		let firstBuild = true;
@@ -3147,10 +3151,10 @@ var DevServer = class {
 			const addr = this.rendererServer.httpServer?.address();
 			const port = typeof addr === "object" && addr ? addr.port : 5173;
 			env.ELECTRO_RENDERER_BASE = `http://localhost:${port}`;
-			for (const win of this.config.windows ?? []) {
-				const entryPath = resolve(dirname(win.__source), win.entry);
+			for (const view of this.config.views ?? []) {
+				const entryPath = resolve(dirname(view.__source), view.entry);
 				const relPath = relative(this.root, entryPath);
-				env[`ELECTRO_DEV_URL_${win.name}`] = `http://localhost:${port}/${relPath}`;
+				env[`ELECTRO_DEV_URL_${view.name}`] = `http://localhost:${port}/${relPath}`;
 			}
 		}
 		const proc = await launchElectron({
@@ -3287,15 +3291,15 @@ async function generate$1(options) {
 		console.error("Error: electro.config.ts must have a default export");
 		process.exit(1);
 	}
-	const windows = config.windows ?? [];
-	console.log(`Loaded config with ${windows.length} window(s)`);
+	const views = config.views ?? [];
+	console.log(`Loaded config with ${views.length} view(s)`);
 	const srcDir = resolve(process.cwd(), "src");
 	console.log(`Scanning ${srcDir}...`);
 	const scanResult = await scan(srcDir);
 	console.log(`Found ${scanResult.features.length} feature(s)`);
 	const { files, envTypes } = generate({
 		scanResult,
-		windows,
+		views,
 		outputDir,
 		srcDir
 	});

package/package.json

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