@cordy/electro-cli 1.2.6 → 1.2.7

package/dist/index.mjs

@@ -490,7 +490,7 @@ const cac = (name = "") => new CAC(name);
 
 //#endregion
 //#region package.json
-var version$1 = "1.2.6";
+var version$1 = "1.2.7";
 
 //#endregion
 //#region src/dev/logger.ts
@@ -805,160 +805,15 @@ async function loadConfig(configPath) {
 /**
 * Resolve externals for Node scope builds (main/preload).
 *
-* Auto-externalizes: electron, Node builtins (bare + node: prefixed),
-* package.json dependencies + optionalDependencies, and deep imports (pkg/subpath).
+* Only externalizes electron and Node builtins.
+* All npm dependencies are bundled by Vite (handles CJS→ESM conversion).
 */
-async function resolveExternals(root) {
-	const pkgPath = resolve(root, "package.json");
-	const pkg = JSON.parse(await readFile(pkgPath, "utf-8"));
-	const deps = new Set([
+function resolveExternals() {
+	return [
 		"electron",
-		...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/vite-node-config.ts
-function resolveSourcemap$1(mode) {
-	if (!mode || mode === "linked" || mode === "external") return true;
-	if (mode === "inline") return "inline";
-	if (mode === "none") return false;
-	return true;
-}
-function createNodeConfig(opts) {
-	const resolveConditions = opts.scope === "preload" ? [
-		"node",
-		"import",
-		"default"
-	] : ["node", "import"];
-	const envPrefix = opts.scope === "main" ? ["MAIN_VITE_", "VITE_"] : ["PRELOAD_VITE_", "VITE_"];
-	const config = {
-		configFile: false,
-		root: opts.root,
-		plugins: opts.plugins ?? [],
-		customLogger: opts.customLogger,
-		envPrefix,
-		define: {
-			"process.env": "process.env",
-			...opts.define
-		},
-		build: {
-			ssr: opts.entry,
-			ssrEmitAssets: true,
-			outDir: opts.outDir,
-			emptyOutDir: true,
-			rolldownOptions: {
-				output: {
-					format: "es",
-					entryFileNames: "index.mjs"
-				},
-				external: opts.externals
-			},
-			target: "esnext",
-			sourcemap: resolveSourcemap$1(opts.sourcemap),
-			minify: false,
-			modulePreload: false,
-			watch: opts.watch ? {} : null,
-			reportCompressedSize: !opts.watch
-		},
-		ssr: {
-			target: "node",
-			noExternal: ["@cordy/electro"]
-		},
-		resolve: { conditions: resolveConditions },
-		logLevel: opts.logLevel ?? "warn",
-		clearScreen: opts.clearScreen
-	};
-	if (opts.scope === "main") {
-		const resourcesDir = resolve(opts.root, "resources");
-		if (existsSync(resourcesDir)) config.publicDir = resourcesDir;
-	}
-	if (opts.userViteConfig) {
-		const merged = mergeConfig(config, opts.userViteConfig);
-		validateMergedNodeConfig(merged, opts.scope);
-		enforceMergedNodeConfig(merged, opts.scope);
-		return merged;
-	}
-	return config;
-}
-
-//#endregion
-//#region src/dev/vite-renderer-config.ts
-function resolveSourcemap(mode) {
-	if (!mode || mode === "linked" || mode === "external") return true;
-	if (mode === "inline") return "inline";
-	if (mode === "none") return false;
-	return true;
-}
-function createRendererConfig(opts) {
-	const input = {};
-	for (const view of opts.views) {
-		const sourceDir = dirname(view.__source);
-		input[view.name] = resolve(sourceDir, view.entry);
-	}
-	const isBuild = !!opts.outDir;
-	const config = {
-		configFile: false,
-		root: opts.root,
-		customLogger: opts.customLogger,
-		envPrefix: ["RENDERER_VITE_", "VITE_"],
-		...!isBuild && { server: { strictPort: false } },
-		...isBuild && { base: "./" },
-		build: {
-			rolldownOptions: { input },
-			...isBuild && {
-				outDir: opts.outDir,
-				emptyOutDir: true,
-				minify: opts.minify ?? true,
-				sourcemap: resolveSourcemap(opts.sourcemap),
-				reportCompressedSize: true,
-				modulePreload: { polyfill: false }
-			}
-		},
-		logLevel: opts.logLevel ?? "info",
-		clearScreen: opts.clearScreen
-	};
-	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;
+		/^electron\/.+/,
+		...builtinModules.flatMap((m) => [m, `node:${m}`])
+	];
 }
 
 //#endregion
@@ -1973,6 +1828,182 @@ 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 = `
+// -- CommonJS Shims --
+import __cjs_mod__ from 'node:module';
+const __filename = import.meta.filename;
+const __dirname = import.meta.dirname;
+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;
+function findStaticImports(code) {
+	const matches = [];
+	for (const match of code.matchAll(ESMStaticImportRe)) matches.push({ end: (match.index || 0) + match[0].length });
+	return matches;
+}
+function esmShimPlugin() {
+	return {
+		name: "electro:esm-shim",
+		apply: "build",
+		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;
+			const s = new MagicString(code);
+			s.appendRight(indexToAppend, CJSShim);
+			return {
+				code: s.toString(),
+				map: sourcemap ? s.generateMap({ hires: "boundary" }) : null
+			};
+		}
+	};
+}
+
+//#endregion
+//#region src/dev/vite-node-config.ts
+function resolveSourcemap$1(mode) {
+	if (!mode || mode === "linked" || mode === "external") return true;
+	if (mode === "inline") return "inline";
+	if (mode === "none") return false;
+	return true;
+}
+function createNodeConfig(opts) {
+	const resolveConditions = opts.scope === "preload" ? [
+		"node",
+		"import",
+		"default"
+	] : ["node", "import"];
+	const envPrefix = opts.scope === "main" ? ["MAIN_VITE_", "VITE_"] : ["PRELOAD_VITE_", "VITE_"];
+	const config = {
+		configFile: false,
+		root: opts.root,
+		plugins: [esmShimPlugin(), ...opts.plugins ?? []],
+		customLogger: opts.customLogger,
+		envPrefix,
+		define: {
+			"process.env": "process.env",
+			...opts.define
+		},
+		build: {
+			ssr: opts.entry,
+			ssrEmitAssets: true,
+			outDir: opts.outDir,
+			emptyOutDir: true,
+			rolldownOptions: {
+				output: {
+					format: "es",
+					entryFileNames: "index.mjs"
+				},
+				external: opts.externals
+			},
+			target: "esnext",
+			sourcemap: resolveSourcemap$1(opts.sourcemap),
+			minify: false,
+			modulePreload: false,
+			watch: opts.watch ? {} : null,
+			reportCompressedSize: !opts.watch
+		},
+		ssr: {
+			target: "node",
+			noExternal: true
+		},
+		resolve: { conditions: resolveConditions },
+		logLevel: opts.logLevel ?? "warn",
+		clearScreen: opts.clearScreen
+	};
+	if (opts.scope === "main") {
+		const resourcesDir = resolve(opts.root, "resources");
+		if (existsSync(resourcesDir)) config.publicDir = resourcesDir;
+	}
+	if (opts.userViteConfig) {
+		const merged = mergeConfig(config, opts.userViteConfig);
+		validateMergedNodeConfig(merged, opts.scope);
+		enforceMergedNodeConfig(merged, opts.scope);
+		return merged;
+	}
+	return config;
+}
+
+//#endregion
+//#region src/dev/vite-renderer-config.ts
+function resolveSourcemap(mode) {
+	if (!mode || mode === "linked" || mode === "external") return true;
+	if (mode === "inline") return "inline";
+	if (mode === "none") return false;
+	return true;
+}
+function createRendererConfig(opts) {
+	const input = {};
+	for (const view of opts.views) {
+		const sourceDir = dirname(view.__source);
+		input[view.name] = resolve(sourceDir, view.entry);
+	}
+	const isBuild = !!opts.outDir;
+	const config = {
+		configFile: false,
+		root: opts.root,
+		customLogger: opts.customLogger,
+		envPrefix: ["RENDERER_VITE_", "VITE_"],
+		...!isBuild && { server: { strictPort: false } },
+		...isBuild && { base: "./" },
+		build: {
+			rolldownOptions: { input },
+			...isBuild && {
+				outDir: opts.outDir,
+				emptyOutDir: true,
+				minify: opts.minify ?? true,
+				sourcemap: resolveSourcemap(opts.sourcemap),
+				reportCompressedSize: true,
+				modulePreload: { polyfill: false }
+			}
+		},
+		logLevel: opts.logLevel ?? "info",
+		clearScreen: opts.clearScreen
+	};
+	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 src/plugins/utils.ts
 /** Strip query and hash from a URL/path. */
@@ -2694,7 +2725,7 @@ async function build$1(options) {
 		stepFail("codegen", err instanceof Error ? err.message : String(err));
 		process.exit(1);
 	}
-	const externals = await resolveExternals(root);
+	const externals = resolveExternals();
 	const logger = createBuildLogger();
 	try {
 		buildScope("main");
@@ -2945,7 +2976,7 @@ var DevServer = class {
 			this.attachConfigWatcher();
 			return;
 		}
-		const externals = await resolveExternals(this.root);
+		const externals = resolveExternals();
 		if (views.length > 0) {
 			const preloadTimer = startTimer();
 			try {

package/package.json

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