From 7054e2dbf7025ae1d4e331dd9b5cac6887349e35 Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Mon, 6 Jul 2026 13:16:55 -0700 Subject: [PATCH] Update electron to 43.0.0 --- .nvmrc | 2 +- package.json | 8 ++++---- pnpm-lock.yaml | 28 +++++++++++++++++----------- ts/test-mock/bootstrap.node.ts | 9 +++------ 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.nvmrc b/.nvmrc index 5bf4400f22..1dd37d5374 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -24.15.0 +24.17.0 diff --git a/package.json b/package.json index a0ea649028..ffa5e2e1cc 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "@react-spring/web": "10.0.3", "@signalapp/lame": "workspace:*", "@signalapp/minimask": "1.0.1", - "@signalapp/mock-server": "23.0.0", + "@signalapp/mock-server": "24.0.2", "@signalapp/parchment-cjs": "3.0.1", "@signalapp/quill-cjs": "2.1.2", "@storybook/addon-a11y": "8.4.4", @@ -237,7 +237,7 @@ "debug": "4.4.3", "direction": "2.0.1", "dom-accessibility-api": "0.7.1", - "electron": "42.3.0", + "electron": "43.0.0", "electron-builder": "26.11.1", "electron-mocha": "13.1.0", "emoji-regex-xs": "2.0.1", @@ -341,7 +341,7 @@ "zod": "4.3.6" }, "engines": { - "node": "24.15.0" + "node": "24.17.0" }, "build": { "appId": "org.whispersystems.signal-desktop", @@ -626,6 +626,6 @@ ] }, "volta": { - "node": "24.15.0" + "node": "24.17.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b8b293dad..d3f4daf22c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -147,8 +147,8 @@ importers: specifier: 1.0.1 version: 1.0.1 '@signalapp/mock-server': - specifier: 23.0.0 - version: 23.0.0(bufferutil@4.0.9)(utf-8-validate@5.0.10) + specifier: 24.0.2 + version: 24.0.2(bufferutil@4.0.9)(utf-8-validate@5.0.10) '@signalapp/parchment-cjs': specifier: 3.0.1 version: 3.0.1 @@ -387,8 +387,8 @@ importers: specifier: 0.7.1 version: 0.7.1 electron: - specifier: 42.3.0 - version: 42.3.0 + specifier: 43.0.0 + version: 43.0.0 electron-builder: specifier: 26.11.1 version: 26.11.1(electron-builder-squirrel-windows@26.11.1) @@ -1169,6 +1169,10 @@ packages: resolution: {integrity: sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==, tarball: https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz} engines: {node: '>= 8.9.0'} + '@electron-internal/extract-zip@1.0.4': + resolution: {integrity: sha512-Zr1Vs7E9tpCNhZHDAbFVXc2gEVCG9RqPDjrno5+bdgB6LRAuvgyMHJut4NCVyYwtAieapMzc3fiQ3CSTi75ARg==, tarball: https://registry.npmjs.org/@electron-internal/extract-zip/-/extract-zip-1.0.4.tgz} + engines: {node: '>=22.12.0'} + '@electron/asar@3.4.1': resolution: {integrity: sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==, tarball: https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz} engines: {node: '>=10.12.0'} @@ -4199,8 +4203,8 @@ packages: '@signalapp/minimask@1.0.1': resolution: {integrity: sha512-QAwo0joA60urTNbW9RIz6vLKQjy+jdVtH7cvY0wD9PVooD46MAjE40MLssp4xUJrph91n2XvtJ3pbEUDrmT2AA==, tarball: https://registry.npmjs.org/@signalapp/minimask/-/minimask-1.0.1.tgz} - '@signalapp/mock-server@23.0.0': - resolution: {integrity: sha512-w+Olk/o6kO0DuerE+PNGFSUp1bzsr6S49nvMv7a9H97WVNMqwqz89fX7I8FYUtQ7XWtNtXWewriIOWEmWSPH9g==, tarball: https://registry.npmjs.org/@signalapp/mock-server/-/mock-server-23.0.0.tgz} + '@signalapp/mock-server@24.0.2': + resolution: {integrity: sha512-UO4bUB0z1HGB/FvIVuUnw9I8P6jM6GONI4l5yHjngIbreVhTuJ+EoyhZWhrK9WUimE9pMtNBBbPla6SwLxickQ==, tarball: https://registry.npmjs.org/@signalapp/mock-server/-/mock-server-24.0.2.tgz} '@signalapp/parchment-cjs@3.0.1': resolution: {integrity: sha512-hSBMQ1M7wE4GcC8ZeNtvpJF+DAJg3eIRRf1SiHS3I3Algav/sgJJNm6HIYm6muHuK7IJmuEjkL3ILSXgmu0RfQ==, tarball: https://registry.npmjs.org/@signalapp/parchment-cjs/-/parchment-cjs-3.0.1.tgz} @@ -6379,8 +6383,8 @@ packages: engines: {node: '>= 12.20.55'} hasBin: true - electron@42.3.0: - resolution: {integrity: sha512-9ZiLdRXk+WDxW1OgIUz8J2rIQ5TYU9o629gCOjU48Q3dQiOmym7osWsH5Ubs/Jh4uuFLn6m6SBD2rmRXLAPz9g==, tarball: https://registry.npmjs.org/electron/-/electron-42.3.0.tgz} + electron@43.0.0: + resolution: {integrity: sha512-PV60GsWU6qufhuOhw3n+Yix3WPDcqDtBqE8orbEQGQGHEkgp9o/JCPgb7L4vIL0r1HnfPdqSRtboOTqbDkcFDQ==, tarball: https://registry.npmjs.org/electron/-/electron-43.0.0.tgz} engines: {node: '>= 22.12.0'} hasBin: true @@ -11316,6 +11320,8 @@ snapshots: ajv: 6.14.0 ajv-keywords: 3.5.2(ajv@6.14.0) + '@electron-internal/extract-zip@1.0.4': {} + '@electron/asar@3.4.1': dependencies: commander: 5.1.0 @@ -14569,7 +14575,7 @@ snapshots: '@signalapp/minimask@1.0.1': {} - '@signalapp/mock-server@23.0.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)': + '@signalapp/mock-server@24.0.2(bufferutil@4.0.9)(utf-8-validate@5.0.10)': dependencies: '@indutny/parallel-prettier': 3.0.0(prettier@3.8.3) '@indutny/protopiler': 4.0.0 @@ -17100,11 +17106,11 @@ snapshots: transitivePeerDependencies: - supports-color - electron@42.3.0: + electron@43.0.0: dependencies: + '@electron-internal/extract-zip': 1.0.4 '@electron/get': 5.0.0 '@types/node': 24.12.0 - extract-zip: 2.0.1 transitivePeerDependencies: - supports-color diff --git a/ts/test-mock/bootstrap.node.ts b/ts/test-mock/bootstrap.node.ts index 3a9a006492..5e6bef0208 100644 --- a/ts/test-mock/bootstrap.node.ts +++ b/ts/test-mock/bootstrap.node.ts @@ -495,7 +495,7 @@ export class Bootstrap { debug('starting the app'); - const { port, family } = this.server.address(); + const { port } = this.server.address(); let startAttempts = 0; const MAX_ATTEMPTS = 4; @@ -509,7 +509,7 @@ export class Bootstrap { } // oxlint-disable-next-line no-await-in-loop - const config = await this.#generateConfig(port, family, extraConfig); + const config = await this.#generateConfig(port, extraConfig); const startedApp = new App({ main: ELECTRON, @@ -953,12 +953,9 @@ export class Bootstrap { async #generateConfig( port: number, - family: string, extraConfig?: Partial ): Promise { - const host = family === 'IPv6' ? '[::1]' : '127.0.0.1'; - - const url = `https://${host}:${port}`; + const url = `https://localhost:${port}`; return JSON.stringify({ ...(await loadCertificates()),