Upgrade electron-builder to 26.0.12
This commit is contained in:
parent
0b5f0df1ca
commit
b9673d55ec
4 changed files with 40 additions and 83 deletions
|
@ -1,46 +1,3 @@
|
|||
diff --git a/out/node-module-collector/pnpmNodeModulesCollector.js b/out/node-module-collector/pnpmNodeModulesCollector.js
|
||||
index e52d98fbc0d9d7fdd72a156823fca2bbc9b393fd..410701db7b805d984305ca89ac32d1d6908663ae 100644
|
||||
--- a/out/node-module-collector/pnpmNodeModulesCollector.js
|
||||
+++ b/out/node-module-collector/pnpmNodeModulesCollector.js
|
||||
@@ -25,17 +25,32 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
|
||||
extractProductionDependencyTree(tree) {
|
||||
const p = path.normalize(this.resolvePath(tree.path));
|
||||
const packageJson = require(path.join(p, "package.json"));
|
||||
- const prodDependencies = { ...(packageJson.dependencies || {}), ...(packageJson.optionalDependencies || {}) };
|
||||
const deps = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) };
|
||||
const dependencies = Object.entries(deps).reduce((acc, curr) => {
|
||||
+ var _b, _c;
|
||||
const [packageName, dependency] = curr;
|
||||
- if (!prodDependencies[packageName]) {
|
||||
+ let isOptional;
|
||||
+ if ((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b[packageName]) {
|
||||
+ isOptional = false;
|
||||
+ }
|
||||
+ else if ((_c = packageJson.optionalDependencies) === null || _c === void 0 ? void 0 : _c[packageName]) {
|
||||
+ isOptional = true;
|
||||
+ }
|
||||
+ else {
|
||||
return acc;
|
||||
}
|
||||
- return {
|
||||
- ...acc,
|
||||
- [packageName]: this.extractProductionDependencyTree(dependency),
|
||||
- };
|
||||
+ try {
|
||||
+ return {
|
||||
+ ...acc,
|
||||
+ [packageName]: this.extractProductionDependencyTree(dependency),
|
||||
+ };
|
||||
+ }
|
||||
+ catch (error) {
|
||||
+ if (isOptional) {
|
||||
+ return acc;
|
||||
+ }
|
||||
+ throw error;
|
||||
+ }
|
||||
}, {});
|
||||
const { name, version, path: packagePath, workspaces } = tree;
|
||||
const depTree = {
|
||||
diff --git a/out/targets/nsis/NsisTarget.js b/out/targets/nsis/NsisTarget.js
|
||||
index 8336c600a45fb843e0c88f3c7673b30f435c5aab..746569c20e4c9e32abf040e9c722e3eb97d53c62 100644
|
||||
--- a/out/targets/nsis/NsisTarget.js
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue