@electron-forge/core-utils 7.6.0 → 7.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- declare type PackageJSONWithDeps = {
1
+ type PackageJSONWithDeps = {
2
2
  devDependencies?: Record<string, string>;
3
3
  dependencies?: Record<string, string>;
4
4
  };
@@ -1 +1 @@
1
- {"version":3,"file":"electron-version.d.ts","sourceRoot":"","sources":["../src/electron-version.ts"],"names":[],"mappings":"AAaA,aAAK,mBAAmB,GAAG;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AA4BF,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAG7C;AA+BD,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQtH;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBvG;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAkB/H"}
1
+ {"version":3,"file":"electron-version.d.ts","sourceRoot":"","sources":["../src/electron-version.ts"],"names":[],"mappings":"AAWA,KAAK,mBAAmB,GAAG;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AA4BF,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAG7C;AA+BD,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQtH;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBvG;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAkB/H"}
@@ -4,12 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.updateElectronDependency = exports.getElectronVersion = exports.getElectronModulePath = exports.PackageNotFoundError = void 0;
7
- const path_1 = __importDefault(require("path"));
7
+ const node_path_1 = __importDefault(require("node:path"));
8
8
  const debug_1 = __importDefault(require("debug"));
9
9
  const find_up_1 = __importDefault(require("find-up"));
10
10
  const fs_extra_1 = __importDefault(require("fs-extra"));
11
11
  const semver_1 = __importDefault(require("semver"));
12
- const yarn_or_npm_1 = require("./yarn-or-npm");
13
12
  const d = (0, debug_1.default)('electron-forge:electron-version');
14
13
  const electronPackageNames = ['electron-nightly', 'electron'];
15
14
  function findElectronDep(dep) {
@@ -20,7 +19,7 @@ async function findAncestorNodeModulesPath(dir, packageName) {
20
19
  const lockPath = await (0, find_up_1.default)(['package-lock.json', 'yarn.lock', 'pnpm-lock.yaml'], { cwd: dir, type: 'file' });
21
20
  if (lockPath) {
22
21
  d(`Found lock file: ${lockPath}`);
23
- const nodeModulesPath = path_1.default.join(path_1.default.dirname(lockPath), 'node_modules', packageName);
22
+ const nodeModulesPath = node_path_1.default.join(node_path_1.default.dirname(lockPath), 'node_modules', packageName);
24
23
  if (await fs_extra_1.default.pathExists(nodeModulesPath)) {
25
24
  return nodeModulesPath;
26
25
  }
@@ -28,7 +27,7 @@ async function findAncestorNodeModulesPath(dir, packageName) {
28
27
  return Promise.resolve(undefined);
29
28
  }
30
29
  async function determineNodeModulesPath(dir, packageName) {
31
- const nodeModulesPath = path_1.default.join(dir, 'node_modules', packageName);
30
+ const nodeModulesPath = node_path_1.default.join(dir, 'node_modules', packageName);
32
31
  if (await fs_extra_1.default.pathExists(nodeModulesPath)) {
33
32
  return nodeModulesPath;
34
33
  }
@@ -36,7 +35,7 @@ async function determineNodeModulesPath(dir, packageName) {
36
35
  }
37
36
  class PackageNotFoundError extends Error {
38
37
  constructor(packageName, dir) {
39
- super(`Cannot find the package "${packageName}". Perhaps you need to run "${(0, yarn_or_npm_1.safeYarnOrNpm)()} install" in "${dir}"?`);
38
+ super(`Cannot find the package "${packageName}". Perhaps you need to run install it in "${dir}"?`);
40
39
  }
41
40
  }
42
41
  exports.PackageNotFoundError = PackageNotFoundError;
@@ -57,7 +56,7 @@ async function getElectronPackageJSONPath(dir, packageName) {
57
56
  if (!nodeModulesPath) {
58
57
  throw new PackageNotFoundError(packageName, dir);
59
58
  }
60
- const electronPackageJSONPath = path_1.default.join(nodeModulesPath, 'package.json');
59
+ const electronPackageJSONPath = node_path_1.default.join(nodeModulesPath, 'package.json');
61
60
  if (await fs_extra_1.default.pathExists(electronPackageJSONPath)) {
62
61
  return electronPackageJSONPath;
63
62
  }
@@ -67,7 +66,7 @@ async function getElectronModulePath(dir, packageJSON) {
67
66
  const moduleName = getElectronModuleName(packageJSON);
68
67
  const packageJSONPath = await getElectronPackageJSONPath(dir, moduleName);
69
68
  if (packageJSONPath) {
70
- return path_1.default.dirname(packageJSONPath);
69
+ return node_path_1.default.dirname(packageJSONPath);
71
70
  }
72
71
  return undefined;
73
72
  }
@@ -111,4 +110,4 @@ function updateElectronDependency(packageJSON, dev, exact) {
111
110
  return [alteredDev, alteredExact];
112
111
  }
113
112
  exports.updateElectronDependency = updateElectronDependency;
114
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxlY3Ryb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9lbGVjdHJvbi12ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGdEQUF3QjtBQUV4QixrREFBMEI7QUFDMUIsc0RBQTZCO0FBQzdCLHdEQUEwQjtBQUMxQixvREFBNEI7QUFFNUIsK0NBQThDO0FBRTlDLE1BQU0sQ0FBQyxHQUFHLElBQUEsZUFBSyxFQUFDLGlDQUFpQyxDQUFDLENBQUM7QUFFbkQsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLGtCQUFrQixFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBTzlELFNBQVMsZUFBZSxDQUFDLEdBQVc7SUFDbEMsT0FBTyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDNUMsQ0FBQztBQUVELEtBQUssVUFBVSwyQkFBMkIsQ0FBQyxHQUFXLEVBQUUsV0FBbUI7SUFDekUsQ0FBQyxDQUFDLDBEQUEwRCxDQUFDLENBQUM7SUFDOUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLGlCQUFNLEVBQUMsQ0FBQyxtQkFBbUIsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLENBQUMsRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFDaEgsSUFBSSxRQUFRLEVBQUU7UUFDWixDQUFDLENBQUMsb0JBQW9CLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDbEMsTUFBTSxlQUFlLEdBQUcsY0FBSSxDQUFDLElBQUksQ0FBQyxjQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUN2RixJQUFJLE1BQU0sa0JBQUUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLEVBQUU7WUFDeEMsT0FBTyxlQUFlLENBQUM7U0FDeEI7S0FDRjtJQUVELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENB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
113
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxlY3Ryb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9lbGVjdHJvbi12ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDBEQUE2QjtBQUU3QixrREFBMEI7QUFDMUIsc0RBQTZCO0FBQzdCLHdEQUEwQjtBQUMxQixvREFBNEI7QUFFNUIsTUFBTSxDQUFDLEdBQUcsSUFBQSxlQUFLLEVBQUMsaUNBQWlDLENBQUMsQ0FBQztBQUVuRCxNQUFNLG9CQUFvQixHQUFHLENBQUMsa0JBQWtCLEVBQUUsVUFBVSxDQUFDLENBQUM7QUFPOUQsU0FBUyxlQUFlLENBQUMsR0FBVztJQUNsQyxPQUFPLG9CQUFvQixDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUM1QyxDQUFDO0FBRUQsS0FBSyxVQUFVLDJCQUEyQixDQUFDLEdBQVcsRUFBRSxXQUFtQjtJQUN6RSxDQUFDLENBQUMsMERBQTBELENBQUMsQ0FBQztJQUM5RCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUEsaUJBQU0sRUFBQyxDQUFDLG1CQUFtQixFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUNoSCxJQUFJLFFBQVEsRUFBRSxDQUFDO1FBQ2IsQ0FBQyxDQUFDLG9CQUFvQixRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sZUFBZSxHQUFHLG1CQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUN2RixJQUFJLE1BQU0sa0JBQUUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQztZQUN6QyxPQUFPLGVBQWUsQ0FBQztRQUN6QixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FB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
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  export * from './rebuild';
2
2
  export * from './electron-version';
3
- export * from './yarn-or-npm';
3
+ export * from './package-manager';
4
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC"}
package/dist/index.js CHANGED
@@ -16,5 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./rebuild"), exports);
18
18
  __exportStar(require("./electron-version"), exports);
19
- __exportStar(require("./yarn-or-npm"), exports);
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDRDQUEwQjtBQUMxQixxREFBbUM7QUFDbkMsZ0RBQThCIn0=
19
+ __exportStar(require("./package-manager"), exports);
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDRDQUEwQjtBQUMxQixxREFBbUM7QUFDbkMsb0RBQWtDIn0=
@@ -0,0 +1,29 @@
1
+ import { CrossSpawnArgs, CrossSpawnOptions } from '@malept/cross-spawn-promise';
2
+ export type SupportedPackageManager = 'yarn' | 'npm' | 'pnpm';
3
+ export type PMDetails = {
4
+ executable: SupportedPackageManager;
5
+ version?: string;
6
+ install: string;
7
+ dev: string;
8
+ exact: string;
9
+ };
10
+ /**
11
+ * Supported package managers and the commands and flags they need to install dependencies.
12
+ */
13
+ export declare const PACKAGE_MANAGERS: Record<SupportedPackageManager, PMDetails>;
14
+ /**
15
+ * Resolves the package manager to use. In order, it checks the following:
16
+ *
17
+ * 1. The value of the `NODE_INSTALLER` environment variable.
18
+ * 2. The `process.env.npm_config_user_agent` value set by the executing package manager.
19
+ * 3. The presence of a lockfile in an ancestor directory.
20
+ * 4. If an unknown package manager is used (or none of the above apply), then we fall back to `npm`.
21
+ *
22
+ * The version of the executing package manager is also returned if it is detected via user agent.
23
+ *
24
+ * Supported package managers are `yarn`, `pnpm`, and `npm`.
25
+ *
26
+ */
27
+ export declare const resolvePackageManager: () => Promise<PMDetails>;
28
+ export declare const spawnPackageManager: (pm: PMDetails, args?: CrossSpawnArgs, opts?: CrossSpawnOptions) => Promise<string>;
29
+ //# sourceMappingURL=package-manager.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../src/package-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAS,MAAM,6BAA6B,CAAC;AAQvF,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;AAC9D,MAAM,MAAM,SAAS,GAAG;IAAE,UAAU,EAAE,uBAAuB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAI/H;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,uBAAuB,EAAE,SAAS,CAmBvE,CAAC;AA2BF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,OAAO,CAAC,SAAS,CA+B1D,CAAC;AAEF,eAAO,MAAM,mBAAmB,OAAc,SAAS,SAAS,cAAc,SAAS,iBAAiB,KAAG,QAAQ,MAAM,CAExH,CAAC"}
@@ -0,0 +1,104 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.spawnPackageManager = exports.resolvePackageManager = exports.PACKAGE_MANAGERS = void 0;
7
+ const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
8
+ const chalk_1 = __importDefault(require("chalk"));
9
+ const debug_1 = __importDefault(require("debug"));
10
+ const find_up_1 = __importDefault(require("find-up"));
11
+ const log_symbols_1 = __importDefault(require("log-symbols"));
12
+ const d = (0, debug_1.default)('electron-forge:package-manager');
13
+ let hasWarned = false;
14
+ /**
15
+ * Supported package managers and the commands and flags they need to install dependencies.
16
+ */
17
+ exports.PACKAGE_MANAGERS = {
18
+ yarn: {
19
+ executable: 'yarn',
20
+ install: 'add',
21
+ dev: '--dev',
22
+ exact: '--exact',
23
+ },
24
+ npm: {
25
+ executable: 'npm',
26
+ install: 'install',
27
+ dev: '--save-dev',
28
+ exact: '--save-exact',
29
+ },
30
+ pnpm: {
31
+ executable: 'pnpm',
32
+ install: 'add',
33
+ dev: '--save-dev',
34
+ exact: '--save-exact',
35
+ },
36
+ };
37
+ const PM_FROM_LOCKFILE = {
38
+ 'package-lock.json': 'npm',
39
+ 'yarn.lock': 'yarn',
40
+ 'pnpm-lock.yaml': 'pnpm',
41
+ };
42
+ /**
43
+ * Parses the `npm_config_user_agent` environment variable and returns its name and version.
44
+ *
45
+ * Code taken from {@link https://github.com/zkochan/packages/tree/main/which-pm-runs/ | which-pm-runs}.
46
+ */
47
+ function pmFromUserAgent() {
48
+ const userAgent = process.env.npm_config_user_agent;
49
+ if (!userAgent) {
50
+ return undefined;
51
+ }
52
+ const pmSpec = userAgent.split(' ', 1)[0];
53
+ const separatorPos = pmSpec.lastIndexOf('/');
54
+ const name = pmSpec.substring(0, separatorPos);
55
+ return {
56
+ name: name === 'npminstall' ? 'cnpm' : name,
57
+ version: pmSpec.substring(separatorPos + 1),
58
+ };
59
+ }
60
+ /**
61
+ * Resolves the package manager to use. In order, it checks the following:
62
+ *
63
+ * 1. The value of the `NODE_INSTALLER` environment variable.
64
+ * 2. The `process.env.npm_config_user_agent` value set by the executing package manager.
65
+ * 3. The presence of a lockfile in an ancestor directory.
66
+ * 4. If an unknown package manager is used (or none of the above apply), then we fall back to `npm`.
67
+ *
68
+ * The version of the executing package manager is also returned if it is detected via user agent.
69
+ *
70
+ * Supported package managers are `yarn`, `pnpm`, and `npm`.
71
+ *
72
+ */
73
+ const resolvePackageManager = async () => {
74
+ const executingPM = pmFromUserAgent();
75
+ const lockfile = await (0, find_up_1.default)(['package-lock.json', 'yarn.lock', 'pnpm-lock.yaml', 'pnpm-workspace.yaml'], { type: 'file' });
76
+ const lockfilePM = (lockfile && PM_FROM_LOCKFILE[lockfile]) ?? undefined;
77
+ const installer = process.env.NODE_INSTALLER || executingPM?.name || lockfilePM;
78
+ // TODO(erickzhao): Remove NODE_INSTALLER environment variable for Forge 8
79
+ if (typeof process.env.NODE_INSTALLER === 'string' && !hasWarned) {
80
+ console.warn(log_symbols_1.default.warning, chalk_1.default.yellow(`The NODE_INSTALLER environment variable is deprecated and will be removed in Electron Forge v8`));
81
+ hasWarned = true;
82
+ }
83
+ switch (installer) {
84
+ case 'yarn':
85
+ case 'npm':
86
+ case 'pnpm':
87
+ d(`Resolved package manager to ${installer}. (Derived from NODE_INSTALLER: ${process.env.NODE_INSTALLER}, npm_config_user_agent: ${executingPM}, lockfile: ${lockfilePM}.)`);
88
+ return { ...exports.PACKAGE_MANAGERS[installer], version: executingPM?.version };
89
+ default:
90
+ if (installer !== undefined) {
91
+ console.warn(log_symbols_1.default.warning, chalk_1.default.yellow(`Package manager ${chalk_1.default.red(installer)} is unsupported. Falling back to ${chalk_1.default.green('npm')} instead.`));
92
+ }
93
+ else {
94
+ d(`No package manager detected. Falling back to npm.`);
95
+ }
96
+ return exports.PACKAGE_MANAGERS['npm'];
97
+ }
98
+ };
99
+ exports.resolvePackageManager = resolvePackageManager;
100
+ const spawnPackageManager = async (pm, args, opts) => {
101
+ return (0, cross_spawn_promise_1.spawn)(pm.executable, args, opts);
102
+ };
103
+ exports.spawnPackageManager = spawnPackageManager;
104
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFja2FnZS1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3BhY2thZ2UtbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxxRUFBdUY7QUFDdkYsa0RBQTBCO0FBQzFCLGtEQUEwQjtBQUMxQixzREFBNkI7QUFDN0IsOERBQXFDO0FBRXJDLE1BQU0sQ0FBQyxHQUFHLElBQUEsZUFBSyxFQUFDLGdDQUFnQyxDQUFDLENBQUM7QUFLbEQsSUFBSSxTQUFTLEdBQUcsS0FBSyxDQUFDO0FBRXRCOztHQUVHO0FBQ1UsUUFBQSxnQkFBZ0IsR0FBK0M7SUFDMUUsSUFBSSxFQUFFO1FBQ0osVUFBVSxFQUFFLE1BQU07UUFDbEIsT0FBTyxFQUFFLEtBQUs7UUFDZCxHQUFHLEVBQUUsT0FBTztRQUNaLEtBQUssRUFBRSxTQUFTO0tBQ2pCO0lBQ0QsR0FBRyxFQUFFO1FBQ0gsVUFBVSxFQUFFLEtBQUs7UUFDakIsT0FBTyxFQUFFLFNBQVM7UUFDbEIsR0FBRyxFQUFFLFlBQVk7UUFDakIsS0FBSyxFQUFFLGNBQWM7S0FDdEI7SUFDRCxJQUFJLEVBQUU7UUFDSixVQUFVLEVBQUUsTUFBTTtRQUNsQixPQUFPLEVBQUUsS0FBSztRQUNkLEdBQUcsRUFBRSxZQUFZO1FBQ2pCLEtBQUssRUFBRSxjQUFjO0tBQ3RCO0NBQ0YsQ0FBQztBQUVGLE1BQU0sZ0JBQWdCLEdBQTRDO0lBQ2hFLG1CQUFtQixFQUFFLEtBQUs7SUFDMUIsV0FBVyxFQUFFLE1BQU07SUFDbkIsZ0JBQWdCLEVBQUUsTUFBTTtDQUN6QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILFNBQVMsZUFBZTtJQUN0QixNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDO0lBQ3BELElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUNmLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxNQUFNLE1BQU0sR0FBRyxTQUFTLENB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
package/dist/rebuild.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ForgeArch, ForgeListrTask, ForgePlatform } from '@electron-forge/shared-types';
2
1
  import { RebuildOptions } from '@electron/rebuild';
2
+ import { ForgeArch, ForgeListrTask, ForgePlatform } from '@electron-forge/shared-types';
3
3
  export declare const listrCompatibleRebuildHook: <Ctx = never>(buildPath: string, electronVersion: string, platform: ForgePlatform, arch: ForgeArch, config: Partial<RebuildOptions> | undefined, task: ForgeListrTask<Ctx>, taskTitlePrefix?: string) => Promise<void>;
4
4
  //# sourceMappingURL=rebuild.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"rebuild.d.ts","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,eAAO,MAAM,0BAA0B,2BAC1B,MAAM,mBACA,MAAM,YACb,aAAa,QACjB,SAAS,uGAId,QAAQ,IAAI,CAgEd,CAAC"}
1
+ {"version":3,"file":"rebuild.d.ts","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAExF,eAAO,MAAM,0BAA0B,2BAC1B,MAAM,mBACA,MAAM,YACb,aAAa,QACjB,SAAS,uGAId,QAAQ,IAAI,CAgEd,CAAC"}
package/dist/rebuild.js CHANGED
@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.listrCompatibleRebuildHook = void 0;
27
- const cp = __importStar(require("child_process"));
28
- const path = __importStar(require("path"));
27
+ const cp = __importStar(require("node:child_process"));
28
+ const path = __importStar(require("node:path"));
29
29
  const listrCompatibleRebuildHook = async (buildPath, electronVersion, platform, arch, config = {}, task, taskTitlePrefix = '') => {
30
30
  task.title = `${taskTitlePrefix}Preparing native dependencies`;
31
31
  const options = {
@@ -86,4 +86,4 @@ const listrCompatibleRebuildHook = async (buildPath, electronVersion, platform,
86
86
  });
87
87
  };
88
88
  exports.listrCompatibleRebuildHook = listrCompatibleRebuildHook;
89
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVidWlsZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9yZWJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0RBQW9DO0FBQ3BDLDJDQUE2QjtBQUt0QixNQUFNLDBCQUEwQixHQUFHLEtBQUssRUFDN0MsU0FBaUIsRUFDakIsZUFBdUIsRUFDdkIsUUFBdUIsRUFDdkIsSUFBZSxFQUNmLFNBQWtDLEVBQUUsRUFDcEMsSUFBeUIsRUFDekIsZUFBZSxHQUFHLEVBQUUsRUFDTCxFQUFFO0lBQ2pCLElBQUksQ0FBQyxLQUFLLEdBQUcsR0FBRyxlQUFlLCtCQUErQixDQUFDO0lBRS9ELE1BQU0sT0FBTyxHQUFtQjtRQUM5QixHQUFHLE1BQU07UUFDVCxTQUFTO1FBQ1QsZUFBZTtRQUNmLElBQUk7S0FDTCxDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxtQkFBbUIsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFO1FBQzdGLEtBQUssRUFBRSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQztLQUN2QyxDQUFDLENBQUM7SUFFSCxJQUFJLFlBQW1CLENBQUM7SUFDeEIsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDO0lBRWIsTUFBTSxNQUFNLEdBQUcsR0FBRyxFQUFFO1FBQ2xCLElBQUksQ0FBQyxLQUFLLEdBQUcsR0FBRyxlQUFlLGtDQUFrQyxJQUFJLE1BQU0sS0FBSyxFQUFFLENBQUM7SUFDckYsQ0FBQyxDQUFDO0lBRUYsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDakMsSUFBSSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDakMsQ0FBQyxDQUFDLENBQUM7SUFDSCxLQUFLLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUNqQyxJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNqQyxDQUFDLENBQUMsQ0FBQztJQUVILEtBQUssQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUFFLENBQUMsT0FBaUUsRUFBRSxFQUFFO1FBQ3hGLFFBQVEsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNuQixLQUFLLGNBQWMsQ0FBQyxDQUFDO2dCQUNuQixLQUFLLElBQUksQ0FBQyxDQUFDO2dCQUNYLE1BQU0sRUFBRSxDQUFDO2dCQUNULE1BQU07YUFDUDtZQUNELEtBQUssYUFBYSxDQUFDLENBQUM7Z0JBQ2xCLElBQUksSUFBSSxDQUFDLENBQUM7Z0JBQ1YsTUFBTSxFQUFFLENBQUM7Z0JBQ1QsTUFBTTthQUNQO1lBQ0QsS0FBSyxlQUFlLENBQUMsQ0FBQztnQkFDcEIsWUFBWSxHQUFHLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQzlDLFlBQVksQ0FBQyxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7Z0JBQ3ZDLE1BQU07YUFDUDtZQUNELEtBQUssY0FBYyxDQUFDLENBQUM7Z0JBQ25CLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsSUFBSSxrQkFBa0IsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixFQUFFO29CQUN4RixJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQztpQkFDeEQ7Z0JBQ0QsTUFBTTthQUNQO1NBQ0Y7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDMUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUN4QixJQUFJLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUU7Z0JBQy9CLE9BQU8sRUFBRSxDQUFDO2FBQ1g7aUJBQU07Z0JBQ0wsTUFBTSxDQUFDLFlBQVksSUFBSSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO2FBQy9FO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQztBQXhFVyxRQUFBLDBCQUEwQiw4QkF3RXJDIn0=
89
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVidWlsZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9yZWJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXlDO0FBQ3pDLGdEQUFrQztBQUszQixNQUFNLDBCQUEwQixHQUFHLEtBQUssRUFDN0MsU0FBaUIsRUFDakIsZUFBdUIsRUFDdkIsUUFBdUIsRUFDdkIsSUFBZSxFQUNmLFNBQWtDLEVBQUUsRUFDcEMsSUFBeUIsRUFDekIsZUFBZSxHQUFHLEVBQUUsRUFDTCxFQUFFO0lBQ2pCLElBQUksQ0FBQyxLQUFLLEdBQUcsR0FBRyxlQUFlLCtCQUErQixDQUFDO0lBRS9ELE1BQU0sT0FBTyxHQUFtQjtRQUM5QixHQUFHLE1BQU07UUFDVCxTQUFTO1FBQ1QsZUFBZTtRQUNmLElBQUk7S0FDTCxDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxtQkFBbUIsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFO1FBQzdGLEtBQUssRUFBRSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQztLQUN2QyxDQUFDLENBQUM7SUFFSCxJQUFJLFlBQW1CLENBQUM7SUFDeEIsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDO0lBRWIsTUFBTSxNQUFNLEdBQUcsR0FBRyxFQUFFO1FBQ2xCLElBQUksQ0FBQyxLQUFLLEdBQUcsR0FBRyxlQUFlLGtDQUFrQyxJQUFJLE1BQU0sS0FBSyxFQUFFLENBQUM7SUFDckYsQ0FBQyxDQUFDO0lBRUYsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDakMsSUFBSSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDakMsQ0FBQyxDQUFDLENBQUM7SUFDSCxLQUFLLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUNqQyxJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNqQyxDQUFDLENBQUMsQ0FBQztJQUVILEtBQUssQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUFFLENBQUMsT0FBaUUsRUFBRSxFQUFFO1FBQ3hGLFFBQVEsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3BCLEtBQUssY0FBYyxDQUFDLENBQUMsQ0FBQztnQkFDcEIsS0FBSyxJQUFJLENBQUMsQ0FBQztnQkFDWCxNQUFNLEVBQUUsQ0FBQztnQkFDVCxNQUFNO1lBQ1IsQ0FBQztZQUNELEtBQUssYUFBYSxDQUFDLENBQUMsQ0FBQztnQkFDbkIsSUFBSSxJQUFJLENBQUMsQ0FBQztnQkFDVixNQUFNLEVBQUUsQ0FBQztnQkFDVCxNQUFNO1lBQ1IsQ0FBQztZQUNELEtBQUssZUFBZSxDQUFDLENBQUMsQ0FBQztnQkFDckIsWUFBWSxHQUFHLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQzlDLFlBQVksQ0FBQyxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7Z0JBQ3ZDLE1BQU07WUFDUixDQUFDO1lBQ0QsS0FBSyxjQUFjLENBQUMsQ0FBQyxDQUFDO2dCQUNwQixJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsbUJBQW1CLElBQUksa0JBQWtCLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO29CQUN6RixJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQztnQkFDekQsQ0FBQztnQkFDRCxNQUFNO1lBQ1IsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDMUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUN4QixJQUFJLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztnQkFDaEMsT0FBTyxFQUFFLENBQUM7WUFDWixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sTUFBTSxDQUFDLFlBQVksSUFBSSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQ2hGLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBeEVXLFFBQUEsMEJBQTBCLDhCQXdFckMifQ==
@@ -27,4 +27,4 @@ rebuilder
27
27
  // eslint-disable-next-line no-process-exit
28
28
  process.exit(0);
29
29
  });
30
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3RlLXJlYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcmVtb3RlLXJlYnVpbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBNEQ7QUFFNUQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUU7SUFDakIsT0FBTyxDQUFDLEtBQUssQ0FBQyxnRUFBZ0UsQ0FBQyxDQUFDO0lBQ2hGLDJDQUEyQztJQUMzQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2pCO0FBRUQsTUFBTSxPQUFPLEdBQW1CLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRTVELE1BQU0sU0FBUyxHQUFHLElBQUEsaUJBQU8sRUFBQyxPQUFPLENBQUMsQ0FBQztBQUVuQyxTQUFTLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxjQUFjLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsR0FBRyxFQUFFLGNBQWMsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUN0RixTQUFTLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxhQUFhLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsR0FBRyxFQUFFLGFBQWEsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUVwRixTQUFTO0tBQ04sSUFBSSxDQUFDLEdBQUcsRUFBRTtJQUNULE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDO0lBQ3hDLDJDQUEyQztJQUMzQyxPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDekIsQ0FBQyxDQUFDO0tBQ0QsS0FBSyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7SUFDYixPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDYixHQUFHLEVBQUUsZUFBZTtRQUNwQixHQUFHLEVBQUU7WUFDSCxPQUFPLEVBQUUsR0FBRyxDQUFDLE9BQU87WUFDcEIsS0FBSyxFQUFFLEdBQUcsQ0FBQyxLQUFLO1NBQ2pCO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsMkNBQTJDO0lBQzNDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEIsQ0FBQyxDQUFDLENBQUMifQ==
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3RlLXJlYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcmVtb3RlLXJlYnVpbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBNEQ7QUFFNUQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNsQixPQUFPLENBQUMsS0FBSyxDQUFDLGdFQUFnRSxDQUFDLENBQUM7SUFDaEYsMkNBQTJDO0lBQzNDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEIsQ0FBQztBQUVELE1BQU0sT0FBTyxHQUFtQixJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUU1RCxNQUFNLFNBQVMsR0FBRyxJQUFBLGlCQUFPLEVBQUMsT0FBTyxDQUFDLENBQUM7QUFFbkMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsY0FBYyxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDdEYsU0FBUyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFFcEYsU0FBUztLQUNOLElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDVCxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxHQUFHLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQztJQUN4QywyQ0FBMkM7SUFDM0MsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3pCLENBQUMsQ0FBQztLQUNELEtBQUssQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO0lBQ2IsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2IsR0FBRyxFQUFFLGVBQWU7UUFDcEIsR0FBRyxFQUFFO1lBQ0gsT0FBTyxFQUFFLEdBQUcsQ0FBQyxPQUFPO1lBQ3BCLEtBQUssRUFBRSxHQUFHLENBQUMsS0FBSztTQUNqQjtLQUNGLENBQUMsQ0FBQztJQUNILDJDQUEyQztJQUMzQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUMsQ0FBQyxDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@electron-forge/core-utils",
3
- "version": "7.6.0",
3
+ "version": "7.7.0",
4
4
  "description": "Core utilities for the Electron Forge packages",
5
5
  "repository": "https://github.com/electron/forge",
6
6
  "author": "Samuel Attard",
@@ -8,7 +8,7 @@
8
8
  "main": "dist/index.js",
9
9
  "typings": "dist/index.d.ts",
10
10
  "dependencies": {
11
- "@electron-forge/shared-types": "7.6.0",
11
+ "@electron-forge/shared-types": "7.7.0",
12
12
  "@electron/rebuild": "^3.7.0",
13
13
  "@malept/cross-spawn-promise": "^2.0.0",
14
14
  "chalk": "^4.0.0",
@@ -16,18 +16,17 @@
16
16
  "find-up": "^5.0.0",
17
17
  "fs-extra": "^10.0.0",
18
18
  "log-symbols": "^4.0.0",
19
- "semver": "^7.2.1",
20
- "yarn-or-npm": "^3.0.1"
19
+ "semver": "^7.2.1"
21
20
  },
22
21
  "engines": {
23
22
  "node": ">= 16.4.0"
24
23
  },
25
24
  "devDependencies": {
26
- "chai": "^4.3.3"
25
+ "vitest": "^3.0.3"
27
26
  },
28
27
  "files": [
29
28
  "dist",
30
29
  "src"
31
30
  ],
32
- "gitHead": "37a66f2a42e2ea74a30d168a32aff69c90cc20b9"
31
+ "gitHead": "6a88c47b5916a39ee9f993d98d420c6c857de54c"
33
32
  }
@@ -1,12 +1,10 @@
1
- import path from 'path';
1
+ import path from 'node:path';
2
2
 
3
3
  import debug from 'debug';
4
4
  import findUp from 'find-up';
5
5
  import fs from 'fs-extra';
6
6
  import semver from 'semver';
7
7
 
8
- import { safeYarnOrNpm } from './yarn-or-npm';
9
-
10
8
  const d = debug('electron-forge:electron-version');
11
9
 
12
10
  const electronPackageNames = ['electron-nightly', 'electron'];
@@ -44,7 +42,7 @@ async function determineNodeModulesPath(dir: string, packageName: string): Promi
44
42
 
45
43
  export class PackageNotFoundError extends Error {
46
44
  constructor(packageName: string, dir: string) {
47
- super(`Cannot find the package "${packageName}". Perhaps you need to run "${safeYarnOrNpm()} install" in "${dir}"?`);
45
+ super(`Cannot find the package "${packageName}". Perhaps you need to run install it in "${dir}"?`);
48
46
  }
49
47
  }
50
48
 
package/src/index.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export * from './rebuild';
2
2
  export * from './electron-version';
3
- export * from './yarn-or-npm';
3
+ export * from './package-manager';
@@ -0,0 +1,111 @@
1
+ import { CrossSpawnArgs, CrossSpawnOptions, spawn } from '@malept/cross-spawn-promise';
2
+ import chalk from 'chalk';
3
+ import debug from 'debug';
4
+ import findUp from 'find-up';
5
+ import logSymbols from 'log-symbols';
6
+
7
+ const d = debug('electron-forge:package-manager');
8
+
9
+ export type SupportedPackageManager = 'yarn' | 'npm' | 'pnpm';
10
+ export type PMDetails = { executable: SupportedPackageManager; version?: string; install: string; dev: string; exact: string };
11
+
12
+ let hasWarned = false;
13
+
14
+ /**
15
+ * Supported package managers and the commands and flags they need to install dependencies.
16
+ */
17
+ export const PACKAGE_MANAGERS: Record<SupportedPackageManager, PMDetails> = {
18
+ yarn: {
19
+ executable: 'yarn',
20
+ install: 'add',
21
+ dev: '--dev',
22
+ exact: '--exact',
23
+ },
24
+ npm: {
25
+ executable: 'npm',
26
+ install: 'install',
27
+ dev: '--save-dev',
28
+ exact: '--save-exact',
29
+ },
30
+ pnpm: {
31
+ executable: 'pnpm',
32
+ install: 'add',
33
+ dev: '--save-dev',
34
+ exact: '--save-exact',
35
+ },
36
+ };
37
+
38
+ const PM_FROM_LOCKFILE: Record<string, SupportedPackageManager> = {
39
+ 'package-lock.json': 'npm',
40
+ 'yarn.lock': 'yarn',
41
+ 'pnpm-lock.yaml': 'pnpm',
42
+ };
43
+
44
+ /**
45
+ * Parses the `npm_config_user_agent` environment variable and returns its name and version.
46
+ *
47
+ * Code taken from {@link https://github.com/zkochan/packages/tree/main/which-pm-runs/ | which-pm-runs}.
48
+ */
49
+ function pmFromUserAgent() {
50
+ const userAgent = process.env.npm_config_user_agent;
51
+ if (!userAgent) {
52
+ return undefined;
53
+ }
54
+ const pmSpec = userAgent.split(' ', 1)[0];
55
+ const separatorPos = pmSpec.lastIndexOf('/');
56
+ const name = pmSpec.substring(0, separatorPos);
57
+ return {
58
+ name: name === 'npminstall' ? 'cnpm' : name,
59
+ version: pmSpec.substring(separatorPos + 1),
60
+ };
61
+ }
62
+
63
+ /**
64
+ * Resolves the package manager to use. In order, it checks the following:
65
+ *
66
+ * 1. The value of the `NODE_INSTALLER` environment variable.
67
+ * 2. The `process.env.npm_config_user_agent` value set by the executing package manager.
68
+ * 3. The presence of a lockfile in an ancestor directory.
69
+ * 4. If an unknown package manager is used (or none of the above apply), then we fall back to `npm`.
70
+ *
71
+ * The version of the executing package manager is also returned if it is detected via user agent.
72
+ *
73
+ * Supported package managers are `yarn`, `pnpm`, and `npm`.
74
+ *
75
+ */
76
+ export const resolvePackageManager: () => Promise<PMDetails> = async () => {
77
+ const executingPM = pmFromUserAgent();
78
+ const lockfile = await findUp(['package-lock.json', 'yarn.lock', 'pnpm-lock.yaml', 'pnpm-workspace.yaml'], { type: 'file' });
79
+ const lockfilePM = (lockfile && PM_FROM_LOCKFILE[lockfile]) ?? undefined;
80
+ const installer = process.env.NODE_INSTALLER || executingPM?.name || lockfilePM;
81
+
82
+ // TODO(erickzhao): Remove NODE_INSTALLER environment variable for Forge 8
83
+ if (typeof process.env.NODE_INSTALLER === 'string' && !hasWarned) {
84
+ console.warn(logSymbols.warning, chalk.yellow(`The NODE_INSTALLER environment variable is deprecated and will be removed in Electron Forge v8`));
85
+ hasWarned = true;
86
+ }
87
+
88
+ switch (installer) {
89
+ case 'yarn':
90
+ case 'npm':
91
+ case 'pnpm':
92
+ d(
93
+ `Resolved package manager to ${installer}. (Derived from NODE_INSTALLER: ${process.env.NODE_INSTALLER}, npm_config_user_agent: ${executingPM}, lockfile: ${lockfilePM}.)`
94
+ );
95
+ return { ...PACKAGE_MANAGERS[installer], version: executingPM?.version };
96
+ default:
97
+ if (installer !== undefined) {
98
+ console.warn(
99
+ logSymbols.warning,
100
+ chalk.yellow(`Package manager ${chalk.red(installer)} is unsupported. Falling back to ${chalk.green('npm')} instead.`)
101
+ );
102
+ } else {
103
+ d(`No package manager detected. Falling back to npm.`);
104
+ }
105
+ return PACKAGE_MANAGERS['npm'];
106
+ }
107
+ };
108
+
109
+ export const spawnPackageManager = async (pm: PMDetails, args?: CrossSpawnArgs, opts?: CrossSpawnOptions): Promise<string> => {
110
+ return spawn(pm.executable, args, opts);
111
+ };
package/src/rebuild.ts CHANGED
@@ -1,8 +1,8 @@
1
- import * as cp from 'child_process';
2
- import * as path from 'path';
1
+ import * as cp from 'node:child_process';
2
+ import * as path from 'node:path';
3
3
 
4
- import { ForgeArch, ForgeListrTask, ForgePlatform } from '@electron-forge/shared-types';
5
4
  import { RebuildOptions } from '@electron/rebuild';
5
+ import { ForgeArch, ForgeListrTask, ForgePlatform } from '@electron-forge/shared-types';
6
6
 
7
7
  export const listrCompatibleRebuildHook = async <Ctx = never>(
8
8
  buildPath: string,
@@ -1,5 +0,0 @@
1
- import { CrossSpawnArgs, CrossSpawnOptions } from '@malept/cross-spawn-promise';
2
- export declare const safeYarnOrNpm: () => "yarn" | "npm";
3
- export declare const yarnOrNpmSpawn: (args?: CrossSpawnArgs, opts?: CrossSpawnOptions | undefined) => Promise<string>;
4
- export declare const hasYarn: () => boolean;
5
- //# sourceMappingURL=yarn-or-npm.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"yarn-or-npm.d.ts","sourceRoot":"","sources":["../src/yarn-or-npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAS,MAAM,6BAA6B,CAAC;AAKvF,eAAO,MAAM,aAAa,sBAYzB,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,cAAc,2CAA6B,QAAQ,MAAM,CAAuC,CAAC;AAEvI,eAAO,MAAM,OAAO,QAAO,OAAqC,CAAC"}
@@ -1,29 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.hasYarn = exports.yarnOrNpmSpawn = exports.safeYarnOrNpm = void 0;
7
- const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
8
- const chalk_1 = __importDefault(require("chalk"));
9
- const log_symbols_1 = __importDefault(require("log-symbols"));
10
- const yarn_or_npm_1 = __importDefault(require("yarn-or-npm"));
11
- const safeYarnOrNpm = () => {
12
- const system = (0, yarn_or_npm_1.default)();
13
- switch (process.env.NODE_INSTALLER) {
14
- case 'yarn':
15
- case 'npm':
16
- return process.env.NODE_INSTALLER;
17
- default:
18
- if (process.env.NODE_INSTALLER) {
19
- console.warn(log_symbols_1.default.warning, chalk_1.default.yellow(`Unknown NODE_INSTALLER, using detected installer ${system}`));
20
- }
21
- return system;
22
- }
23
- };
24
- exports.safeYarnOrNpm = safeYarnOrNpm;
25
- const yarnOrNpmSpawn = (args, opts) => (0, cross_spawn_promise_1.spawn)((0, exports.safeYarnOrNpm)(), args, opts);
26
- exports.yarnOrNpmSpawn = yarnOrNpmSpawn;
27
- const hasYarn = () => (0, exports.safeYarnOrNpm)() === 'yarn';
28
- exports.hasYarn = hasYarn;
29
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoieWFybi1vci1ucG0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMveWFybi1vci1ucG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEscUVBQXVGO0FBQ3ZGLGtEQUEwQjtBQUMxQiw4REFBcUM7QUFDckMsOERBQW9DO0FBRTdCLE1BQU0sYUFBYSxHQUFHLEdBQUcsRUFBRTtJQUNoQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFTLEdBQUUsQ0FBQztJQUMzQixRQUFRLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFO1FBQ2xDLEtBQUssTUFBTSxDQUFDO1FBQ1osS0FBSyxLQUFLO1lBQ1IsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQztRQUNwQztZQUNFLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEVBQUU7Z0JBQzlCLE9BQU8sQ0FBQyxJQUFJLENBQUMscUJBQVUsQ0FBQyxPQUFPLEVBQUUsZUFBSyxDQUFDLE1BQU0sQ0FBQyxvREFBb0QsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDO2FBQzlHO1lBQ0QsT0FBTyxNQUFNLENBQUM7S0FDakI7QUFDSCxDQUFDLENBQUM7QUFaVyxRQUFBLGFBQWEsaUJBWXhCO0FBRUssTUFBTSxjQUFjLEdBQUcsQ0FBQyxJQUFxQixFQUFFLElBQXdCLEVBQW1CLEVBQUUsQ0FBQyxJQUFBLDJCQUFLLEVBQUMsSUFBQSxxQkFBYSxHQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0FBQTFILFFBQUEsY0FBYyxrQkFBNEc7QUFFaEksTUFBTSxPQUFPLEdBQUcsR0FBWSxFQUFFLENBQUMsSUFBQSxxQkFBYSxHQUFFLEtBQUssTUFBTSxDQUFDO0FBQXBELFFBQUEsT0FBTyxXQUE2QyJ9
@@ -1,22 +0,0 @@
1
- import { CrossSpawnArgs, CrossSpawnOptions, spawn } from '@malept/cross-spawn-promise';
2
- import chalk from 'chalk';
3
- import logSymbols from 'log-symbols';
4
- import yarnOrNpm from 'yarn-or-npm';
5
-
6
- export const safeYarnOrNpm = () => {
7
- const system = yarnOrNpm();
8
- switch (process.env.NODE_INSTALLER) {
9
- case 'yarn':
10
- case 'npm':
11
- return process.env.NODE_INSTALLER;
12
- default:
13
- if (process.env.NODE_INSTALLER) {
14
- console.warn(logSymbols.warning, chalk.yellow(`Unknown NODE_INSTALLER, using detected installer ${system}`));
15
- }
16
- return system;
17
- }
18
- };
19
-
20
- export const yarnOrNpmSpawn = (args?: CrossSpawnArgs, opts?: CrossSpawnOptions): Promise<string> => spawn(safeYarnOrNpm(), args, opts);
21
-
22
- export const hasYarn = (): boolean => safeYarnOrNpm() === 'yarn';