mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2025-12-20 02:08:57 +00:00
Update electron-builder to 26.0.14
This commit is contained in:
@@ -294,7 +294,7 @@
|
|||||||
"danger": "12.3.3",
|
"danger": "12.3.3",
|
||||||
"debug": "4.3.7",
|
"debug": "4.3.7",
|
||||||
"electron": "35.1.4",
|
"electron": "35.1.4",
|
||||||
"electron-builder": "26.0.12",
|
"electron-builder": "26.0.14",
|
||||||
"electron-mocha": "13.0.1",
|
"electron-mocha": "13.0.1",
|
||||||
"endanger": "7.0.4",
|
"endanger": "7.0.4",
|
||||||
"enquirer": "2.4.1",
|
"enquirer": "2.4.1",
|
||||||
@@ -376,7 +376,6 @@
|
|||||||
"backbone@1.6.0": "patches/backbone+1.6.0.patch",
|
"backbone@1.6.0": "patches/backbone+1.6.0.patch",
|
||||||
"node-fetch@2.6.7": "patches/node-fetch+2.6.7.patch",
|
"node-fetch@2.6.7": "patches/node-fetch+2.6.7.patch",
|
||||||
"zod@3.23.8": "patches/zod+3.23.8.patch",
|
"zod@3.23.8": "patches/zod+3.23.8.patch",
|
||||||
"@electron/rebuild": "patches/@electron__rebuild.patch",
|
|
||||||
"app-builder-lib": "patches/app-builder-lib.patch",
|
"app-builder-lib": "patches/app-builder-lib.patch",
|
||||||
"dmg-builder": "patches/dmg-builder.patch"
|
"dmg-builder": "patches/dmg-builder.patch"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
diff --git a/lib/module-walker.js b/lib/module-walker.js
|
|
||||||
index b36e35c968c85b625f2080466f6518b1d355e4ef..427e81b7ada4f01e8712c4c6c8353fe0ff4f7cab 100644
|
|
||||||
--- a/lib/module-walker.js
|
|
||||||
+++ b/lib/module-walker.js
|
|
||||||
@@ -89,11 +89,22 @@ class ModuleWalker {
|
|
||||||
// Ignore the magical .bin directory
|
|
||||||
if (modulePath === '.bin')
|
|
||||||
continue;
|
|
||||||
+ const subPath = path_1.default.resolve(nodeModulesPath, modulePath);
|
|
||||||
// Ensure that we don't mark modules as needing to be rebuilt more than once
|
|
||||||
// by ignoring / resolving symlinks
|
|
||||||
- const realPath = await fs_extra_1.default.realpath(path_1.default.resolve(nodeModulesPath, modulePath));
|
|
||||||
- if (this.realModulePaths.has(realPath)) {
|
|
||||||
- continue;
|
|
||||||
+ let realPath;
|
|
||||||
+ try {
|
|
||||||
+ realPath = await fs_extra_1.default.realpath(subPath);
|
|
||||||
+ }
|
|
||||||
+ catch (error) {
|
|
||||||
+ // pnpm leaves dangling symlinks when modules are removed
|
|
||||||
+ if (error.code === 'ENOENT') {
|
|
||||||
+ const stat = await fs_extra_1.default.lstat(subPath);
|
|
||||||
+ if (stat.isSymbolicLink()) {
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ throw error;
|
|
||||||
}
|
|
||||||
this.realModulePaths.add(realPath);
|
|
||||||
if (this.prodDeps[`${prefix}${modulePath}`] && (!this.onlyModules || this.onlyModules.includes(modulePath))) {
|
|
||||||
@@ -1,116 +1,3 @@
|
|||||||
diff --git a/out/targets/nsis/NsisTarget.js b/out/targets/nsis/NsisTarget.js
|
|
||||||
index 8336c600a45fb843e0c88f3c7673b30f435c5aab..746569c20e4c9e32abf040e9c722e3eb97d53c62 100644
|
|
||||||
--- a/out/targets/nsis/NsisTarget.js
|
|
||||||
+++ b/out/targets/nsis/NsisTarget.js
|
|
||||||
@@ -7,7 +7,6 @@ const debug_1 = require("debug");
|
|
||||||
const fs = require("fs");
|
|
||||||
const fs_extra_1 = require("fs-extra");
|
|
||||||
const path = require("path");
|
|
||||||
-const binDownload_1 = require("../../binDownload");
|
|
||||||
const core_1 = require("../../core");
|
|
||||||
const CommonWindowsInstallerConfiguration_1 = require("../../options/CommonWindowsInstallerConfiguration");
|
|
||||||
const platformPackager_1 = require("../../platformPackager");
|
|
||||||
@@ -25,8 +24,6 @@ const nsisUtil_1 = require("./nsisUtil");
|
|
||||||
const debug = (0, debug_1.default)("electron-builder:nsis");
|
|
||||||
// noinspection SpellCheckingInspection
|
|
||||||
const ELECTRON_BUILDER_NS_UUID = builder_util_runtime_1.UUID.parse("50e065bc-3134-11e6-9bab-38c9862bdaf3");
|
|
||||||
-// noinspection SpellCheckingInspection
|
|
||||||
-const nsisResourcePathPromise = () => (0, binDownload_1.getBinFromUrl)("nsis-resources", "3.4.1", "Dqd6g+2buwwvoG1Vyf6BHR1b+25QMmPcwZx40atOT57gH27rkjOei1L0JTldxZu4NFoEmW4kJgZ3DlSWVON3+Q==");
|
|
||||||
const USE_NSIS_BUILT_IN_COMPRESSOR = false;
|
|
||||||
class NsisTarget extends core_1.Target {
|
|
||||||
constructor(packager, outDir, targetName, packageHelper) {
|
|
||||||
@@ -546,7 +543,7 @@ class NsisTarget extends core_1.Target {
|
|
||||||
const taskManager = new builder_util_1.AsyncTaskManager(packager.info.cancellationToken);
|
|
||||||
const pluginArch = this.isUnicodeEnabled ? "x86-unicode" : "x86-ansi";
|
|
||||||
taskManager.add(async () => {
|
|
||||||
- scriptGenerator.addPluginDir(pluginArch, path.join(await nsisResourcePathPromise(), "plugins", pluginArch));
|
|
||||||
+ scriptGenerator.addPluginDir(pluginArch, path.join(await (0, nsisUtil_1.NSIS_RESOURCES_PATH)(), "plugins", pluginArch));
|
|
||||||
});
|
|
||||||
taskManager.add(async () => {
|
|
||||||
const userPluginDir = path.join(packager.info.buildResourcesDir, pluginArch);
|
|
||||||
diff --git a/out/targets/nsis/nsisUtil.js b/out/targets/nsis/nsisUtil.js
|
|
||||||
index 693d39c95f23b6ba890a560a4ce925c6400a45f4..5ce1e38bf9bb237b2e44f65186a3ca405b42fd26 100644
|
|
||||||
--- a/out/targets/nsis/nsisUtil.js
|
|
||||||
+++ b/out/targets/nsis/nsisUtil.js
|
|
||||||
@@ -35,6 +35,19 @@ const NSIS_PATH = () => {
|
|
||||||
});
|
|
||||||
};
|
|
||||||
exports.NSIS_PATH = NSIS_PATH;
|
|
||||||
+const NSIS_RESOURCES_PATH = () => {
|
|
||||||
+ return exports.NsisTargetOptions.then((options) => {
|
|
||||||
+ if (options.customNsisResources) {
|
|
||||||
+ const { checksum, url, version } = options.customNsisResources;
|
|
||||||
+ if (checksum && url) {
|
|
||||||
+ const binaryVersion = version || checksum.substr(0, 8);
|
|
||||||
+ return (0, binDownload_1.getBinFromCustomLoc)("nsis-resources", binaryVersion, url, checksum);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return (0, binDownload_1.getBinFromUrl)("nsis-resources", "3.4.1", "Dqd6g+2buwwvoG1Vyf6BHR1b+25QMmPcwZx40atOT57gH27rkjOei1L0JTldxZu4NFoEmW4kJgZ3DlSWVON3+Q==");
|
|
||||||
+ });
|
|
||||||
+};
|
|
||||||
+exports.NSIS_RESOURCES_PATH = NSIS_RESOURCES_PATH;
|
|
||||||
class AppPackageHelper {
|
|
||||||
constructor(elevateHelper) {
|
|
||||||
this.elevateHelper = elevateHelper;
|
|
||||||
diff --git a/scheme.json b/scheme.json
|
|
||||||
index a4fc2517768ac5dac24c1dbdec0315d85e4c1bad..d738fab1d4983fea664972b59c0cd837f6c7c2b6 100644
|
|
||||||
--- a/scheme.json
|
|
||||||
+++ b/scheme.json
|
|
||||||
@@ -465,6 +465,36 @@
|
|
||||||
],
|
|
||||||
"type": "object"
|
|
||||||
},
|
|
||||||
+ "CustomNsisResources": {
|
|
||||||
+ "additionalProperties": false,
|
|
||||||
+ "properties": {
|
|
||||||
+ "checksum": {
|
|
||||||
+ "default": "Dqd6g+2buwwvoG1Vyf6BHR1b+25QMmPcwZx40atOT57gH27rkjOei1L0JTldxZu4NFoEmW4kJgZ3DlSWVON3+Q==",
|
|
||||||
+ "type": [
|
|
||||||
+ "null",
|
|
||||||
+ "string"
|
|
||||||
+ ]
|
|
||||||
+ },
|
|
||||||
+ "url": {
|
|
||||||
+ "default": "https://github.com/electron-userland/electron-builder-binaries/releases/download/nsis-resources-3.4.1/nsis-resources-3.4.1.7z",
|
|
||||||
+ "type": [
|
|
||||||
+ "null",
|
|
||||||
+ "string"
|
|
||||||
+ ]
|
|
||||||
+ },
|
|
||||||
+ "version": {
|
|
||||||
+ "default": "3.4.1",
|
|
||||||
+ "type": [
|
|
||||||
+ "null",
|
|
||||||
+ "string"
|
|
||||||
+ ]
|
|
||||||
+ }
|
|
||||||
+ },
|
|
||||||
+ "required": [
|
|
||||||
+ "url"
|
|
||||||
+ ],
|
|
||||||
+ "type": "object"
|
|
||||||
+ },
|
|
||||||
"CustomPublishOptions": {
|
|
||||||
"additionalProperties": {},
|
|
||||||
"properties": {
|
|
||||||
@@ -3900,6 +3930,17 @@
|
|
||||||
],
|
|
||||||
"description": "Allows you to provide your own `makensis`, such as one with support for debug logging via LogSet and LogText. (Logging also requires option `debugLogging = true`)"
|
|
||||||
},
|
|
||||||
+ "customNsisResources": {
|
|
||||||
+ "anyOf": [
|
|
||||||
+ {
|
|
||||||
+ "$ref": "#/definitions/CustomNsisResources"
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ "type": "null"
|
|
||||||
+ }
|
|
||||||
+ ],
|
|
||||||
+ "description": "Allows you to provide your own `nsis-resources`"
|
|
||||||
+ },
|
|
||||||
"deleteAppDataOnUninstall": {
|
|
||||||
"default": false,
|
|
||||||
"description": "*one-click installer only.* Whether to delete app data on uninstall.",
|
|
||||||
diff --git a/templates/nsis/include/installer.nsh b/templates/nsis/include/installer.nsh
|
diff --git a/templates/nsis/include/installer.nsh b/templates/nsis/include/installer.nsh
|
||||||
index 34e91dfe82fdbb2e929820f2e8deb771b7f7893c..73bfffc6c227a018cbbeb690d6d7b882ed142fc8 100644
|
index 34e91dfe82fdbb2e929820f2e8deb771b7f7893c..73bfffc6c227a018cbbeb690d6d7b882ed142fc8 100644
|
||||||
--- a/templates/nsis/include/installer.nsh
|
--- a/templates/nsis/include/installer.nsh
|
||||||
|
|||||||
111
pnpm-lock.yaml
generated
111
pnpm-lock.yaml
generated
@@ -15,9 +15,6 @@ overrides:
|
|||||||
'@electron/rebuild@3.7.0>@electron/node-gyp': 10.2.0-electron.2
|
'@electron/rebuild@3.7.0>@electron/node-gyp': 10.2.0-electron.2
|
||||||
|
|
||||||
patchedDependencies:
|
patchedDependencies:
|
||||||
'@electron/rebuild':
|
|
||||||
hash: 31649378d7bedcb532b7f379773ffc7df45968de1ac73c6d1b9f06cc521071fa
|
|
||||||
path: patches/@electron__rebuild.patch
|
|
||||||
'@types/backbone@1.4.22':
|
'@types/backbone@1.4.22':
|
||||||
hash: 9dace206a9f53e0e3b0203051b26aec1e92ad49744b156ad8076946356c6c8e7
|
hash: 9dace206a9f53e0e3b0203051b26aec1e92ad49744b156ad8076946356c6c8e7
|
||||||
path: patches/@types+backbone+1.4.22.patch
|
path: patches/@types+backbone+1.4.22.patch
|
||||||
@@ -37,7 +34,7 @@ patchedDependencies:
|
|||||||
hash: e8a96f71e52bf903c9f1eadba4740489a0beb48da33db52354adca484fe1f495
|
hash: e8a96f71e52bf903c9f1eadba4740489a0beb48da33db52354adca484fe1f495
|
||||||
path: patches/@vitest+expect+2.0.5.patch
|
path: patches/@vitest+expect+2.0.5.patch
|
||||||
app-builder-lib:
|
app-builder-lib:
|
||||||
hash: e32305da30fb126846cea8d7fc5a3c0085bfaadbe18fb707455d4713e0c5fe76
|
hash: 04e067399341fd84f665a9752328485e134a017e78303896a4cc65aa9e4c0f89
|
||||||
path: patches/app-builder-lib.patch
|
path: patches/app-builder-lib.patch
|
||||||
backbone@1.6.0:
|
backbone@1.6.0:
|
||||||
hash: 342b4b6012f8aecfa041554256444cb25af75bc933cf2ab1e91c4f66a8e47a31
|
hash: 342b4b6012f8aecfa041554256444cb25af75bc933cf2ab1e91c4f66a8e47a31
|
||||||
@@ -652,8 +649,8 @@ importers:
|
|||||||
specifier: 35.1.4
|
specifier: 35.1.4
|
||||||
version: 35.1.4
|
version: 35.1.4
|
||||||
electron-builder:
|
electron-builder:
|
||||||
specifier: 26.0.12
|
specifier: 26.0.14
|
||||||
version: 26.0.12(electron-builder-squirrel-windows@26.0.12)
|
version: 26.0.14(electron-builder-squirrel-windows@26.0.14)
|
||||||
electron-mocha:
|
electron-mocha:
|
||||||
specifier: 13.0.1
|
specifier: 13.0.1
|
||||||
version: 13.0.1
|
version: 13.0.1
|
||||||
@@ -1129,13 +1126,13 @@ packages:
|
|||||||
'@dual-bundle/import-meta-resolve@4.1.0':
|
'@dual-bundle/import-meta-resolve@4.1.0':
|
||||||
resolution: {integrity: sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==}
|
resolution: {integrity: sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==}
|
||||||
|
|
||||||
'@electron/asar@3.2.18':
|
'@electron/asar@3.3.1':
|
||||||
resolution: {integrity: sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg==}
|
resolution: {integrity: sha512-WtpC/+34p0skWZiarRjLAyqaAX78DofhDxnREy/V5XHfu1XEXbFCSSMcDQ6hNCPJFaPy8/NnUgYuf9uiCkvKPg==}
|
||||||
engines: {node: '>=10.12.0'}
|
engines: {node: '>=10.12.0'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
'@electron/asar@3.3.1':
|
'@electron/asar@3.4.1':
|
||||||
resolution: {integrity: sha512-WtpC/+34p0skWZiarRjLAyqaAX78DofhDxnREy/V5XHfu1XEXbFCSSMcDQ6hNCPJFaPy8/NnUgYuf9uiCkvKPg==}
|
resolution: {integrity: sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==}
|
||||||
engines: {node: '>=10.12.0'}
|
engines: {node: '>=10.12.0'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
@@ -1169,8 +1166,8 @@ packages:
|
|||||||
engines: {node: '>=12.0.0'}
|
engines: {node: '>=12.0.0'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
'@electron/rebuild@3.7.0':
|
'@electron/rebuild@3.7.2':
|
||||||
resolution: {integrity: sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw==}
|
resolution: {integrity: sha512-19/KbIR/DAxbsCkiaGMXIdPnMCJLkcf8AvGnduJtWBs/CBwiAjY1apCqOLVxrXg+rtXFCngbXhBanWjxLUt1Mg==}
|
||||||
engines: {node: '>=12.13.0'}
|
engines: {node: '>=12.13.0'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
@@ -3582,12 +3579,12 @@ packages:
|
|||||||
app-builder-bin@5.0.0-alpha.12:
|
app-builder-bin@5.0.0-alpha.12:
|
||||||
resolution: {integrity: sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==}
|
resolution: {integrity: sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==}
|
||||||
|
|
||||||
app-builder-lib@26.0.12:
|
app-builder-lib@26.0.14:
|
||||||
resolution: {integrity: sha512-+/CEPH1fVKf6HowBUs6LcAIoRcjeqgvAeoSE+cl7Y7LndyQ9ViGPYibNk7wmhMHzNgHIuIbw4nWADPO+4mjgWw==}
|
resolution: {integrity: sha512-nc/A9MUd95MCc7bR4yVW7Lhs9FZTA/l8QdV8PE1vZZOOiogK4dupBfCCJG0UqLU81JS62f078/bwAeuMjt3hfQ==}
|
||||||
engines: {node: '>=14.0.0'}
|
engines: {node: '>=14.0.0'}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
dmg-builder: 26.0.12
|
dmg-builder: 26.0.14
|
||||||
electron-builder-squirrel-windows: 26.0.12
|
electron-builder-squirrel-windows: 26.0.14
|
||||||
|
|
||||||
append-transform@2.0.0:
|
append-transform@2.0.0:
|
||||||
resolution: {integrity: sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==}
|
resolution: {integrity: sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==}
|
||||||
@@ -3889,12 +3886,12 @@ packages:
|
|||||||
resolution: {integrity: sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==}
|
resolution: {integrity: sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==}
|
||||||
engines: {node: '>=6.14.2'}
|
engines: {node: '>=6.14.2'}
|
||||||
|
|
||||||
builder-util-runtime@9.3.1:
|
builder-util-runtime@9.3.2:
|
||||||
resolution: {integrity: sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==}
|
resolution: {integrity: sha512-7QDXJ1FwT6d9ZhG4kuObUUPY8/ENBS/Ky26O4hR5vbeoRGavgekS2Jxv+8sCn/v23aPGU2DXRWEeJuijN2ooYA==}
|
||||||
engines: {node: '>=12.0.0'}
|
engines: {node: '>=12.0.0'}
|
||||||
|
|
||||||
builder-util@26.0.11:
|
builder-util@26.0.13:
|
||||||
resolution: {integrity: sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==}
|
resolution: {integrity: sha512-6b64uHzywaL2KAG+rVcqk/Prta1m3I2Jo1d4d2CrApb6EeSk2V384tmSL0EniH+P8jaNbMp6qhg7cIALw32zRA==}
|
||||||
|
|
||||||
bundle-name@4.1.0:
|
bundle-name@4.1.0:
|
||||||
resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
|
resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
|
||||||
@@ -4642,8 +4639,8 @@ packages:
|
|||||||
resolution: {integrity: sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ==}
|
resolution: {integrity: sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
dmg-builder@26.0.12:
|
dmg-builder@26.0.14:
|
||||||
resolution: {integrity: sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==}
|
resolution: {integrity: sha512-0l7oEj175hee7NfnaUpb0zf7fsgh1SyHeLjDA0AtOMnBUfTGxPPwrifbUxfd73qzamrGNcyeqza+m/EJx3QUug==}
|
||||||
|
|
||||||
dmg-license@1.0.11:
|
dmg-license@1.0.11:
|
||||||
resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==}
|
resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==}
|
||||||
@@ -4752,11 +4749,11 @@ packages:
|
|||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
electron-builder-squirrel-windows@26.0.12:
|
electron-builder-squirrel-windows@26.0.14:
|
||||||
resolution: {integrity: sha512-kpwXM7c/ayRUbYVErQbsZ0nQZX4aLHQrPEG9C4h9vuJCXylwFH8a7Jgi2VpKIObzCXO7LKHiCw4KdioFLFOgqA==}
|
resolution: {integrity: sha512-1JvbMXtNJsElDZZaFMa3nIRV/diXBFeP0+JPhLLu1c7b21VWPcPbr3MCCL+lTchVDq+q2v0F5dmHN72CJnOTpg==}
|
||||||
|
|
||||||
electron-builder@26.0.12:
|
electron-builder@26.0.14:
|
||||||
resolution: {integrity: sha512-cD1kz5g2sgPTMFHjLxfMjUK5JABq3//J4jPswi93tOPFz6btzXYtK5NrDt717NRbukCUDOrrvmYVOWERlqoiXA==}
|
resolution: {integrity: sha512-YBxpWLMGj0oS7fbS3LVingeZqFunU0F8s+uB9QTd5+wN4qgrf/rSGRkqoImbWg2+F2yHq11wmaA/Xr9xzvgQ0w==}
|
||||||
engines: {node: '>=14.0.0'}
|
engines: {node: '>=14.0.0'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
@@ -4765,8 +4762,8 @@ packages:
|
|||||||
engines: {node: '>= 16.0.0'}
|
engines: {node: '>= 16.0.0'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
electron-publish@26.0.11:
|
electron-publish@26.0.13:
|
||||||
resolution: {integrity: sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==}
|
resolution: {integrity: sha512-O5hfHSwli5cegQ4JS3Dp0dZcheex6UCRE/qYyRQvhB6DhSwojiwTnAGEuQCJXc8K8Zxz2lku5Du3VwYHf8d5Lw==}
|
||||||
|
|
||||||
electron-to-chromium@1.5.99:
|
electron-to-chromium@1.5.99:
|
||||||
resolution: {integrity: sha512-77c/+fCyL2U+aOyqfIFi89wYLBeSTCs55xCZL0oFH0KjqsvSvyh6AdQ+UIl1vgpnQQE6g+/KK8hOIupH6VwPtg==}
|
resolution: {integrity: sha512-77c/+fCyL2U+aOyqfIFi89wYLBeSTCs55xCZL0oFH0KjqsvSvyh6AdQ+UIl1vgpnQQE6g+/KK8hOIupH6VwPtg==}
|
||||||
@@ -10058,13 +10055,13 @@ snapshots:
|
|||||||
|
|
||||||
'@dual-bundle/import-meta-resolve@4.1.0': {}
|
'@dual-bundle/import-meta-resolve@4.1.0': {}
|
||||||
|
|
||||||
'@electron/asar@3.2.18':
|
'@electron/asar@3.3.1':
|
||||||
dependencies:
|
dependencies:
|
||||||
commander: 5.1.0
|
commander: 5.1.0
|
||||||
glob: 7.2.3
|
glob: 7.2.3
|
||||||
minimatch: 3.1.2
|
minimatch: 3.1.2
|
||||||
|
|
||||||
'@electron/asar@3.3.1':
|
'@electron/asar@3.4.1':
|
||||||
dependencies:
|
dependencies:
|
||||||
commander: 5.1.0
|
commander: 5.1.0
|
||||||
glob: 7.2.3
|
glob: 7.2.3
|
||||||
@@ -10139,7 +10136,7 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
'@electron/rebuild@3.7.0(patch_hash=31649378d7bedcb532b7f379773ffc7df45968de1ac73c6d1b9f06cc521071fa)':
|
'@electron/rebuild@3.7.2':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@electron/node-gyp': 10.2.0-electron.2
|
'@electron/node-gyp': 10.2.0-electron.2
|
||||||
'@malept/cross-spawn-promise': 2.0.0
|
'@malept/cross-spawn-promise': 2.0.0
|
||||||
@@ -13434,29 +13431,29 @@ snapshots:
|
|||||||
|
|
||||||
app-builder-bin@5.0.0-alpha.12: {}
|
app-builder-bin@5.0.0-alpha.12: {}
|
||||||
|
|
||||||
app-builder-lib@26.0.12(patch_hash=e32305da30fb126846cea8d7fc5a3c0085bfaadbe18fb707455d4713e0c5fe76)(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12):
|
app-builder-lib@26.0.14(patch_hash=04e067399341fd84f665a9752328485e134a017e78303896a4cc65aa9e4c0f89)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@develar/schema-utils': 2.6.5
|
'@develar/schema-utils': 2.6.5
|
||||||
'@electron/asar': 3.2.18
|
'@electron/asar': 3.4.1
|
||||||
'@electron/fuses': 1.8.0
|
'@electron/fuses': 1.8.0
|
||||||
'@electron/notarize': 2.5.0
|
'@electron/notarize': 2.5.0
|
||||||
'@electron/osx-sign': 1.3.1
|
'@electron/osx-sign': 1.3.1
|
||||||
'@electron/rebuild': 3.7.0(patch_hash=31649378d7bedcb532b7f379773ffc7df45968de1ac73c6d1b9f06cc521071fa)
|
'@electron/rebuild': 3.7.2
|
||||||
'@electron/universal': 2.0.1
|
'@electron/universal': 2.0.1
|
||||||
'@malept/flatpak-bundler': 0.4.0
|
'@malept/flatpak-bundler': 0.4.0
|
||||||
'@types/fs-extra': 9.0.13
|
'@types/fs-extra': 9.0.13
|
||||||
async-exit-hook: 2.0.1
|
async-exit-hook: 2.0.1
|
||||||
builder-util: 26.0.11
|
builder-util: 26.0.13
|
||||||
builder-util-runtime: 9.3.1
|
builder-util-runtime: 9.3.2
|
||||||
chromium-pickle-js: 0.2.0
|
chromium-pickle-js: 0.2.0
|
||||||
config-file-ts: 0.2.8-rc1
|
config-file-ts: 0.2.8-rc1
|
||||||
debug: 4.3.7(supports-color@8.1.1)
|
debug: 4.3.7(supports-color@8.1.1)
|
||||||
dmg-builder: 26.0.12(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.12)
|
dmg-builder: 26.0.14(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14)
|
||||||
dotenv: 16.4.7
|
dotenv: 16.4.7
|
||||||
dotenv-expand: 11.0.7
|
dotenv-expand: 11.0.7
|
||||||
ejs: 3.1.10
|
ejs: 3.1.10
|
||||||
electron-builder-squirrel-windows: 26.0.12(dmg-builder@26.0.12)
|
electron-builder-squirrel-windows: 26.0.14(dmg-builder@26.0.14)
|
||||||
electron-publish: 26.0.11
|
electron-publish: 26.0.13
|
||||||
fs-extra: 10.1.0
|
fs-extra: 10.1.0
|
||||||
hosted-git-info: 4.1.0
|
hosted-git-info: 4.1.0
|
||||||
is-ci: 3.0.1
|
is-ci: 3.0.1
|
||||||
@@ -13830,19 +13827,19 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
node-gyp-build: 4.8.4
|
node-gyp-build: 4.8.4
|
||||||
|
|
||||||
builder-util-runtime@9.3.1:
|
builder-util-runtime@9.3.2:
|
||||||
dependencies:
|
dependencies:
|
||||||
debug: 4.3.7(supports-color@8.1.1)
|
debug: 4.3.7(supports-color@8.1.1)
|
||||||
sax: 1.4.1
|
sax: 1.4.1
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
builder-util@26.0.11:
|
builder-util@26.0.13:
|
||||||
dependencies:
|
dependencies:
|
||||||
7zip-bin: 5.2.0
|
7zip-bin: 5.2.0
|
||||||
'@types/debug': 4.1.12
|
'@types/debug': 4.1.12
|
||||||
app-builder-bin: 5.0.0-alpha.12
|
app-builder-bin: 5.0.0-alpha.12
|
||||||
builder-util-runtime: 9.3.1
|
builder-util-runtime: 9.3.2
|
||||||
chalk: 4.1.2
|
chalk: 4.1.2
|
||||||
cross-spawn: 7.0.6
|
cross-spawn: 7.0.6
|
||||||
debug: 4.3.7(supports-color@8.1.1)
|
debug: 4.3.7(supports-color@8.1.1)
|
||||||
@@ -14616,11 +14613,11 @@ snapshots:
|
|||||||
|
|
||||||
direction@1.0.4: {}
|
direction@1.0.4: {}
|
||||||
|
|
||||||
dmg-builder@26.0.12(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.12):
|
dmg-builder@26.0.14(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14):
|
||||||
dependencies:
|
dependencies:
|
||||||
app-builder-lib: 26.0.12(patch_hash=e32305da30fb126846cea8d7fc5a3c0085bfaadbe18fb707455d4713e0c5fe76)(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12)
|
app-builder-lib: 26.0.14(patch_hash=04e067399341fd84f665a9752328485e134a017e78303896a4cc65aa9e4c0f89)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14)
|
||||||
builder-util: 26.0.11
|
builder-util: 26.0.13
|
||||||
builder-util-runtime: 9.3.1
|
builder-util-runtime: 9.3.2
|
||||||
fs-extra: 10.1.0
|
fs-extra: 10.1.0
|
||||||
iconv-lite: 0.6.3
|
iconv-lite: 0.6.3
|
||||||
js-yaml: 4.1.0
|
js-yaml: 4.1.0
|
||||||
@@ -14762,23 +14759,23 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
jake: 10.9.2
|
jake: 10.9.2
|
||||||
|
|
||||||
electron-builder-squirrel-windows@26.0.12(dmg-builder@26.0.12):
|
electron-builder-squirrel-windows@26.0.14(dmg-builder@26.0.14):
|
||||||
dependencies:
|
dependencies:
|
||||||
app-builder-lib: 26.0.12(patch_hash=e32305da30fb126846cea8d7fc5a3c0085bfaadbe18fb707455d4713e0c5fe76)(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12)
|
app-builder-lib: 26.0.14(patch_hash=04e067399341fd84f665a9752328485e134a017e78303896a4cc65aa9e4c0f89)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14)
|
||||||
builder-util: 26.0.11
|
builder-util: 26.0.13
|
||||||
electron-winstaller: 5.4.0
|
electron-winstaller: 5.4.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- bluebird
|
- bluebird
|
||||||
- dmg-builder
|
- dmg-builder
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
electron-builder@26.0.12(electron-builder-squirrel-windows@26.0.12):
|
electron-builder@26.0.14(electron-builder-squirrel-windows@26.0.14):
|
||||||
dependencies:
|
dependencies:
|
||||||
app-builder-lib: 26.0.12(patch_hash=e32305da30fb126846cea8d7fc5a3c0085bfaadbe18fb707455d4713e0c5fe76)(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12)
|
app-builder-lib: 26.0.14(patch_hash=04e067399341fd84f665a9752328485e134a017e78303896a4cc65aa9e4c0f89)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14)
|
||||||
builder-util: 26.0.11
|
builder-util: 26.0.13
|
||||||
builder-util-runtime: 9.3.1
|
builder-util-runtime: 9.3.2
|
||||||
chalk: 4.1.2
|
chalk: 4.1.2
|
||||||
dmg-builder: 26.0.12(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.12)
|
dmg-builder: 26.0.14(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14)
|
||||||
fs-extra: 10.1.0
|
fs-extra: 10.1.0
|
||||||
is-ci: 3.0.1
|
is-ci: 3.0.1
|
||||||
lazy-val: 1.0.5
|
lazy-val: 1.0.5
|
||||||
@@ -14797,11 +14794,11 @@ snapshots:
|
|||||||
which: 4.0.0
|
which: 4.0.0
|
||||||
yargs: 17.7.2
|
yargs: 17.7.2
|
||||||
|
|
||||||
electron-publish@26.0.11:
|
electron-publish@26.0.13:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/fs-extra': 9.0.13
|
'@types/fs-extra': 9.0.13
|
||||||
builder-util: 26.0.11
|
builder-util: 26.0.13
|
||||||
builder-util-runtime: 9.3.1
|
builder-util-runtime: 9.3.2
|
||||||
chalk: 4.1.2
|
chalk: 4.1.2
|
||||||
form-data: 4.0.1
|
form-data: 4.0.1
|
||||||
fs-extra: 10.1.0
|
fs-extra: 10.1.0
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ RUN apt install -oAcquire::https::Verify-Peer=false -y ca-certificates
|
|||||||
|
|
||||||
# Back to normal, verification back on
|
# Back to normal, verification back on
|
||||||
RUN apt update
|
RUN apt update
|
||||||
RUN apt install -y git curl g++ g++-10 gcc gcc-10 make python3 tar
|
RUN apt install -y git curl g++ g++-10 gcc gcc-10 make python3 tar xz-utils
|
||||||
|
|
||||||
# On Ubuntu 20 GCC 9 is the default but we need 10 to build
|
# On Ubuntu 20 GCC 9 is the default but we need 10 to build
|
||||||
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
|
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
|
||||||
|
|||||||
Reference in New Issue
Block a user