@electron/rebuild 3.4.0 → 3.4.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.
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.NodePreGyp = void 0;
|
|
7
7
|
const debug_1 = __importDefault(require("debug"));
|
|
8
8
|
const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
|
|
9
|
+
const read_binary_file_arch_1 = require("read-binary-file-arch");
|
|
9
10
|
const _1 = require(".");
|
|
10
11
|
const d = (0, debug_1.default)('electron-rebuild');
|
|
11
12
|
class NodePreGyp extends _1.NativeModule {
|
|
@@ -18,12 +19,15 @@ class NodePreGyp extends _1.NativeModule {
|
|
|
18
19
|
return (0, _1.locateBinary)(this.modulePath, 'node_modules/@mapbox/node-pre-gyp/bin/node-pre-gyp');
|
|
19
20
|
}
|
|
20
21
|
async run(nodePreGypPath) {
|
|
22
|
+
const redownloadBinary = await this.shouldUpdateBinary(nodePreGypPath);
|
|
21
23
|
await (0, cross_spawn_promise_1.spawn)(process.execPath, [
|
|
22
24
|
nodePreGypPath,
|
|
23
25
|
'reinstall',
|
|
24
26
|
'--fallback-to-build',
|
|
27
|
+
...(redownloadBinary ? ['--update-binary'] : []),
|
|
25
28
|
`--arch=${this.rebuilder.arch}`,
|
|
26
|
-
`--
|
|
29
|
+
`--target_arch=${this.rebuilder.arch}`,
|
|
30
|
+
`--target_platform=${this.rebuilder.platform}`,
|
|
27
31
|
...await this.getNodePreGypRuntimeArgs(),
|
|
28
32
|
], {
|
|
29
33
|
cwd: this.modulePath,
|
|
@@ -63,6 +67,50 @@ class NodePreGyp extends _1.NativeModule {
|
|
|
63
67
|
];
|
|
64
68
|
}
|
|
65
69
|
}
|
|
70
|
+
async shouldUpdateBinary(nodePreGypPath) {
|
|
71
|
+
let shouldUpdate = false;
|
|
72
|
+
// Redownload binary only if the existing module arch differs from the
|
|
73
|
+
// target arch.
|
|
74
|
+
try {
|
|
75
|
+
const modulePaths = await this.getModulePaths(nodePreGypPath);
|
|
76
|
+
d('module paths:', modulePaths);
|
|
77
|
+
for (const modulePath of modulePaths) {
|
|
78
|
+
let moduleArch;
|
|
79
|
+
try {
|
|
80
|
+
moduleArch = await (0, read_binary_file_arch_1.readBinaryFileArch)(modulePath);
|
|
81
|
+
d('module arch:', moduleArch);
|
|
82
|
+
}
|
|
83
|
+
catch (error) {
|
|
84
|
+
d('failed to read module arch:', error.message);
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
if (moduleArch && moduleArch !== this.rebuilder.arch) {
|
|
88
|
+
shouldUpdate = true;
|
|
89
|
+
d('module architecture differs:', `${moduleArch} !== ${this.rebuilder.arch}`);
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
catch (error) {
|
|
95
|
+
d('failed to get existing binary arch:', error.message);
|
|
96
|
+
// Assume architecture differs
|
|
97
|
+
shouldUpdate = true;
|
|
98
|
+
}
|
|
99
|
+
return shouldUpdate;
|
|
100
|
+
}
|
|
101
|
+
async getModulePaths(nodePreGypPath) {
|
|
102
|
+
const results = await (0, cross_spawn_promise_1.spawn)(process.execPath, [
|
|
103
|
+
nodePreGypPath,
|
|
104
|
+
'reveal',
|
|
105
|
+
'module',
|
|
106
|
+
`--target_arch=${this.rebuilder.arch}`,
|
|
107
|
+
`--target_platform=${this.rebuilder.platform}`,
|
|
108
|
+
], {
|
|
109
|
+
cwd: this.modulePath,
|
|
110
|
+
});
|
|
111
|
+
// Packages with multiple binaries will output one per line
|
|
112
|
+
return results.split('\n').filter(Boolean);
|
|
113
|
+
}
|
|
66
114
|
}
|
|
67
115
|
exports.NodePreGyp = NodePreGyp;
|
|
68
116
|
//# sourceMappingURL=node-pre-gyp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-pre-gyp.js","sourceRoot":"","sources":["../../src/module-type/node-pre-gyp.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,qEAAoD;
|
|
1
|
+
{"version":3,"file":"node-pre-gyp.js","sourceRoot":"","sources":["../../src/module-type/node-pre-gyp.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@electron/rebuild",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.1",
|
|
4
4
|
"description": "Electron supporting package to rebuild native node modules against the currently installed electron",
|
|
5
5
|
"main": "lib/main.js",
|
|
6
6
|
"typings": "lib/main.d.ts",
|
|
@@ -49,6 +49,7 @@
|
|
|
49
49
|
"node-api-version": "^0.1.4",
|
|
50
50
|
"node-gyp": "^9.0.0",
|
|
51
51
|
"ora": "^5.1.0",
|
|
52
|
+
"read-binary-file-arch": "^1.0.6",
|
|
52
53
|
"semver": "^7.3.5",
|
|
53
54
|
"tar": "^6.0.5",
|
|
54
55
|
"yargs": "^17.0.1"
|