diff --git a/.npmrc b/.npmrc index d669e952d9..ffd7fcf372 100644 --- a/.npmrc +++ b/.npmrc @@ -2,3 +2,4 @@ legacy-peer-deps=true public-hoist-pattern[]=*eslint-* minimum-release-age=14400 minimum-release-age-exclude[]=@signalapp/* +minimum-release-age-exclude[]=electron diff --git a/.nvmrc b/.nvmrc index 91d5f6ff8e..442c7587a9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22.18.0 +22.20.0 diff --git a/package.json b/package.json index 8dec6511fd..834688e835 100644 --- a/package.json +++ b/package.json @@ -310,8 +310,8 @@ "csv-parse": "5.5.6", "danger": "12.3.3", "debug": "4.3.7", - "electron": "38.2.1", - "electron-builder": "26.0.14", + "electron": "38.4.0", + "electron-builder": "26.1.0", "electron-mocha": "13.0.1", "endanger": "7.0.4", "enhanced-resolve": "5.18.3", @@ -425,7 +425,7 @@ ] }, "engines": { - "node": "22.18.0" + "node": "22.20.0" }, "build": { "appId": "org.whispersystems.signal-desktop", @@ -521,6 +521,7 @@ } }, "linux": { + "executableName": "signal-desktop", "category": "Network;InstantMessaging;Chat", "desktop": { "entry": { @@ -700,6 +701,6 @@ ] }, "volta": { - "node": "22.18.0" + "node": "22.20.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d52d9e33b4..e27d5c70cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -658,11 +658,11 @@ importers: specifier: 4.3.7 version: 4.3.7(supports-color@8.1.1) electron: - specifier: 38.2.1 - version: 38.2.1 + specifier: 38.4.0 + version: 38.4.0 electron-builder: - specifier: 26.0.14 - version: 26.0.14(electron-builder-squirrel-windows@26.0.14) + specifier: 26.1.0 + version: 26.1.0(electron-builder-squirrel-windows@26.0.14) electron-mocha: specifier: 13.0.1 version: 13.0.1 @@ -1211,11 +1211,21 @@ packages: engines: {node: '>=12.0.0'} hasBin: true + '@electron/osx-sign@1.3.3': + resolution: {integrity: sha512-KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg==} + engines: {node: '>=12.0.0'} + hasBin: true + '@electron/rebuild@3.7.2': resolution: {integrity: sha512-19/KbIR/DAxbsCkiaGMXIdPnMCJLkcf8AvGnduJtWBs/CBwiAjY1apCqOLVxrXg+rtXFCngbXhBanWjxLUt1Mg==} engines: {node: '>=12.13.0'} hasBin: true + '@electron/rebuild@4.0.1': + resolution: {integrity: sha512-iMGXb6Ib7H/Q3v+BKZJoETgF9g6KMNZVbsO4b7Dmpgb5qTFqyFTzqW9F3TOSHdybv2vKYKzSS9OiZL+dcJb+1Q==} + engines: {node: '>=22.12.0'} + hasBin: true + '@electron/symbolicate-mac@2.3.1': resolution: {integrity: sha512-V/1RN7QI+dD3cquravwSg9Z9vEuSgOm4G50dJutQUlCUip6ECUMxsIqPnleTreA/27eboWs6Ev/jV/fN0Uklzw==} engines: {node: '>=4'} @@ -1225,6 +1235,10 @@ packages: resolution: {integrity: sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==} engines: {node: '>=16.4'} + '@electron/universal@2.0.3': + resolution: {integrity: sha512-Wn9sPYIVFRFl5HmwMJkARCCf7rqK/EurkfQ/rJZ14mHP3iYTjZSIOSVonEAnhWeAXwtw7zOekGRlc6yTtZ0t+g==} + engines: {node: '>=16.4'} + '@electron/windows-sign@1.2.2': resolution: {integrity: sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==} engines: {node: '>=14.14'} @@ -1745,6 +1759,14 @@ packages: '@ioredis/commands@1.2.0': resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==} + '@isaacs/balanced-match@4.0.1': + resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==} + engines: {node: 20 || >=22} + + '@isaacs/brace-expansion@5.0.0': + resolution: {integrity: sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==} + engines: {node: 20 || >=22} + '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -4626,6 +4648,13 @@ packages: dmg-builder: 26.0.14 electron-builder-squirrel-windows: 26.0.14 + app-builder-lib@26.1.0: + resolution: {integrity: sha512-dxWEGIgTTPD8OiYN8X6n3PV31+DFwvP9pyXCFDsV5fyt6g+0TMZUVXrCRrSPj0+X/phBPad5sNPLLvBRDVDPaQ==} + engines: {node: '>=14.0.0'} + peerDependencies: + dmg-builder: 26.1.0 + electron-builder-squirrel-windows: 26.1.0 + append-transform@2.0.0: resolution: {integrity: sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==} engines: {node: '>=8'} @@ -4939,9 +4968,16 @@ packages: resolution: {integrity: sha512-7QDXJ1FwT6d9ZhG4kuObUUPY8/ENBS/Ky26O4hR5vbeoRGavgekS2Jxv+8sCn/v23aPGU2DXRWEeJuijN2ooYA==} engines: {node: '>=12.0.0'} + builder-util-runtime@9.5.0: + resolution: {integrity: sha512-7qmRMH8X/IzDM+1TysKNFo5cNWBbfacdLX4EqkuE5aiRTECAlYiKHSqEc6cc3c4Lrmpgk0utbxOPkj0iYaWAWQ==} + engines: {node: '>=12.0.0'} + builder-util@26.0.13: resolution: {integrity: sha512-6b64uHzywaL2KAG+rVcqk/Prta1m3I2Jo1d4d2CrApb6EeSk2V384tmSL0EniH+P8jaNbMp6qhg7cIALw32zRA==} + builder-util@26.1.0: + resolution: {integrity: sha512-BTUhmpkCuEAAUmc8EJkJOg7fMGsDSSRMPn1QTpoUpYpGp3SjyJV18LlCPTu3+UBfuQ/5ua7KqDLrsK9NAXO7fg==} + bundle-name@4.1.0: resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==} engines: {node: '>=18'} @@ -5124,6 +5160,10 @@ packages: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} + ci-info@4.3.1: + resolution: {integrity: sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==} + engines: {node: '>=8'} + cirbuf@1.0.2: resolution: {integrity: sha512-qatGIQ8pnGCXzx06hZhA6o8iYYdBmIcb5vlUkN2viTEvbz2XLmhAwmWYKJqsiEXQNPlWmEcJAFTJwc/wbNkDxQ==} @@ -5704,8 +5744,8 @@ packages: resolution: {integrity: sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ==} hasBin: true - dmg-builder@26.0.14: - resolution: {integrity: sha512-0l7oEj175hee7NfnaUpb0zf7fsgh1SyHeLjDA0AtOMnBUfTGxPPwrifbUxfd73qzamrGNcyeqza+m/EJx3QUug==} + dmg-builder@26.1.0: + resolution: {integrity: sha512-0eXB7qX9YHiQ2o83EMgC8A6VQ7BfCFP8zxlhUtqtvqy1nEVIZa8XbOAcIiP8ne58RhwLYKV2LCcfN1OImXFEWg==} dmg-license@1.0.11: resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==} @@ -5814,8 +5854,8 @@ packages: electron-builder-squirrel-windows@26.0.14: resolution: {integrity: sha512-1JvbMXtNJsElDZZaFMa3nIRV/diXBFeP0+JPhLLu1c7b21VWPcPbr3MCCL+lTchVDq+q2v0F5dmHN72CJnOTpg==} - electron-builder@26.0.14: - resolution: {integrity: sha512-YBxpWLMGj0oS7fbS3LVingeZqFunU0F8s+uB9QTd5+wN4qgrf/rSGRkqoImbWg2+F2yHq11wmaA/Xr9xzvgQ0w==} + electron-builder@26.1.0: + resolution: {integrity: sha512-dvy9sODWE7uqz7l68copgAtO2EKumdkLqCgooNWl7bSFjrubMmjf2hVS6iwSrcb7hLHL02OULBPNp45aeGAcpA==} engines: {node: '>=14.0.0'} hasBin: true @@ -5827,6 +5867,9 @@ packages: electron-publish@26.0.13: resolution: {integrity: sha512-O5hfHSwli5cegQ4JS3Dp0dZcheex6UCRE/qYyRQvhB6DhSwojiwTnAGEuQCJXc8K8Zxz2lku5Du3VwYHf8d5Lw==} + electron-publish@26.1.0: + resolution: {integrity: sha512-GwghDIOk5vzNtbiMeXHEIRN+9hPR8cqTOSzMidX4vCC7U9GFh8whruhFhAyaI6MY5YlyTNmT7z6LpLlO8ncOWw==} + electron-to-chromium@1.5.99: resolution: {integrity: sha512-77c/+fCyL2U+aOyqfIFi89wYLBeSTCs55xCZL0oFH0KjqsvSvyh6AdQ+UIl1vgpnQQE6g+/KK8hOIupH6VwPtg==} @@ -5842,8 +5885,8 @@ packages: engines: {node: '>= 12.20.55'} hasBin: true - electron@38.2.1: - resolution: {integrity: sha512-P4pE2RpRg3kM8IeOK+heg6iAxR5wcXnNHrbVchn7M3GBnYAhjfJRkROusdOro5PlKzdtfKjesbbqaG4MqQXccg==} + electron@38.4.0: + resolution: {integrity: sha512-9CsXKbGf2qpofVe2pQYSgom2E//zLDJO2rGLLbxgy9tkdTOs7000Gte+d/PUtzLjI/DS95jDK0ojYAeqjLvpYg==} engines: {node: '>= 12.20.55'} hasBin: true @@ -6338,6 +6381,15 @@ packages: fd-slicer@1.1.0: resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} + fdir@6.5.0: + resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} + engines: {node: '>=12.0.0'} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + file-entry-cache@6.0.1: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} @@ -8170,6 +8222,10 @@ packages: resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==} engines: {node: 20 || >=22} + minimatch@10.0.3: + resolution: {integrity: sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==} + engines: {node: 20 || >=22} + minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -8329,6 +8385,10 @@ packages: resolution: {integrity: sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==} engines: {node: '>=10'} + node-abi@4.14.0: + resolution: {integrity: sha512-E4n91K4Nk1Rch2KzD+edU2bfZTP4W42GypAUDXU4vu1A+4u9PvUNDkGI0dXbsy8ZeF3WGj0SD/uHxnXD/sW+3w==} + engines: {node: '>=22.12.0'} + node-abort-controller@3.1.1: resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==} @@ -8349,6 +8409,9 @@ packages: node-api-version@0.2.0: resolution: {integrity: sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==} + node-api-version@0.2.1: + resolution: {integrity: sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==} + node-cleanup@2.1.2: resolution: {integrity: sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==} @@ -8374,6 +8437,11 @@ packages: engines: {node: ^18.17.0 || >=20.5.0} hasBin: true + node-gyp@11.5.0: + resolution: {integrity: sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ==} + engines: {node: ^18.17.0 || >=20.5.0} + hasBin: true + node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} @@ -8751,6 +8819,10 @@ packages: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} + picomatch@4.0.3: + resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} + engines: {node: '>=12'} + pidtree@0.3.1: resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==} engines: {node: '>=0.10'} @@ -9650,6 +9722,11 @@ packages: engines: {node: '>=10'} hasBin: true + semver@7.7.2: + resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} + engines: {node: '>=10'} + hasBin: true + send@0.19.0: resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==} engines: {node: '>= 0.8.0'} @@ -10197,6 +10274,10 @@ packages: tiny-invariant@1.3.3: resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==} + tinyglobby@0.2.15: + resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} + engines: {node: '>=12.0.0'} + tinykeys@3.0.0: resolution: {integrity: sha512-nazawuGv5zx6MuDfDY0rmfXjuOGhD5XU2z0GLURQ1nzl0RUe9OuCJq+0u8xxJZINHe+mr7nw8PWYYZ9WhMFujw==} @@ -11400,6 +11481,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@electron/osx-sign@1.3.3': + dependencies: + compare-version: 0.1.2 + debug: 4.3.7(supports-color@8.1.1) + fs-extra: 10.1.0 + isbinaryfile: 4.0.10 + minimist: 1.2.8 + plist: 3.1.0 + transitivePeerDependencies: + - supports-color + '@electron/rebuild@3.7.2': dependencies: '@electron/node-gyp': 10.2.0-electron.2 @@ -11420,6 +11512,25 @@ snapshots: - bluebird - supports-color + '@electron/rebuild@4.0.1': + dependencies: + '@malept/cross-spawn-promise': 2.0.0 + chalk: 4.1.2 + debug: 4.3.7(supports-color@8.1.1) + detect-libc: 2.0.4 + got: 11.8.5(patch_hash=cfe393dc1cca8970377087e9555a285d1121f75d57223ddd872b1a8d3f8c909b) + graceful-fs: 4.2.11 + node-abi: 4.14.0 + node-api-version: 0.2.1 + node-gyp: 11.5.0 + ora: 5.4.1 + read-binary-file-arch: 1.0.6 + semver: 7.6.3 + tar: 6.2.1 + yargs: 17.7.2 + transitivePeerDependencies: + - supports-color + '@electron/symbolicate-mac@2.3.1': dependencies: '@indutny/breakpad': 1.2.3 @@ -11439,6 +11550,18 @@ snapshots: transitivePeerDependencies: - supports-color + '@electron/universal@2.0.3': + dependencies: + '@electron/asar': 3.4.1 + '@malept/cross-spawn-promise': 2.0.0 + debug: 4.3.7(supports-color@8.1.1) + dir-compare: 4.2.0 + fs-extra: 11.2.0 + minimatch: 9.0.5 + plist: 3.1.0 + transitivePeerDependencies: + - supports-color + '@electron/windows-sign@1.2.2': dependencies: cross-dirname: 0.1.0 @@ -11909,6 +12032,12 @@ snapshots: '@ioredis/commands@1.2.0': optional: true + '@isaacs/balanced-match@4.0.1': {} + + '@isaacs/brace-expansion@5.0.0': + dependencies: + '@isaacs/balanced-match': 4.0.1 + '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 @@ -14427,7 +14556,7 @@ snapshots: '@storybook/builder-webpack5@8.4.4(@swc/core@1.10.16(@swc/helpers@0.5.15))(esbuild@0.25.9)(storybook@8.4.4(bufferutil@4.0.9)(prettier@3.3.3)(utf-8-validate@5.0.10))(typescript@5.6.3)(webpack-cli@5.1.4)': dependencies: '@storybook/core-webpack': 8.4.4(storybook@8.4.4(bufferutil@4.0.9)(prettier@3.3.3)(utf-8-validate@5.0.10)) - '@types/node': 22.13.4 + '@types/node': 22.18.8 '@types/semver': 7.5.8 browser-assert: 1.2.1 case-sensitive-paths-webpack-plugin: 2.4.0 @@ -14529,7 +14658,7 @@ snapshots: '@storybook/core-webpack': 8.4.4(storybook@8.4.4(bufferutil@4.0.9)(prettier@3.3.3)(utf-8-validate@5.0.10)) '@storybook/react': 8.4.4(@storybook/test@8.4.4(storybook@8.4.4(bufferutil@4.0.9)(prettier@3.3.3)(utf-8-validate@5.0.10)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.4.4(bufferutil@4.0.9)(prettier@3.3.3)(utf-8-validate@5.0.10))(typescript@5.6.3) '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0(typescript@5.6.3)(webpack@5.96.1) - '@types/node': 22.13.4 + '@types/node': 22.18.8 '@types/semver': 7.5.8 find-up: 5.0.0 magic-string: 0.30.17 @@ -15655,7 +15784,7 @@ snapshots: app-builder-bin@5.0.0-alpha.12: {} - app-builder-lib@26.0.14(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14): + app-builder-lib@26.0.14(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.1.0)(electron-builder-squirrel-windows@26.0.14): dependencies: '@develar/schema-utils': 2.6.5 '@electron/asar': 3.4.1 @@ -15672,11 +15801,11 @@ snapshots: chromium-pickle-js: 0.2.0 config-file-ts: 0.2.8-rc1 debug: 4.3.7(supports-color@8.1.1) - dmg-builder: 26.0.14(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14) + dmg-builder: 26.1.0(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14) dotenv: 16.4.7 dotenv-expand: 11.0.7 ejs: 3.1.10 - electron-builder-squirrel-windows: 26.0.14(dmg-builder@26.0.14) + electron-builder-squirrel-windows: 26.0.14(dmg-builder@26.1.0) electron-publish: 26.0.13 fs-extra: 10.1.0 hosted-git-info: 4.1.0 @@ -15696,6 +15825,47 @@ snapshots: - bluebird - supports-color + app-builder-lib@26.1.0(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.1.0)(electron-builder-squirrel-windows@26.0.14): + dependencies: + '@develar/schema-utils': 2.6.5 + '@electron/asar': 3.4.1 + '@electron/fuses': 1.8.0 + '@electron/notarize': 2.5.0 + '@electron/osx-sign': 1.3.3 + '@electron/rebuild': 4.0.1 + '@electron/universal': 2.0.3 + '@malept/flatpak-bundler': 0.4.0 + '@types/fs-extra': 9.0.13 + async-exit-hook: 2.0.1 + builder-util: 26.1.0 + builder-util-runtime: 9.5.0 + chromium-pickle-js: 0.2.0 + ci-info: 4.3.1 + debug: 4.3.7(supports-color@8.1.1) + dmg-builder: 26.1.0(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14) + dotenv: 16.4.7 + dotenv-expand: 11.0.7 + ejs: 3.1.10 + electron-builder-squirrel-windows: 26.0.14(dmg-builder@26.1.0) + electron-publish: 26.1.0 + fs-extra: 10.1.0 + hosted-git-info: 4.1.0 + isbinaryfile: 5.0.4 + jiti: 2.4.2 + js-yaml: 4.1.0 + json5: 2.2.3 + lazy-val: 1.0.5 + minimatch: 10.0.3 + plist: 3.1.0 + resedit: 1.7.2 + semver: 7.7.2 + tar: 6.2.1 + temp-file: 3.4.0 + tiny-async-pool: 1.3.0 + which: 5.0.0 + transitivePeerDependencies: + - supports-color + append-transform@2.0.0: dependencies: default-require-extensions: 3.0.1 @@ -16079,6 +16249,13 @@ snapshots: transitivePeerDependencies: - supports-color + builder-util-runtime@9.5.0: + dependencies: + debug: 4.3.7(supports-color@8.1.1) + sax: 1.4.1 + transitivePeerDependencies: + - supports-color + builder-util@26.0.13: dependencies: 7zip-bin: 5.2.0 @@ -16101,6 +16278,28 @@ snapshots: transitivePeerDependencies: - supports-color + builder-util@26.1.0: + dependencies: + 7zip-bin: 5.2.0 + '@types/debug': 4.1.12 + app-builder-bin: 5.0.0-alpha.12 + builder-util-runtime: 9.5.0 + chalk: 4.1.2 + ci-info: 4.3.1 + cross-spawn: 7.0.6 + debug: 4.3.7(supports-color@8.1.1) + fs-extra: 10.1.0 + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.6 + js-yaml: 4.1.0 + sanitize-filename: 1.6.3 + source-map-support: 0.5.21 + stat-mode: 1.0.0 + temp-file: 3.4.0 + tiny-async-pool: 1.3.0 + transitivePeerDependencies: + - supports-color + bundle-name@4.1.0: dependencies: run-applescript: 7.0.0 @@ -16316,6 +16515,8 @@ snapshots: ci-info@3.9.0: {} + ci-info@4.3.1: {} + cirbuf@1.0.2: {} cjs-module-lexer@1.4.3: {} @@ -16872,18 +17073,16 @@ snapshots: direction@1.0.4: {} - dmg-builder@26.0.14(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14): + dmg-builder@26.1.0(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14): dependencies: - app-builder-lib: 26.0.14(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) - builder-util: 26.0.13 - builder-util-runtime: 9.3.2 + app-builder-lib: 26.1.0(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.1.0)(electron-builder-squirrel-windows@26.0.14) + builder-util: 26.1.0 fs-extra: 10.1.0 iconv-lite: 0.6.3 js-yaml: 4.1.0 optionalDependencies: dmg-license: 1.0.11 transitivePeerDependencies: - - bluebird - electron-builder-squirrel-windows - supports-color @@ -17016,9 +17215,9 @@ snapshots: dependencies: jake: 10.9.2 - electron-builder-squirrel-windows@26.0.14(dmg-builder@26.0.14): + electron-builder-squirrel-windows@26.0.14(dmg-builder@26.1.0): dependencies: - app-builder-lib: 26.0.14(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) + app-builder-lib: 26.0.14(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.1.0)(electron-builder-squirrel-windows@26.0.14) builder-util: 26.0.13 electron-winstaller: 5.4.0 transitivePeerDependencies: @@ -17026,20 +17225,19 @@ snapshots: - dmg-builder - supports-color - electron-builder@26.0.14(electron-builder-squirrel-windows@26.0.14): + electron-builder@26.1.0(electron-builder-squirrel-windows@26.0.14): dependencies: - app-builder-lib: 26.0.14(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) - builder-util: 26.0.13 - builder-util-runtime: 9.3.2 + app-builder-lib: 26.1.0(patch_hash=b412b44a47bb3d2be98e6edffed5dc4286cc62ac3c02fef42d1557927baa2420)(dmg-builder@26.1.0)(electron-builder-squirrel-windows@26.0.14) + builder-util: 26.1.0 + builder-util-runtime: 9.5.0 chalk: 4.1.2 - dmg-builder: 26.0.14(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14) + ci-info: 4.3.1 + dmg-builder: 26.1.0(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14) fs-extra: 10.1.0 - is-ci: 3.0.1 lazy-val: 1.0.5 simple-update-notifier: 2.0.0 yargs: 17.7.2 transitivePeerDependencies: - - bluebird - electron-builder-squirrel-windows - supports-color @@ -17064,6 +17262,19 @@ snapshots: transitivePeerDependencies: - supports-color + electron-publish@26.1.0: + dependencies: + '@types/fs-extra': 9.0.13 + builder-util: 26.1.0 + builder-util-runtime: 9.5.0 + chalk: 4.1.2 + form-data: 4.0.1 + fs-extra: 10.1.0 + lazy-val: 1.0.5 + mime: 2.6.0 + transitivePeerDependencies: + - supports-color + electron-to-chromium@1.5.99: {} electron-window@0.8.1: @@ -17090,7 +17301,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron@38.2.1: + electron@38.4.0: dependencies: '@electron/get': 2.0.3 '@types/node': 22.18.8 @@ -17899,6 +18110,10 @@ snapshots: dependencies: pend: 1.2.0 + fdir@6.5.0(picomatch@4.0.3): + optionalDependencies: + picomatch: 4.0.3 + file-entry-cache@6.0.1: dependencies: flat-cache: 3.2.0 @@ -20082,6 +20297,10 @@ snapshots: dependencies: brace-expansion: 2.0.1 + minimatch@10.0.3: + dependencies: + '@isaacs/brace-expansion': 5.0.0 + minimatch@3.1.2: dependencies: brace-expansion: 1.1.11 @@ -20245,6 +20464,10 @@ snapshots: dependencies: semver: 7.6.3 + node-abi@4.14.0: + dependencies: + semver: 7.6.3 + node-abort-controller@3.1.1: {} node-addon-api@1.7.2: @@ -20260,6 +20483,10 @@ snapshots: dependencies: semver: 7.6.3 + node-api-version@0.2.1: + dependencies: + semver: 7.6.3 + node-cleanup@2.1.2: {} node-fetch@2.6.7(patch_hash=94385e2da301d6873723275386bb0c70da98cf56487f2431668d8fd79623818d)(encoding@0.1.13): @@ -20287,6 +20514,21 @@ snapshots: transitivePeerDependencies: - supports-color + node-gyp@11.5.0: + dependencies: + env-paths: 2.2.1 + exponential-backoff: 3.1.2 + graceful-fs: 4.2.11 + make-fetch-happen: 14.0.3 + nopt: 8.1.0 + proc-log: 5.0.0 + semver: 7.6.3 + tar: 7.4.3 + tinyglobby: 0.2.15 + which: 5.0.0 + transitivePeerDependencies: + - supports-color + node-int64@0.4.0: {} node-preload@0.2.1: @@ -20703,6 +20945,8 @@ snapshots: picomatch@2.3.1: {} + picomatch@4.0.3: {} + pidtree@0.3.1: {} pify@2.3.0: {} @@ -21743,6 +21987,8 @@ snapshots: semver@7.6.3: {} + semver@7.7.2: {} + send@0.19.0: dependencies: debug: 2.6.9 @@ -22447,6 +22693,11 @@ snapshots: tiny-invariant@1.3.3: {} + tinyglobby@0.2.15: + dependencies: + fdir: 6.5.0(picomatch@4.0.3) + picomatch: 4.0.3 + tinykeys@3.0.0: {} tinyrainbow@1.2.0: {} diff --git a/scripts/prepare_adhoc_build.js b/scripts/prepare_adhoc_build.js index e92c212b7d..40fc71b620 100644 --- a/scripts/prepare_adhoc_build.js +++ b/scripts/prepare_adhoc_build.js @@ -67,6 +67,10 @@ const DESKTOP_NAME_PATH = 'desktopName'; const PRODUCTION_DESKTOP_NAME = 'signal.desktop'; const ADHOC_DESKTOP_NAME = `signal adhoc.${formattedDate}.${shortSha}.desktop`; +const EXECUTABLE_NAME_PATH = 'build.linux.executableName'; +const PRODUCTION_EXECUTABLE_NAME = 'signal-desktop'; +const ADHOC_EXECUTABLE_NAME = `signal-desktop-adhoc-${formattedDate}-${shortSha}`; + // ------- function checkValue(object, objectPath, expected) { @@ -83,6 +87,7 @@ checkValue(packageJson, PRODUCT_NAME_PATH, PRODUCTION_PRODUCT_NAME); checkValue(packageJson, APP_ID_PATH, PRODUCTION_APP_ID); checkValue(packageJson, STARTUP_WM_CLASS_PATH, PRODUCTION_WM_CLASS); checkValue(packageJson, DESKTOP_NAME_PATH, PRODUCTION_DESKTOP_NAME); +checkValue(packageJson, EXECUTABLE_NAME_PATH, PRODUCTION_EXECUTABLE_NAME); // ------- @@ -91,6 +96,7 @@ _.set(packageJson, PRODUCT_NAME_PATH, ADHOC_PRODUCT_NAME); _.set(packageJson, APP_ID_PATH, ADHOC_APP_ID); _.set(packageJson, STARTUP_WM_CLASS_PATH, ADHOC_WM_CLASS); _.set(packageJson, DESKTOP_NAME_PATH, ADHOC_DESKTOP_NAME); +_.set(packageJson, EXECUTABLE_NAME_PATH, ADHOC_EXECUTABLE_NAME); // ------- diff --git a/scripts/prepare_alpha_build.js b/scripts/prepare_alpha_build.js index 6867fe8095..0e4c89660c 100644 --- a/scripts/prepare_alpha_build.js +++ b/scripts/prepare_alpha_build.js @@ -45,6 +45,10 @@ const DESKTOP_NAME_PATH = 'desktopName'; const PRODUCTION_DESKTOP_NAME = 'signal.desktop'; const ALPHA_DESKTOP_NAME = 'signal alpha.desktop'; +const EXECUTABLE_NAME_PATH = 'build.linux.executableName'; +const PRODUCTION_EXECUTABLE_NAME = 'signal-desktop'; +const ALPHA_EXECUTABLE_NAME = 'signal-desktop-alpha'; + // ------- function checkValue(object, objectPath, expected) { @@ -61,6 +65,7 @@ checkValue(packageJson, PRODUCT_NAME_PATH, PRODUCTION_PRODUCT_NAME); checkValue(packageJson, APP_ID_PATH, PRODUCTION_APP_ID); checkValue(packageJson, STARTUP_WM_CLASS_PATH, PRODUCTION_WM_CLASS); checkValue(packageJson, DESKTOP_NAME_PATH, PRODUCTION_DESKTOP_NAME); +checkValue(packageJson, EXECUTABLE_NAME_PATH, PRODUCTION_EXECUTABLE_NAME); // ------- @@ -69,6 +74,7 @@ _.set(packageJson, PRODUCT_NAME_PATH, ALPHA_PRODUCT_NAME); _.set(packageJson, APP_ID_PATH, ALPHA_APP_ID); _.set(packageJson, STARTUP_WM_CLASS_PATH, ALPHA_WM_CLASS); _.set(packageJson, DESKTOP_NAME_PATH, ALPHA_DESKTOP_NAME); +_.set(packageJson, EXECUTABLE_NAME_PATH, ALPHA_EXECUTABLE_NAME); // ------- diff --git a/scripts/prepare_axolotl_build.js b/scripts/prepare_axolotl_build.js index 58fe288eba..6d38f7cd04 100644 --- a/scripts/prepare_axolotl_build.js +++ b/scripts/prepare_axolotl_build.js @@ -45,6 +45,10 @@ const DESKTOP_NAME_PATH = 'desktopName'; const PRODUCTION_DESKTOP_NAME = 'signal.desktop'; const AXOLOTL_DESKTOP_NAME = 'signal axolotl.desktop'; +const EXECUTABLE_NAME_PATH = 'build.linux.executableName'; +const PRODUCTION_EXECUTABLE_NAME = 'signal-desktop'; +const AXOLOTL_EXECUTABLE_NAME = 'signal-desktop-axolotl'; + // ------- function checkValue(object, objectPath, expected) { @@ -61,6 +65,7 @@ checkValue(packageJson, PRODUCT_NAME_PATH, PRODUCTION_PRODUCT_NAME); checkValue(packageJson, APP_ID_PATH, PRODUCTION_APP_ID); checkValue(packageJson, STARTUP_WM_CLASS_PATH, PRODUCTION_WM_CLASS); checkValue(packageJson, DESKTOP_NAME_PATH, PRODUCTION_DESKTOP_NAME); +checkValue(packageJson, EXECUTABLE_NAME_PATH, PRODUCTION_EXECUTABLE_NAME); // ------- @@ -69,6 +74,7 @@ _.set(packageJson, PRODUCT_NAME_PATH, AXOLOTL_PRODUCT_NAME); _.set(packageJson, APP_ID_PATH, AXOLOTL_APP_ID); _.set(packageJson, STARTUP_WM_CLASS_PATH, AXOLOTL_WM_CLASS); _.set(packageJson, DESKTOP_NAME_PATH, AXOLOTL_DESKTOP_NAME); +_.set(packageJson, EXECUTABLE_NAME_PATH, AXOLOTL_EXECUTABLE_NAME); // ------- diff --git a/scripts/prepare_beta_build.js b/scripts/prepare_beta_build.js index 3f86526e9b..a2b39df072 100644 --- a/scripts/prepare_beta_build.js +++ b/scripts/prepare_beta_build.js @@ -44,6 +44,10 @@ const DESKTOP_NAME_PATH = 'desktopName'; const PRODUCTION_DESKTOP_NAME = 'signal.desktop'; const BETA_DESKTOP_NAME = 'signal beta.desktop'; +const EXECUTABLE_NAME_PATH = 'build.linux.executableName'; +const PRODUCTION_EXECUTABLE_NAME = 'signal-desktop'; +const BETA_EXECUTABLE_NAME = 'signal-desktop-beta'; + // ------- function checkValue(object, objectPath, expected) { @@ -60,6 +64,7 @@ checkValue(packageJson, PRODUCT_NAME_PATH, PRODUCTION_PRODUCT_NAME); checkValue(packageJson, APP_ID_PATH, PRODUCTION_APP_ID); checkValue(packageJson, STARTUP_WM_CLASS_PATH, PRODUCTION_WM_CLASS); checkValue(packageJson, DESKTOP_NAME_PATH, PRODUCTION_DESKTOP_NAME); +checkValue(packageJson, EXECUTABLE_NAME_PATH, PRODUCTION_EXECUTABLE_NAME); // ------- @@ -68,6 +73,7 @@ _.set(packageJson, PRODUCT_NAME_PATH, BETA_PRODUCT_NAME); _.set(packageJson, APP_ID_PATH, BETA_APP_ID); _.set(packageJson, STARTUP_WM_CLASS_PATH, BETA_WM_CLASS); _.set(packageJson, DESKTOP_NAME_PATH, BETA_DESKTOP_NAME); +_.set(packageJson, EXECUTABLE_NAME_PATH, BETA_EXECUTABLE_NAME); // ------- diff --git a/scripts/prepare_staging_build.js b/scripts/prepare_staging_build.js index 47289fa7f5..22b59800d0 100644 --- a/scripts/prepare_staging_build.js +++ b/scripts/prepare_staging_build.js @@ -48,6 +48,10 @@ const DESKTOP_NAME_PATH = 'desktopName'; const PRODUCTION_DESKTOP_NAME = 'signal.desktop'; const STAGING_DESKTOP_NAME = 'signal staging.desktop'; +const EXECUTABLE_NAME_PATH = 'build.linux.executableName'; +const PRODUCTION_EXECUTABLE_NAME = 'signal-desktop'; +const STAGING_EXECUTABLE_NAME = 'signal-desktop-staging'; + // ------- function checkValue(object, objectPath, expected) { @@ -64,6 +68,7 @@ checkValue(packageJson, PRODUCT_NAME_PATH, PRODUCTION_PRODUCT_NAME); checkValue(packageJson, APP_ID_PATH, PRODUCTION_APP_ID); checkValue(packageJson, STARTUP_WM_CLASS_PATH, PRODUCTION_WM_CLASS); checkValue(packageJson, DESKTOP_NAME_PATH, PRODUCTION_DESKTOP_NAME); +checkValue(packageJson, EXECUTABLE_NAME_PATH, PRODUCTION_EXECUTABLE_NAME); // ------- @@ -73,6 +78,7 @@ _.set(packageJson, PRODUCT_NAME_PATH, STAGING_PRODUCT_NAME); _.set(packageJson, APP_ID_PATH, STAGING_APP_ID); _.set(packageJson, STARTUP_WM_CLASS_PATH, STAGING_WM_CLASS); _.set(packageJson, DESKTOP_NAME_PATH, STAGING_DESKTOP_NAME); +_.set(packageJson, EXECUTABLE_NAME_PATH, STAGING_EXECUTABLE_NAME); // -------