Revert "Update Electron to 26.1.0"

This commit is contained in:
trevor-signal 2023-09-08 12:36:18 -04:00 committed by GitHub
parent d5479343ac
commit 148a54eb65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 30 deletions

View file

@ -28,7 +28,7 @@ jobs:
- name: Setup node.js - name: Setup node.js
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: '18.16.1' node-version: '18.15.0'
- name: Install global dependencies - name: Install global dependencies
run: npm install -g yarn@1.22.10 run: npm install -g yarn@1.22.10

View file

@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '18.16.1' node-version: '18.15.0'
- run: npm install -g yarn@1.22.10 - run: npm install -g yarn@1.22.10
- name: Cache Desktop node_modules - name: Cache Desktop node_modules
@ -72,7 +72,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '18.16.1' node-version: '18.15.0'
- run: npm install -g yarn@1.22.10 - run: npm install -g yarn@1.22.10
- name: Cache Desktop node_modules - name: Cache Desktop node_modules
@ -121,7 +121,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '18.16.1' node-version: '18.15.0'
- run: sudo apt-get install xvfb - run: sudo apt-get install xvfb
- run: npm install -g yarn@1.22.10 - run: npm install -g yarn@1.22.10
@ -187,7 +187,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '18.16.1' node-version: '18.15.0'
- run: npm install -g yarn@1.22.10 - run: npm install -g yarn@1.22.10
# Set things up so @nodert-win10-rs4 dependencies build properly # Set things up so @nodert-win10-rs4 dependencies build properly
@ -262,7 +262,7 @@ jobs:
- name: Setup node.js - name: Setup node.js
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: '18.16.1' node-version: '18.15.0'
- name: Install global dependencies - name: Install global dependencies
run: npm install -g yarn@1.22.10 run: npm install -g yarn@1.22.10

View file

@ -15,7 +15,7 @@ jobs:
fetch-depth: 0 # fetch all history fetch-depth: 0 # fetch all history
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '18.16.1' node-version: '18.15.0'
- run: npm install -g yarn@1.22.10 - run: npm install -g yarn@1.22.10
- name: Cache danger node_modules - name: Cache danger node_modules
id: cache-desktop-modules id: cache-desktop-modules

2
.nvmrc
View file

@ -1 +1 @@
18.16.1 18.15.0

View file

