From 148a54eb6573b003b79dffd569344f907fb14192 Mon Sep 17 00:00:00 2001 From: trevor-signal <131492920+trevor-signal@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:36:18 -0400 Subject: [PATCH] Revert "Update Electron to 26.1.0" --- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 10 +++++----- .github/workflows/danger.yml | 2 +- .nvmrc | 2 +- package.json | 6 +++--- ts/test-mock/messaging/stories_test.ts | 5 ++--- ts/test-mock/rate-limit/story_test.ts | 5 ++--- yarn.lock | 26 +++++++++++++------------- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 542d917a3311..05e4140738e5 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.16.1' + node-version: '18.15.0' - 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 cc230f376295..5cb1ad1057c1 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.16.1' + node-version: '18.15.0' - 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.16.1' + node-version: '18.15.0' - 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.16.1' + node-version: '18.15.0' - 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.16.1' + node-version: '18.15.0' - 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.16.1' + node-version: '18.15.0' - 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 b7f531f93cea..8d827514c2b1 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.16.1' + node-version: '18.15.0' - run: npm install -g yarn@1.22.10 - name: Cache danger node_modules id: cache-desktop-modules diff --git a/.nvmrc b/.nvmrc index 3876fd498646..55bffd620b9a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.16.1 +18.15.0 diff --git a/package.json b/package.json index bc996fcc2016..8fc9ef247b4b 100644 --- a/package.json +++ b/package.json @@ -269,7 +269,7 @@ "css-loader": "3.2.0", "danger": "11.1.2", "debug": "4.3.3", - "electron": "26.1.0", + "electron": "25.4.0", "electron-builder": "24.6.3", "electron-mocha": "11.0.2", "electron-notarize": "1.2.1", @@ -292,7 +292,7 @@ "nyc": "11.4.1", "p-limit": "3.1.0", "patch-package": "6.4.7", - "playwright": "1.37.1", + "playwright": "1.33.0", "prettier": "2.8.0", "protobufjs-cli": "1.1.1", "sass": "1.49.7", @@ -325,7 +325,7 @@ "read-last-lines/mz/thenify-all/thenify": "3.3.1" }, "engines": { - "node": "18.16.1" + "node": "18.15.0" }, "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 f8855485c925..99b37c405aa4 100644 --- a/ts/test-mock/messaging/stories_test.ts +++ b/ts/test-mock/messaging/stories_test.ts @@ -219,9 +219,8 @@ describe('story/messaging', function unknownContacts() { 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(); - // 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.locator('.TextAttachment').click(); + await window.getByRole('textbox', { name: 'Add text' }).type('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 806ee91e04d7..63ead1568d3f 100644 --- a/ts/test-mock/rate-limit/story_test.ts +++ b/ts/test-mock/rate-limit/story_test.ts @@ -94,13 +94,12 @@ describe('story/no-sender-key', function needsName() { .click(); debug('Focusing textarea'); - // Note: For some reason `.click()` doesn't work here anymore. - await storiesCreator.locator('.TextAttachment').dispatchEvent('click'); + await storiesCreator.locator('.TextAttachment__story').click(); debug('Entering text'); await storiesCreator .locator('.TextAttachment__text__textarea') - .fill('123'); + .type('123'); debug('Clicking "Next"'); await storiesCreator diff --git a/yarn.lock b/yarn.lock index 9d158854e3b9..eeda5c802357 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9269,10 +9269,10 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-26.1.0.tgz#d26fefba5a5c68069b07a117d87aee1c4e5d172d" - integrity sha512-qEh19H09Pysn3ibms5nZ0haIh5pFoOd7/5Ww7gzmAwDQOulRi8Sa2naeueOyIb1GKpf+6L4ix3iceYRAuA5r5Q== +electron@25.4.0: + version "25.4.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.4.0.tgz#d45b1cf3e4e96eb5bff5fee704d7aa13b532f3a5" + integrity sha512-VLTRxDhL4UvQbqM7pTNENnJo62cdAPZT92N+B7BZQ5Xfok1wuVPEewIjBot4K7U3EpLUuHn1veeLzho3ihiP+Q== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" @@ -15597,17 +15597,17 @@ pkg-dir@^5.0.0: dependencies: find-up "^5.0.0" -playwright-core@1.37.1: - version "1.37.1" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.37.1.tgz#cb517d52e2e8cb4fa71957639f1cd105d1683126" - integrity sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA== +playwright-core@1.33.0: + version "1.33.0" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.33.0.tgz#269efe29a927cd6d144d05f3c2d2f72bd72447a1" + integrity sha512-aizyPE1Cj62vAECdph1iaMILpT0WUDCq3E6rW6I+dleSbBoGbktvJtzS6VHkZ4DKNEOG9qJpiom/ZxO+S15LAw== -playwright@1.37.1: - version "1.37.1" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.37.1.tgz#6e488d82d7d98b9127c5db9c701f9c956ab47e76" - integrity sha512-bgUXRrQKhT48zHdxDYQTpf//0xDfDd5hLeEhjuSw8rXEGoT9YeElpfvs/izonTNY21IQZ7d3s22jLxYaAnubbQ== +playwright@1.33.0: + version "1.33.0" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.33.0.tgz#88df1cffe97718ab8a02303e12c9133681ec7fab" + integrity sha512-+zzU3V2TslRX2ETBRgQKsKytYBkJeLZ2xzUj4JohnZnxQnivoUvOvNbRBYWSYykQTO0Y4zb8NwZTYFUO+EpPBQ== dependencies: - playwright-core "1.37.1" + playwright-core "1.33.0" plist@^3.0.4: version "3.0.5"