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

Merge branch 'master' of https://github.com/cutls/TheDesk

Browse Source
This commit is contained in:
Cutls 2019-06-03 23:39:27 +09:00
commit 075c3ef9ca
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "thedesk", "name": "thedesk",
"version": "18.4.0", "version": "18.5.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -361,27 +361,27 @@
"dev": true "dev": true
}, },
"app-builder-lib": { "app-builder-lib": {
"version": "20.40.2", "version": "20.41.0",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.40.2.tgz", "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.41.0.tgz",
"integrity": "sha512-SAbfua8+L3pFbQp3QFpKV0PzHJPJqepROeX/FPrfdL02zxlw+BVOe6KfC3+UV6XUombWvVPG+SwG956vfIx/Cw==", "integrity": "sha512-c/BpNDuyd0xAh2jI2s9ep+NVC4T0lD1mmEpSH0iueOP8TqWXEMYMJsrSFn6CwRsVeFGaYCz0o+IPpsHUohgP+g==",
"dev": true, "dev": true,
"requires": { "requires": {
"7zip-bin": "~4.1.0", "7zip-bin": "~4.1.0",
"app-builder-bin": "2.6.6", "app-builder-bin": "2.6.6",
"async-exit-hook": "^2.0.1", "async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.7", "bluebird-lst": "^1.0.7",
"builder-util": "9.7.1", "builder-util": "10.0.0",
"builder-util-runtime": "8.2.1", "builder-util-runtime": "8.2.2",
"chromium-pickle-js": "^0.2.0", "chromium-pickle-js": "^0.2.0",
"debug": "^4.1.1", "debug": "^4.1.1",
"ejs": "^2.6.1", "ejs": "^2.6.1",
"electron-osx-sign": "0.4.11", "electron-osx-sign": "0.4.11",
"electron-publish": "20.40.0", "electron-publish": "20.41.0",
"fs-extra-p": "^7.0.1", "fs-extra-p": "^7.0.1",
"hosted-git-info": "^2.7.1", "hosted-git-info": "^2.7.1",
"is-ci": "^2.0.0", "is-ci": "^2.0.0",
"isbinaryfile": "^4.0.0", "isbinaryfile": "^4.0.0",
"js-yaml": "^3.13.0", "js-yaml": "^3.13.1",
"lazy-val": "^1.0.4", "lazy-val": "^1.0.4",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"normalize-package-data": "^2.5.0", "normalize-package-data": "^2.5.0",
@ -393,9 +393,9 @@
}, },
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "6.0.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz",
"integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==", "integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==",
"dev": true "dev": true
} }
} }
@ -484,9 +484,9 @@
} }
}, },
"bluebird": { "bluebird": {
"version": "3.5.4", "version": "3.5.5",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
"integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==", "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
"dev": true "dev": true
}, },
"bluebird-lst": { "bluebird-lst": {
@ -570,29 +570,29 @@
"dev": true "dev": true
}, },
"builder-util": { "builder-util": {
"version": "9.7.1", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.1.tgz", "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-10.0.0.tgz",
"integrity": "sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA==", "integrity": "sha512-7gBdyDprpb0QpVCCrSIf1nQhOpT8gp//f8f9o40zki00ePrBxJhvGwwkBXoorJfh3vSgIdMgpvHLAbV5xcnolA==",
"dev": true, "dev": true,
"requires": { "requires": {
"7zip-bin": "~4.1.0", "7zip-bin": "~4.1.0",
"app-builder-bin": "2.6.6", "app-builder-bin": "2.6.6",
"bluebird-lst": "^1.0.7", "bluebird-lst": "^1.0.7",
"builder-util-runtime": "^8.2.1", "builder-util-runtime": "^8.2.2",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"debug": "^4.1.1", "debug": "^4.1.1",
"fs-extra-p": "^7.0.1", "fs-extra-p": "^7.0.1",
"is-ci": "^2.0.0", "is-ci": "^2.0.0",
"js-yaml": "^3.13.0", "js-yaml": "^3.13.1",
"source-map-support": "^0.5.11", "source-map-support": "^0.5.12",
"stat-mode": "^0.3.0", "stat-mode": "^0.3.0",
"temp-file": "^3.3.2" "temp-file": "^3.3.2"
} }
}, },
"builder-util-runtime": { "builder-util-runtime": {
"version": "8.2.1", "version": "8.2.2",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.2.tgz",
"integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==", "integrity": "sha512-Z0NKlpa5VQBMVXAcZH9n4dx+CY5Ckyv7a0Yr/is1h5hwCWaJbQ2JN9PGT7g6YzE5gM3FyrgGDB4DTyJlLcRKNw==",
"dev": true, "dev": true,
"requires": { "requires": {
"bluebird-lst": "^1.0.7", "bluebird-lst": "^1.0.7",
@ -882,17 +882,17 @@
"optional": true "optional": true
}, },
"dmg-builder": { "dmg-builder": {
"version": "6.6.1", "version": "6.6.2",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.1.tgz", "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.2.tgz",
"integrity": "sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg==", "integrity": "sha512-o7qD7UknmKW9w0FcRZ+KWBPtFS59LAdwphrA0Q9eMdKBiOY9qZyt34fZizsuJbR+9sX1cVNwH/zFSwsGNet9fQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"app-builder-lib": "~20.40.0", "app-builder-lib": "~20.41.0",
"bluebird-lst": "^1.0.7", "bluebird-lst": "^1.0.7",
"builder-util": "~9.7.1", "builder-util": "~10.0.0",
"fs-extra-p": "^7.0.1", "fs-extra-p": "^7.0.1",
"iconv-lite": "^0.4.24", "iconv-lite": "^0.4.24",
"js-yaml": "^3.13.0", "js-yaml": "^3.13.1",
"parse-color": "^1.0.0", "parse-color": "^1.0.0",
"sanitize-filename": "^1.6.1" "sanitize-filename": "^1.6.1"
} }
@ -956,17 +956,17 @@
} }
}, },
"electron-builder": { "electron-builder": {
"version": "20.40.2", "version": "20.41.0",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.40.2.tgz", "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.41.0.tgz",
"integrity": "sha512-hnnBzyLXna+WpmT4MIoWVdRli43q09yqKOgzPJj0KrOoJZ7TIoY1aYSPvSg8VL5rSuTgdAWGL4rYd9zcq3YXMQ==", "integrity": "sha512-NgVD3UKyr9AjKumYeLfdLDmefhXj+XwAXan1CvgfjjiR6IZdh8oPPfpNJvpX3CWJi/aEUfZn0B7PcIzzsZT8FQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"app-builder-lib": "20.40.2", "app-builder-lib": "20.41.0",
"bluebird-lst": "^1.0.7", "bluebird-lst": "^1.0.7",
"builder-util": "9.7.1", "builder-util": "10.0.0",
"builder-util-runtime": "8.2.1", "builder-util-runtime": "8.2.2",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"dmg-builder": "6.6.1", "dmg-builder": "6.6.2",
"fs-extra-p": "^7.0.1", "fs-extra-p": "^7.0.1",
"is-ci": "^2.0.0", "is-ci": "^2.0.0",
"lazy-val": "^1.0.4", "lazy-val": "^1.0.4",
@ -1104,18 +1104,18 @@
} }
}, },
"electron-publish": { "electron-publish": {
"version": "20.40.0", "version": "20.41.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.40.0.tgz", "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.41.0.tgz",
"integrity": "sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA==", "integrity": "sha512-JaNL2zNIcZfwlwyK5sc4FSPslldFvodHi9WaCtV41+L6hvvi7QE6CqFSW/OUY6Fp+BRNu83D/P2t47TOFTDLoA==",
"dev": true, "dev": true,
"requires": { "requires": {
"bluebird-lst": "^1.0.7", "bluebird-lst": "^1.0.7",
"builder-util": "~9.7.1", "builder-util": "~10.0.0",
"builder-util-runtime": "^8.2.1", "builder-util-runtime": "^8.2.2",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"fs-extra-p": "^7.0.1", "fs-extra-p": "^7.0.1",
"lazy-val": "^1.0.4", "lazy-val": "^1.0.4",
"mime": "^2.4.1" "mime": "^2.4.2"
}, },
"dependencies": { "dependencies": {
"mime": { "mime": {
@ -3571,9 +3571,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
}, },
"write-file-atomic": { "write-file-atomic": {
"version": "2.4.2", "version": "2.4.3",
"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
"integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==", "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"graceful-fs": "^4.1.11", "graceful-fs": "^4.1.11",

2
app/package.json
View File

@ -61,7 +61,7 @@
}, },
"devDependencies": { "devDependencies": {
"electron": "^5.0.1", "electron": "^5.0.1",
"electron-builder": "^20.40.2" "electron-builder": "^20.41.0"
}, },
"build": { "build": {
"productName": "TheDesk", "productName": "TheDesk",