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

Merge branch 'WIP-(before-CI)' of https://github.com/cutls/TheDesk into WIP-(before-CI)

Browse Source
This commit is contained in:
Cutls
2019-05-19 17:01:18 +09:00
parent 40d877682b 5e324f19ae
commit d529a105c5
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/package-lock.json generated
View File

@@ -780,9 +780,9 @@
} }
}, },
"electron-dl": { "electron-dl": {
"version": "1.11.0", "version": "1.14.0",
"resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-1.11.0.tgz", "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-1.14.0.tgz",
"integrity": "sha512-iL9qHzzWOuL9bus+UT+P72SwrDQcFTV6QHqcbhwgqjCC9/K5jhdRzG0dIMB3TzYlk6rmApanPqh9DvWykwIH1Q==", "integrity": "sha512-4okyei42a1mLsvLK7hLrIfd20EQzB18nIlLTwBV992aMSmTGLUEFRTmO1MfSslGNrzD8nuPuy1l/VxO8so4lig==",
"requires": { "requires": {
"ext-name": "^5.0.0", "ext-name": "^5.0.0",
"pupa": "^1.0.0", "pupa": "^1.0.0",
@@ -990,7 +990,7 @@
"ext-list": { "ext-list": {
"version": "2.2.2", "version": "2.2.2",
"resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
"integrity": "sha1-C5jmTtgvWs8PKTG6v2khLvUt3Tc=", "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
"requires": { "requires": {
"mime-db": "^1.28.0" "mime-db": "^1.28.0"
} }
@@ -998,7 +998,7 @@
"ext-name": { "ext-name": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
"integrity": "sha1-cHgZgdGD7hXROZPIgiBFxQbI8KY=", "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
"requires": { "requires": {
"ext-list": "^2.0.0", "ext-list": "^2.0.0",
"sort-keys-length": "^1.0.0" "sort-keys-length": "^1.0.0"
@@ -1726,9 +1726,9 @@
"integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=" "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE="
}, },
"mime-db": { "mime-db": {
"version": "1.33.0", "version": "1.40.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
}, },
"mime-types": { "mime-types": {
"version": "2.1.18", "version": "2.1.18",
@@ -3090,9 +3090,9 @@
} }
}, },
"vue": { "vue": {
"version": "2.6.9", "version": "2.6.10",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.9.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
"integrity": "sha512-t1+tvH8hybPM86oNne3ZozCD02zj/VoZIiojOBPJLjwBn7hxYU5e1gBObFpq8ts1NEn1VhPf/hVXBDAJ3X5ljg==" "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
}, },
"which": { "which": {
"version": "1.3.1", "version": "1.3.1",

4
app/package.json
View File

@@ -46,12 +46,12 @@
], ],
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"electron-dl": "^1.11.0", "electron-dl": "^1.14.0",
"jimp": "^0.2.28", "jimp": "^0.2.28",
"json5": "^2.1.0", "json5": "^2.1.0",
"node-notifier": "^5.4.0", "node-notifier": "^5.4.0",
"sumchecker": "^3.0.0", "sumchecker": "^3.0.0",
"vue": "^2.6.9" "vue": "^2.6.10"
}, },
"optionalDependencies": { "optionalDependencies": {
"nowplaying-node": "git+https://github.com/cutls/nowplaying-node", "nowplaying-node": "git+https://github.com/cutls/nowplaying-node",