@electron-forge/core-utils 7.6.0 → 7.6.1
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.
- package/dist/electron-version.d.ts +1 -1
- package/dist/electron-version.d.ts.map +1 -1
- package/dist/electron-version.js +7 -8
- package/dist/rebuild.d.ts +1 -1
- package/dist/rebuild.d.ts.map +1 -1
- package/dist/rebuild.js +3 -3
- package/dist/remote-rebuild.js +1 -1
- package/dist/yarn-or-npm.d.ts +3 -3
- package/dist/yarn-or-npm.d.ts.map +1 -1
- package/dist/yarn-or-npm.js +6 -6
- package/package.json +6 -6
- package/src/electron-version.ts +2 -4
- package/src/rebuild.ts +3 -3
- package/src/yarn-or-npm.ts +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-version.d.ts","sourceRoot":"","sources":["../src/electron-version.ts"],"names":[],"mappings":"
|
|
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"}
|
package/dist/electron-version.js
CHANGED
|
@@ -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
|
|
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 =
|
|
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 =
|
|
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
|
|
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 =
|
|
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
|
|
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,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxlY3Ryb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9lbGVjdHJvbi12ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDBEQUE2QjtBQUU3QixrREFBMEI7QUFDMUIsc0RBQTZCO0FBQzdCLHdEQUEwQjtBQUMxQixvREFBNEI7QUFFNUIsTUFBTSxDQUFDLEdBQUcsSUFBQSxlQUFLLEVBQUMsaUNBQWlDLENBQUMsQ0FBQztBQUVuRCxNQUFNLG9CQUFvQixHQUFHLENBQUMsa0JBQWtCLEVBQUUsVUFBVSxDQUFDLENBQUM7QUFPOUQsU0FBUyxlQUFlLENBQUMsR0FBVztJQUNsQyxPQUFPLG9CQUFvQixDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUM1QyxDQUFDO0FBRUQsS0FBSyxVQUFVLDJCQUEyQixDQUFDLEdBQVcsRUFBRSxXQUFtQjtJQUN6RSxDQUFDLENBQUMsMERBQTBELENBQUMsQ0FBQztJQUM5RCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUEsaUJBQU0sRUFBQyxDQUFDLG1CQUFtQixFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUNoSCxJQUFJLFFBQVEsRUFBRSxDQUFDO1FBQ2IsQ0FBQyxDQUFDLG9CQUFvQixRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sZUFBZSxHQUFHLG1CQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUN2RixJQUFJLE1BQU0sa0JBQUUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQztZQUN6QyxPQUFPLGVBQWUsQ0FBQztRQUN6QixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FB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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
|
package/dist/rebuild.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rebuild.d.ts","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,
|
|
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,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVidWlsZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9yZWJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXlDO0FBQ3pDLGdEQUFrQztBQUszQixNQUFNLDBCQUEwQixHQUFHLEtBQUssRUFDN0MsU0FBaUIsRUFDakIsZUFBdUIsRUFDdkIsUUFBdUIsRUFDdkIsSUFBZSxFQUNmLFNBQWtDLEVBQUUsRUFDcEMsSUFBeUIsRUFDekIsZUFBZSxHQUFHLEVBQUUsRUFDTCxFQUFFO0lBQ2pCLElBQUksQ0FBQyxLQUFLLEdBQUcsR0FBRyxlQUFlLCtCQUErQixDQUFDO0lBRS9ELE1BQU0sT0FBTyxHQUFtQjtRQUM5QixHQUFHLE1BQU07UUFDVCxTQUFTO1FBQ1QsZUFBZTtRQUNmLElBQUk7S0FDTCxDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxtQkFBbUIsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFO1FBQzdGLEtBQUssRUFBRSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQztLQUN2QyxDQUFDLENBQUM7SUFFSCxJQUFJLFlBQW1CLENBQUM7SUFDeEIsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDO0lBRWIsTUFBTSxNQUFNLEdBQUcsR0FBRyxFQUFFO1FBQ2xCLElBQUksQ0FBQyxLQUFLLEdBQUcsR0FBRyxlQUFlLGtDQUFrQyxJQUFJLE1BQU0sS0FBSyxFQUFFLENBQUM7SUFDckYsQ0FBQyxDQUFDO0lBRUYsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDakMsSUFBSSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDakMsQ0FBQyxDQUFDLENBQUM7SUFDSCxLQUFLLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUNqQyxJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNqQyxDQUFDLENBQUMsQ0FBQztJQUVILEtBQUssQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUFFLENBQUMsT0FBaUUsRUFBRSxFQUFFO1FBQ3hGLFFBQVEsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3BCLEtBQUssY0FBYyxDQUFDLENBQUMsQ0FBQztnQkFDcEIsS0FBSyxJQUFJLENBQUMsQ0FBQztnQkFDWCxNQUFNLEVBQUUsQ0FBQztnQkFDVCxNQUFNO1lBQ1IsQ0FBQztZQUNELEtBQUssYUFBYSxDQUFDLENBQUMsQ0FBQztnQkFDbkIsSUFBSSxJQUFJLENBQUMsQ0FBQztnQkFDVixNQUFNLEVBQUUsQ0FBQztnQkFDVCxNQUFNO1lBQ1IsQ0FBQztZQUNELEtBQUssZUFBZSxDQUFDLENBQUMsQ0FBQztnQkFDckIsWUFBWSxHQUFHLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQzlDLFlBQVksQ0FBQyxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7Z0JBQ3ZDLE1BQU07WUFDUixDQUFDO1lBQ0QsS0FBSyxjQUFjLENBQUMsQ0FBQyxDQUFDO2dCQUNwQixJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsbUJBQW1CLElBQUksa0JBQWtCLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO29CQUN6RixJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQztnQkFDekQsQ0FBQztnQkFDRCxNQUFNO1lBQ1IsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDMUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUN4QixJQUFJLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztnQkFDaEMsT0FBTyxFQUFFLENBQUM7WUFDWixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sTUFBTSxDQUFDLFlBQVksSUFBSSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQ2hGLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBeEVXLFFBQUEsMEJBQTBCLDhCQXdFckMifQ==
|
package/dist/remote-rebuild.js
CHANGED
|
@@ -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,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3RlLXJlYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcmVtb3RlLXJlYnVpbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBNEQ7QUFFNUQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNsQixPQUFPLENBQUMsS0FBSyxDQUFDLGdFQUFnRSxDQUFDLENBQUM7SUFDaEYsMkNBQTJDO0lBQzNDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEIsQ0FBQztBQUVELE1BQU0sT0FBTyxHQUFtQixJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUU1RCxNQUFNLFNBQVMsR0FBRyxJQUFBLGlCQUFPLEVBQUMsT0FBTyxDQUFDLENBQUM7QUFFbkMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsY0FBYyxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDdEYsU0FBUyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFFcEYsU0FBUztLQUNOLElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDVCxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxHQUFHLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQztJQUN4QywyQ0FBMkM7SUFDM0MsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3pCLENBQUMsQ0FBQztLQUNELEtBQUssQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO0lBQ2IsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2IsR0FBRyxFQUFFLGVBQWU7UUFDcEIsR0FBRyxFQUFFO1lBQ0gsT0FBTyxFQUFFLEdBQUcsQ0FBQyxPQUFPO1lBQ3BCLEtBQUssRUFBRSxHQUFHLENBQUMsS0FBSztTQUNqQjtLQUNGLENBQUMsQ0FBQztJQUNILDJDQUEyQztJQUMzQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUMsQ0FBQyxDQUFDIn0=
|
package/dist/yarn-or-npm.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CrossSpawnArgs, CrossSpawnOptions } from '@malept/cross-spawn-promise';
|
|
2
|
-
export declare const safeYarnOrNpm: () => "
|
|
3
|
-
export declare const yarnOrNpmSpawn: (args?: CrossSpawnArgs, opts?: CrossSpawnOptions
|
|
4
|
-
export declare const hasYarn: () => boolean
|
|
2
|
+
export declare const safeYarnOrNpm: () => Promise<import("detect-package-manager").PM>;
|
|
3
|
+
export declare const yarnOrNpmSpawn: (args?: CrossSpawnArgs, opts?: CrossSpawnOptions) => Promise<string>;
|
|
4
|
+
export declare const hasYarn: () => Promise<boolean>;
|
|
5
5
|
//# sourceMappingURL=yarn-or-npm.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,oDAYzB,CAAC;AAEF,eAAO,MAAM,cAAc,UAAiB,cAAc,SAAS,iBAAiB,KAAG,QAAQ,MAAM,CAA6C,CAAC;AAEnJ,eAAO,MAAM,OAAO,wBAAiD,CAAC"}
|
package/dist/yarn-or-npm.js
CHANGED
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.hasYarn = exports.yarnOrNpmSpawn = exports.safeYarnOrNpm = void 0;
|
|
7
7
|
const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
|
+
const detect_package_manager_1 = require("detect-package-manager");
|
|
9
10
|
const log_symbols_1 = __importDefault(require("log-symbols"));
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
const system = (0, yarn_or_npm_1.default)();
|
|
11
|
+
const safeYarnOrNpm = async () => {
|
|
12
|
+
const system = await (0, detect_package_manager_1.detect)();
|
|
13
13
|
switch (process.env.NODE_INSTALLER) {
|
|
14
14
|
case 'yarn':
|
|
15
15
|
case 'npm':
|
|
@@ -22,8 +22,8 @@ const safeYarnOrNpm = () => {
|
|
|
22
22
|
}
|
|
23
23
|
};
|
|
24
24
|
exports.safeYarnOrNpm = safeYarnOrNpm;
|
|
25
|
-
const yarnOrNpmSpawn = (args, opts) => (0, cross_spawn_promise_1.spawn)((0, exports.safeYarnOrNpm)(), args, opts);
|
|
25
|
+
const yarnOrNpmSpawn = async (args, opts) => (0, cross_spawn_promise_1.spawn)(await (0, exports.safeYarnOrNpm)(), args, opts);
|
|
26
26
|
exports.yarnOrNpmSpawn = yarnOrNpmSpawn;
|
|
27
|
-
const hasYarn = () => (0, exports.safeYarnOrNpm)() === 'yarn';
|
|
27
|
+
const hasYarn = async () => (await (0, exports.safeYarnOrNpm)()) === 'yarn';
|
|
28
28
|
exports.hasYarn = hasYarn;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoieWFybi1vci1ucG0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMveWFybi1vci1ucG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEscUVBQXVGO0FBQ3ZGLGtEQUEwQjtBQUMxQixtRUFBZ0Q7QUFDaEQsOERBQXFDO0FBRTlCLE1BQU0sYUFBYSxHQUFHLEtBQUssSUFBSSxFQUFFO0lBQ3RDLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSwrQkFBTSxHQUFFLENBQUM7SUFDOUIsUUFBUSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQ25DLEtBQUssTUFBTSxDQUFDO1FBQ1osS0FBSyxLQUFLO1lBQ1IsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQztRQUNwQztZQUNFLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEVBQUUsQ0FBQztnQkFDL0IsT0FBTyxDQUFDLElBQUksQ0FBQyxxQkFBVSxDQUFDLE9BQU8sRUFBRSxlQUFLLENBQUMsTUFBTSxDQUFDLG9EQUFvRCxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDL0csQ0FBQztZQUNELE9BQU8sTUFBTSxDQUFDO0lBQ2xCLENBQUM7QUFDSCxDQUFDLENBQUM7QUFaVyxRQUFBLGFBQWEsaUJBWXhCO0FBRUssTUFBTSxjQUFjLEdBQUcsS0FBSyxFQUFFLElBQXFCLEVBQUUsSUFBd0IsRUFBbUIsRUFBRSxDQUFDLElBQUEsMkJBQUssRUFBQyxNQUFNLElBQUEscUJBQWEsR0FBRSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztBQUF0SSxRQUFBLGNBQWMsa0JBQXdIO0FBRTVJLE1BQU0sT0FBTyxHQUFHLEtBQUssSUFBSSxFQUFFLENBQUMsQ0FBQyxNQUFNLElBQUEscUJBQWEsR0FBRSxDQUFDLEtBQUssTUFBTSxDQUFDO0FBQXpELFFBQUEsT0FBTyxXQUFrRCJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@electron-forge/core-utils",
|
|
3
|
-
"version": "7.6.
|
|
3
|
+
"version": "7.6.1",
|
|
4
4
|
"description": "Core utilities for the Electron Forge packages",
|
|
5
5
|
"repository": "https://github.com/electron/forge",
|
|
6
6
|
"author": "Samuel Attard",
|
|
@@ -8,26 +8,26 @@
|
|
|
8
8
|
"main": "dist/index.js",
|
|
9
9
|
"typings": "dist/index.d.ts",
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@electron-forge/shared-types": "7.6.
|
|
11
|
+
"@electron-forge/shared-types": "7.6.1",
|
|
12
12
|
"@electron/rebuild": "^3.7.0",
|
|
13
13
|
"@malept/cross-spawn-promise": "^2.0.0",
|
|
14
14
|
"chalk": "^4.0.0",
|
|
15
15
|
"debug": "^4.3.1",
|
|
16
|
+
"detect-package-manager": "^3.0.2",
|
|
16
17
|
"find-up": "^5.0.0",
|
|
17
18
|
"fs-extra": "^10.0.0",
|
|
18
19
|
"log-symbols": "^4.0.0",
|
|
19
|
-
"semver": "^7.2.1"
|
|
20
|
-
"yarn-or-npm": "^3.0.1"
|
|
20
|
+
"semver": "^7.2.1"
|
|
21
21
|
},
|
|
22
22
|
"engines": {
|
|
23
23
|
"node": ">= 16.4.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"
|
|
26
|
+
"vitest": "^3.0.3"
|
|
27
27
|
},
|
|
28
28
|
"files": [
|
|
29
29
|
"dist",
|
|
30
30
|
"src"
|
|
31
31
|
],
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "a9cac9ad3df1e936bde020f68870b6ed6ffbd282"
|
|
33
33
|
}
|
package/src/electron-version.ts
CHANGED
|
@@ -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
|
|
45
|
+
super(`Cannot find the package "${packageName}". Perhaps you need to run install it in "${dir}"?`);
|
|
48
46
|
}
|
|
49
47
|
}
|
|
50
48
|
|
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,
|
package/src/yarn-or-npm.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { CrossSpawnArgs, CrossSpawnOptions, spawn } from '@malept/cross-spawn-promise';
|
|
2
2
|
import chalk from 'chalk';
|
|
3
|
+
import { detect } from 'detect-package-manager';
|
|
3
4
|
import logSymbols from 'log-symbols';
|
|
4
|
-
import yarnOrNpm from 'yarn-or-npm';
|
|
5
5
|
|
|
6
|
-
export const safeYarnOrNpm = () => {
|
|
7
|
-
const system =
|
|
6
|
+
export const safeYarnOrNpm = async () => {
|
|
7
|
+
const system = await detect();
|
|
8
8
|
switch (process.env.NODE_INSTALLER) {
|
|
9
9
|
case 'yarn':
|
|
10
10
|
case 'npm':
|
|
@@ -17,6 +17,6 @@ export const safeYarnOrNpm = () => {
|
|
|
17
17
|
}
|
|
18
18
|
};
|
|
19
19
|
|
|
20
|
-
export const yarnOrNpmSpawn = (args?: CrossSpawnArgs, opts?: CrossSpawnOptions): Promise<string> => spawn(safeYarnOrNpm(), args, opts);
|
|
20
|
+
export const yarnOrNpmSpawn = async (args?: CrossSpawnArgs, opts?: CrossSpawnOptions): Promise<string> => spawn(await safeYarnOrNpm(), args, opts);
|
|
21
21
|
|
|
22
|
-
export const hasYarn = ()
|
|
22
|
+
export const hasYarn = async () => (await safeYarnOrNpm()) === 'yarn';
|