Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-20 02:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade electron-builder to 26.0.10 to fix packaging for pnpm

Browse Source 
Co-authored-by: Fedor Indutny <indutny@signal.org>
This commit is contained in:
ayumi-signal
2025-03-14 12:02:51 -07:00
committed by GitHub
parent 7c0cbb58ef
commit ae35eb8e49
7 changed files with 217 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
patches/app-builder-lib+26.0.0-alpha.8.patch → patches/app-builder-lib@26.0.10.patch
View File

@@ -1,5 +1,48 @@
diff --git a/out/node-module-collector/pnpmNodeModulesCollector.js b/out/node-module-collector/pnpmNodeModulesCollector.js
index e52d98fbc0d9d7fdd72a156823fca2bbc9b393fd..34c02fcfd6f81f84f49c90219425814ee3026bcd 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/templates/nsis/include/installer.nsh b/templates/nsis/include/installer.nsh
index 34e91df..73bfffc 100644
index 34e91dfe82fdbb2e929820f2e8deb771b7f7893c..73bfffc6c227a018cbbeb690d6d7b882ed142fc8 100644
--- a/templates/nsis/include/installer.nsh
+++ b/templates/nsis/include/installer.nsh
@@ -90,7 +90,13 @@
@@ -18,7 +61,7 @@ index 34e91df..73bfffc 100644
SetShellVarContext all
${endif}
diff --git a/templates/nsis/installSection.nsh b/templates/nsis/installSection.nsh
index 053772f..a58ea8c 100644
index 053772f55ca6ece52f0a34c4fa0f05c9a5f07bd2..a58ea8c19116f8ec3fb7515ec4104282f635ecc8 100644
--- a/templates/nsis/installSection.nsh
+++ b/templates/nsis/installSection.nsh
@@ -22,11 +22,37 @@ StrCpy $appExe "$INSTDIR\${APP_EXECUTABLE_FILENAME}"

14
patches/dmg-builder+26.0.0-alpha.8.patch → patches/dmg-builder@26.0.10.patch
View File

@@ -1,13 +1,13 @@
diff --git a/out/dmgLicense.js b/out/dmgLicense.js
index 9263c2b..40706e5 100644
index cf1dbdf803d3af37e439c7f0fa219b497f8faaef..d727aac55e263486b88801ac04d5b98360b374ce 100644
--- a/out/dmgLicense.js
+++ b/out/dmgLicense.js
@@ -6,7 +6,7 @@ const js_yaml_1 = require("js-yaml");
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.addLicenseToDmg = addLicenseToDmg;
const license_1 = require("app-builder-lib/out/util/license");
const fs_extra_1 = require("fs-extra");
const licenseButtons_1 = require("./licenseButtons");
const builder_util_1 = require("builder-util");
-const dmg_license_1 = require("dmg-license");
+// SIGNAL: const dmg_license_1 = require("dmg-license");
async function addLicenseToDmg(packager, dmgPath) {
const licenseFiles = await (0, license_1.getLicenseFiles)(packager);
if (licenseFiles.length === 0) {
const fs_extra_1 = require("fs-extra");
const js_yaml_1 = require("js-yaml");
const licenseButtons_1 = require("./licenseButtons");