Bump app-builder-lib and electron-builder
This commit is contained in:
parent
2603771e46
commit
aefe84dfc4
3 changed files with 535 additions and 323 deletions
785
package-lock.json
generated
785
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -293,7 +293,7 @@
|
||||||
"danger": "11.1.2",
|
"danger": "11.1.2",
|
||||||
"debug": "4.3.3",
|
"debug": "4.3.3",
|
||||||
"electron": "30.0.9",
|
"electron": "30.0.9",
|
||||||
"electron-builder": "24.6.3",
|
"electron-builder": "24.13.3",
|
||||||
"electron-mocha": "12.2.0",
|
"electron-mocha": "12.2.0",
|
||||||
"endanger": "7.0.4",
|
"endanger": "7.0.4",
|
||||||
"esbuild": "0.17.11",
|
"esbuild": "0.17.11",
|
||||||
|
|
|
@ -137,51 +137,6 @@ index 0000000..f198807
|
||||||
+}
|
+}
|
||||||
+exports.addWinAsarIntegrity = addWinAsarIntegrity;
|
+exports.addWinAsarIntegrity = addWinAsarIntegrity;
|
||||||
+//# sourceMappingURL=electronWin.js.map
|
+//# sourceMappingURL=electronWin.js.map
|
||||||
diff --git a/node_modules/app-builder-lib/out/macPackager.js b/node_modules/app-builder-lib/out/macPackager.js
|
|
||||||
index 9df12c4..465ffa3 100644
|
|
||||||
--- a/node_modules/app-builder-lib/out/macPackager.js
|
|
||||||
+++ b/node_modules/app-builder-lib/out/macPackager.js
|
|
||||||
@@ -194,7 +194,8 @@ class MacPackager extends platformPackager_1.PlatformPackager {
|
|
||||||
builder_util_1.log.warn("Mac Developer is used to sign app — it is only for development and testing, not for production");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if (identity == null) {
|
|
||||||
+ const customSign = await (0, platformPackager_1.resolveFunction)(options.sign, "sign");
|
|
||||||
+ if (!customSign && identity == null) {
|
|
||||||
await (0, macCodeSign_1.reportError)(isMas, certificateTypes, qualifier, keychainFile, this.forceCodeSigning);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
@@ -261,11 +262,11 @@ class MacPackager extends platformPackager_1.PlatformPackager {
|
|
||||||
};
|
|
||||||
builder_util_1.log.info({
|
|
||||||
file: builder_util_1.log.filePath(appPath),
|
|
||||||
- identityName: identity.name,
|
|
||||||
- identityHash: identity.hash,
|
|
||||||
+ identityName: identity ? identity.name : undefined,
|
|
||||||
+ identityHash: identity ? identity.hash : undefined,
|
|
||||||
provisioningProfile: signOptions.provisioningProfile || "none",
|
|
||||||
}, "signing");
|
|
||||||
- await this.doSign(signOptions);
|
|
||||||
+ await this.doSign(signOptions, masOptions);
|
|
||||||
// https://github.com/electron-userland/electron-builder/issues/1196#issuecomment-312310209
|
|
||||||
if (masOptions != null && !isDevelopment) {
|
|
||||||
const certType = isDevelopment ? "Mac Developer" : "3rd Party Mac Developer Installer";
|
|
||||||
@@ -332,7 +333,14 @@ class MacPackager extends platformPackager_1.PlatformPackager {
|
|
||||||
return optionsForFile;
|
|
||||||
}
|
|
||||||
//noinspection JSMethodCanBeStatic
|
|
||||||
- doSign(opts) {
|
|
||||||
+ doSign(opts, masOptions) {
|
|
||||||
+ const options = masOptions == null ? this.platformSpecificBuildOptions : masOptions;
|
|
||||||
+
|
|
||||||
+ const customSign = (0, platformPackager_1.resolveFunction)(options.sign, "sign");
|
|
||||||
+ if (customSign) {
|
|
||||||
+ return Promise.resolve(customSign(opts));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
return (0, osx_sign_1.signAsync)(opts);
|
|
||||||
}
|
|
||||||
//noinspection JSMethodCanBeStatic
|
|
||||||
diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
||||||
index fcb7f54..3f27bf3 100644
|
index fcb7f54..3f27bf3 100644
|
||||||
--- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
--- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
||||||
|
@ -195,28 +150,6 @@ index fcb7f54..3f27bf3 100644
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const desktopMeta = {
|
const desktopMeta = {
|
||||||
diff --git a/node_modules/app-builder-lib/scheme.json b/node_modules/app-builder-lib/scheme.json
|
|
||||||
index 1d45055..0d0cb9c 100644
|
|
||||||
--- a/node_modules/app-builder-lib/scheme.json
|
|
||||||
+++ b/node_modules/app-builder-lib/scheme.json
|
|
||||||
@@ -2784,6 +2784,17 @@
|
|
||||||
"string"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
+ "sign": {
|
|
||||||
+ "anyOf": [
|
|
||||||
+ {
|
|
||||||
+ "type": [
|
|
||||||
+ "null",
|
|
||||||
+ "string"
|
|
||||||
+ ]
|
|
||||||
+ }
|
|
||||||
+ ],
|
|
||||||
+ "description": "The custom function (or path to file or module id) to sign macOS files."
|
|
||||||
+ },
|
|
||||||
"signIgnore": {
|
|
||||||
"anyOf": [
|
|
||||||
{
|
|
||||||
diff --git a/node_modules/app-builder-lib/templates/linux/after-install.tpl b/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
diff --git a/node_modules/app-builder-lib/templates/linux/after-install.tpl b/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
||||||
index 0f541f9..d1e77a0 100644
|
index 0f541f9..d1e77a0 100644
|
||||||
--- a/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
--- a/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
||||||
|
@ -228,8 +161,8 @@ index 0f541f9..d1e77a0 100644
|
||||||
-# SUID chrome-sandbox for Electron 5+
|
-# SUID chrome-sandbox for Electron 5+
|
||||||
-chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || true
|
-chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || true
|
||||||
-
|
-
|
||||||
update-mime-database /usr/share/mime || true
|
if hash update-mime-database 2>/dev/null; then
|
||||||
update-desktop-database /usr/share/applications || true
|
update-mime-database /usr/share/mime || true
|
||||||
diff --git a/node_modules/app-builder-lib/templates/nsis/installSection.nsh b/node_modules/app-builder-lib/templates/nsis/installSection.nsh
|
diff --git a/node_modules/app-builder-lib/templates/nsis/installSection.nsh b/node_modules/app-builder-lib/templates/nsis/installSection.nsh
|
||||||
index 053772f..7981a4e 100644
|
index 053772f..7981a4e 100644
|
||||||
--- a/node_modules/app-builder-lib/templates/nsis/installSection.nsh
|
--- a/node_modules/app-builder-lib/templates/nsis/installSection.nsh
|
Loading…
Add table
Add a link
Reference in a new issue