diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a561e9d2663..7143ac53bb9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ on: APPLE_APPLICATION_CERT_PASSWORD: env: - NODE_VERSION: 18.16.1 + NODE_VERSION: 20.11.1 jobs: lint: @@ -94,13 +94,6 @@ jobs: with: node-version: ${{ env.NODE_VERSION }} cache: yarn - - # This step can be removed as soon as official Windows arm64 builds are published: - # https://github.com/nodejs/build/issues/2450#issuecomment-705853342 - - name: Get NodeJS node-gyp lib for Windows arm64 - if: ${{ matrix.os == 'windows-2019' && matrix.arch == 'arm64' }} - run: .\script\download-nodejs-win-arm64.ps1 ${{ env.NODE_VERSION }} - - name: Install and build dependencies run: yarn env: diff --git a/.node-version b/.node-version index 3876fd49864..2dbbe00e679 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.16.1 +20.11.1 diff --git a/.nvmrc b/.nvmrc index 5e0828ad15c..ee09fac75c8 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v18.16.1 +v20.11.1 diff --git a/.tool-versions b/.tool-versions index 35dde7c8767..a6f2871079c 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ python 3.9.5 -nodejs 18.16.1 +nodejs 20.11.1 diff --git a/docs/contributing/setup.md b/docs/contributing/setup.md index bc77f9f1bf0..a6136bd8b7f 100644 --- a/docs/contributing/setup.md +++ b/docs/contributing/setup.md @@ -19,7 +19,7 @@ versions look similar to the below output: ```shellsession $ node -v -v18.16.1 +v20.11.1 $ yarn -v 1.21.1 diff --git a/package.json b/package.json index 411cdfff680..138826367d7 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "@types/legal-eagle": "^0.15.0", "@types/memoize-one": "^3.1.1", "@types/mri": "^1.1.0", - "@types/node": "18.16.1", + "@types/node": "20.11.1", "@types/prettier": "^2.0.1", "@types/react": "^16.8.7", "@types/react-css-transition-replace": "^2.1.3", @@ -157,7 +157,7 @@ "@types/webpack-hot-middleware": "^2.25.6", "@types/webpack-merge": "^5.0.0", "@types/xml2js": "^0.4.11", - "electron": "28.2.3", + "electron": "30.0.8", "electron-packager": "^17.1.1", "electron-winstaller": "^5.0.0", "eslint-plugin-github": "^4.10.1", diff --git a/script/download-nodejs-win-arm64.ps1 b/script/download-nodejs-win-arm64.ps1 deleted file mode 100644 index 15201149d60..00000000000 --- a/script/download-nodejs-win-arm64.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -# This script can be removed as soon as official Windows arm64 builds are published: -# https://github.com/nodejs/build/issues/2450#issuecomment-705853342 - -$nodeVersion = $args[0] - -If ($null -eq $nodeVersion) { - Write-Error "No NodeJS version given as argument to this file. Run it like download-nodejs-win-arm64.ps1 12.10.1" - exit 1 -} - -$url = "https://unofficial-builds.nodejs.org/download/release/v$nodeVersion/win-arm64/node.lib" -$cacheFolder = "$env:LOCALAPPDATA\node-gyp\Cache\$nodeVersion\arm64" - -If (!(Test-Path $cacheFolder)) { - New-Item -ItemType Directory -Force -Path $cacheFolder -} - -$output = "$cacheFolder\node.lib" -$start_time = Get-Date - -Invoke-WebRequest -Uri $url -OutFile $output -Write-Output "Downloaded arm64 NodeJS lib $nodeVersion in $((Get-Date).Subtract($start_time).Seconds) second(s)" diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts index cd8fef88945..bc17d22155a 100644 --- a/script/validate-electron-version.ts +++ b/script/validate-electron-version.ts @@ -16,7 +16,7 @@ type ChannelToValidate = 'production' | 'beta' */ const ValidElectronVersions: Record = { production: '28.2.3', - beta: '28.2.3', + beta: '30.0.8', } const channel = diff --git a/yarn.lock b/yarn.lock index c2f753e76aa..0cff16e8c28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1384,15 +1384,19 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.24.tgz#d4606afd8cf6c609036b854360367d1b2c78931f" integrity sha512-1Ciqv9pqwVtW6FsIUKSZNB82E5Cu1I2bBTj1xuIHXLe/1zYLl3956Nbhg2MzSYHVfl9/rmanjbQIb7LibfCnug== -"@types/node@18.16.1": - version "18.16.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.1.tgz#5db121e9c5352925bb1f1b892c4ae620e3526799" - integrity sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA== +"@types/node@20.11.1": + version "20.11.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.1.tgz#6a93f94abeda166f688d3d2aca18012afbe5f850" + integrity sha512-DsXojJUES2M+FE8CpptJTKpg+r54moV9ZEncPstni1WHFmTcCzeFLnMFfyhCVS8XNOy/OQG+8lVxRLRrVHmV5A== + dependencies: + undici-types "~5.26.4" -"@types/node@^18.11.18": - version "18.16.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.3.tgz#6bda7819aae6ea0b386ebc5b24bdf602f1b42b01" - integrity sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q== +"@types/node@^20.9.0": + version "20.12.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050" + integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw== + dependencies: + undici-types "~5.26.4" "@types/plist@^3.0.2": version "3.0.2" @@ -3605,13 +3609,13 @@ electron-winstaller@*, electron-winstaller@^5.0.0: lodash.template "^4.2.2" temp "^0.9.0" -electron@28.2.3: - version "28.2.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.3.tgz#d26821bcfda7ee445b4b75231da4b057a7ce6e7b" - integrity sha512-he9nGphZo03ejDjYBXpmFVw0KBKogXvR2tYxE4dyYvnfw42uaFIBFrwGeenvqoEOfheJfcI0u4rFG6h3QxDwnA== +electron@30.0.8: + version "30.0.8" + resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.8.tgz#aa54bab26ce706c9e1b244d79047a451733eb4b0" + integrity sha512-ivzXJJ/9gdb4oOw+5SDuaZpSInz8C+Z021dKZfFLMltKbDa4sSqt5cRBiUg7J36Z2kdus+Jai0bdHWutYE9wAA== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" + "@types/node" "^20.9.0" extract-zip "^2.0.1" element-closest@^2.0.2: @@ -9254,6 +9258,11 @@ underscore@~1.6.0: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" integrity sha1-izixDKze9jM3uLJOT/htRa6lKag= +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + union-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"