Skip to content

Commit

Permalink
Revert "Update electron to 30.0.0"
Browse files Browse the repository at this point in the history
  • Loading branch information
indutny-signal committed Apr 18, 2024
1 parent e5aef6a commit 6a3438f
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup node.js
uses: actions/setup-node@v3
with:
node-version: '20.11.1'
node-version: '20.9.0'
- name: Install global dependencies
run: npm install -g yarn@1.22.10 npm@10.2.5

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '20.11.1'
node-version: '20.9.0'
- run: npm install -g yarn@1.22.10 npm@10.2.5

- name: Cache Desktop node_modules
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '20.11.1'
node-version: '20.9.0'

- run: npm install -g yarn@1.22.10 npm@10.2.5

Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '20.11.1'
node-version: '20.9.0'
- run: sudo apt-get install xvfb

- run: npm install -g yarn@1.22.10 npm@10.2.5
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '20.11.1'
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
Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
- name: Setup node.js
uses: actions/setup-node@v3
with:
node-version: '20.11.1'
node-version: '20.9.0'
- name: Install global dependencies
run: npm install -g yarn@1.22.10 npm@10.2.5

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/danger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 0 # fetch all history
- uses: actions/setup-node@v3
with:
node-version: '20.11.1'
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stories.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '20.11.1'
node-version: '20.9.0'
cache: 'yarn'
- name: Install global dependencies
run: npm install -g yarn@1.22.10 npm@10.2.5
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.11.1
20.9.0
6 changes: 0 additions & 6 deletions app/permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ function _createPermissionHandler(
// We default 'media' permission to false, but the user can override that for
// the microphone and camera.
if (permission === 'media') {
// Pacifying typescript because it is always there for 'media' permission
if (!('mediaTypes' in details)) {
callback(false);
return;
}

if (
details.mediaTypes?.includes('audio') ||
details.mediaTypes?.includes('video')
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
"csv-parse": "5.5.2",
"danger": "11.1.2",
"debug": "4.3.3",
"electron": "30.0.0",
"electron": "29.1.5",
"electron-builder": "24.6.3",
"electron-mocha": "12.2.0",
"endanger": "7.0.4",
Expand Down Expand Up @@ -354,7 +354,7 @@
"read-last-lines/mz/thenify-all/thenify": "3.3.1"
},
"engines": {
"node": "20.11.1"
"node": "20.9.0"
},
"build": {
"appId": "org.whispersystems.signal-desktop",
Expand Down
3 changes: 1 addition & 2 deletions ts/scripts/fuse-electron.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ export async function afterPack({
// Disables the --inspect and --inspect-brk family of CLI options
[FuseV1Options.EnableNodeCliInspectArguments]: enableInspectArguments,
// Enables validation of the app.asar archive on macOS
[FuseV1Options.EnableEmbeddedAsarIntegrityValidation]:
electronPlatformName === 'darwin',
[FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
// Enforces that Electron will only load your app from "app.asar" instead of
// its normal search paths
[FuseV1Options.OnlyLoadAppFromAsar]: true,
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9259,10 +9259,10 @@ electron-window@^0.8.0:
dependencies:
is-electron-renderer "^2.0.0"

electron@30.0.0:
version "30.0.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.0.tgz#6b72a27dcc46759fac5f12e147ef64554e596391"
integrity sha512-GRwKphq/TUhSlb44OwSckXKl50f5OR/pm9MvF3rBLyqcxwfu7L11xejrZ0hDea1eKyCkzGd4B+cIqaQiDguPEA==
electron@29.1.5:
version "29.1.5"
resolved "https://registry.yarnpkg.com/electron/-/electron-29.1.5.tgz#b745b4d201c1ac9f84d6aa034126288dde34d5a1"
integrity sha512-1uWGRw/ffA62lcrklxGUgVxVtOHojsg/nwsYr+/F9cVjipZJn8iPv/ABGIIexhmUqWcho8BqfTJ4osCBa29gBg==
dependencies:
"@electron/get" "^2.0.0"
"@types/node" "^20.9.0"
Expand Down

0 comments on commit 6a3438f

Please sign in to comment.