Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dependabot/npm_and_yarn/app/electron-builder-22.8.1

Browse Source
This commit is contained in:
Cutls 2020-09-17 21:23:11 +09:00 committed by GitHub
commit 70e145eceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/package.json
View File

@ -78,7 +78,7 @@
}, },
"devDependencies": { "devDependencies": {
"chokidar": "^3.4.1", "chokidar": "^3.4.1",
"electron": "^9.1.1", "electron": "^10.1.2",
"electron-builder": "^22.8.1", "electron-builder": "^22.8.1",
"electron-rebuild": "^1.11.0", "electron-rebuild": "^1.11.0",
"eslint": "^7.9.0", "eslint": "^7.9.0",

8
app/yarn.lock
View File

@ -1192,10 +1192,10 @@ electron-rebuild@^1.11.0:
spawn-rx "^3.0.0" spawn-rx "^3.0.0"
yargs "^14.2.0" yargs "^14.2.0"
electron@^9.1.1: electron@^10.1.2:
version "9.1.1" version "10.1.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-9.1.1.tgz#d52c9873be4113287c3eb2b02f85bad6644b100e" resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.2.tgz#30b6fd7669f8daf08c56219a61dfa053fa2b0c70"
integrity sha512-BYvroBLV9x7G4iN33P/IxeZqwjl62/9VuBAF1CoM0m6OeheaiLog1ZMKLlCqVXycJvvrAvLHc454DDEmwnqqhA== integrity sha512-SvN8DcKCmPZ0UcQSNAJBfaUu+LGACqtRhUn1rW0UBLHgdbbDM76L0GU5/XGQEllH5pu5bwlCZwax3srzIl+Aeg==
dependencies: dependencies:
"@electron/get" "^1.0.1" "@electron/get" "^1.0.1"
"@types/node" "^12.0.12" "@types/node" "^12.0.12"