🔀 Merge dev and origin

......@@ -61,7 +61,7 @@ I'm not done with this software just yet. I'm actively working on exciting new f
#### Is this repo actively maintained?
![Yes.](https://img.shields.io/github/last-commit/GitSquared/edex-ui.svg?style=popout)
#### How did you make this?
Glad you're interested! See #272.
Glad you're interested! See [#272](https://github.com/GitSquared/edex-ui/issues/272).
#### This is so cool.
Thanks! If you feel like it, you can [buy me a coffee](https://buymeacoff.ee/gaby) to encourage me to build more awesome stuff.
......
......@@ -86,38 +86,38 @@
}
},
"app-builder-bin": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.4.tgz",
"integrity": "sha512-wC9HYqiC1XqpunT/9y2VuF90KbarnIHL90Tv8BD3TITTgbVIdRTXAsvWvmaR/ImvAX0+l5Z3jZtXjdJ7Pw3bLQ=="
"version": "2.6.6",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.6.tgz",
"integrity": "sha512-G0Ee6xkbxV+fvM/7xXWIgSDjWAD4E/d/aNbxerq/TVsCyBIau/0VPmrEqBMyZv0NbTwLDW5aF/yHG+0ZEY77kA=="
},
"app-builder-lib": {
"version": "20.39.0",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.39.0.tgz",
"integrity": "sha512-lkxGyBrQwueYb3ViqHt5WjyzVVBQqXMXc7TF+JqkuuUWp5DF7SXAYZYd+rsR3gmCbdNxw4SPIEmWmm+I9LK2gw==",
"version": "20.40.2",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.40.2.tgz",
"integrity": "sha512-SAbfua8+L3pFbQp3QFpKV0PzHJPJqepROeX/FPrfdL02zxlw+BVOe6KfC3+UV6XUombWvVPG+SwG956vfIx/Cw==",
"requires": {
"7zip-bin": "~4.1.0",
"app-builder-bin": "2.6.4",
"app-builder-bin": "2.6.6",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.7",
"builder-util": "9.7.0",
"builder-util-runtime": "8.2.0",
"builder-util": "9.7.1",
"builder-util-runtime": "8.2.1",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.1.1",
"ejs": "^2.6.1",
"electron-osx-sign": "0.4.11",
"electron-publish": "20.39.0",
"electron-publish": "20.40.0",
"fs-extra-p": "^7.0.1",
"hosted-git-info": "^2.7.1",
"is-ci": "^2.0.0",
"isbinaryfile": "^4.0.0",
"js-yaml": "^3.12.1",
"js-yaml": "^3.13.0",
"lazy-val": "^1.0.4",
"minimatch": "^3.0.4",
"normalize-package-data": "^2.5.0",
"plist": "^3.0.1",
"read-config-file": "3.2.2",
"sanitize-filename": "^1.6.1",
"semver": "^5.6.0",
"semver": "^6.0.0",
"temp-file": "^3.3.2"
},
"dependencies": {
......@@ -135,9 +135,9 @@
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
},
"semver": {
"version": "5.7.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
"integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ=="
}
}
},
......@@ -260,11 +260,11 @@
"integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
},
"bluebird-lst": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.7.tgz",
"integrity": "sha512-5ix04IbXVIZ6nSRM4aZnwQfk40Td0D57WAl8LfhnICF6XwT4efCZYh0veOHvfDmgpbqE4ju5L5XEAMIcAe13Kw==",
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.8.tgz",
"integrity": "sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==",
"requires": {
"bluebird": "^3.5.3"
"bluebird": "^3.5.4"
}
},
"boxen": {
......@@ -349,21 +349,21 @@
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
},
"builder-util": {
"version": "9.7.0",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.0.tgz",
"integrity": "sha512-QA2RxbaSKvaFVNGcYsjmlkTn03tcdPxgIxHCOgw38G7NK91QWc76RBY9+T1sU8BLVEZJ4qNRWx+pd5rG9tTi+Q==",
"version": "9.7.1",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.1.tgz",
"integrity": "sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA==",
"requires": {
"7zip-bin": "~4.1.0",
"app-builder-bin": "2.6.4",
"app-builder-bin": "2.6.6",
"bluebird-lst": "^1.0.7",
"builder-util-runtime": "^8.2.0",
"builder-util-runtime": "^8.2.1",
"chalk": "^2.4.2",
"debug": "^4.1.1",
"fs-extra-p": "^7.0.1",
"is-ci": "^2.0.0",
"js-yaml": "^3.12.1",
"source-map-support": "^0.5.10",
"stat-mode": "^0.2.2",
"js-yaml": "^3.13.0",
"source-map-support": "^0.5.11",
"stat-mode": "^0.3.0",
"temp-file": "^3.3.2"
},
"dependencies": {
......@@ -393,9 +393,9 @@
}
},
"builder-util-runtime": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz",
"integrity": "sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==",
"version": "8.2.1",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
"integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
"requires": {
"bluebird-lst": "^1.0.7",
"debug": "^4.1.1",
......@@ -742,16 +742,16 @@
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
},
"dmg-builder": {
"version": "6.6.0",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.0.tgz",
"integrity": "sha512-voodd3qdpdRiaciFZTfrFq/e82UPmUqSJq6R3Wc2Ql6XqXYLQcKo1h9rSZiivwls8PqE4Mk1IHTIOwmvJaq+MA==",
"version": "6.6.1",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.1.tgz",
"integrity": "sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg==",
"requires": {
"app-builder-lib": "~20.39.0",
"app-builder-lib": "~20.40.0",
"bluebird-lst": "^1.0.7",
"builder-util": "~9.7.0",
"builder-util": "~9.7.1",
"fs-extra-p": "^7.0.1",
"iconv-lite": "^0.4.24",
"js-yaml": "^3.12.1",
"js-yaml": "^3.13.0",
"parse-color": "^1.0.0",
"sanitize-filename": "^1.6.1"
}
......@@ -804,23 +804,23 @@
}
},
"electron-builder": {
"version": "20.39.0",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.39.0.tgz",
"integrity": "sha512-50SNZ/G+iE9MpTwxzeHt1Cqg8jZKeFLuJ9wubR4e/8VIzAe0ERUmwAQw+77UrlwXZD/PKKoYblc0Sr08Vm4exg==",
"version": "20.40.2",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.40.2.tgz",
"integrity": "sha512-hnnBzyLXna+WpmT4MIoWVdRli43q09yqKOgzPJj0KrOoJZ7TIoY1aYSPvSg8VL5rSuTgdAWGL4rYd9zcq3YXMQ==",
"requires": {
"app-builder-lib": "20.39.0",
"app-builder-lib": "20.40.2",
"bluebird-lst": "^1.0.7",
"builder-util": "9.7.0",
"builder-util-runtime": "8.2.0",
"builder-util": "9.7.1",
"builder-util-runtime": "8.2.1",
"chalk": "^2.4.2",
"dmg-builder": "6.6.0",
"dmg-builder": "6.6.1",
"fs-extra-p": "^7.0.1",
"is-ci": "^2.0.0",
"lazy-val": "^1.0.4",
"read-config-file": "3.2.2",
"sanitize-filename": "^1.6.1",
"update-notifier": "^2.5.0",
"yargs": "^13.2.1"
"yargs": "^13.2.2"
},
"dependencies": {
"ansi-regex": {
......@@ -843,6 +843,16 @@
"supports-color": "^5.3.0"
}
},
"cliui": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
"requires": {
"string-width": "^3.1.0",
"strip-ansi": "^5.2.0",
"wrap-ansi": "^5.1.0"
}
},
"find-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
......@@ -884,12 +894,22 @@
"ansi-regex": "^4.1.0"
}
},
"wrap-ansi": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
"requires": {
"ansi-styles": "^3.2.0",
"string-width": "^3.0.0",
"strip-ansi": "^5.0.0"
}
},
"yargs": {
"version": "13.2.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
"integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
"version": "13.2.4",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
"integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
"requires": {
"cliui": "^4.0.0",
"cliui": "^5.0.0",
"find-up": "^3.0.0",
"get-caller-file": "^2.0.1",
"os-locale": "^3.1.0",
......@@ -899,13 +919,13 @@
"string-width": "^3.0.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
"yargs-parser": "^13.0.0"
"yargs-parser": "^13.1.0"
}
},
"yargs-parser": {
"version": "13.0.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
"integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
"version": "13.1.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz",
"integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==",
"requires": {
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
......@@ -968,17 +988,17 @@
}
},
"electron-publish": {
"version": "20.39.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.39.0.tgz",
"integrity": "sha512-PWrGUru994CSmtsA56GnjyLB3EnIS3zyEmrW0hDXtwuctZLGMnrxjK/7WEORYkgTQ/GufD5b/8T05Q2Kr42nqQ==",
"version": "20.40.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.40.0.tgz",
"integrity": "sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA==",
"requires": {
"bluebird-lst": "^1.0.7",
"builder-util": "~9.7.0",
"builder-util-runtime": "^8.2.0",
"builder-util": "~9.7.1",
"builder-util-runtime": "^8.2.1",
"chalk": "^2.4.2",
"fs-extra-p": "^7.0.1",
"lazy-val": "^1.0.4",
"mime": "^2.4.0"
"mime": "^2.4.1"
},
"dependencies": {
"chalk": {
......@@ -1661,9 +1681,9 @@
}
},
"mime": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz",
"integrity": "sha512-VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ=="
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
"integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg=="
},
"mime-db": {
"version": "1.35.0",
......@@ -2416,9 +2436,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"source-map-support": {
"version": "0.5.11",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz",
"integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==",
"version": "0.5.12",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
"integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
"requires": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
......@@ -2489,9 +2509,9 @@
}
},
"stat-mode": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
"integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI="
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.3.0.tgz",
"integrity": "sha512-QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng=="
},
"string-width": {
"version": "1.0.2",
......
......@@ -471,9 +471,9 @@
}
},
"systeminformation": {
"version": "4.1.6",
"resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.1.6.tgz",
"integrity": "sha512-8Q8wPRvnZX0WRxPVVGN6Q/51GeDBhqruNhFzAjoCPaf4/l0hxTLj8XPjeAME8/Y9I5Y4bdA4fx0QjxvuFhlD8A=="
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.4.1.tgz",
"integrity": "sha512-rZhqXp8+Scjb7e9w68WwgiagHDrTU0hiIXHPb9eystJMymrSxC43ibtAps1afjyB+zymrdaa92z//9Nl6f9sDg=="
},
"tail": {
"version": "2.0.2",
......@@ -511,9 +511,9 @@
}
},
"xterm": {
"version": "3.12.2",
"resolved": "https://registry.npmjs.org/xterm/-/xterm-3.12.2.tgz",
"integrity": "sha512-FSXovDdsqIKqoayC6+zFzhaHi+A3NSceM5rgTW88DH7sS96HdwMToB2p1rW+FyNsSqfAgFwlXDRQk+fh/aHvPQ=="
"version": "3.13.0",
"resolved": "https://registry.npmjs.org/xterm/-/xterm-3.13.0.tgz",
"integrity": "sha512-FZVmvkkbkky3zldJ2NNOZ9h8jirtbGTlF4sIKMDrejR4wPsVZ3o4F++DQVkdeZqjAwtNOMoR17PMSOTZ+h070g=="
}
}
}
......@@ -31,10 +31,10 @@
"shell-env": "3.0.0",
"signale": "1.4.0",
"smoothie": "1.35.0",
"systeminformation": "4.1.6",
"systeminformation": "4.4.1",
"tail": "2.0.2",
"ws": "7.0.0",
"xterm": "3.12.2",
"xterm": "3.13.0",
"username": "5.0.0"
},
"optionalDependencies": {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册