@electron/rebuild 3.3.1 → 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.
@@ -5,4 +5,6 @@ export declare class NodePreGyp extends NativeModule {
5
5
  run(nodePreGypPath: string): Promise<void>;
6
6
  findPrebuiltModule(): Promise<boolean>;
7
7
  getNodePreGypRuntimeArgs(): Promise<string[]>;
8
+ private shouldUpdateBinary;
9
+ private getModulePaths;
8
10
  }
@@ -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
- `--platform=${this.rebuilder.platform}`,
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;AAEpD,wBAA+C;AAC/C,MAAM,CAAC,GAAG,IAAA,eAAK,EAAC,kBAAkB,CAAC,CAAC;AAEpC,MAAa,UAAW,SAAQ,eAAY;IAC1C,KAAK,CAAC,QAAQ;QACZ,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QAChF,iDAAiD;QACjD,OAAO,YAAY,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,IAAA,eAAY,EAAC,IAAI,CAAC,UAAU,EAAE,oDAAoD,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,cAAsB;QAC9B,MAAM,IAAA,2BAAK,EACT,OAAO,CAAC,QAAQ,EAChB;YACE,cAAc;YACd,WAAW;YACX,qBAAqB;YACrB,UAAU,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE;YAC/B,cAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;YACvC,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE;SACzC,EACD;YACE,GAAG,EAAE,IAAI,CAAC,UAAU;SACrB,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB;;QACtB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACjD,IAAI,cAAc,EAAE;YAClB,CAAC,CAAC,sCAAsC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAC3D,IAAI;gBACF,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAC/B,OAAO,IAAI,CAAC;aACb;YAAC,OAAO,GAAG,EAAE;gBACZ,CAAC,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;gBAEtC,IAAI,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,QAAQ,CAAC,gCAAgC,CAAC,EAAE;oBAC5D,MAAM,GAAG,CAAC;iBACX;aACF;SACF;aAAM;YACL,CAAC,CAAC,4CAA4C,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;SAClE;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACjE,IAAI,kBAAkB,EAAE;YACtB,OAAO,EAAE,CAAC;SACX;aAAM;YACL,OAAO;gBACL,oBAAoB;gBACpB,YAAY,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE;gBAC5C,cAAc,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;aACzC,CAAC;SACH;IACH,CAAC;CACF;AA7DD,gCA6DC"}
1
+ {"version":3,"file":"node-pre-gyp.js","sourceRoot":"","sources":["../../src/module-type/node-pre-gyp.ts"],"names":[],"mappings":"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"}
package/lib/rebuild.d.ts CHANGED
@@ -21,6 +21,7 @@ export interface RebuildOptions {
21
21
  forceABI?: number;
22
22
  disablePreGypCopy?: boolean;
23
23
  buildFromSource?: boolean;
24
+ ignoreModules?: string[];
24
25
  }
25
26
  export interface RebuilderOptions extends RebuildOptions {
26
27
  lifecycle: EventEmitter;
@@ -46,6 +47,7 @@ export declare class Rebuilder implements IRebuilder {
46
47
  useElectronClang: boolean;
47
48
  disablePreGypCopy: boolean;
48
49
  buildFromSource: boolean;
50
+ ignoreModules: string[];
49
51
  constructor(options: RebuilderOptions);
50
52
  get ABI(): string;
51
53
  get buildType(): BuildType;
package/lib/rebuild.js CHANGED
@@ -59,6 +59,8 @@ class Rebuilder {
59
59
  this.msvsVersion = process.env.GYP_MSVS_VERSION;
60
60
  this.disablePreGypCopy = options.disablePreGypCopy || false;
61
61
  this.buildFromSource = options.buildFromSource || false;
62
+ this.ignoreModules = options.ignoreModules || [];
63
+ d('ignoreModules', this.ignoreModules);
62
64
  if (this.useCache && this.force) {
63
65
  console.warn('[WARNING]: Electron Rebuild has force enabled and cache enabled, force take precedence and the cache will not be used.');
64
66
  this.useCache = false;
@@ -119,15 +121,27 @@ class Rebuilder {
119
121
  return;
120
122
  }
121
123
  const moduleRebuilder = new module_rebuilder_1.ModuleRebuilder(this, modulePath);
122
- this.lifecycle.emit('module-found', path.basename(modulePath));
124
+ let moduleName = path.basename(modulePath);
125
+ const parentName = path.basename(path.dirname(modulePath));
126
+ if (parentName !== 'node_modules') {
127
+ moduleName = `${parentName}/${moduleName}`;
128
+ }
129
+ this.lifecycle.emit('module-found', moduleName);
123
130
  if (!this.force && await moduleRebuilder.alreadyBuiltByRebuild()) {
124
- d(`skipping: ${path.basename(modulePath)} as it is already built`);
125
- this.lifecycle.emit('module-done');
126
- this.lifecycle.emit('module-skip');
131
+ d(`skipping: ${moduleName} as it is already built`);
132
+ this.lifecycle.emit('module-done', moduleName);
133
+ this.lifecycle.emit('module-skip', moduleName);
134
+ return;
135
+ }
136
+ d('checking', moduleName, 'against', this.ignoreModules);
137
+ if (this.ignoreModules.includes(moduleName)) {
138
+ d(`skipping: ${moduleName} as it is in the ignoreModules array`);
139
+ this.lifecycle.emit('module-done', moduleName);
140
+ this.lifecycle.emit('module-skip', moduleName);
127
141
  return;
128
142
  }
129
143
  if (await moduleRebuilder.prebuildInstallNativeModuleExists()) {
130
- d(`skipping: ${path.basename(modulePath)} as it was prebuilt`);
144
+ d(`skipping: ${moduleName} as it was prebuilt`);
131
145
  return;
132
146
  }
133
147
  let cacheKey;
@@ -143,12 +157,12 @@ class Rebuilder {
143
157
  const applyDiffFn = await (0, cache_1.lookupModuleState)(this.cachePath, cacheKey);
144
158
  if (typeof applyDiffFn === 'function') {
145
159
  await applyDiffFn(modulePath);
146
- this.lifecycle.emit('module-done');
160
+ this.lifecycle.emit('module-done', moduleName);
147
161
  return;
148
162
  }
149
163
  }
150
164
  if (await moduleRebuilder.rebuild(cacheKey)) {
151
- this.lifecycle.emit('module-done');
165
+ this.lifecycle.emit('module-done', moduleName);
152
166
  }
153
167
  }
154
168
  }
@@ -1 +1 @@
1
- {"version":3,"file":"rebuild.js","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rebuild.js","sourceRoot":"","sources":["../src/rebuild.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.3.1",
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"