@cordy/electro-cli 1.1.3 → 1.2.0

package/dist/index.mjs

@@ -490,7 +490,7 @@ const cac = (name = "") => new CAC(name);
 
 //#endregion
 //#region package.json
-var version$1 = "1.1.3";
+var version$1 = "1.2.0";
 
 //#endregion
 //#region src/dev/logger.ts
@@ -2659,14 +2659,15 @@ async function build$1(options) {
 	const outDir = resolve(root, options.outDir);
 	const codegenDir = resolve(root, ".electro");
 	const views = config.views ?? [];
+	const rendererViews = views.filter((v) => v.entry);
 	const srcDir = resolve(root, "src");
 	session({
 		root,
 		main: resolve(dirname(config.runtime.__source), config.runtime.entry),
-		preload: views.length > 0 ? resolve(codegenDir, "generated/preload") : null,
-		renderer: views.length > 0 ? resolve(root, dirname(relative(root, views[0].__source))) : null,
+		preload: rendererViews.length > 0 ? resolve(codegenDir, "generated/preload") : null,
+		renderer: rendererViews.length > 0 ? resolve(root, dirname(relative(root, rendererViews[0].__source))) : null,
 		mode: "build",
-		windows: views.map((w) => ({
+		windows: rendererViews.map((w) => ({
 			name: w.name,
 			entry: resolve(dirname(w.__source), w.entry)
 		}))
@@ -2710,7 +2711,7 @@ async function build$1(options) {
 		stepFail("main", err instanceof Error ? err.message : String(err));
 		process.exit(1);
 	}
-	if (views.length > 0) try {
+	if (rendererViews.length > 0) try {
 		buildScope("preload");
 		await buildPreload({
 			config,
@@ -2726,12 +2727,12 @@ async function build$1(options) {
 		stepFail("preload", err instanceof Error ? err.message : String(err));
 		process.exit(1);
 	}
-	if (views.length > 0) try {
+	if (rendererViews.length > 0) try {
 		buildScope("renderer");
-		const userViteConfigs = views.filter((w) => w.vite).map((w) => w.vite);
+		const userViteConfigs = rendererViews.filter((w) => w.vite).map((w) => w.vite);
 		await build(createRendererConfig({
 			root,
-			views,
+			views: rendererViews,
 			userViteConfigs: userViteConfigs.length > 0 ? userViteConfigs : void 0,
 			logLevel: "info",
 			customLogger: logger,
@@ -2739,7 +2740,7 @@ async function build$1(options) {
 			minify: options.minify,
 			sourcemap: options.sourcemap
 		}));
-		await flattenRendererOutput(resolve(outDir, "renderer"), views, root);
+		await flattenRendererOutput(resolve(outDir, "renderer"), rendererViews, root);
 	} catch (err) {
 		stepFail("renderer", err instanceof Error ? err.message : String(err));
 		process.exit(1);
@@ -2749,6 +2750,11 @@ 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 viewRegistry = (args.config.views ?? []).map((v) => ({
+		id: v.name,
+		hasRenderer: !!v.entry,
+		webPreferences: v.webPreferences ?? {}
+	}));
 	await build(createNodeConfig({
 		scope: "main",
 		root: args.root,
@@ -2765,11 +2771,12 @@ async function buildMain(args) {
 		userViteConfig: args.config.runtime.vite,
 		sourcemap: args.sourcemap,
 		customLogger: args.logger,
-		logLevel: "info"
+		logLevel: "info",
+		define: { __ELECTRO_VIEW_REGISTRY__: JSON.stringify(viewRegistry) }
 	}));
 }
 async function buildPreload(args) {
-	const views = args.config.views ?? [];
+	const views = (args.config.views ?? []).filter((v) => v.entry);
 	const input = {};
 	for (const view of views) input[view.name] = resolve(args.codegenDir, `generated/preload/${view.name}.gen.ts`);
 	const firstEntry = Object.values(input)[0];
@@ -2900,14 +2907,15 @@ var DevServer = class {
 		this.configPaths.add(loaded.configPath);
 		for (const view of this.config.views ?? []) 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({
 			root: this.root,
 			main: mainEntry,
-			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) => ({
+			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) => ({
 				name: w.name,
 				entry: resolve(dirname(w.__source), w.entry)
 			}))
@@ -3019,7 +3027,7 @@ var DevServer = class {
 		await writeFile(envTypesPath, envTypes.content);
 	}
 	async startRenderer() {
-		const views = this.config.views ?? [];
+		const views = (this.config.views ?? []).filter((v) => v.entry);
 		const userViteConfigs = views.filter((w) => w.vite).map((w) => w.vite);
 		this.rendererServer = await createServer(createRendererConfig({
 			root: this.root,
@@ -3034,7 +3042,7 @@ var DevServer = class {
 		this.rendererUrl = `http://localhost:${typeof addr === "object" && addr ? addr.port : 5173}`;
 	}
 	async buildPreload(externals) {
-		const views = this.config.views ?? [];
+		const views = (this.config.views ?? []).filter((v) => v.entry);
 		const preloadOutDir = resolve(this.outputDir, "preload");
 		const input = {};
 		for (const view of views) input[view.name] = resolve(this.outputDir, `generated/preload/${view.name}.gen.ts`);
@@ -3099,6 +3107,11 @@ var DevServer = class {
 	async buildMain(externals) {
 		const runtimeEntry = this.config.runtime.entry;
 		const entry = resolve(dirname(this.config.runtime.__source), runtimeEntry);
+		const viewRegistry = (this.config.views ?? []).map((v) => ({
+			id: v.name,
+			hasRenderer: !!v.entry,
+			webPreferences: v.webPreferences ?? {}
+		}));
 		const mainConfig = createNodeConfig({
 			scope: "main",
 			root: this.root,
@@ -3114,7 +3127,8 @@ var DevServer = class {
 			logLevel: this.logLevel,
 			clearScreen: this.clearScreen,
 			userViteConfig: this.config.runtime.vite,
-			sourcemap: this.sourcemap
+			sourcemap: this.sourcemap,
+			define: { __ELECTRO_VIEW_REGISTRY__: JSON.stringify(viewRegistry) }
 		});
 		const self = this;
 		let firstBuild = true;
@@ -3152,6 +3166,7 @@ var DevServer = class {
 			const port = typeof addr === "object" && addr ? addr.port : 5173;
 			env.ELECTRO_RENDERER_BASE = `http://localhost:${port}`;
 			for (const view of this.config.views ?? []) {
+				if (!view.entry) continue;
 				const entryPath = resolve(dirname(view.__source), view.entry);
 				const relPath = relative(this.root, entryPath);
 				env[`ELECTRO_DEV_URL_${view.name}`] = `http://localhost:${port}/${relPath}`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cordy/electro-cli",
-    "version": "1.1.3",
+    "version": "1.2.0",
     "description": "CLI for @cordy/electro — dev server, build, and code generation commands",
     "license": "MIT",
     "type": "module",