From 2bfb6e74810c5a8064243296da20a03d29b6b987 Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Thu, 22 Feb 2024 13:19:37 -0800 Subject: [PATCH] Upgrade electron to 29.0.0 --- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 10 +++++----- .github/workflows/danger.yml | 2 +- .github/workflows/stories.yml | 2 +- .nvmrc | 2 +- app/main.ts | 7 ++----- package.json | 6 +++--- yarn.lock | 32 ++++++++++++++++++++++---------- 8 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 313e50a2ebf4..315710534e87 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -28,7 +28,7 @@ jobs: - name: Setup node.js uses: actions/setup-node@v3 with: - node-version: '18.18.2' + node-version: '20.9.0' - name: Install global dependencies run: npm install -g yarn@1.22.10 npm@10.2.5 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 231ecda780e9..ce0d5ab4c79a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.18.2' + node-version: '20.9.0' - run: npm install -g yarn@1.22.10 npm@10.2.5 - name: Cache Desktop node_modules @@ -72,7 +72,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.18.2' + node-version: '20.9.0' - run: npm install -g yarn@1.22.10 npm@10.2.5 @@ -124,7 +124,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.18.2' + node-version: '20.9.0' - run: sudo apt-get install xvfb - run: npm install -g yarn@1.22.10 npm@10.2.5 @@ -191,7 +191,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.18.2' + node-version: '20.9.0' - run: npm install -g yarn@1.22.10 npm@10.2.5 node-gyp@10.0.1 # Set things up so @nodert-win10-rs4 dependencies build properly @@ -300,7 +300,7 @@ jobs: - name: Setup node.js uses: actions/setup-node@v3 with: - node-version: '18.18.2' + node-version: '20.9.0' - name: Install global dependencies run: npm install -g yarn@1.22.10 npm@10.2.5 diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 2c70bc94c345..863987b82344 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -15,7 +15,7 @@ jobs: fetch-depth: 0 # fetch all history - uses: actions/setup-node@v3 with: - node-version: '18.18.2' + node-version: '20.9.0' - run: npm install -g yarn@1.22.10 npm@10.2.5 - name: Cache danger node_modules id: cache-desktop-modules diff --git a/.github/workflows/stories.yml b/.github/workflows/stories.yml index 56a46374f63a..9c370e5fcaa7 100644 --- a/.github/workflows/stories.yml +++ b/.github/workflows/stories.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.18.2' + node-version: '20.9.0' cache: 'yarn' - name: Install global dependencies run: npm install -g yarn@1.22.10 npm@10.2.5 diff --git a/.nvmrc b/.nvmrc index 87ec8842b158..f3f52b42d3da 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.18.2 +20.9.0 diff --git a/app/main.ts b/app/main.ts index 8d9fbac23a2b..4cd154d89bac 100644 --- a/app/main.ts +++ b/app/main.ts @@ -29,10 +29,7 @@ import { systemPreferences, Notification, } from 'electron'; -import type { - MenuItemConstructorOptions, - LoginItemSettingsOptions, -} from 'electron'; +import type { MenuItemConstructorOptions, Settings } from 'electron'; import { z } from 'zod'; import packageJson from '../package.json'; @@ -1695,7 +1692,7 @@ function loadPreferredSystemLocales(): Array { return app.getPreferredSystemLanguages(); } -async function getDefaultLoginItemSettings(): Promise { +async function getDefaultLoginItemSettings(): Promise { if (!OS.isWindows()) { return {}; } diff --git a/package.json b/package.json index 93b878cdcaab..7b1ceb66a4df 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@popperjs/core": "2.11.6", "@react-aria/utils": "3.16.0", "@react-spring/web": "9.5.5", - "@signalapp/better-sqlite3": "8.6.0", + "@signalapp/better-sqlite3": "8.7.1", "@signalapp/libsignal-client": "0.40.0", "@signalapp/ringrtc": "2.37.1", "@signalapp/windows-dummy-keystroke": "1.0.0", @@ -276,7 +276,7 @@ "csv-parse": "5.5.2", "danger": "11.1.2", "debug": "4.3.3", - "electron": "28.2.0", + "electron": "29.0.0", "electron-builder": "24.6.3", "electron-mocha": "12.2.0", "endanger": "7.0.4", @@ -336,7 +336,7 @@ "read-last-lines/mz/thenify-all/thenify": "3.3.1" }, "engines": { - "node": "18.18.2" + "node": "20.9.0" }, "build": { "appId": "org.whispersystems.signal-desktop", diff --git a/yarn.lock b/yarn.lock index a2cdf4cfe4bd..a5819cc08852 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3947,10 +3947,10 @@ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== -"@signalapp/better-sqlite3@8.6.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.6.0.tgz#0413f4d0626b99838cd64ad09c88720aa2bec6ed" - integrity sha512-dSLWG4m6XtPq/jbUjckLaiR/nFFkY95pWZI8VSm0dEVJC8S2YTXHm6VZ7vZiErt4h6EjBaa827WyK1oheElE2A== +"@signalapp/better-sqlite3@8.7.1": + version "8.7.1" + resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.7.1.tgz#0a09293aa833b836ec6b17f6ab0e790097f3fdeb" + integrity sha512-T/7OXR0RfSJ8jXK837wXmad0c4XESBHoGDCLDZFTrd4l0nzfbTxEbXo6VCvUyxDTGrKUfIHCo5JtffIl8jQL5Q== dependencies: bindings "^1.5.0" tar "^6.1.0" @@ -5491,7 +5491,7 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node@*", "@types/node@18.15.11", "@types/node@>=13.7.0", "@types/node@^18.11.18": +"@types/node@*", "@types/node@18.15.11", "@types/node@>=13.7.0": version "18.15.11" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== @@ -5501,6 +5501,13 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.55.tgz#3d9ac633ed401238c13ccaeed54297bd653412a3" integrity sha512-Y1zz/LIuJek01+hlPNzzXQhmq/Z2BCP96j18MSXC0S0jSu/IG4FFxmBs7W4/lI2vPJ7foVfEB0hUVtnOjnCiTg== +"@types/node@^20.9.0": + version "20.11.19" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.19.tgz#b466de054e9cb5b3831bee38938de64ac7f81195" + integrity sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ== + dependencies: + undici-types "~5.26.4" + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -9098,13 +9105,13 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@28.2.0: - version "28.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.0.tgz#ecf7097d4a1e47dd08111c0229a9d03c44f485ad" - integrity sha512-22SylXQQ9IHtwLw4D+Z4Si7OUpeDtpHfJVTjy3yv53iLg5zJKKPOCWT4ZwgYGHQZ0eldyBrYBHF/P9FPd2CcVQ== +electron@29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-29.0.0.tgz#2c1d34a95fc23a5b3530aa53de6eacca89a410b1" + integrity sha512-HhrRC5vWb6fAbWXP3A6ABwKUO9JvYSC4E141RzWFgnDBqNiNtabfmgC8hsVeCR65RQA2MLSDgC8uP52I9zFllQ== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" + "@types/node" "^20.9.0" extract-zip "^2.0.1" emittery@^0.10.2: @@ -19290,6 +19297,11 @@ underscore@~1.13.2: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"