Merge pull request #13814 from desktop/electron-16

Upgrade Electron 16
This commit is contained in:
tidy-dev 2022-02-07 11:23:22 -05:00 committed by GitHub
commit a1e92fdf19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions

View file

@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14.17.0]
node: [16.9.1]
os: [macos-10.15, windows-2019]
arch: [x64, arm64]
include:

View file

@ -1 +1 @@
14.17.0
16.9.1

2
.nvmrc
View file

@ -1 +1 @@
v14.17.0
v16.9.1

View file

@ -1,2 +1,2 @@
python 3.9.5
nodejs 14.17.0
nodejs 16.9.1

View file

@ -1,3 +1,3 @@
runtime = electron
disturl = https://atom.io/download/electron
target = 14.2.3
target = 16.0.8

View file

@ -80,7 +80,7 @@ function getSpellCheckMenuItems(
* to english, it returns the item that can set it to their system language.
*/
function getSpellCheckLanguageMenuItem(
session: Electron.session
session: Electron.Session
): MenuItem | null {
const userLanguageCode = app.getLocale()
const englishLanguageCode = 'en-US'

View file

@ -8,7 +8,7 @@
"cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.ts app/src/cli/main.ts",
"check:eslint": "tsc -P eslint-rules/",
"test:eslint": "jest eslint-rules/tests/*.test.js",
"test:unit": "cross-env ELECTRON_RUN_AS_NODE=1 ./node_modules/.bin/electron ./node_modules/jest/bin/jest --detectOpenHandles --silent --testLocationInResults --config ./app/jest.unit.config.js",
"test:unit": "cross-env ELECTRON_RUN_AS_NODE=1 NODE_OPTIONS='--max_old_space_size=4096' ./node_modules/.bin/electron ./node_modules/jest/bin/jest --detectOpenHandles --silent --testLocationInResults --config ./app/jest.unit.config.js",
"test:unit:cov": "yarn test:unit --coverage",
"test:script": "jest --silent --config ./script/jest.config.js",
"test:script:cov": "yarn test:script --coverage",
@ -167,7 +167,7 @@
"@types/webpack-merge": "^4.1.3",
"@types/winston": "^2.2.0",
"@types/xml2js": "^0.4.0",
"electron": "=14.2.3",
"electron": "=16.0.8",
"electron-builder": "^22.7.0",
"electron-packager": "^15.1.0",
"electron-winstaller": "^5.0.0",

View file

@ -506,7 +506,7 @@
ajv "^6.12.0"
ajv-keywords "^3.4.1"
"@electron/get@^1.0.1":
"@electron/get@^1.13.0":
version "1.13.1"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
@ -3963,12 +3963,12 @@ electron-winstaller@*, electron-winstaller@^5.0.0:
lodash.template "^4.2.2"
temp "^0.9.0"
electron@=14.2.3:
version "14.2.3"
resolved "https://registry.yarnpkg.com/electron/-/electron-14.2.3.tgz#3facf572c57cefe8ce80154ad3e63f937784644b"
integrity sha512-7wBqvzUKhK1tw544w3+F8J7NajnqURGC4pH3VFTiBHU5ayiI/oaTTXJxyFLZ54zsR7xwon/3dYEVjIm2i68+Zg==
electron@=16.0.8:
version "16.0.8"
resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.8.tgz#7ebd3e23c4883c239f53d8b7af1100f455ac8a02"
integrity sha512-znTVkl8LaGcPNdfc6SRr+6LYg2GtSCKXln/nW/PC+urBfAFnOYIuDock8QyGVFfzr5PuAa+g8YQQAboHV77D7g==
dependencies:
"@electron/get" "^1.0.1"
"@electron/get" "^1.13.0"
"@types/node" "^14.6.2"
extract-zip "^1.0.3"