diff --git a/server-console/package-lock.json b/server-console/package-lock.json
index e25fd3cded..4311fde51a 100644
--- a/server-console/package-lock.json
+++ b/server-console/package-lock.json
@@ -4,6 +4,12 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@types/node": {
+ "version": "8.10.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.2.tgz",
+ "integrity": "sha512-A6Uv1anbsCvrRDtaUXS2xZ5tlzD+Kg7yMRlSLFDy3z0r7KlGXDzL14vELXIAgpk2aJbU3XeZZQRcEkLkowT92g==",
+ "dev": true
+ },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -40,12 +46,6 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
- "any-promise": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
- "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
- "dev": true
- },
"array-find-index": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz",
@@ -148,12 +148,6 @@
"lru-cache": "4.0.1"
}
},
- "balanced-match": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz",
- "integrity": "sha1-qRzdHr7xqGZZ5w/03vAWJfwtZ1Y=",
- "dev": true
- },
"base64-js": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
@@ -217,16 +211,6 @@
"hoek": "2.16.3"
}
},
- "brace-expansion": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz",
- "integrity": "sha1-Rr/1ARXUf8mriYVKu4fZgHihCZE=",
- "dev": true,
- "requires": {
- "balanced-match": "0.3.0",
- "concat-map": "0.0.1"
- }
- },
"buffers": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
@@ -515,29 +499,70 @@
"jsbn": "0.1.0"
}
},
- "electron-download": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-2.1.1.tgz",
- "integrity": "sha1-AH07HyrTco0nzP5PhJayY/kTijE=",
+ "electron": {
+ "version": "1.8.4",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.4.tgz",
+ "integrity": "sha512-2f1cx0G3riMFODXFftF5AHXy+oHfhpntZHTDN66Hxtl09gmEr42B3piNEod9MEmw72f75LX2JfeYceqq1PF8cA==",
"dev": true,
"requires": {
- "debug": "2.2.0",
- "home-path": "1.0.3",
+ "@types/node": "8.10.2",
+ "electron-download": "3.3.0",
+ "extract-zip": "1.5.0"
+ }
+ },
+ "electron-download": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz",
+ "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "fs-extra": "0.30.0",
+ "home-path": "1.0.5",
"minimist": "1.2.0",
- "mkdirp": "0.5.1",
- "mv": "2.1.1",
- "nugget": "1.6.2",
- "path-exists": "1.0.0",
- "rc": "1.1.6"
+ "nugget": "2.0.1",
+ "path-exists": "2.1.0",
+ "rc": "1.1.6",
+ "semver": "5.5.0",
+ "sumchecker": "1.3.1"
},
"dependencies": {
"debug": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
- "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"dev": true,
"requires": {
- "ms": "0.7.1"
+ "ms": "2.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "0.30.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+ "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.3",
+ "jsonfile": "2.2.3",
+ "klaw": "1.3.1",
+ "path-is-absolute": "1.0.0",
+ "rimraf": "2.6.2"
+ }
+ },
+ "semver": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+ "dev": true
+ },
+ "sumchecker": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz",
+ "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "es6-promise": "4.2.4"
}
}
}
@@ -579,9 +604,9 @@
}
},
"electron-packager": {
- "version": "11.0.0",
- "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-11.0.0.tgz",
- "integrity": "sha512-ufyYMe3Gt6IEZm9RuG+KK3Nh+V2jZHWg9gihp8wylUNtleQihECIXtQdpPJxH9740XFERVPraNEaa7cZvDzpyw==",
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-12.0.0.tgz",
+ "integrity": "sha1-uC0k14ovIUA7v9FmpbFWmJTVzQw=",
"dev": true,
"requires": {
"asar": "0.14.2",
@@ -590,20 +615,25 @@
"electron-osx-sign": "0.4.8",
"extract-zip": "1.5.0",
"fs-extra": "5.0.0",
+ "galactus": "0.2.0",
"get-package-info": "1.0.0",
- "mz": "2.7.0",
"nodeify": "1.0.1",
"parse-author": "2.0.0",
"pify": "3.0.0",
"plist": "2.1.0",
- "pruner": "0.0.7",
- "rcedit": "0.9.0",
+ "rcedit": "1.0.0",
"resolve": "1.5.0",
"sanitize-filename": "1.6.1",
"semver": "5.5.0",
- "yargs-parser": "8.1.0"
+ "yargs-parser": "9.0.2"
},
"dependencies": {
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ },
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -726,6 +756,12 @@
"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"dev": true
},
+ "rcedit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.0.0.tgz",
+ "integrity": "sha512-W7DNa34x/3OgWyDHsI172AG/Lr/lZ+PkavFkHj0QhhkBRcV9QTmRJE1tDKrWkx8XHPSBsmZkNv9OKue6pncLFQ==",
+ "dev": true
+ },
"semver": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
@@ -746,19 +782,18 @@
"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
"integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
"dev": true
+ },
+ "yargs-parser": {
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+ "dev": true,
+ "requires": {
+ "camelcase": "4.1.0"
+ }
}
}
},
- "electron-prebuilt": {
- "version": "0.37.5",
- "resolved": "https://registry.npmjs.org/electron-prebuilt/-/electron-prebuilt-0.37.5.tgz",
- "integrity": "sha1-OkGJgod4FdOnrB+bLi9KcPQg/3A=",
- "dev": true,
- "requires": {
- "electron-download": "2.1.1",
- "extract-zip": "1.5.0"
- }
- },
"end-of-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
@@ -787,6 +822,12 @@
"is-arrayish": "0.2.1"
}
},
+ "es6-promise": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
+ "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==",
+ "dev": true
+ },
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -873,6 +914,62 @@
}
}
},
+ "flora-colossus": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/flora-colossus/-/flora-colossus-0.0.2.tgz",
+ "integrity": "sha1-fRvimh8X+k8isb1hSC+Gw04HuQE=",
+ "dev": true,
+ "requires": {
+ "debug": "3.1.0",
+ "fs-extra": "4.0.3"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.3",
+ "jsonfile": "4.0.0",
+ "universalify": "0.1.1"
+ }
+ },
+ "jsonfile": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
+ }
+ }
+ },
"forever-agent": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -904,6 +1001,63 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
+ "galactus": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/galactus/-/galactus-0.2.0.tgz",
+ "integrity": "sha1-w9Y7pVAkZv5A6mfMaJCFs90kqPw=",
+ "dev": true,
+ "requires": {
+ "debug": "3.1.0",
+ "flora-colossus": "0.0.2",
+ "fs-extra": "4.0.3"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.3",
+ "jsonfile": "4.0.0",
+ "universalify": "0.1.1"
+ }
+ },
+ "jsonfile": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
+ }
+ }
+ },
"generate-function": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
@@ -1107,9 +1261,9 @@
"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
},
"home-path": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.3.tgz",
- "integrity": "sha1-ns5Z/sPwMubRC1Q0/uJk30wt4y8=",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.5.tgz",
+ "integrity": "sha1-eIspgVsS1Tus9XVkhHbm+QQdEz8=",
"dev": true
},
"hosted-git-info": {
@@ -1461,15 +1615,6 @@
"mime-db": "1.22.0"
}
},
- "minimatch": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
- "integrity": "sha1-UjYVelHk8ATBd/s8Un/33Xjw74M=",
- "dev": true,
- "requires": {
- "brace-expansion": "1.1.3"
- }
- },
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
@@ -1723,61 +1868,9 @@
}
},
"ms": {
- "version": "0.7.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
- "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
- "dev": true
- },
- "mv": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
- "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
- "dev": true,
- "requires": {
- "mkdirp": "0.5.1",
- "ncp": "2.0.0",
- "rimraf": "2.4.5"
- },
- "dependencies": {
- "glob": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
- "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
- "dev": true,
- "requires": {
- "inflight": "1.0.4",
- "inherits": "2.0.1",
- "minimatch": "3.0.0",
- "once": "1.3.3",
- "path-is-absolute": "1.0.0"
- }
- },
- "rimraf": {
- "version": "2.4.5",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
- "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
- "dev": true,
- "requires": {
- "glob": "6.0.4"
- }
- }
- }
- },
- "mz": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
- "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
- "dev": true,
- "requires": {
- "any-promise": "1.3.0",
- "object-assign": "4.0.1",
- "thenify-all": "1.6.0"
- }
- },
- "ncp": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
- "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
},
"node-notifier": {
@@ -1843,27 +1936,27 @@
}
},
"nugget": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/nugget/-/nugget-1.6.2.tgz",
- "integrity": "sha1-iMpuA7pXBqmRc/XaCQJZPWvK4Qc=",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
+ "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
"dev": true,
"requires": {
- "debug": "2.2.0",
+ "debug": "2.6.9",
"minimist": "1.2.0",
"pretty-bytes": "1.0.4",
"progress-stream": "1.2.0",
"request": "2.71.0",
- "single-line-log": "0.4.1",
+ "single-line-log": "1.1.2",
"throttleit": "0.0.2"
},
"dependencies": {
"debug": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
- "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"dev": true,
"requires": {
- "ms": "0.7.1"
+ "ms": "2.0.0"
}
},
"throttleit": {
@@ -1966,10 +2059,13 @@
}
},
"path-exists": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
- "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
- "dev": true
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+ "dev": true,
+ "requires": {
+ "pinkie-promise": "2.0.1"
+ }
},
"path-is-absolute": {
"version": "1.0.0",
@@ -2070,46 +2166,6 @@
"is-promise": "1.0.1"
}
},
- "pruner": {
- "version": "0.0.7",
- "resolved": "https://registry.npmjs.org/pruner/-/pruner-0.0.7.tgz",
- "integrity": "sha1-NF+8s+gHARY6HXrfVrrCKaWh5ME=",
- "dev": true,
- "requires": {
- "fs-extra": "4.0.3"
- },
- "dependencies": {
- "fs-extra": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
- "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.3",
- "jsonfile": "4.0.0",
- "universalify": "0.1.1"
- }
- },
- "jsonfile": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
- "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11"
- },
- "dependencies": {
- "graceful-fs": {
- "version": "4.1.11",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
- "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
- "dev": true,
- "optional": true
- }
- }
- }
- }
- },
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -2153,12 +2209,6 @@
"strip-json-comments": "1.0.4"
}
},
- "rcedit": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.9.0.tgz",
- "integrity": "sha1-ORDfVzRTmeKwMl9KUZAH+J5V7xw=",
- "dev": true
- },
"read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -2288,10 +2338,13 @@
"dev": true
},
"single-line-log": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz",
- "integrity": "sha1-h6VWSfdJ14PsDc2AToFA2Yc8fO4=",
- "dev": true
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
+ "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
+ "dev": true,
+ "requires": {
+ "string-width": "1.0.1"
+ }
},
"sntp": {
"version": "1.0.9",
@@ -2476,24 +2529,6 @@
}
}
},
- "thenify": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
- "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
- "dev": true,
- "requires": {
- "any-promise": "1.3.0"
- }
- },
- "thenify-all": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
- "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
- "dev": true,
- "requires": {
- "thenify": "3.3.0"
- }
- },
"throttleit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
@@ -2694,23 +2729,6 @@
"y18n": "3.2.1"
}
},
- "yargs-parser": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
- "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
- "dev": true,
- "requires": {
- "camelcase": "4.1.0"
- },
- "dependencies": {
- "camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
- "dev": true
- }
- }
- },
"yauzl": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
diff --git a/server-console/package.json b/server-console/package.json
index 0b13eeb2a8..2428d2574e 100644
--- a/server-console/package.json
+++ b/server-console/package.json
@@ -8,8 +8,8 @@
""
],
"devDependencies": {
- "electron-packager": "^11.0.0",
- "electron-prebuilt": "0.37.5"
+ "electron-packager": "^12.0.0",
+ "electron": "1.8.4"
},
"repository": {
"type": "git",
@@ -25,6 +25,7 @@
"dependencies": {
"always-tail": "0.2.0",
"cheerio": "^0.19.0",
+ "electron-log": "1.1.1",
"extend": "^3.0.0",
"fs-extra": "^1.0.0",
"node-notifier": "^5.2.1",
@@ -32,7 +33,6 @@
"request": "^2.67.0",
"request-progress": "1.0.2",
"tar-fs": "^1.12.0",
- "yargs": "^3.30.0",
- "electron-log": "1.1.1"
+ "yargs": "^3.30.0"
}
}
diff --git a/server-console/src/main.js b/server-console/src/main.js
index efa04a8512..b08db6222f 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -8,9 +8,9 @@ const nativeImage = electron.nativeImage;
const notifier = require('node-notifier');
const util = require('util');
const dialog = electron.dialog;
-const Menu = require('menu');
-const Tray = require('tray');
-const shell = require('shell');
+const Menu = electron.Menu;
+const Tray = electron.Tray;
+const shell = electron.shell;
const os = require('os');
const childProcess = require('child_process');
const path = require('path');