@electron/rebuild 3.3.1 → 3.4.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/lib/rebuild.d.ts +2 -0
- package/lib/rebuild.js +21 -7
- package/lib/rebuild.js.map +1 -1
- package/package.json +1 -1
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
|
-
|
|
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: ${
|
|
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: ${
|
|
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
|
}
|
package/lib/rebuild.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rebuild.js","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,mCAAsC;AACtC,6CAA+B;AAC/B,kDAAoC;AACpC,uCAAyB;AACzB,2CAA6B;AAE7B,mCAA8D;AAC9D,mCAA6D;AAC7D,yDAAqD;AACrD,mDAA2D;
|
|
1
|
+
{"version":3,"file":"rebuild.js","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED