diff --git a/package.json b/package.json
index d9da4eb..8bb239c 100644
--- a/package.json
+++ b/package.json
@@ -62,10 +62,14 @@
},
"dependencies": {
"axios": "^0.18.0",
+ "body-parser": "^1.18.3",
"bplist-parser": "^0.1.1",
"electron-oauth2": "^3.0.0",
"electron-osx-prompt": "^1.3.10",
+ "electron-routes": "^1.3.0",
+ "express": "^4.16.3",
"motion-core": "https://github.com/motioncrypto/motion-core",
+ "opn": "^5.3.0",
"vue": "^2.5.13",
"vue-electron": "^1.0.6",
"vue-js-modal": "^1.3.15",
@@ -93,8 +97,8 @@
"css-loader": "^0.28.4",
"del": "^3.0.0",
"devtron": "^1.4.0",
- "electron": "^1.7.5",
- "electron-builder": "^19.19.1",
+ "electron": "^2.0.5",
+ "electron-builder": "^20.26.0",
"electron-debug": "^1.4.0",
"electron-devtools-installer": "^2.2.0",
"eslint": "^4.4.1",
diff --git a/src/main/express.js b/src/main/express.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/index.js b/src/main/index.js
index 76648dc..7cf8b5e 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1,6 +1,7 @@
-import { app, BrowserWindow, ipcMain, Menu } from 'electron' // eslint-disable-line
-const electronOauth2 = require('electron-oauth2');
-const oauthConfig = require('./config').oauth;
+import { app, BrowserWindow, Menu } from 'electron' // eslint-disable-line
+const express = require('express');
+const bodyParser = require('body-parser');
+const expressApp = express();
const Client = require('motion-core');
const client = new Client({
username: 'motion',
@@ -8,6 +9,9 @@ const client = new Client({
port: 3385,
});
+expressApp.use(bodyParser.urlencoded({ extended: true }));
+expressApp.use(bodyParser.json());
+
/**
* Set `__static` path to static files in production
* https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html
@@ -16,22 +20,20 @@ if (process.env.NODE_ENV !== 'development') {
global.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\') // eslint-disable-line
}
-const windowParams = {
- alwaysOnTop: true,
- autoHideMenuBar: true,
- webPreferences: {
- nodeIntegration: false,
- },
-};
-
-const digitalOceanOAuth = electronOauth2(oauthConfig, windowParams);
-
let mainWindow;
const winURL = process.env.NODE_ENV === 'development'
? 'http://localhost:9080'
: `file://${__dirname}/index.html`;
+expressApp.get('/do-auth/:accessToken', (req, res) => {
+ mainWindow.webContents.send('do-oauth-reply', req.params.accessToken);
+ res.send('Done, now you can close this tab and return to the installer.');
+});
+
function createWindow() {
+ expressApp.listen(3456, () => {
+ console.log('oAuth Server listening on port 3456!');
+ });
/**
* Initial window options
*/
@@ -80,18 +82,6 @@ function createWindow() {
Menu.setApplicationMenu(Menu.buildFromTemplate(template));
}
-ipcMain.on('do-oauth', (event) => {
- digitalOceanOAuth.getAccessToken({
- scope: 'read write',
- })
- .then((token) => {
- console.log(token);
- event.sender.send('do-oauth-reply', token);
- }, (err) => {
- console.log('Error while getting token', err);
- });
-});
-
app.on('ready', createWindow);
app.on('quit', () => {
diff --git a/src/renderer/components/LandingPage/FirstStep.vue b/src/renderer/components/LandingPage/FirstStep.vue
index fd6c2d1..dd8758f 100644
--- a/src/renderer/components/LandingPage/FirstStep.vue
+++ b/src/renderer/components/LandingPage/FirstStep.vue
@@ -2,9 +2,9 @@
Currently you have: {{Math.floor(balance)}}XMN
We can continue.
-
We can't continue. You need at least 1000 XMN unlocked on your account.
+
We can't continue. You need at least 1000.1 XMN unlocked on your account.
-
+
First, we need a good VPS:
-
+
{
this.$store.commit('SET_ACCESS_TOKEN', {
- accessToken: accessToken.access_token,
+ accessToken,
});
this.getCurrentMasternodes();
});
diff --git a/yarn.lock b/yarn.lock
index 1c4fb1b..541cec7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,9 +2,9 @@
# yarn lockfile v1
-"7zip-bin@~3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-3.0.0.tgz#17416dc542f41511b26a9667b92847d75ef150fe"
+"7zip-bin@~4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179"
"7zip@0.0.6":
version "0.0.6"
@@ -78,11 +78,11 @@ ajv-keywords@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-ajv-keywords@^3.1.0:
+ajv-keywords@^3.1.0, ajv-keywords@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0, ajv@^5.5.0:
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
version "5.5.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
@@ -100,6 +100,15 @@ ajv@^6.1.0:
json-schema-traverse "^0.3.0"
uri-js "^4.2.1"
+ajv@^6.5.2:
+ version "6.5.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
+ dependencies:
+ fast-deep-equal "^2.0.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.1"
+
align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -166,6 +175,72 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
+app-builder-bin@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.0.0.tgz#bda985bee14370b254841a9982753b8f383415c5"
+
+app-builder-lib@20.26.0:
+ version "20.26.0"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.26.0.tgz#551667e1924f43da48399703f492ca8a35666a9e"
+ dependencies:
+ "7zip-bin" "~4.0.2"
+ app-builder-bin "2.0.0"
+ async-exit-hook "^2.0.1"
+ bluebird-lst "^1.0.5"
+ builder-util "5.20.0"
+ builder-util-runtime "4.4.1"
+ chromium-pickle-js "^0.2.0"
+ debug "^3.1.0"
+ ejs "^2.6.1"
+ electron-osx-sign "0.4.10"
+ electron-publish "20.26.0"
+ env-paths "^1.0.0"
+ fs-extra-p "^4.6.1"
+ hosted-git-info "^2.7.1"
+ is-ci "^1.1.0"
+ isbinaryfile "^3.0.2"
+ js-yaml "^3.12.0"
+ lazy-val "^1.0.3"
+ minimatch "^3.0.4"
+ normalize-package-data "^2.4.0"
+ plist "^3.0.1"
+ read-config-file "3.1.0"
+ sanitize-filename "^1.6.1"
+ semver "^5.5.0"
+ sumchecker "^2.0.2"
+ temp-file "^3.1.3"
+
+app-builder-lib@~20.26.0:
+ version "20.26.1"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.26.1.tgz#5165875e23436244a287594676235a25f8d15bd9"
+ dependencies:
+ "7zip-bin" "~4.0.2"
+ app-builder-bin "2.0.0"
+ async-exit-hook "^2.0.1"
+ bluebird-lst "^1.0.5"
+ builder-util "5.20.1"
+ builder-util-runtime "4.4.1"
+ chromium-pickle-js "^0.2.0"
+ debug "^3.1.0"
+ ejs "^2.6.1"
+ electron-osx-sign "0.4.10"
+ electron-publish "20.26.0"
+ env-paths "^1.0.0"
+ fs-extra-p "^4.6.1"
+ hosted-git-info "^2.7.1"
+ is-ci "^1.1.0"
+ isbinaryfile "^3.0.2"
+ js-yaml "^3.12.0"
+ lazy-val "^1.0.3"
+ minimatch "^3.0.4"
+ normalize-package-data "^2.4.0"
+ plist "^3.0.1"
+ read-config-file "3.1.0"
+ sanitize-filename "^1.6.1"
+ semver "^5.5.0"
+ sumchecker "^2.0.2"
+ temp-file "^3.1.3"
+
aproba@^1.0.3, aproba@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -254,13 +329,6 @@ arrify@^1.0.0, arrify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-asar-integrity@0.2.4:
- version "0.2.4"
- resolved "https://registry.yarnpkg.com/asar-integrity/-/asar-integrity-0.2.4.tgz#b7867c9720e08c461d12bc42f005c239af701733"
- dependencies:
- bluebird-lst "^1.0.5"
- fs-extra-p "^4.5.0"
-
asn1.js@^4.0.0:
version "4.10.1"
resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
@@ -1198,7 +1266,7 @@ base64-js@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
-base64-js@^1.0.2:
+base64-js@^1.0.2, base64-js@^1.2.3:
version "1.3.0"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
@@ -1289,7 +1357,7 @@ body-parser@1.18.2:
raw-body "2.3.2"
type-is "~1.6.15"
-body-parser@^1.16.1:
+body-parser@^1.16.1, body-parser@^1.18.3:
version "1.18.3"
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
dependencies:
@@ -1477,63 +1545,52 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"
-builder-util-runtime@4.0.4:
- version "4.0.4"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.4.tgz#c92c352097006a07f3324ea200fa815440cba198"
+builder-util-runtime@4.4.1, builder-util-runtime@^4.4.1:
+ version "4.4.1"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz#2770d03241e51fde46acacc7ed3ed8a9f45f02cb"
dependencies:
bluebird-lst "^1.0.5"
debug "^3.1.0"
- fs-extra-p "^4.5.0"
+ fs-extra-p "^4.6.1"
sax "^1.2.4"
-builder-util-runtime@^4.0.4, builder-util-runtime@^4.0.5:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.2.1.tgz#0caa358f1331d70680010141ca591952b69b35bc"
+builder-util@5.20.0:
+ version "5.20.0"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.20.0.tgz#dadce32c57036eb9f9c6f1139a76cbc63f6d7582"
dependencies:
+ "7zip-bin" "~4.0.2"
+ app-builder-bin "2.0.0"
bluebird-lst "^1.0.5"
+ builder-util-runtime "^4.4.1"
+ chalk "^2.4.1"
debug "^3.1.0"
- fs-extra-p "^4.6.0"
- sax "^1.2.4"
-
-builder-util@4.2.4:
- version "4.2.4"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.4.tgz#ab0b460e6d62d8f24ecfe9435d9335851be3ea1a"
- dependencies:
- "7zip-bin" "~3.0.0"
- bluebird-lst "^1.0.5"
- builder-util-runtime "^4.0.4"
- chalk "^2.3.0"
- debug "^3.1.0"
- fs-extra-p "^4.5.0"
- ini "^1.3.5"
+ fs-extra-p "^4.6.1"
is-ci "^1.1.0"
- js-yaml "^3.10.0"
+ js-yaml "^3.12.0"
lazy-val "^1.0.3"
semver "^5.5.0"
- source-map-support "^0.5.3"
+ source-map-support "^0.5.6"
stat-mode "^0.2.2"
- temp-file "^3.1.1"
- tunnel-agent "^0.6.0"
+ temp-file "^3.1.3"
-builder-util@^4.2.2:
- version "4.2.5"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.5.tgz#babc190e2f2c3681497632b5cc274f1543aa9264"
+builder-util@5.20.1, builder-util@~5.20.0:
+ version "5.20.1"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.20.1.tgz#64544def24a9fbbdc77ac0c027661bb3dbb520a2"
dependencies:
- "7zip-bin" "~3.0.0"
+ "7zip-bin" "~4.0.2"
+ app-builder-bin "2.0.0"
bluebird-lst "^1.0.5"
- builder-util-runtime "^4.0.5"
- chalk "^2.3.0"
+ builder-util-runtime "^4.4.1"
+ chalk "^2.4.1"
debug "^3.1.0"
- fs-extra-p "^4.5.0"
- ini "^1.3.5"
+ fs-extra-p "^4.6.1"
is-ci "^1.1.0"
- js-yaml "^3.10.0"
+ js-yaml "^3.12.0"
lazy-val "^1.0.3"
semver "^5.5.0"
- source-map-support "^0.5.3"
+ source-map-support "^0.5.6"
stat-mode "^0.2.2"
- temp-file "^3.1.1"
- tunnel-agent "^0.6.0"
+ temp-file "^3.1.3"
builtin-modules@^1.0.0:
version "1.1.1"
@@ -1700,7 +1757,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
dependencies:
@@ -2416,7 +2473,7 @@ debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.
dependencies:
ms "2.0.0"
-debug@^3.0.0, debug@^3.1.0:
+debug@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
dependencies:
@@ -2433,6 +2490,12 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+decamelize@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+ dependencies:
+ xregexp "4.0.0"
+
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2580,16 +2643,18 @@ dir-glob@^2.0.0:
arrify "^1.0.1"
path-type "^3.0.0"
-dmg-builder@3.1.4:
- version "3.1.4"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-3.1.4.tgz#57c53a2b5a1e28526a837430b6ecc7110cadcf63"
+dmg-builder@5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-5.1.0.tgz#fc8528ab3b053e6e4d42087ed63f613894466271"
dependencies:
+ app-builder-lib "~20.26.0"
bluebird-lst "^1.0.5"
- builder-util "^4.2.2"
- fs-extra-p "^4.5.0"
- iconv-lite "^0.4.19"
- js-yaml "^3.10.0"
+ builder-util "~5.20.0"
+ fs-extra-p "^4.6.1"
+ iconv-lite "^0.4.23"
+ js-yaml "^3.12.0"
parse-color "^1.0.0"
+ sanitize-filename "^1.6.1"
dns-equal@^1.0.0:
version "1.0.0"
@@ -2699,13 +2764,13 @@ dot-prop@^4.1.0:
dependencies:
is-obj "^1.0.0"
-dotenv-expand@^4.0.1:
+dotenv-expand@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
-dotenv@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
+dotenv@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935"
dtrace-provider@~0.8:
version "0.8.6"
@@ -2736,57 +2801,27 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-ejs@^2.5.7:
+ejs@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
-electron-builder-lib@19.56.2:
- version "19.56.2"
- resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-19.56.2.tgz#9e4ef3a1a5fa21d3fd490561261ae639bb263da3"
+electron-builder@^20.26.0:
+ version "20.26.0"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.26.0.tgz#8ae1ff1b8265423a6dd6d8e904a32ab00a61e8f4"
dependencies:
- "7zip-bin" "~3.0.0"
- asar-integrity "0.2.4"
- async-exit-hook "^2.0.1"
+ app-builder-lib "20.26.0"
bluebird-lst "^1.0.5"
- builder-util "4.2.4"
- builder-util-runtime "4.0.4"
- chromium-pickle-js "^0.2.0"
- debug "^3.1.0"
- dmg-builder "3.1.4"
- ejs "^2.5.7"
- electron-osx-sign "0.4.8"
- electron-publish "19.56.0"
- fs-extra-p "^4.5.0"
- hosted-git-info "^2.5.0"
- is-ci "^1.1.0"
- isbinaryfile "^3.0.2"
- js-yaml "^3.10.0"
- lazy-val "^1.0.3"
- minimatch "^3.0.4"
- normalize-package-data "^2.4.0"
- plist "^2.1.0"
- read-config-file "2.1.1"
- sanitize-filename "^1.6.1"
- semver "^5.5.0"
- temp-file "^3.1.1"
-
-electron-builder@^19.19.1:
- version "19.56.2"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.56.2.tgz#11c0c4544c4d82f1f1a2837e7f349a67457f1d99"
- dependencies:
- bluebird-lst "^1.0.5"
- builder-util "4.2.4"
- builder-util-runtime "4.0.4"
- chalk "^2.3.0"
- electron-builder-lib "19.56.2"
- electron-download-tf "4.3.4"
- fs-extra-p "^4.5.0"
+ builder-util "5.20.0"
+ builder-util-runtime "4.4.1"
+ chalk "^2.4.1"
+ dmg-builder "5.1.0"
+ fs-extra-p "^4.6.1"
is-ci "^1.1.0"
lazy-val "^1.0.3"
- read-config-file "2.1.1"
+ read-config-file "3.1.0"
sanitize-filename "^1.6.1"
- update-notifier "^2.3.0"
- yargs "^11.0.0"
+ update-notifier "^2.5.0"
+ yargs "^12.0.1"
electron-debug@^1.4.0:
version "1.5.0"
@@ -2804,20 +2839,6 @@ electron-devtools-installer@^2.2.0:
rimraf "^2.5.2"
semver "^5.3.0"
-electron-download-tf@4.3.4:
- version "4.3.4"
- resolved "https://registry.yarnpkg.com/electron-download-tf/-/electron-download-tf-4.3.4.tgz#b03740b2885aa2ad3f8784fae74df427f66d5165"
- dependencies:
- debug "^3.0.0"
- env-paths "^1.0.0"
- fs-extra "^4.0.1"
- minimist "^1.2.0"
- nugget "^2.0.1"
- path-exists "^3.0.0"
- rc "^1.2.1"
- semver "^5.4.1"
- sumchecker "^2.0.2"
-
electron-download@^3.0.1:
version "3.3.0"
resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-3.3.0.tgz#2cfd54d6966c019c4d49ad65fbe65cc9cdef68c8"
@@ -2861,9 +2882,9 @@ electron-osx-prompt@^1.3.10:
version "1.3.10"
resolved "https://registry.yarnpkg.com/electron-osx-prompt/-/electron-osx-prompt-1.3.10.tgz#71be8ff524cea4d9509d308178c725fc91d7c415"
-electron-osx-sign@0.4.8:
- version "0.4.8"
- resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz#f0b9fadded9e1e54ec35fa89877b5c6c34c7bc40"
+electron-osx-sign@0.4.10:
+ version "0.4.10"
+ resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz#be4f3b89b2a75a1dc5f1e7249081ab2929ca3a26"
dependencies:
bluebird "^3.5.0"
compare-version "^0.1.2"
@@ -2872,24 +2893,32 @@ electron-osx-sign@0.4.8:
minimist "^1.2.0"
plist "^2.1.0"
-electron-publish@19.56.0:
- version "19.56.0"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.56.0.tgz#1a0446e69b3085a905c0abdf16125c1c97d108d9"
+electron-publish@20.26.0:
+ version "20.26.0"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.26.0.tgz#406f9ccc10d09925492497cb4bee869f664a5945"
dependencies:
bluebird-lst "^1.0.5"
- builder-util "^4.2.2"
- builder-util-runtime "^4.0.4"
- chalk "^2.3.0"
- fs-extra-p "^4.5.0"
- mime "^2.2.0"
+ builder-util "~5.20.0"
+ builder-util-runtime "^4.4.1"
+ chalk "^2.4.1"
+ fs-extra-p "^4.6.1"
+ lazy-val "^1.0.3"
+ mime "^2.3.1"
+
+electron-routes@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/electron-routes/-/electron-routes-1.3.0.tgz#83b2aa56d6ffd7bf036d8d8fbf297be9e140fd5f"
+ dependencies:
+ path-to-regexp "^1.6.0"
+ stream-buffers "^3.0.1"
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.47:
version "1.3.47"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.47.tgz#764e887ca9104d01a0ac8eabee7dfc0e2ce14104"
-electron@^1.7.5:
- version "1.8.7"
- resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.7.tgz#373c1dc4589d7ab4acd49aff8db4a1c0a6c3bcc1"
+electron@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.5.tgz#6045db011e2547062a36e8c5da84d4982f434fc0"
dependencies:
"@types/node" "^8.0.24"
electron-download "^3.0.1"
@@ -3383,7 +3412,7 @@ expand-range@^1.8.1:
dependencies:
fill-range "^2.1.0"
-express@^4.16.2:
+express@^4.16.2, express@^4.16.3:
version "4.16.3"
resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
dependencies:
@@ -3632,6 +3661,12 @@ find-up@^2.0.0, find-up@^2.1.0:
dependencies:
locate-path "^2.0.0"
+find-up@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+ dependencies:
+ locate-path "^3.0.0"
+
flat-cache@^1.2.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
@@ -3723,12 +3758,12 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"
-fs-extra-p@^4.5.0, fs-extra-p@^4.6.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.6.0.tgz#c7b7117f0dcf8a99c9b2ed589067c960abcf3ef9"
+fs-extra-p@^4.6.1:
+ version "4.6.1"
+ resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.6.1.tgz#6156e0cc98097f415fcd17029578fc41c78b5092"
dependencies:
bluebird-lst "^1.0.5"
- fs-extra "^6.0.0"
+ fs-extra "^6.0.1"
fs-extra@^0.30.0:
version "0.30.0"
@@ -3740,15 +3775,7 @@ fs-extra@^0.30.0:
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
-fs-extra@^4.0.1:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
- dependencies:
- graceful-fs "^4.1.2"
- jsonfile "^4.0.0"
- universalify "^0.1.0"
-
-fs-extra@^6.0.0:
+fs-extra@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
dependencies:
@@ -4162,10 +4189,14 @@ home-path@^1.0.1:
version "1.0.6"
resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.6.tgz#d549dc2465388a7f8667242c5b31588d29af29fc"
-hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
+hosted-git-info@^2.1.4:
version "2.6.0"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+hosted-git-info@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+
hpack.js@^2.1.6:
version "2.1.6"
resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -4309,7 +4340,7 @@ iconv-lite@0.4.19:
version "0.4.19"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-iconv-lite@0.4.23, iconv-lite@^0.4.17, iconv-lite@^0.4.19, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.23, iconv-lite@^0.4.17, iconv-lite@^0.4.23, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
version "0.4.23"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
dependencies:
@@ -4391,7 +4422,7 @@ inherits@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
version "1.3.5"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
@@ -4865,13 +4896,20 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-js-yaml@3.x, js-yaml@^3.10.0, js-yaml@^3.4.3, js-yaml@^3.9.1:
+js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.9.1:
version "3.11.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
+js-yaml@^3.12.0:
+ version "3.12.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+ dependencies:
+ argparse "^1.0.7"
+ esprima "^4.0.0"
+
js-yaml@~3.7.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
@@ -4905,6 +4943,10 @@ json-schema-traverse@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+json-schema-traverse@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+
json-schema@0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -4925,6 +4967,12 @@ json5@^0.5.0, json5@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+json5@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+ dependencies:
+ minimist "^1.2.0"
+
jsonfile@^2.1.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -5164,6 +5212,13 @@ locate-path@^2.0.0:
p-locate "^2.0.0"
path-exists "^3.0.0"
+locate-path@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+ dependencies:
+ p-locate "^3.0.0"
+ path-exists "^3.0.0"
+
lodash._arraycopy@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
@@ -5564,7 +5619,7 @@ mime@^1.3.4, mime@^1.5.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-mime@^2.2.0:
+mime@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@@ -5983,7 +6038,7 @@ nth-check@~1.0.1:
dependencies:
boolbase "~1.0.0"
-nugget@^2.0.0, nugget@^2.0.1:
+nugget@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0"
dependencies:
@@ -6088,7 +6143,7 @@ onetime@^2.0.0:
dependencies:
mimic-fn "^1.0.0"
-opn@^5.1.0:
+opn@^5.1.0, opn@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
dependencies:
@@ -6165,12 +6220,24 @@ p-limit@^1.0.0, p-limit@^1.1.0:
dependencies:
p-try "^1.0.0"
+p-limit@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+ dependencies:
+ p-try "^2.0.0"
+
p-locate@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
dependencies:
p-limit "^1.1.0"
+p-locate@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+ dependencies:
+ p-limit "^2.0.0"
+
p-map@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
@@ -6179,6 +6246,10 @@ p-try@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+p-try@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+
package-json@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
@@ -6314,6 +6385,12 @@ path-to-regexp@0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+path-to-regexp@^1.6.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+ dependencies:
+ isarray "0.0.1"
+
path-type@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -6394,6 +6471,14 @@ plist@^2.1.0:
xmlbuilder "8.2.2"
xmldom "0.1.x"
+plist@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
+ dependencies:
+ base64-js "^1.2.3"
+ xmlbuilder "^9.0.7"
+ xmldom "0.1.x"
+
pluralize@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -6870,7 +6955,7 @@ raw-body@2.3.3:
iconv-lite "0.4.23"
unpipe "1.0.0"
-rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1:
+rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297"
dependencies:
@@ -6879,18 +6964,18 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
-read-config-file@2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-2.1.1.tgz#bd6c2b93e97a82a35f71a3c9eb43161e16692054"
+read-config-file@3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.1.0.tgz#d433283c76f32204d6995542e4a04723db9e8308"
dependencies:
- ajv "^5.5.0"
- ajv-keywords "^2.1.0"
+ ajv "^6.5.2"
+ ajv-keywords "^3.2.0"
bluebird-lst "^1.0.5"
- dotenv "^4.0.0"
- dotenv-expand "^4.0.1"
- fs-extra-p "^4.5.0"
- js-yaml "^3.10.0"
- json5 "^0.5.1"
+ dotenv "^6.0.0"
+ dotenv-expand "^4.2.0"
+ fs-extra-p "^4.6.1"
+ js-yaml "^3.12.0"
+ json5 "^1.0.1"
lazy-val "^1.0.3"
read-pkg-up@^1.0.1:
@@ -7618,7 +7703,7 @@ source-map-support@^0.4.15:
dependencies:
source-map "^0.5.6"
-source-map-support@^0.5.3:
+source-map-support@^0.5.6:
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
dependencies:
@@ -7768,6 +7853,10 @@ stream-browserify@^2.0.1:
inherits "~2.0.1"
readable-stream "^2.0.2"
+stream-buffers@^3.0.1:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-3.0.2.tgz#5249005a8d5c2d00b3a32e6e0a6ea209dc4f3521"
+
stream-each@^1.1.0:
version "1.2.2"
resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
@@ -7964,13 +8053,13 @@ tar@^4:
safe-buffer "^5.1.2"
yallist "^3.0.2"
-temp-file@^3.1.1:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.2.tgz#54ba4084097558e8ff2ad1e4bd84841ef2804043"
+temp-file@^3.1.3:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.3.tgz#24c144994f033be1ccf6773280c8f7f1c91691a9"
dependencies:
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.5"
- fs-extra-p "^4.6.0"
+ fs-extra-p "^4.6.1"
lazy-val "^1.0.3"
term-size@^1.2.0:
@@ -8268,7 +8357,7 @@ upath@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-update-notifier@^2.3.0:
+update-notifier@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
dependencies:
@@ -8713,6 +8802,10 @@ xmlbuilder@8.2.2:
version "8.2.2"
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
+xmlbuilder@^9.0.7:
+ version "9.0.7"
+ resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+
xmldom@0.1.x:
version "0.1.27"
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
@@ -8721,6 +8814,10 @@ xmlhttprequest-ssl@1.5.3:
version "1.5.3"
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
+xregexp@4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+
xtend@^4.0.0, xtend@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -8735,7 +8832,7 @@ y18n@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-y18n@^4.0.0:
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -8747,6 +8844,12 @@ yallist@^3.0.0, yallist@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+yargs-parser@^10.1.0:
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+ dependencies:
+ camelcase "^4.1.0"
+
yargs-parser@^4.2.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
@@ -8765,12 +8868,6 @@ yargs-parser@^7.0.0:
dependencies:
camelcase "^4.1.0"
-yargs-parser@^9.0.2:
- version "9.0.2"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
- dependencies:
- camelcase "^4.1.0"
-
yargs@6.6.0:
version "6.6.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
@@ -8789,13 +8886,13 @@ yargs@6.6.0:
y18n "^3.2.1"
yargs-parser "^4.2.0"
-yargs@^11.0.0:
- version "11.0.0"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b"
+yargs@^12.0.1:
+ version "12.0.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2"
dependencies:
cliui "^4.0.0"
- decamelize "^1.1.1"
- find-up "^2.1.0"
+ decamelize "^2.0.0"
+ find-up "^3.0.0"
get-caller-file "^1.0.1"
os-locale "^2.0.0"
require-directory "^2.1.1"
@@ -8803,8 +8900,8 @@ yargs@^11.0.0:
set-blocking "^2.0.0"
string-width "^2.0.0"
which-module "^2.0.0"
- y18n "^3.2.1"
- yargs-parser "^9.0.2"
+ y18n "^3.2.1 || ^4.0.0"
+ yargs-parser "^10.1.0"
yargs@^7.0.0:
version "7.1.0"