@pipelab/plugin-electron 1.0.0-beta.32 → 1.0.0-beta.35

package/dist/index.cjs

@@ -100815,7 +100815,7 @@ var require_errors$3 = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, mo
 var require_polyfill = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module) => {
 	const { ERR_FS_CP_DIR_TO_NON_DIR, ERR_FS_CP_EEXIST, ERR_FS_CP_EINVAL, ERR_FS_CP_FIFO_PIPE, ERR_FS_CP_NON_DIR_TO_DIR, ERR_FS_CP_SOCKET, ERR_FS_CP_SYMLINK_TO_SUBDIRECTORY, ERR_FS_CP_UNKNOWN, ERR_FS_EISDIR, ERR_INVALID_ARG_TYPE } = require_errors$3();
 	const { constants: { errno: { EEXIST, EISDIR, EINVAL, ENOTDIR } } } = require("os");
-	const { chmod: chmod$2, copyFile, lstat: lstat$2, mkdir: mkdir$8, readdir: readdir$7, readlink, stat: stat$6, symlink, unlink, utimes } = require("fs/promises");
+	const { chmod: chmod$2, copyFile, lstat: lstat$2, mkdir: mkdir$9, readdir: readdir$7, readlink, stat: stat$6, symlink, unlink, utimes } = require("fs/promises");
 	const { dirname: dirname$10, isAbsolute: isAbsolute$2, join: join$13, parse, resolve: resolve$11, sep: sep$2, toNamespacedPath } = require("path");
 	const { fileURLToPath } = require("url");
 	const defaultOptions = {
@@ -100892,7 +100892,7 @@ var require_polyfill = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, mo
 	async function checkParentDir(destStat, src, dest, opts) {
 		const destParent = dirname$10(dest);
 		if (await pathExists(destParent)) return getStatsForCopy(destStat, src, dest, opts);
-		await mkdir$8(destParent, { recursive: true });
+		await mkdir$9(destParent, { recursive: true });
 		return getStatsForCopy(destStat, src, dest, opts);
 	}
 	function pathExists(dest) {
@@ -101017,7 +101017,7 @@ var require_polyfill = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, mo
 		return copyDir(src, dest, opts);
 	}
 	async function mkDirAndCopy(srcMode, src, dest, opts) {
-		await mkdir$8(dest);
+		await mkdir$9(dest);
 		await copyDir(src, dest, opts);
 		return setDestMode(dest, srcMode);
 	}
@@ -101092,10 +101092,10 @@ var require_cp = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module)
 var require_with_temp_dir = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module) => {
 	const { join: join$12, sep: sep$1 } = require("path");
 	const getOptions = require_get_options();
-	const { mkdir: mkdir$7, mkdtemp, rm: rm$9 } = require("fs/promises");
+	const { mkdir: mkdir$8, mkdtemp, rm: rm$9 } = require("fs/promises");
 	const withTempDir = async (root, fn, opts) => {
 		const options = getOptions(opts, { copy: ["tmpPrefix"] });
-		await mkdir$7(root, { recursive: true });
+		await mkdir$8(root, { recursive: true });
 		const target = await mkdtemp(join$12(`${root}${sep$1}`, options.tmpPrefix || ""));
 		let err;
 		let result;
@@ -101332,7 +101332,7 @@ var require_path = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module
 //#region ../../node_modules/cacache/lib/entry-index.js
 var require_entry_index = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module) => {
 	const crypto$1 = require("crypto");
-	const { appendFile, mkdir: mkdir$6, readFile: readFile$8, readdir: readdir$5, rm: rm$8, writeFile: writeFile$4 } = require("fs/promises");
+	const { appendFile, mkdir: mkdir$7, readFile: readFile$8, readdir: readdir$5, rm: rm$8, writeFile: writeFile$4 } = require("fs/promises");
 	const { Minipass } = require_commonjs$10();
 	const path$14 = require("path");
 	const ssri = require_lib$17();
@@ -101366,7 +101366,7 @@ var require_entry_index = /* @__PURE__ */ require_chunk.__commonJSMin(((exports,
 		}).join("\n");
 		const setup = async () => {
 			const target = tmpName(cache, opts.tmpPrefix);
-			await mkdir$6(path$14.dirname(target), { recursive: true });
+			await mkdir$7(path$14.dirname(target), { recursive: true });
 			return {
 				target,
 				moved: false
@@ -101380,7 +101380,7 @@ var require_entry_index = /* @__PURE__ */ require_chunk.__commonJSMin(((exports,
 		};
 		const write = async (tmp) => {
 			await writeFile$4(tmp.target, newIndex, { flag: "wx" });
-			await mkdir$6(path$14.dirname(bucket), { recursive: true });
+			await mkdir$7(path$14.dirname(bucket), { recursive: true });
 			await moveFile(tmp.target, bucket);
 			tmp.moved = true;
 		};
@@ -101404,7 +101404,7 @@ var require_entry_index = /* @__PURE__ */ require_chunk.__commonJSMin(((exports,
 			metadata
 		};
 		try {
-			await mkdir$6(path$14.dirname(bucket), { recursive: true });
+			await mkdir$7(path$14.dirname(bucket), { recursive: true });
 			const stringified = JSON.stringify(entry);
 			await appendFile(bucket, `\n${hashEntry(stringified)}\t${stringified}`);
 		} catch (err) {
@@ -106247,7 +106247,7 @@ var require_rm = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module)
 //#endregion
 //#region ../../node_modules/cacache/lib/verify.js
 var require_verify$1 = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module) => {
-	const { mkdir: mkdir$5, readFile: readFile$7, rm: rm$6, stat: stat$5, truncate, writeFile: writeFile$3 } = require("fs/promises");
+	const { mkdir: mkdir$6, readFile: readFile$7, rm: rm$6, stat: stat$5, truncate, writeFile: writeFile$3 } = require("fs/promises");
 	const contentPath = require_path();
 	const fsm = require_lib$15();
 	const glob = require_glob();
@@ -106297,7 +106297,7 @@ var require_verify$1 = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, mo
 	}
 	async function fixPerms(cache, opts) {
 		opts.log.silly("verify", "fixing cache permissions");
-		await mkdir$5(cache, { recursive: true });
+		await mkdir$6(cache, { recursive: true });
 		return null;
 	}
 	async function garbageCollect(cache, opts) {
@@ -142140,7 +142140,7 @@ var require_registry = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, mo
 //#region ../../node_modules/pacote/lib/fetcher.js
 var require_fetcher = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module) => {
 	const { basename: basename$2, dirname: dirname$5 } = require("node:path");
-	const { rm: rm$5, mkdir: mkdir$4 } = require("node:fs/promises");
+	const { rm: rm$5, mkdir: mkdir$5 } = require("node:fs/promises");
 	const PackageJson = require_lib$18();
 	const cacache = require_lib$14();
 	const fsm = require_lib$13();
@@ -142324,7 +142324,7 @@ var require_fetcher = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, mod
 		}
 		async #mkdir(dest) {
 			await this.#empty(dest);
-			return await mkdir$4(dest, { recursive: true });
+			return await mkdir$5(dest, { recursive: true });
 		}
 		async extract(dest) {
 			await this.#mkdir(dest);
@@ -142344,7 +142344,7 @@ var require_fetcher = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, mod
 			}));
 		}
 		async tarballFile(dest) {
-			await mkdir$4(dirname$5(dest), { recursive: true });
+			await mkdir$5(dirname$5(dest), { recursive: true });
 			return this.#toFile(dest);
 		}
 		#extract(dest, tarball) {
@@ -152242,6 +152242,14 @@ const forge = async (action, appFolder, { cwd, log, inputs, setOutput, paths, ab
 	const destinationFolder = await context.createTempFolder("electron-forge-");
 	log(`Staging build in ${destinationFolder}`);
 	try {
+		const shimDir = (0, node_path.join)(destinationFolder, ".bin");
+		await (0, node_fs_promises.mkdir)(shimDir, { recursive: true });
+		const pnpmCjsPath = paths.pnpm;
+		if ((0, node_os.platform)() === "win32") await (0, node_fs_promises.writeFile)((0, node_path.join)(shimDir, "pnpm.cmd"), `@echo off\r\n"${node}" "${pnpmCjsPath}" %*\r\n`, "utf8");
+		else await (0, node_fs_promises.writeFile)((0, node_path.join)(shimDir, "pnpm"), `#!/bin/sh\nexec "${node}" "${pnpmCjsPath}" "$@"\n`, {
+			encoding: "utf8",
+			mode: 493
+		});
 		const forge = (0, node_path.join)(destinationFolder, "node_modules", "@electron-forge", "cli", "dist", "electron-forge.js");
 		const templateFolder = (0, node_path.join)(await fetchPipelabAsset("@pipelab/asset-electron", "^1.0.0", { context }), "template");
 		console.log("templateFolder", templateFolder);
@@ -152406,7 +152414,7 @@ const forge = async (action, appFolder, { cwd, log, inputs, setOutput, paths, ab
 				env: {
 					DEBUG: completeConfiguration.enableExtraLogging ? "*" : "",
 					ELECTRON_NO_ASAR: "1",
-					PATH: `${(0, node_path.dirname)(node)}${node_path.delimiter}${process.env.PATH}`
+					PATH: `${shimDir}${node_path.delimiter}${(0, node_path.dirname)(node)}${node_path.delimiter}${process.env.PATH}`
 				},
 				cancelSignal: abortSignal
 			}, log, {
@@ -152453,10 +152461,14 @@ const forge = async (action, appFolder, { cwd, log, inputs, setOutput, paths, ab
 		} catch (e) {
 			log("Failed to copy build output back to cwd:", e instanceof Error ? `${e.message}\n${e.stack}` : String(e));
 		}
-		await (0, node_fs_promises.rm)(destinationFolder, {
-			recursive: true,
-			force: true
-		});
+		try {
+			await (0, node_fs_promises.rm)(destinationFolder, {
+				recursive: true,
+				force: true
+			});
+		} catch (e) {
+			log("Failed to clean up staging directory:", e instanceof Error ? `${e.message}\n${e.stack}` : String(e));
+		}
 	}
 };
 //#endregion

package/dist/index.mjs

@@ -152236,6 +152236,14 @@ const forge = async (action, appFolder, { cwd, log, inputs, setOutput, paths, ab
 	const destinationFolder = await context.createTempFolder("electron-forge-");
 	log(`Staging build in ${destinationFolder}`);
 	try {
+		const shimDir = join(destinationFolder, ".bin");
+		await mkdir(shimDir, { recursive: true });
+		const pnpmCjsPath = paths.pnpm;
+		if (platform() === "win32") await writeFile(join(shimDir, "pnpm.cmd"), `@echo off\r\n"${node}" "${pnpmCjsPath}" %*\r\n`, "utf8");
+		else await writeFile(join(shimDir, "pnpm"), `#!/bin/sh\nexec "${node}" "${pnpmCjsPath}" "$@"\n`, {
+			encoding: "utf8",
+			mode: 493
+		});
 		const forge = join(destinationFolder, "node_modules", "@electron-forge", "cli", "dist", "electron-forge.js");
 		const templateFolder = join(await fetchPipelabAsset("@pipelab/asset-electron", "^1.0.0", { context }), "template");
 		console.log("templateFolder", templateFolder);
@@ -152400,7 +152408,7 @@ const forge = async (action, appFolder, { cwd, log, inputs, setOutput, paths, ab
 				env: {
 					DEBUG: completeConfiguration.enableExtraLogging ? "*" : "",
 					ELECTRON_NO_ASAR: "1",
-					PATH: `${dirname(node)}${delimiter}${process.env.PATH}`
+					PATH: `${shimDir}${delimiter}${dirname(node)}${delimiter}${process.env.PATH}`
 				},
 				cancelSignal: abortSignal
 			}, log, {
@@ -152447,10 +152455,14 @@ const forge = async (action, appFolder, { cwd, log, inputs, setOutput, paths, ab
 		} catch (e) {
 			log("Failed to copy build output back to cwd:", e instanceof Error ? `${e.message}\n${e.stack}` : String(e));
 		}
-		await rm(destinationFolder, {
-			recursive: true,
-			force: true
-		});
+		try {
+			await rm(destinationFolder, {
+				recursive: true,
+				force: true
+			});
+		} catch (e) {
+			log("Failed to clean up staging directory:", e instanceof Error ? `${e.message}\n${e.stack}` : String(e));
+		}
 	}
 };
 //#endregion