diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 65c785f6e2..04ac27558a 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.15.0' + node-version: '18.17.1' - name: Install global dependencies run: npm install -g yarn@1.22.10 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a78a443ec..36acc91335 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.15.0' + node-version: '18.17.1' - run: npm install -g yarn@1.22.10 - name: Cache Desktop node_modules @@ -72,7 +72,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '18.17.1' - run: npm install -g yarn@1.22.10 - name: Cache Desktop node_modules @@ -121,7 +121,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '18.17.1' - run: sudo apt-get install xvfb - run: npm install -g yarn@1.22.10 @@ -187,7 +187,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '18.17.1' - run: npm install -g yarn@1.22.10 # Set things up so @nodert-win10-rs4 dependencies build properly @@ -262,7 +262,7 @@ jobs: - name: Setup node.js uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '18.17.1' - name: Install global dependencies run: npm install -g yarn@1.22.10 diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index a80819561a..2750f564c3 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.15.0' + node-version: '18.17.1' - run: npm install -g yarn@1.22.10 - name: Cache danger node_modules id: cache-desktop-modules diff --git a/.github/workflows/stories.yml b/.github/workflows/stories.yml index d5ae8d77ae..b96b476c98 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.15.0' + node-version: '18.17.1' cache: 'yarn' - run: yarn install --frozen-lockfile - run: yarn build:storybook diff --git a/.nvmrc b/.nvmrc index 55bffd620b..4a1f488b6c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.15.0 +18.17.1 diff --git a/package.json b/package.json index 0c88924a73..35ac57b112 100644 --- a/package.json +++ b/package.json @@ -275,7 +275,7 @@ "csv-parse": "5.5.2", "danger": "11.1.2", "debug": "4.3.3", - "electron": "25.9.3", + "electron": "27.1.2", "electron-builder": "24.6.3", "electron-mocha": "11.0.2", "endanger": "7.0.4", @@ -335,7 +335,7 @@ "read-last-lines/mz/thenify-all/thenify": "3.3.1" }, "engines": { - "node": "18.15.0" + "node": "18.17.1" }, "build": { "appId": "org.whispersystems.signal-desktop", diff --git a/ts/test-mock/messaging/stories_test.ts b/ts/test-mock/messaging/stories_test.ts index ccbab6c46d..d8c4b1665c 100644 --- a/ts/test-mock/messaging/stories_test.ts +++ b/ts/test-mock/messaging/stories_test.ts @@ -219,8 +219,9 @@ describe('story/messaging', function (this: Mocha.Suite) { debug('Create and send a story to the group'); await window.getByRole('button', { name: 'Add a story' }).first().click(); await window.getByRole('button', { name: 'Text story' }).click(); - await window.locator('.TextAttachment').click(); - await window.getByRole('textbox', { name: 'Add text' }).type('hello'); + // Note: For some reason `.click()` doesn't work here anymore. + await window.locator('.TextAttachment').dispatchEvent('click'); + await window.getByRole('textbox', { name: 'Add text' }).fill('hello'); await window.getByRole('button', { name: 'Next' }).click(); await window .locator('.Checkbox__container') diff --git a/ts/test-mock/rate-limit/story_test.ts b/ts/test-mock/rate-limit/story_test.ts index 5d62ebd705..102b4664e3 100644 --- a/ts/test-mock/rate-limit/story_test.ts +++ b/ts/test-mock/rate-limit/story_test.ts @@ -94,12 +94,13 @@ describe('story/no-sender-key', function (this: Mocha.Suite) { .click(); debug('Focusing textarea'); - await storiesCreator.locator('.TextAttachment__story').click(); + // Note: For some reason `.click()` doesn't work here anymore. + await storiesCreator.locator('.TextAttachment').dispatchEvent('click'); debug('Entering text'); await storiesCreator .locator('.TextAttachment__text__textarea') - .type('123'); + .fill('123'); debug('Clicking "Next"'); await storiesCreator diff --git a/yarn.lock b/yarn.lock index f41cbcf6a6..7c0341f9cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9067,10 +9067,10 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@25.9.3: - version "25.9.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-25.9.3.tgz#cdd53a30fb914adadcfbd34124237fb38b1c07d0" - integrity sha512-dacaHg/PuwVcFRgPDCM5j7UDzqGJWOsbBRdS5wPKLNS/ejPeccIjuNUT1cqcrpvCJKAFW8swHWg9kdizNSEDHQ== +electron@27.1.2: + version "27.1.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-27.1.2.tgz#d3074c91cce94c1e19b5904b1cdf78c830f2558d" + integrity sha512-Dy6BUuGLiIJv+zfsXwr78TV2TNppi24rXF4PIIS+OjDblEKdkI9r1iM8JUd3/x3sbGUy5mdLMSPhvmu//IhkgA== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18"