@electron-forge/maker-base 7.8.2 → 7.9.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.
- package/dist/Maker.d.ts.map +1 -1
- package/dist/Maker.js +3 -2
- package/package.json +3 -3
- package/src/Maker.ts +26 -7
package/dist/Maker.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Maker.d.ts","sourceRoot":"","sources":["../src/Maker.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"Maker.d.ts","sourceRoot":"","sources":["../src/Maker.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EACT,aAAa,EACb,WAAW,EACX,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAItC,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,cAAc,EAAE,aAAa,CAAC;IAC9B;;OAEG;IACH,UAAU,EAAE,SAAS,CAAC;IACtB;;OAEG;IACH,WAAW,EAAE,mBAAmB,CAAC;IACjC;;OAEG;IACH,WAAW,EAAE,GAAG,CAAC;CAClB;AAED,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,KAAK,CAAC,CAAC,CAAE,YAAW,WAAW;IAiBzD,OAAO,CAAC,qBAAqB;IAC7B,SAAS,CAAC,iBAAiB,CAAC;IAjBvB,MAAM,EAAG,CAAC,CAAC;IAElB,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B,SAAgB,gBAAgB,EAAE,aAAa,EAAE,CAAC;IAE3C,wBAAwB,EAAE,MAAM,EAAE,CAAM;IAE/C,gBAAgB;IAChB,sBAAsB,EAAG,IAAI,CAAC;IAE9B;;;OAGG;gBAEO,qBAAqB,GAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,SAAS,KAAK,CAAC,CAAW,EAC3D,iBAAiB,CAAC,sBAAiB;IAS/C,IAAI,SAAS,IAAI,aAAa,EAAE,CAG/B;IAIK,aAAa,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzD;;;;;;;;OAQG;IACH,4BAA4B,IAAI,OAAO;IAYvC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IAKjB;;;OAGG;IAEG,IAAI,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAOjD;;OAEG;IAEH;;;;;OAKG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD;;;;OAIG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C;;OAEG;IACH,qBAAqB,IAAI,OAAO;IAMhC;;OAEG;IACH,2BAA2B,IAAI,IAAI;IAQnC;;;OAGG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUpC;;;OAGG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAIjD;AAED,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,CAAC"}
|
package/dist/Maker.js
CHANGED
|
@@ -47,7 +47,8 @@ class Maker {
|
|
|
47
47
|
* telling the developer exactly what is missing and if possible how to get it.
|
|
48
48
|
*/
|
|
49
49
|
isSupportedOnCurrentPlatform() {
|
|
50
|
-
if (this.isSupportedOnCurrentPlatform ===
|
|
50
|
+
if (this.isSupportedOnCurrentPlatform ===
|
|
51
|
+
Maker.prototype.isSupportedOnCurrentPlatform) {
|
|
51
52
|
throw new Error(`Maker ${this.name} did not implement the isSupportedOnCurrentPlatform method`);
|
|
52
53
|
}
|
|
53
54
|
return true;
|
|
@@ -132,4 +133,4 @@ class Maker {
|
|
|
132
133
|
}
|
|
133
134
|
exports.default = Maker;
|
|
134
135
|
exports.MakerBase = Maker;
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvTWFrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsMERBQTZCO0FBUTdCLHdEQUEwQjtBQUMxQixrREFBMEI7QUFvQzFCLE1BQThCLEtBQUs7SUFZakM7OztPQUdHO0lBQ0gsWUFDVSx3QkFBc0QsRUFBTyxFQUMzRCxpQkFBbUM7UUFEckMsMEJBQXFCLEdBQXJCLHFCQUFxQixDQUF3QztRQUMzRCxzQkFBaUIsR0FBakIsaUJBQWlCLENBQWtCO1FBWHhDLDZCQUF3QixHQUFhLEVBQUUsQ0FBQztRQWE3QyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSx3QkFBd0IsRUFBRTtZQUNwRCxLQUFLLEVBQUUsSUFBSTtZQUNYLFVBQVUsRUFBRSxLQUFLO1lBQ2pCLFlBQVksRUFBRSxLQUFLO1NBQ3BCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFNBQVM7UUFDWCxJQUFJLElBQUksQ0FBQyxpQkFBaUI7WUFBRSxPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQztRQUMxRCxPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQztJQUMvQixDQUFDO0lBRUQsNEVBQTRFO0lBQzVFLDhDQUE4QztJQUM5QyxLQUFLLENBQUMsYUFBYSxDQUFDLFVBQXFCO1FBQ3ZDLElBQUksT0FBTyxJQUFJLENBQUMscUJBQXFCLEtBQUssVUFBVSxFQUFFLENBQUM7WUFDckQsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQ2hDLElBQUksQ0FBQyxxQkFBZ0QsQ0FBQyxVQUFVLENBQUMsQ0FDbkUsQ0FBQztRQUNKLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMscUJBQTBCLENBQUM7UUFDaEQsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILDRCQUE0QjtRQUMxQixJQUNFLElBQUksQ0FBQyw0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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@electron-forge/maker-base",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.9.0",
|
|
4
4
|
"description": "Base maker for Electron Forge",
|
|
5
5
|
"repository": "https://github.com/electron/forge",
|
|
6
6
|
"author": "Samuel Attard",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"node": ">= 16.4.0"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@electron-forge/shared-types": "7.
|
|
17
|
+
"@electron-forge/shared-types": "7.9.0",
|
|
18
18
|
"fs-extra": "^10.0.0",
|
|
19
19
|
"which": "^2.0.2"
|
|
20
20
|
},
|
|
@@ -25,5 +25,5 @@
|
|
|
25
25
|
"dist",
|
|
26
26
|
"src"
|
|
27
27
|
],
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "cd63f57bd6870af2ad847076a183456221b30269"
|
|
29
29
|
}
|
package/src/Maker.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
ForgeArch,
|
|
5
|
+
ForgePlatform,
|
|
6
|
+
IForgeMaker,
|
|
7
|
+
ResolvedForgeConfig,
|
|
8
|
+
} from '@electron-forge/shared-types';
|
|
4
9
|
import fs from 'fs-extra';
|
|
5
10
|
import which from 'which';
|
|
6
11
|
|
|
@@ -54,7 +59,10 @@ export default abstract class Maker<C> implements IForgeMaker {
|
|
|
54
59
|
* @param configOrConfigFetcher - Either a configuration object for this maker or a simple method that returns such a configuration for a given target architecture
|
|
55
60
|
* @param platformsToMakeOn - If you want this maker to run on platforms different from `defaultPlatforms` you can provide those platforms here
|
|
56
61
|
*/
|
|
57
|
-
constructor(
|
|
62
|
+
constructor(
|
|
63
|
+
private configOrConfigFetcher: C | ((arch: ForgeArch) => C) = {} as C,
|
|
64
|
+
protected platformsToMakeOn?: ForgePlatform[],
|
|
65
|
+
) {
|
|
58
66
|
Object.defineProperty(this, '__isElectronForgeMaker', {
|
|
59
67
|
value: true,
|
|
60
68
|
enumerable: false,
|
|
@@ -71,7 +79,9 @@ export default abstract class Maker<C> implements IForgeMaker {
|
|
|
71
79
|
// v5 style functionality in the new API
|
|
72
80
|
async prepareConfig(targetArch: ForgeArch): Promise<void> {
|
|
73
81
|
if (typeof this.configOrConfigFetcher === 'function') {
|
|
74
|
-
this.config = await Promise.resolve(
|
|
82
|
+
this.config = await Promise.resolve(
|
|
83
|
+
(this.configOrConfigFetcher as (arch: ForgeArch) => C)(targetArch),
|
|
84
|
+
);
|
|
75
85
|
} else {
|
|
76
86
|
this.config = this.configOrConfigFetcher as C;
|
|
77
87
|
}
|
|
@@ -87,8 +97,13 @@ export default abstract class Maker<C> implements IForgeMaker {
|
|
|
87
97
|
* telling the developer exactly what is missing and if possible how to get it.
|
|
88
98
|
*/
|
|
89
99
|
isSupportedOnCurrentPlatform(): boolean {
|
|
90
|
-
if (
|
|
91
|
-
|
|
100
|
+
if (
|
|
101
|
+
this.isSupportedOnCurrentPlatform ===
|
|
102
|
+
Maker.prototype.isSupportedOnCurrentPlatform
|
|
103
|
+
) {
|
|
104
|
+
throw new Error(
|
|
105
|
+
`Maker ${this.name} did not implement the isSupportedOnCurrentPlatform method`,
|
|
106
|
+
);
|
|
92
107
|
}
|
|
93
108
|
return true;
|
|
94
109
|
}
|
|
@@ -143,7 +158,9 @@ export default abstract class Maker<C> implements IForgeMaker {
|
|
|
143
158
|
* Checks if the specified binaries exist, which are required for the maker to be used.
|
|
144
159
|
*/
|
|
145
160
|
externalBinariesExist(): boolean {
|
|
146
|
-
return this.requiredExternalBinaries.every(
|
|
161
|
+
return this.requiredExternalBinaries.every(
|
|
162
|
+
(binary) => which.sync(binary, { nothrow: true }) !== null,
|
|
163
|
+
);
|
|
147
164
|
}
|
|
148
165
|
|
|
149
166
|
/**
|
|
@@ -151,7 +168,9 @@ export default abstract class Maker<C> implements IForgeMaker {
|
|
|
151
168
|
*/
|
|
152
169
|
ensureExternalBinariesExist(): void {
|
|
153
170
|
if (!this.externalBinariesExist()) {
|
|
154
|
-
throw new Error(
|
|
171
|
+
throw new Error(
|
|
172
|
+
`Cannot make for ${this.name}, the following external binaries need to be installed: ${this.requiredExternalBinaries.join(', ')}`,
|
|
173
|
+
);
|
|
155
174
|
}
|
|
156
175
|
}
|
|
157
176
|
|