@ -269,7 +269,7 @@
"css-loader": "3.2.0", "css-loader": "3.2.0",
"danger": "11.1.2", "danger": "11.1.2",
"debug": "4.3.3", "debug": "4.3.3",
"electron": "26.1.0", "electron": "25.4.0",
"electron-builder": "24.6.3", "electron-builder": "24.6.3",
"electron-mocha": "11.0.2", "electron-mocha": "11.0.2",
"electron-notarize": "1.2.1", "electron-notarize": "1.2.1",
@ -292,7 +292,7 @@
"nyc": "11.4.1", "nyc": "11.4.1",
"p-limit": "3.1.0", "p-limit": "3.1.0",
"patch-package": "6.4.7", "patch-package": "6.4.7",
"playwright": "1.37.1", "playwright": "1.33.0",
"prettier": "2.8.0", "prettier": "2.8.0",
"protobufjs-cli": "1.1.1", "protobufjs-cli": "1.1.1",
"sass": "1.49.7", "sass": "1.49.7",
@ -325,7 +325,7 @@
"read-last-lines/mz/thenify-all/thenify": "3.3.1" "read-last-lines/mz/thenify-all/thenify": "3.3.1"
}, },
"engines": { "engines": {
"node": "18.16.1" "node": "18.15.0"
}, },
"build": { "build": {
"appId": "org.whispersystems.signal-desktop", "appId": "org.whispersystems.signal-desktop",

View file

@ -219,9 +219,8 @@ describe('story/messaging', function unknownContacts() {
debug('Create and send a story to the group'); debug('Create and send a story to the group');
await window.getByRole('button', { name: 'Add a story' }).first().click(); await window.getByRole('button', { name: 'Add a story' }).first().click();
await window.getByRole('button', { name: 'Text story' }).click(); await window.getByRole('button', { name: 'Text story' }).click();
// Note: For some reason `.click()` doesn't work here anymore. await window.locator('.TextAttachment').click();
await window.locator('.TextAttachment').dispatchEvent('click'); await window.getByRole('textbox', { name: 'Add text' }).type('hello');
await window.getByRole('textbox', { name: 'Add text' }).fill('hello');
await window.getByRole('button', { name: 'Next' }).click(); await window.getByRole('button', { name: 'Next' }).click();
await window await window
.locator('.Checkbox__container') .locator('.Checkbox__container')

View file

@ -94,13 +94,12 @@ describe('story/no-sender-key', function needsName() {
.click(); .click();
debug('Focusing textarea'); debug('Focusing textarea');
// Note: For some reason `.click()` doesn't work here anymore. await storiesCreator.locator('.TextAttachment__story').click();
await storiesCreator.locator('.TextAttachment').dispatchEvent('click');
debug('Entering text'); debug('Entering text');
await storiesCreator await storiesCreator
.locator('.TextAttachment__text__textarea') .locator('.TextAttachment__text__textarea')
.fill('123'); .type('123');
debug('Clicking "Next"'); debug('Clicking "Next"');
await storiesCreator await storiesCreator

View file

@ -9269,10 +9269,10 @@ electron-window@^0.8.0:
dependencies: dependencies:
is-electron-renderer "^2.0.0" is-electron-renderer "^2.0.0"
electron@26.1.0: electron@25.4.0:
version "26.1.0" version "25.4.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-26.1.0.tgz#d26fefba5a5c68069b07a117d87aee1c4e5d172d" resolved "https://registry.yarnpkg.com/electron/-/electron-25.4.0.tgz#d45b1cf3e4e96eb5bff5fee704d7aa13b532f3a5"
integrity sha512-qEh19H09Pysn3ibms5nZ0haIh5pFoOd7/5Ww7gzmAwDQOulRi8Sa2naeueOyIb1GKpf+6L4ix3iceYRAuA5r5Q== integrity sha512-VLTRxDhL4UvQbqM7pTNENnJo62cdAPZT92N+B7BZQ5Xfok1wuVPEewIjBot4K7U3EpLUuHn1veeLzho3ihiP+Q==
dependencies: dependencies:
"@electron/get" "^2.0.0" "@electron/get" "^2.0.0"
"@types/node" "^18.11.18" "@types/node" "^18.11.18"
@ -15597,17 +15597,17 @@ pkg-dir@^5.0.0:
dependencies: dependencies:
find-up "^5.0.0" find-up "^5.0.0"
playwright-core@1.37.1: playwright-core@1.33.0:
version "1.37.1" version "1.33.0"
resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.37.1.tgz#cb517d52e2e8cb4fa71957639f1cd105d1683126" resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.33.0.tgz#269efe29a927cd6d144d05f3c2d2f72bd72447a1"
integrity sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA== integrity sha512-aizyPE1Cj62vAECdph1iaMILpT0WUDCq3E6rW6I+dleSbBoGbktvJtzS6VHkZ4DKNEOG9qJpiom/ZxO+S15LAw==
playwright@1.37.1: playwright@1.33.0:
version "1.37.1" version "1.33.0"
resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.37.1.tgz#6e488d82d7d98b9127c5db9c701f9c956ab47e76" resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.33.0.tgz#88df1cffe97718ab8a02303e12c9133681ec7fab"
integrity sha512-bgUXRrQKhT48zHdxDYQTpf//0xDfDd5hLeEhjuSw8rXEGoT9YeElpfvs/izonTNY21IQZ7d3s22jLxYaAnubbQ== integrity sha512-+zzU3V2TslRX2ETBRgQKsKytYBkJeLZ2xzUj4JohnZnxQnivoUvOvNbRBYWSYykQTO0Y4zb8NwZTYFUO+EpPBQ==
dependencies: dependencies:
playwright-core "1.37.1" playwright-core "1.33.0"
plist@^3.0.4: plist@^3.0.4:
version "3.0.5" version "3.0.5"