development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-01 05:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16624 from desktop/Electron-24

Browse source 
Electron v24.4.0
This commit is contained in:
tidy-dev 2023-06-21 14:15:47 +00:00
parent cc164588f4
commit e7bbc5a9c7
17 changed files with 77 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.eslintrc.yml
View file

@ -123,7 +123,10 @@ rules:
jsdoc/check-tag-names: error
jsdoc/check-types: error
jsdoc/implements-on-classes: error
jsdoc/newline-after-description: error
jsdoc/tag-lines:
- error
- any
- startLines: 1
jsdoc/no-undefined-types: error
jsdoc/valid-types: error

2
.github/workflows/ci.yml vendored
View file

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

2
.node-version
View file

@ -1 +1 @@
16.17.1
18.14.0

2
.nvmrc
View file

@ -1 +1 @@
v16.17.1
v18.14.0

2
.tool-versions
View file

@ -1,2 +1,2 @@
python 3.9.5
nodejs 16.17.1
nodejs 18.14.0

2
app/.npmrc
View file

@ -1,3 +1,3 @@
runtime = electron
disturl = https://electronjs.org/headers
target = 22.0.0
target = 24.4.0

1
app/src/lib/fatal-error.ts
View file

@ -14,7 +14,6 @@ export function fatalError(msg: string): never {
* in an exhaustive check.
*
* @param message The message to be used in the runtime exception.
*
*/
export function assertNever(x: never, message: string): never {
throw new Error(message)

1
app/src/lib/git/clone.ts
View file

@ -23,7 +23,6 @@ import { envForRemoteOperation } from './environment'
* of the clone operation. When provided this enables
* the '--progress' command line flag for
* 'git clone'.
*
*/
export async function clone(
url: string,

2
app/src/lib/git/git-delimiter-parser.ts
View file

@ -12,7 +12,6 @@
* Example:
*
* `const { args, parse } = createLogParser({ sha: '%H' })`
*
*/
export function createLogParser<T extends Record<string, string>>(fields: T) {
const keys: Array<keyof T> = Object.keys(fields)
@ -49,7 +48,6 @@ export function createLogParser<T extends Record<string, string>>(fields: T) {
* Example:
*
* `const { args, parse } = createForEachRefParser({ sha: '%(objectname)' })`
*
*/
export function createForEachRefParser<T extends Record<string, string>>(
fields: T

1
app/src/lib/git/revert.ts
View file

@ -18,7 +18,6 @@ import {
* @param repository - The repository to update
*
* @param commit - The SHA of the commit to be reverted
*
*/
export async function revertCommit(
repository: Repository,

1
app/src/lib/squirrel-error-parser.ts
View file

@ -14,7 +14,6 @@ const squirrelTimeoutRegex =
* friendlier message to the user.
*
* @param error The underlying error from Squirrel.
*
*/
export function parseError(error: Error): Error | null {
if (squirrelMissingRegex.test(error.message)) {

1
app/src/lib/stores/git-store.ts
View file

@ -1051,7 +1051,6 @@ export class GitStore extends BaseStore {
* @param refspec - The association between a remote and local ref to use as
* part of this action. Refer to git-scm for more
* information on refspecs: https://www.git-scm.com/book/tr/v2/Git-Internals-The-Refspec
*
*/
public async fetchRefspec(
account: IGitAccount | null,

2
app/src/lib/stores/pull-request-coordinator.ts
View file

@ -80,7 +80,6 @@ export class PullRequestCoordinator {
* the `Repository`)
* * the parent GitHub repo, if the `Repository` has one (the
* `upstream` remote for the `Repository`)
*
*/
public onPullRequestsChanged(
fn: (
@ -119,7 +118,6 @@ export class PullRequestCoordinator {
* the `Repository`)
* * the parent GitHub repo, if the `Repository` has one (the
* `upstream` remote for the `Repository`)
*
*/
public onIsLoadingPullRequests(
fn: (

2
app/src/ui/lib/list/list.tsx
View file

@ -995,7 +995,6 @@ export class List extends React.Component<IListProps, IListState> {
*
* @param width - The width of the Grid as given by AutoSizer
* @param height - The height of the Grid as given by AutoSizer
*
*/
private renderContents(width: number, height: number) {
if (__WIN32__) {
@ -1082,7 +1081,6 @@ export class List extends React.Component<IListProps, IListState> {
* and accurately positions the fake scroll bar.
*
* @param height The height of the Grid as given by AutoSizer
*
*/
private renderFakeScroll(height: number) {
let totalHeight: number = 0

2
app/webpack.common.ts
View file

@ -81,7 +81,7 @@ export const renderer = merge({}, commonConfig, {
},
{
test: /\.cmd$/,
loader: 'file-loader',
type: 'asset/resource',
},
],
},

5
package.json
View file

@ -70,13 +70,12 @@
"css-loader": "^6.7.1",
"eslint": "^7.3.1",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-jsdoc": "^37.7.0",
"eslint-plugin-jsdoc": "^43.0.1",
"eslint-plugin-json": "^2.1.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "7.26.1",
"express": "^4.17.3",
"fake-indexeddb": "^2.0.4",
"file-loader": "^6.2.0",
"front-matter": "^2.3.0",
"fs-extra": "^9.0.1",
"glob": "^7.1.2",
@ -156,7 +155,7 @@
"@types/webpack-hot-middleware": "^2.25.6",
"@types/webpack-merge": "^5.0.0",
"@types/xml2js": "^0.4.11",
"electron": "22.0.3",
"electron": "24.4.0",
"electron-builder": "^23.6.0",
"electron-packager": "^15.1.0",
"electron-winstaller": "^5.0.0",

117
yarn.lock
View file

@ -653,14 +653,28 @@
minimatch "^3.0.4"
plist "^3.0.4"
"@es-joy/jsdoccomment@~0.18.0":
version "0.18.0"
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz#2532b2ecb8576d694011b157c447ed6b12534c70"
integrity sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==
"@electron/universal@^1.3.2":
version "1.3.4"
resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777"
integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==
dependencies:
comment-parser "1.3.0"
esquery "^1.4.0"
jsdoc-type-pratt-parser "~2.2.2"
"@electron/asar" "^3.2.1"
"@malept/cross-spawn-promise" "^1.1.0"
debug "^4.3.1"
dir-compare "^3.0.0"
fs-extra "^9.0.1"
minimatch "^3.0.4"
plist "^3.0.4"
"@es-joy/jsdoccomment@~0.37.1":
version "0.37.1"
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz#fa32a41ba12097452693343e09ad4d26d157aedd"
integrity sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==
dependencies:
comment-parser "1.3.1"
esquery "^1.5.0"
jsdoc-type-pratt-parser "~4.0.0"
"@github/markdownlint-github@^0.1.0":
version "0.1.0"
@ -1397,10 +1411,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234"
integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==
"@types/node@^16.11.26":
version "16.11.40"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.40.tgz#bcf85f3febe74436107aeb2d3fb5fd0d30818600"
integrity sha512-7bOWglXUO6f21NG3YDI7hIpeMX3M59GG+DzZuzX2EkFKYUnRoxq3EOg4R0KNv2hxryY9M3UUqG5akwwsifrukw==
"@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/normalize-package-data@^2.4.0":
version "2.4.0"
@ -2277,6 +2291,11 @@ app-builder-lib@23.6.0:
tar "^6.1.11"
temp-file "^3.4.0"
are-docs-informative@^0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
argparse@^1.0.7:
version "1.0.10"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@ -3144,10 +3163,10 @@ commander@~9.4.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c"
integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==
comment-parser@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.0.tgz#68beb7dbe0849295309b376406730cd16c719c44"
integrity sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==
comment-parser@1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
compare-version@^0.1.2:
version "0.1.2"
@ -3363,7 +3382,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
dependencies:
ms "2.0.0"
debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@ -3788,13 +3807,13 @@ electron-winstaller@*, electron-winstaller@^5.0.0:
lodash.template "^4.2.2"
temp "^0.9.0"
electron@22.0.3:
version "22.0.3"
resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz#44806cd053ea2ed35bffefd92143d3fc69d7337d"
integrity sha512-eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g==
electron@24.4.0:
version "24.4.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-24.4.0.tgz#48d05561dab6a5835ec1a3a96852797f69824eea"
integrity sha512-A9YzLHRUA+HfYVf2daNv0jPXNCWShgcgcTaGntrZRGynQLEhDTbti9Lfmq2tjRKoEgXZ7qj+aJFw+tJZsT/Cfw==
dependencies:
"@electron/get" "^2.0.0"
"@types/node" "^16.11.26"
"@types/node" "^18.11.18"
extract-zip "^2.0.1"
element-closest@^2.0.2:
@ -4146,18 +4165,18 @@ eslint-plugin-import@^2.25.2:
resolve "^1.22.0"
tsconfig-paths "^3.14.1"
eslint-plugin-jsdoc@^37.7.0:
version "37.7.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.0.tgz#975d9f18cb0520dde7a2b0db5f4421dfee3fdd17"
integrity sha512-vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA==
eslint-plugin-jsdoc@^43.0.1:
version "43.1.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-43.1.1.tgz#fc72ba21597cc99b1a0dc988aebb9bb57d0ec492"
integrity sha512-J2kjjsJ5vBXSyNzqJhceeSGTAgVgZHcPSJKo3vD4tNjUdfky98rR2VfZUDsS1GKL6isyVa8GWvr+Az7Vyg2HXA==
dependencies:
"@es-joy/jsdoccomment" "~0.18.0"
comment-parser "1.3.0"
debug "^4.3.3"
"@es-joy/jsdoccomment" "~0.37.1"
are-docs-informative "^0.0.2"
comment-parser "1.3.1"
debug "^4.3.4"
escape-string-regexp "^4.0.0"
esquery "^1.4.0"
regextras "^0.8.0"
semver "^7.3.5"
esquery "^1.5.0"
semver "^7.5.0"
spdx-expression-parse "^3.0.1"
eslint-plugin-json@^2.1.1:
@ -4341,10 +4360,10 @@ esquery@^1.2.0:
dependencies:
estraverse "^5.1.0"
esquery@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
esquery@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
dependencies:
estraverse "^5.1.0"
@ -4614,14 +4633,6 @@ file-entry-cache@^5.0.1:
dependencies:
flat-cache "^2.0.1"
file-loader@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
dependencies:
loader-utils "^2.0.0"
schema-utils "^3.0.0"
filelist@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.3.tgz#448607750376484932f67ef1b9ff07386b036c83"
@ -6404,10 +6415,10 @@ js-yaml@^4.1.0:
dependencies:
argparse "^2.0.1"
jsdoc-type-pratt-parser@~2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz#a85e407ac502b444dc23333aa4d6d0dc83f76187"
integrity sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==
jsdoc-type-pratt-parser@~4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
jsdom@^16.4.0:
version "16.7.0"
@ -8261,11 +8272,6 @@ regexpp@^3.2.0:
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
regextras@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217"
integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==
relateurl@^0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@ -8596,6 +8602,13 @@ semver@^7.3.7:
dependencies:
lru-cache "^6.0.0"
semver@^7.5.0:
version "7.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
dependencies:
lru-cache "^6.0.0"
semver@~7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"