diff --git a/main/src/app/AppWindow.ts b/main/src/app/AppWindow.ts
index 6a0284fa..fa811b3b 100644
--- a/main/src/app/AppWindow.ts
+++ b/main/src/app/AppWindow.ts
@@ -6,13 +6,17 @@ import windowStateKeeper from 'electron-window-state';
import { EventEmitter } from 'events';
import { now } from '../util/now';
+import { Channel } from '@ucap-webmessenger/native-electron';
+import { registerWindowStateChangedEvents } from '../lib/window-state';
export class AppWindow {
private window: BrowserWindow | null = null;
private eventEmitter = new EventEmitter();
+ // tslint:disable-next-line: variable-name
private _loadTime: number | null = null;
+ // tslint:disable-next-line: variable-name
private _rendererReadyTime: number | null = null;
private minWidth = 960;
@@ -32,8 +36,6 @@ export class AppWindow {
minWidth: this.minWidth,
minHeight: this.minHeight,
center: true,
- autoHideMenuBar: true,
- title: 'UCAP M Messenger',
// This fixes subpixel aliasing on Windows
// See https://github.com/atom/atom/commit/683bef5b9d133cb194b476938c77cc07fd05b972
backgroundColor: '#fff',
@@ -52,7 +54,7 @@ export class AppWindow {
if (__DARWIN__) {
windowOptions.titleBarStyle = 'hidden';
} else if (__WIN32__) {
- // windowOptions.frame = false;
+ windowOptions.frame = false;
} else if (__LINUX__) {
windowOptions.icon = path.join(__dirname, 'static', 'icon-logo.png');
}
@@ -108,22 +110,6 @@ export class AppWindow {
public load(): void {
let startLoad = 0;
- if (__DEV__) {
- this.window.loadURL('http://localhost:4200');
- } else {
- this.window.loadURL(
- url.format({
- pathname: path.join(
- __dirname,
- '..',
- 'ucap-webmessenger-app/index.html'
- ),
- protocol: 'file:',
- slashes: true
- })
- );
- }
-
this.window.webContents.once('did-start-loading', () => {
this._rendererReadyTime = null;
this._loadTime = null;
@@ -147,6 +133,24 @@ export class AppWindow {
this.window.webContents.openDevTools();
this.window.show();
});
+
+ registerWindowStateChangedEvents(this.window);
+
+ if (__DEV__) {
+ this.window.loadURL('http://localhost:4200');
+ } else {
+ this.window.loadURL(
+ url.format({
+ pathname: path.join(
+ __dirname,
+ '..',
+ 'ucap-webmessenger-app/index.html'
+ ),
+ protocol: 'file:',
+ slashes: true
+ })
+ );
+ }
}
/** Is the page loaded and has the renderer signalled it's ready? */
diff --git a/main/src/index.ts b/main/src/index.ts
index 5e7255cd..228db634 100644
--- a/main/src/index.ts
+++ b/main/src/index.ts
@@ -1,4 +1,4 @@
-import { app, ipcMain, IpcMainEvent } from 'electron';
+import { app, ipcMain, IpcMainEvent, remote } from 'electron';
import * as path from 'path';
import * as url from 'url';
import * as fse from 'fs-extra';
diff --git a/main/src/lib/window-state.ts b/main/src/lib/window-state.ts
new file mode 100644
index 00000000..1c5af590
--- /dev/null
+++ b/main/src/lib/window-state.ts
@@ -0,0 +1,49 @@
+import { BrowserWindow } from 'electron';
+import { WindowState } from '@ucap-webmessenger/native';
+import { Channel } from '@ucap-webmessenger/native-electron';
+
+export function getWindowState(window: Electron.BrowserWindow): WindowState {
+ if (window.isFullScreen()) {
+ return WindowState.FullScreen;
+ } else if (window.isMaximized()) {
+ return WindowState.Maximized;
+ } else if (window.isMinimized()) {
+ return WindowState.Minimized;
+ } else if (!window.isVisible()) {
+ return WindowState.Hidden;
+ } else {
+ return WindowState.Normal;
+ }
+}
+
+export function registerWindowStateChangedEvents(window: BrowserWindow) {
+ window.on('enter-full-screen', () =>
+ sendWindowStateEvent(window, WindowState.FullScreen)
+ );
+
+ window.on('leave-full-screen', () =>
+ sendWindowStateEvent(window, WindowState.Normal)
+ );
+
+ window.on('maximize', () =>
+ sendWindowStateEvent(window, WindowState.Maximized)
+ );
+ window.on('minimize', () =>
+ sendWindowStateEvent(window, WindowState.Minimized)
+ );
+ window.on('unmaximize', () =>
+ sendWindowStateEvent(window, WindowState.Normal)
+ );
+ window.on('restore', () => sendWindowStateEvent(window, WindowState.Normal));
+ window.on('hide', () => sendWindowStateEvent(window, WindowState.Hidden));
+ window.on('show', () => {
+ // because the app can be maximized before being closed - which will restore it
+ // maximized on the next launch - this function should inspect the current state
+ // rather than always assume it is a 'normal' launch
+ sendWindowStateEvent(window, getWindowState(window));
+ });
+}
+
+function sendWindowStateEvent(window: BrowserWindow, windowState: WindowState) {
+ window.webContents.send(Channel.windowStateChanged, windowState);
+}
diff --git a/package-lock.json b/package-lock.json
index 1ed1e573..869e2ec9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,12 +27,12 @@
}
},
"@angular-devkit/architect": {
- "version": "0.803.4",
- "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.4.tgz",
- "integrity": "sha512-Ek+xb9GfzHLbD+ATmupbzTSNFGddkH6dbb36cB6gme+vnlBVfXP0dxOg5lRKZoUIFJyREl9jSrA5zUhVwXaoVg==",
+ "version": "0.803.14",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.14.tgz",
+ "integrity": "sha512-CPDDNTpM/9XWCFxCRL1/mYB54ivZcmWaVSjUgN2zcHWBc0gW3lrJrmmb+cJ1KSlOI7hoZaMTV1gWoX2QXd4JrA==",
"dev": true,
"requires": {
- "@angular-devkit/core": "8.3.4",
+ "@angular-devkit/core": "8.3.14",
"rxjs": "6.4.0"
},
"dependencies": {
@@ -48,18 +48,18 @@
}
},
"@angular-devkit/build-angular": {
- "version": "0.803.4",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.803.4.tgz",
- "integrity": "sha512-tL0MdAPtUjqG+F6Hc0xhaKb2gk8g55AeBjSZognlJkqPRS+b+gF1qDmyW0n5HXbyDk+zIGZyvYpzkBBL8VI6bg==",
+ "version": "0.803.14",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.803.14.tgz",
+ "integrity": "sha512-AtrhLDcy5DHi5zWiahEmvbD6THkJkWv27TySTfpZlmMjpRJHNqK7uQiKR1iWSqo4VNpimFle3fwkfjQYHlEKqA==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.803.4",
- "@angular-devkit/build-optimizer": "0.803.4",
- "@angular-devkit/build-webpack": "0.803.4",
- "@angular-devkit/core": "8.3.4",
+ "@angular-devkit/architect": "0.803.14",
+ "@angular-devkit/build-optimizer": "0.803.14",
+ "@angular-devkit/build-webpack": "0.803.14",
+ "@angular-devkit/core": "8.3.14",
"@babel/core": "7.5.5",
"@babel/preset-env": "7.5.5",
- "@ngtools/webpack": "8.3.4",
+ "@ngtools/webpack": "8.3.14",
"ajv": "6.10.2",
"autoprefixer": "9.6.1",
"browserslist": "4.6.6",
@@ -73,6 +73,7 @@
"find-cache-dir": "3.0.0",
"glob": "7.1.4",
"istanbul-instrumenter-loader": "3.0.1",
+ "jest-worker": "24.9.0",
"karma-source-map-support": "1.4.0",
"less": "3.9.0",
"less-loader": "5.0.0",
@@ -98,7 +99,7 @@
"style-loader": "1.0.0",
"stylus": "0.54.5",
"stylus-loader": "3.0.2",
- "terser": "4.1.4",
+ "terser": "4.3.8",
"terser-webpack-plugin": "1.4.1",
"tree-kill": "1.2.1",
"webpack": "4.39.2",
@@ -107,7 +108,6 @@
"webpack-merge": "4.2.1",
"webpack-sources": "1.4.3",
"webpack-subresource-integrity": "1.1.0-rc.6",
- "worker-farm": "1.7.0",
"worker-plugin": "3.2.0"
},
"dependencies": {
@@ -120,6 +120,25 @@
"tslib": "^1.9.0"
}
},
+ "terser": {
+ "version": "4.3.8",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.8.tgz",
+ "integrity": "sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==",
+ "dev": true,
+ "requires": {
+ "commander": "^2.20.0",
+ "source-map": "~0.6.1",
+ "source-map-support": "~0.5.12"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
"webpack-merge": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
@@ -132,12 +151,12 @@
}
},
"@angular-devkit/build-ng-packagr": {
- "version": "0.803.4",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.803.4.tgz",
- "integrity": "sha512-FCC7Lrrqh5AZxLfr10Nq/7KWliqMEsTYasp/8oU7Z+joAHRzZzhJnPeXFXVigIDR1kt20oX3COEzaMBRlrg3rQ==",
+ "version": "0.803.14",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.803.14.tgz",
+ "integrity": "sha512-qIYLEOxL8kOmOVjisN0rSMGeN7D2TYc90k73LnXUtT8WL4a+bd6r8PNGrH9hrF8ABZ01oJ4PQi8kuE4Jm7+ptA==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.803.4",
+ "@angular-devkit/architect": "0.803.14",
"rxjs": "6.4.0"
},
"dependencies": {
@@ -153,9 +172,9 @@
}
},
"@angular-devkit/build-optimizer": {
- "version": "0.803.4",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.803.4.tgz",
- "integrity": "sha512-VGkHCyU/OC0BoTeoERb0cFG00Ippjhtx2du+7JgwGNU1GF+g2H6Ka1NJRQf/TrwgH5ATmagvlTKQRDOMo51jqg==",
+ "version": "0.803.14",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.803.14.tgz",
+ "integrity": "sha512-f1RYhO0swLfoLvCj/fUrDWm4vzVSnffcCc4C4PHnqoOGBRQpmIzG7G54Pm8YK677slioToYZQ68s3/zVtsQNWg==",
"dev": true,
"requires": {
"loader-utils": "1.2.3",
@@ -166,15 +185,14 @@
}
},
"@angular-devkit/build-webpack": {
- "version": "0.803.4",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.803.4.tgz",
- "integrity": "sha512-IbXoKyhdfaza+K8orCwDx3r7C/8qaTwiXUlarW/adoH5XBwzAtYGGsMmmWRffBnBiZtI2LT3VK21QAostklNxg==",
+ "version": "0.803.14",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.803.14.tgz",
+ "integrity": "sha512-hvxAyJzDCaIISATHcu0+rAAj7ZcmX7VREX6J3FUMYDxhdjKqe45Q5J6Oy/Df2ZSV3YxwySZVcIhrBstm+0LC7Q==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.803.4",
- "@angular-devkit/core": "8.3.4",
- "rxjs": "6.4.0",
- "webpack-merge": "4.2.1"
+ "@angular-devkit/architect": "0.803.14",
+ "@angular-devkit/core": "8.3.14",
+ "rxjs": "6.4.0"
},
"dependencies": {
"rxjs": {
@@ -185,22 +203,13 @@
"requires": {
"tslib": "^1.9.0"
}
- },
- "webpack-merge": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
- "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
- "dev": true,
- "requires": {
- "lodash": "^4.17.5"
- }
}
}
},
"@angular-devkit/core": {
- "version": "8.3.4",
- "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz",
- "integrity": "sha512-QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==",
+ "version": "8.3.14",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.14.tgz",
+ "integrity": "sha512-+IYLbtCxwIpaieRj0wurEXBzZ/fDSdWbyrCfajzDerzsxqghNcafAXSazHXWwISqtbr/pAOuqUNR+mEk2XBz3Q==",
"dev": true,
"requires": {
"ajv": "6.10.2",
@@ -222,12 +231,12 @@
}
},
"@angular-devkit/schematics": {
- "version": "8.3.4",
- "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz",
- "integrity": "sha512-+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg==",
+ "version": "8.3.14",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.14.tgz",
+ "integrity": "sha512-5gPmTBN85a2gTxz/FsM5fO9Bxw4KG6uJNLMDAWfPG8vvSQEl7J64ujyqxPz39TernQTEKeuhRC4I5H1aaW9I/Q==",
"dev": true,
"requires": {
- "@angular-devkit/core": "8.3.4",
+ "@angular-devkit/core": "8.3.14",
"rxjs": "6.4.0"
},
"dependencies": {
@@ -243,9 +252,9 @@
}
},
"@angular/animations": {
- "version": "8.2.11",
- "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.11.tgz",
- "integrity": "sha512-u0PSR2uvSqn3ovgGlw2H8ZueyYN42SLir2Yn3+7sGE+LcYOSTjyJ/GIgjV8jWddvPbx7KYzFRCs6bEMpBsMXYg==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.12.tgz",
+ "integrity": "sha512-QVtZUw5J9c0RcDaJntIoeWVk/q9dhjDFxh+yw/uPl9Z4upWASdsOpZU2lfjqyU0myfg8dnQyZa1+Ce7n/DaClQ==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
@@ -271,25 +280,27 @@
}
},
"@angular/cli": {
- "version": "8.3.4",
- "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.3.4.tgz",
- "integrity": "sha512-5Jp7a1/Yepm2JkrMHY2Q7nO1FxlNvGp1Zc3m9dp4ydH08qO6/Z8WO0HF+/BxAsHZzB+XV91E1ZzbLR0RdsM8ag==",
+ "version": "8.3.14",
+ "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.3.14.tgz",
+ "integrity": "sha512-cOP2UvnnYocx1U1aiNkuLCcBxSktIXkadzrY7UlWJtQiCPGWm3Y87BfrQXub9Nsh79iyV8k8uKZKEax2ayESSg==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.803.4",
- "@angular-devkit/core": "8.3.4",
- "@angular-devkit/schematics": "8.3.4",
- "@schematics/angular": "8.3.4",
- "@schematics/update": "0.803.4",
+ "@angular-devkit/architect": "0.803.14",
+ "@angular-devkit/core": "8.3.14",
+ "@angular-devkit/schematics": "8.3.14",
+ "@schematics/angular": "8.3.14",
+ "@schematics/update": "0.803.14",
"@yarnpkg/lockfile": "1.1.0",
"ansi-colors": "4.1.1",
"debug": "^4.1.1",
"ini": "1.3.5",
"inquirer": "6.5.1",
"npm-package-arg": "6.1.0",
+ "npm-pick-manifest": "3.0.2",
"open": "6.4.0",
"pacote": "9.5.5",
"read-package-tree": "5.3.1",
+ "rimraf": "3.0.0",
"semver": "6.3.0",
"symbol-observable": "1.2.0",
"universal-analytics": "^0.4.20",
@@ -301,31 +312,40 @@
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
"dev": true
+ },
+ "rimraf": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
+ "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
+ "dev": true,
+ "requires": {
+ "glob": "^7.1.3"
+ }
}
}
},
"@angular/common": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.6.tgz",
- "integrity": "sha512-OlU3LCPShHJEsOHS+qczY52P0kWtjJD8N7NDHaGMB6Xp8GMgItjQIeeO6yf8DJyaCIC4qk4G7jPdnQk6IE1SbQ==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.12.tgz",
+ "integrity": "sha512-BNz1lo+PP+lwIX3sErRGBRnkMzT5yT8CJ5o/M29AanCdcx9dpoJG2WKgpIgw8UBcj9QlP0CkSmzPtUNtcNMthA==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
}
},
"@angular/compiler": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.6.tgz",
- "integrity": "sha512-NdTY2n0XNRmKixbKDWB++9tEDLFwN0/Bp/1lXJ4qF/8V5Wju6IJ/UZZKjR5C4uiKtF17T3GzubhXgghumt5UVA==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.12.tgz",
+ "integrity": "sha512-V5mDWioGmSZ4cJJ2THo8qHYKwj3sUI7dpJ0oab2Al0FQAN8JCimWO6AQKRtjmnr78ZkMy9Xe/KK6ebl40ewL5Q==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
}
},
"@angular/compiler-cli": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.6.tgz",
- "integrity": "sha512-WLlBO/oGcQBKE8rYcENZQ4HgkbrmMqSNJXHLK/HnZpvbot2+mPiDXykI/p5rKdpAei/lgTU8g8GskoiDeLXsgw==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.12.tgz",
+ "integrity": "sha512-OrNnkJ7OrpbcOtB4TWFBF6D3dtEfUuOQgfc3HBjizZuL8EuX0pU5dv4VTvLTRkmyUT/7fmmWdkEXJL+UQtXqPg==",
"dev": true,
"requires": {
"canonical-path": "1.0.0",
@@ -1104,9 +1124,9 @@
}
},
"@angular/core": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.6.tgz",
- "integrity": "sha512-l+BrvPGwtPUh/rQyB9mjtonMsFEAoRHgDYWeQu/QukIZbItNdFqrhewn2zQ8Skx75BpwFLAVIVXp9ioDyvP2eQ==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.12.tgz",
+ "integrity": "sha512-wEFwhHCuuXynXAMeA1G+0KIYY0jqXYs7I8p+GO+ufKoUmzWHFTvtMJ6nvKgy+LmZTByO2gf9oVAAlRodNb8ttQ==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
@@ -1122,18 +1142,18 @@
}
},
"@angular/forms": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.6.tgz",
- "integrity": "sha512-sYUspJYJGq0OaBuxgdUXPf0TwYyED9OVWNCl9jDJCW//2NAbrZG8BSujvV54Dtg2emY1Uc7EFyQ8Wc8yxS7KSg==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.12.tgz",
+ "integrity": "sha512-y1UObndCGbTYwLSzUWzCiX7th+mb4n712asApooGmfmIQmgTyHbKxYUJ9Ep1pgd0pqLBBnK249MQLH15NDpbyQ==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
}
},
"@angular/language-service": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.2.6.tgz",
- "integrity": "sha512-43h8WFJsk0wK5v1AaTjvDppb0y1ReKEuOkvlcBffb+IIYM8pwuiIvMYGnjstV1jvOd80HPO5wQ8gXhutY52fpQ==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.2.12.tgz",
+ "integrity": "sha512-uXGVSC4ugkyBt7pYdI8qaKNV0TIxfjSWb3dWNuhD6b9riPtaa+xJFQrfMu7OX/tVX642aFxca4jkUHBLCyWptA==",
"dev": true
},
"@angular/material": {
@@ -1155,27 +1175,27 @@
}
},
"@angular/platform-browser": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.6.tgz",
- "integrity": "sha512-wUgcdTXItforNA+6qykPL9SDmV1uSIUQcEZrm3YCoVt7CuwMav3dq9Lg1zZ7HKv0A8It0fAKpXBkamzpRxvZEw==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.12.tgz",
+ "integrity": "sha512-VBvMjmFJapZ2pFlmxZiHtfPwbHp79RRi5mrdMhETjKMaLaC2tAR/99ijCpx2urDMqb/VDm7YHOtoLEpBFVDulg==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
}
},
"@angular/platform-browser-dynamic": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.6.tgz",
- "integrity": "sha512-4azHzNBYYeyzIsktN2P+d0stCisOvYfxU7U0oD+FaGalxg2Ch1mGjnZA+5UcmbMZOOXo4TMcKmzpB6VcLGe+Hw==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.12.tgz",
+ "integrity": "sha512-O4krb+9tj028JOQHPgLk/87lyUlHt8dpNxzuYCT0G6kEmknjpyZBaxhvDPygGjGHXV3LDqlYVH+bh8ygJUhwmw==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
}
},
"@angular/router": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.6.tgz",
- "integrity": "sha512-XAqhrPbU+z/ztf2b0VxFytHPJRpWfhnhCJ2qf9Tie1Cov6zOlgIKInOSF+WtsFEUZAnwSbAfGk4KSXrwBWw8zA==",
+ "version": "8.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.12.tgz",
+ "integrity": "sha512-mq1FethFpYosSVzChstMpxZlL+oUFeaA+FrzZQL7zJP/mm61yFkkhoYGVG6pG0NWSzpJE4NY6YvGCvHgN4ZECw==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
@@ -1213,9 +1233,9 @@
},
"dependencies": {
"json5": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
- "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
+ "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
@@ -1449,14 +1469,83 @@
}
},
"@babel/helpers": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.0.tgz",
- "integrity": "sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ==",
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
+ "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
"dev": true,
"requires": {
"@babel/template": "^7.6.0",
- "@babel/traverse": "^7.6.0",
+ "@babel/traverse": "^7.6.2",
"@babel/types": "^7.6.0"
+ },
+ "dependencies": {
+ "@babel/generator": {
+ "version": "7.6.4",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.4.tgz",
+ "integrity": "sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.6.3",
+ "jsesc": "^2.5.1",
+ "lodash": "^4.17.13",
+ "source-map": "^0.5.0"
+ },
+ "dependencies": {
+ "@babel/types": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
+ "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
+ "dev": true,
+ "requires": {
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
+ }
+ },
+ "@babel/parser": {
+ "version": "7.6.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.4.tgz",
+ "integrity": "sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==",
+ "dev": true
+ },
+ "@babel/traverse": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.3.tgz",
+ "integrity": "sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.5.5",
+ "@babel/generator": "^7.6.3",
+ "@babel/helper-function-name": "^7.1.0",
+ "@babel/helper-split-export-declaration": "^7.4.4",
+ "@babel/parser": "^7.6.3",
+ "@babel/types": "^7.6.3",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0",
+ "lodash": "^4.17.13"
+ },
+ "dependencies": {
+ "@babel/types": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
+ "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
+ "dev": true,
+ "requires": {
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
+ }
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ }
}
},
"@babel/highlight": {
@@ -1508,9 +1597,9 @@
}
},
"@babel/plugin-proposal-object-rest-spread": {
- "version": "7.5.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz",
- "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==",
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz",
+ "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
@@ -1528,14 +1617,14 @@
}
},
"@babel/plugin-proposal-unicode-property-regex": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz",
- "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz",
+ "integrity": "sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/helper-regex": "^7.4.4",
- "regexpu-core": "^4.5.4"
+ "regexpu-core": "^4.6.0"
}
},
"@babel/plugin-syntax-async-generators": {
@@ -1613,9 +1702,9 @@
}
},
"@babel/plugin-transform-block-scoping": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz",
- "integrity": "sha512-tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA==",
+ "version": "7.6.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz",
+ "integrity": "sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
@@ -1657,14 +1746,14 @@
}
},
"@babel/plugin-transform-dotall-regex": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz",
- "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz",
+ "integrity": "sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/helper-regex": "^7.4.4",
- "regexpu-core": "^4.5.4"
+ "regexpu-core": "^4.6.0"
}
},
"@babel/plugin-transform-duplicate-keys": {
@@ -1768,12 +1857,12 @@
}
},
"@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz",
- "integrity": "sha512-jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew==",
+ "version": "7.6.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz",
+ "integrity": "sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw==",
"dev": true,
"requires": {
- "regexp-tree": "^0.1.13"
+ "regexpu-core": "^4.6.0"
}
},
"@babel/plugin-transform-new-target": {
@@ -1843,9 +1932,9 @@
}
},
"@babel/plugin-transform-spread": {
- "version": "7.2.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
- "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz",
+ "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.0.0"
@@ -1881,14 +1970,14 @@
}
},
"@babel/plugin-transform-unicode-regex": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz",
- "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz",
+ "integrity": "sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/helper-regex": "^7.4.4",
- "regexpu-core": "^4.5.4"
+ "regexpu-core": "^4.6.0"
}
},
"@babel/preset-env": {
@@ -2006,6 +2095,20 @@
"ajv-keywords": "^3.1.0"
}
},
+ "@electron/get": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.5.0.tgz",
+ "integrity": "sha512-tafxBz6n08G6SX961F/h8XFtpB/DdwRvJJoDeOH9x78jDSCMQ2G/rRWqSwLFp9oeMFBJf0Pf5Kkw6TKt5w9TWg==",
+ "dev": true,
+ "requires": {
+ "debug": "^4.1.1",
+ "env-paths": "^2.2.0",
+ "fs-extra": "^8.1.0",
+ "got": "^9.6.0",
+ "sanitize-filename": "^1.6.2",
+ "sumchecker": "^3.0.0"
+ }
+ },
"@hapi/address": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.1.tgz",
@@ -2076,12 +2179,12 @@
"dev": true
},
"@ngtools/webpack": {
- "version": "8.3.4",
- "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.4.tgz",
- "integrity": "sha512-hNikQ6cjvCmA/bK8dor+oijPKF9sQAcM29FCPn3t0l3ucoVSOvbFpvtMYqlIHN5pw6WitZpImnkk2OW3o1JaDA==",
+ "version": "8.3.14",
+ "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.14.tgz",
+ "integrity": "sha512-eIU3W3T4YxiExkS/c09FkqQpnKeIuUFFnxyfdG40zospt28B6V5ZaEVw2z5+2CjxJlDUTUYZlhPiV9Rwadp3jg==",
"dev": true,
"requires": {
- "@angular-devkit/core": "8.3.4",
+ "@angular-devkit/core": "8.3.14",
"enhanced-resolve": "4.1.0",
"rxjs": "6.4.0",
"tree-kill": "1.2.1",
@@ -2109,23 +2212,23 @@
}
},
"@schematics/angular": {
- "version": "8.3.4",
- "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.4.tgz",
- "integrity": "sha512-/HO6vZosULsJnwZLG9JLePyaR2g4MePrk27c3H/WbFNN4ajBePe1Mj34q6HCzje30NduLV8B3SykPnG1CoNy5Q==",
+ "version": "8.3.14",
+ "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.14.tgz",
+ "integrity": "sha512-1XXBh9+lowvltRlcCjDJa4GEr5Xq+uNJcxULHBaNY7YfQSwZ5KuyhTBWjCdKmMaTOV3pEcIHwyuNh26mpn98Bw==",
"dev": true,
"requires": {
- "@angular-devkit/core": "8.3.4",
- "@angular-devkit/schematics": "8.3.4"
+ "@angular-devkit/core": "8.3.14",
+ "@angular-devkit/schematics": "8.3.14"
}
},
"@schematics/update": {
- "version": "0.803.4",
- "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.803.4.tgz",
- "integrity": "sha512-ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw==",
+ "version": "0.803.14",
+ "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.803.14.tgz",
+ "integrity": "sha512-1erj7oaR2vKXo1DLE0s4BbbouBmgeAHEkPHQM7FPtyroZ18kytlT+qjTbsSnlRCwcFsjxmRkbRjXaXDz7ttsYQ==",
"dev": true,
"requires": {
- "@angular-devkit/core": "8.3.4",
- "@angular-devkit/schematics": "8.3.4",
+ "@angular-devkit/core": "8.3.14",
+ "@angular-devkit/schematics": "8.3.14",
"@yarnpkg/lockfile": "1.1.0",
"ini": "1.3.5",
"pacote": "9.5.5",
@@ -2267,9 +2370,9 @@
"dev": true
},
"@types/node": {
- "version": "12.7.5",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz",
- "integrity": "sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==",
+ "version": "10.14.22",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.22.tgz",
+ "integrity": "sha512-9taxKC944BqoTVjE+UT3pQH0nHZlTvITwfsOZqyc+R3sfJuxaTtxWjfn1K2UlxyPcKHf0rnaXcVFrS9F9vf0bw==",
"dev": true
},
"@types/normalize-package-data": {
@@ -2335,9 +2438,9 @@
}
},
"@types/webpack": {
- "version": "4.39.1",
- "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.39.1.tgz",
- "integrity": "sha512-rgO9ihNu/l72Sjx3shqwc9r6gi+tOMsqxhMEZhOEVIZt82GFOeUyEdpTk1BO2HqEHLS/XJW8ldUTIIfIMMyYFQ==",
+ "version": "4.39.5",
+ "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.39.5.tgz",
+ "integrity": "sha512-9twG6D97ao13MBLvigwfBJe6rxtb04UY3TcYHBYkW5sXZjUrNhqIRxLYg74VzK/YAE8xlVhOyd+3Whr7E5RrBA==",
"dev": true,
"requires": {
"@types/anymatch": "*",
@@ -2875,12 +2978,6 @@
"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
"dev": true
},
- "array-find-index": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
- "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
- "dev": true
- },
"array-flatten": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
@@ -3208,9 +3305,9 @@
},
"dependencies": {
"core-js": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
- "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==",
+ "version": "2.6.10",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
+ "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==",
"dev": true
},
"regenerator-runtime": {
@@ -3937,24 +4034,6 @@
"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"dev": true
},
- "camelcase-keys": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
- "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
- "dev": true,
- "requires": {
- "camelcase": "^2.0.0",
- "map-obj": "^1.0.0"
- },
- "dependencies": {
- "camelcase": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
- "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
- "dev": true
- }
- }
- },
"caniuse-lite": {
"version": "1.0.30000989",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz",
@@ -4413,20 +4492,14 @@
},
"dependencies": {
"dot-prop": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.1.0.tgz",
- "integrity": "sha512-n1oC6NBF+KM9oVXtjmen4Yo7HyAVWV2UUl50dCYJdw2924K6dX9bf9TTTWaKtYlRn0FEtxG27KS80ayVLixxJA==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.1.1.tgz",
+ "integrity": "sha512-QCHI6Lkf+9fJMpwfAFsTvbiSh6ujoPmhCLiDvD/n4dGtLvHfhuBwPdN6z2x4YSOwwtTcLoO/LP70xELWGF/JVA==",
"dev": true,
"requires": {
"is-obj": "^2.0.0"
}
},
- "env-paths": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
- "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
- "dev": true
- },
"is-obj": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
@@ -4443,9 +4516,9 @@
}
},
"write-file-atomic": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.0.tgz",
- "integrity": "sha512-EIgkf60l2oWsffja2Sf2AL384dx328c0B+cIYPTQq5q2rOYuDV00/iPFBOUiDKKwKMOhkymH8AidPaRvzfxY+Q==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.1.tgz",
+ "integrity": "sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==",
"dev": true,
"requires": {
"imurmurhash": "^0.1.4",
@@ -4655,13 +4728,47 @@
"dev": true
},
"core-js-compat": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz",
- "integrity": "sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.3.3.tgz",
+ "integrity": "sha512-GNZkENsx5pMnS7Inwv7ZO/s3B68a9WU5kIjxqrD/tkNR8mtfXJRk8fAKRlbvWZSGPc59/TkiOBDYl5Cb65pTVA==",
"dev": true,
"requires": {
- "browserslist": "^4.6.6",
+ "browserslist": "^4.7.1",
"semver": "^6.3.0"
+ },
+ "dependencies": {
+ "browserslist": {
+ "version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.1.tgz",
+ "integrity": "sha512-QtULFqKIAtiyNx7NhZ/p4rB8m3xDozVo/pi5VgTlADLF2tNigz/QH+v0m5qhn7XfHT7u+607NcCNOnC0HZAlMg==",
+ "dev": true,
+ "requires": {
+ "caniuse-lite": "^1.0.30000999",
+ "electron-to-chromium": "^1.3.284",
+ "node-releases": "^1.1.36"
+ }
+ },
+ "caniuse-lite": {
+ "version": "1.0.30001002",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001002.tgz",
+ "integrity": "sha512-pRuxPE8wdrWmVPKcDmJJiGBxr6lFJq4ivdSeo9FTmGj5Rb8NX3Mby2pARG57MXF15hYAhZ0nHV5XxT2ig4bz3g==",
+ "dev": true
+ },
+ "electron-to-chromium": {
+ "version": "1.3.295",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.295.tgz",
+ "integrity": "sha512-KxlGE9GcZTv7xGwYJGMEABHJq2JuTMNF7jD8NwHk6sBY226mW+Dyp9kZmA2Od9tKHMCS7ltPnqFg+zq3jTWN7Q==",
+ "dev": true
+ },
+ "node-releases": {
+ "version": "1.1.38",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.38.tgz",
+ "integrity": "sha512-/5NZAaOyTj134Oy5Cp/J8mso8OD/D9CSuL+6TOXXsTKO8yjc5e4up75SRPCganCjwFKMj2jbp5tR0dViVdox7g==",
+ "dev": true,
+ "requires": {
+ "semver": "^6.3.0"
+ }
+ }
}
},
"core-util-is": {
@@ -4858,15 +4965,6 @@
"integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
"dev": true
},
- "currently-unhandled": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
- "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
- "dev": true,
- "requires": {
- "array-find-index": "^1.0.1"
- }
- },
"custom-event": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -5367,20 +5465,20 @@
"dev": true
},
"electron": {
- "version": "6.0.9",
- "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.9.tgz",
- "integrity": "sha512-lFpSmDNyjpvJFwEnK897Soone3DV7D3ASFUb315H2VTVZSbKib9Kbrsovxf4c+e1q5hTdaONsGIm3Lb4CXIW1g==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-7.0.0.tgz",
+ "integrity": "sha512-vrF1loRW1p0vQCbduqO0EZpo8ePJOuxUT6tSoUSU3lsbGK3VnlJop+0PpCIPzbe2K4G4Gk7WexH08V9se7mJcA==",
"dev": true,
"requires": {
- "@types/node": "^10.12.18",
- "electron-download": "^4.1.0",
+ "@electron/get": "^1.0.1",
+ "@types/node": "^12.0.12",
"extract-zip": "^1.0.3"
},
"dependencies": {
"@types/node": {
- "version": "10.14.18",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.18.tgz",
- "integrity": "sha512-ryO3Q3++yZC/+b8j8BdKd/dn9JlzlHBPdm80656xwYUdmPkpTGTjkAdt6BByiNupGPE8w0FhBgvYy/fX9hRNGQ==",
+ "version": "12.11.6",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.6.tgz",
+ "integrity": "sha512-4uPUyY1Aofo1YzoypalYHNd2SnKYxH2b6LzXwpryZCJKA2XlagZSynXx5C8sfPH0r1cSltUpaVHV2q5sYXschQ==",
"dev": true
}
}
@@ -5543,51 +5641,6 @@
}
}
},
- "electron-download": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
- "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
- "dev": true,
- "requires": {
- "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"
- },
- "dependencies": {
- "debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
- "dev": true,
- "requires": {
- "ms": "^2.1.1"
- }
- },
- "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.2",
- "jsonfile": "^4.0.0",
- "universalify": "^0.1.0"
- }
- },
- "semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true
- }
- }
- },
"electron-is-accelerator": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz",
@@ -5694,6 +5747,22 @@
"integrity": "sha512-nA9xFj1SgHXlW/6T4+udW2u/Ic/bne25UoFsddoNM7Ut2bgNGLLQUhLhk+vQlbKh9WiRgDDlHaC36Oy7AgRR9w==",
"dev": true
},
+ "electron-updater": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.1.2.tgz",
+ "integrity": "sha512-4Sk8IW0LfOilDz+WAB/gEDmX7+FUFRbKHGN1zGjehPilnd6H9cmjgBHK6Xzq/FLq/uOHGJ6GX/9tsF+jr7CvnA==",
+ "dev": true,
+ "requires": {
+ "@types/semver": "^6.0.1",
+ "builder-util-runtime": "8.3.0",
+ "fs-extra": "^8.1.0",
+ "js-yaml": "^3.13.1",
+ "lazy-val": "^1.0.4",
+ "lodash.isequal": "^4.5.0",
+ "pako": "^1.0.10",
+ "semver": "^6.2.0"
+ }
+ },
"electron-window-state": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-5.0.3.tgz",
@@ -5887,9 +5956,9 @@
"dev": true
},
"env-paths": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
- "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
+ "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
"dev": true
},
"err-code": {
@@ -6418,9 +6487,9 @@
"dev": true
},
"figures": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz",
- "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz",
+ "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==",
"dev": true,
"requires": {
"escape-string-regexp": "^1.0.5"
@@ -6437,9 +6506,9 @@
},
"dependencies": {
"schema-utils": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.2.0.tgz",
- "integrity": "sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
+ "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
"dev": true,
"requires": {
"ajv": "^6.10.2",
@@ -6759,12 +6828,6 @@
"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
"dev": true
},
- "get-stdin": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
- "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
- "dev": true
- },
"get-stream": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -7320,9 +7383,9 @@
"dev": true
},
"ignore-walk": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.2.tgz",
- "integrity": "sha512-EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+ "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
"dev": true,
"requires": {
"minimatch": "^3.0.4"
@@ -7391,15 +7454,6 @@
"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
"dev": true
},
- "indent-string": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
- "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
- "dev": true,
- "requires": {
- "repeating": "^2.0.0"
- }
- },
"indexof": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
@@ -7545,9 +7599,9 @@
"dev": true
},
"is-absolute-url": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.2.tgz",
- "integrity": "sha512-+5g/wLlcm1AcxSP7014m6GvbPHswDx980vD/3bZaap8aGV9Yfs7Q6y6tfaupgZ5O74Byzc8dGrSCJ+bFXx0KdA==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+ "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
"dev": true
},
"is-accessor-descriptor": {
@@ -7828,12 +7882,6 @@
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"dev": true
},
- "is-utf8": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
- "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
- "dev": true
- },
"is-windows": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -8115,6 +8163,27 @@
"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
"dev": true
},
+ "jest-worker": {
+ "version": "24.9.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+ "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+ "dev": true,
+ "requires": {
+ "merge-stream": "^2.0.0",
+ "supports-color": "^6.1.0"
+ },
+ "dependencies": {
+ "supports-color": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
"js-levenshtein": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
@@ -9205,36 +9274,6 @@
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
"dev": true
},
- "load-json-file": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
- "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.2",
- "parse-json": "^2.2.0",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0",
- "strip-bom": "^2.0.0"
- },
- "dependencies": {
- "parse-json": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
- "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
- "dev": true,
- "requires": {
- "error-ex": "^1.2.0"
- }
- },
- "pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
- "dev": true
- }
- }
- },
"loader-runner": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -9292,6 +9331,12 @@
"integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
"dev": true
},
+ "lodash.isequal": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+ "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+ "dev": true
+ },
"log-symbols": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
@@ -9339,16 +9384,6 @@
"js-tokens": "^3.0.0 || ^4.0.0"
}
},
- "loud-rejection": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
- "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
- "dev": true,
- "requires": {
- "currently-unhandled": "^0.4.1",
- "signal-exit": "^3.0.0"
- }
- },
"lowercase-keys": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
@@ -9398,22 +9433,43 @@
"dev": true
},
"make-fetch-happen": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz",
- "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.1.tgz",
+ "integrity": "sha512-b4dfaMvUDR67zxUq1+GN7Ke9rH5WvGRmoHuMH7l+gmUCR2tCXFP6mpeJ9Dp+jB6z8mShRopSf1vLRBhRs8Cu5w==",
"dev": true,
"requires": {
"agentkeepalive": "^3.4.1",
"cacache": "^12.0.0",
"http-cache-semantics": "^3.8.1",
"http-proxy-agent": "^2.1.0",
- "https-proxy-agent": "^2.2.1",
+ "https-proxy-agent": "^2.2.3",
"lru-cache": "^5.1.1",
"mississippi": "^3.0.0",
"node-fetch-npm": "^2.0.2",
"promise-retry": "^1.1.1",
"socks-proxy-agent": "^4.0.0",
"ssri": "^6.0.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "https-proxy-agent": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.3.tgz",
+ "integrity": "sha512-Ytgnz23gm2DVftnzqRRz2dOXZbGd2uiajSw/95bPp6v53zPRspQjLm/AfBgqbJ2qfeRXWIOMVLpp86+/5yX39Q==",
+ "dev": true,
+ "requires": {
+ "agent-base": "^4.3.0",
+ "debug": "^3.1.0"
+ }
+ }
}
},
"mamacro": {
@@ -9437,12 +9493,6 @@
"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
"dev": true
},
- "map-obj": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
- "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
- "dev": true
- },
"map-visit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -9496,30 +9546,18 @@
"integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
"dev": true
},
- "meow": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
- "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
- "dev": true,
- "requires": {
- "camelcase-keys": "^2.0.0",
- "decamelize": "^1.1.2",
- "loud-rejection": "^1.0.0",
- "map-obj": "^1.0.1",
- "minimist": "^1.1.3",
- "normalize-package-data": "^2.3.4",
- "object-assign": "^4.0.1",
- "read-pkg-up": "^1.0.1",
- "redent": "^1.0.0",
- "trim-newlines": "^1.0.0"
- }
- },
"merge-descriptors": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
"dev": true
},
+ "merge-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+ "dev": true
+ },
"methods": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -9714,9 +9752,9 @@
"dev": true
},
"minipass": {
- "version": "2.6.5",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.6.5.tgz",
- "integrity": "sha512-ewSKOPFH9blOLXx0YSE+mbrNMBFPS+11a2b03QZ+P4LVrUHW/GAlqeYC7DBknDyMWkHzrzTpDhUvy7MUxqyrPA==",
+ "version": "2.9.0",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+ "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
"dev": true,
"requires": {
"safe-buffer": "^5.1.2",
@@ -9724,12 +9762,12 @@
}
},
"minizlib": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz",
- "integrity": "sha512-hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==",
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+ "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
"dev": true,
"requires": {
- "minipass": "^2.2.1"
+ "minipass": "^2.9.0"
}
},
"mississippi": {
@@ -10030,9 +10068,9 @@
}
},
"node-forge": {
- "version": "0.8.2",
- "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.2.tgz",
- "integrity": "sha512-mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg==",
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
+ "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
"dev": true
},
"node-ipc": {
@@ -10182,9 +10220,9 @@
}
},
"npm-packlist": {
- "version": "1.4.4",
- "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz",
- "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==",
+ "version": "1.4.6",
+ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz",
+ "integrity": "sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==",
"dev": true,
"requires": {
"ignore-walk": "^3.0.1",
@@ -10192,9 +10230,9 @@
}
},
"npm-pick-manifest": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
- "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
+ "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
"dev": true,
"requires": {
"figgy-pudding": "^3.5.1",
@@ -10211,9 +10249,9 @@
}
},
"npm-registry-fetch": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.1.tgz",
- "integrity": "sha512-1ZQ+yjnxc698R5h9Yje9CASapzAZr7aYDkJDdERg9xg2hOEY0vRJwskOaJAXq8N/eLavzvW4g564YAfq6zMn/A==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz",
+ "integrity": "sha512-Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==",
"dev": true,
"requires": {
"JSONStream": "^1.3.4",
@@ -10296,38 +10334,6 @@
"path-key": "^2.0.0"
}
},
- "nugget": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
- "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
- "dev": true,
- "requires": {
- "debug": "^2.1.3",
- "minimist": "^1.1.0",
- "pretty-bytes": "^1.0.2",
- "progress-stream": "^1.1.0",
- "request": "^2.45.0",
- "single-line-log": "^1.1.2",
- "throttleit": "0.0.2"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "dev": true,
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "dev": true
- }
- }
- },
"null-check": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
@@ -10687,6 +10693,17 @@
"which": "^1.3.1"
},
"dependencies": {
+ "npm-pick-manifest": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
+ "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+ "dev": true,
+ "requires": {
+ "figgy-pudding": "^3.5.1",
+ "npm-package-arg": "^6.0.0",
+ "semver": "^5.4.1"
+ }
+ },
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -11006,36 +11023,24 @@
"dev": true
},
"portfinder": {
- "version": "1.0.24",
- "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz",
- "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
+ "version": "1.0.25",
+ "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
+ "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
"dev": true,
"requires": {
- "async": "^1.5.2",
- "debug": "^2.2.0",
- "mkdirp": "0.5.x"
+ "async": "^2.6.2",
+ "debug": "^3.1.1",
+ "mkdirp": "^0.5.1"
},
"dependencies": {
- "async": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
- "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
- "dev": true
- },
"debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": {
- "ms": "2.0.0"
+ "ms": "^2.1.1"
}
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "dev": true
}
}
},
@@ -11148,16 +11153,6 @@
"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
"dev": true
},
- "pretty-bytes": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
- "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
- "dev": true,
- "requires": {
- "get-stdin": "^4.0.1",
- "meow": "^3.1.0"
- }
- },
"private": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -11176,67 +11171,6 @@
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
"dev": true
},
- "progress-stream": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
- "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
- "dev": true,
- "requires": {
- "speedometer": "~0.1.2",
- "through2": "~0.2.3"
- },
- "dependencies": {
- "isarray": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
- "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
- "dev": true
- },
- "object-keys": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
- "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
- "dev": true
- },
- "readable-stream": {
- "version": "1.1.14",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
- "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
- "dev": true,
- "requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.1",
- "isarray": "0.0.1",
- "string_decoder": "~0.10.x"
- }
- },
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
- "through2": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
- "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
- "dev": true,
- "requires": {
- "readable-stream": "~1.1.9",
- "xtend": "~2.1.1"
- }
- },
- "xtend": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
- "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
- "dev": true,
- "requires": {
- "object-keys": "~0.4.0"
- }
- }
- }
- },
"promise": {
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -11618,9 +11552,9 @@
},
"dependencies": {
"schema-utils": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.2.0.tgz",
- "integrity": "sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
+ "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
"dev": true,
"requires": {
"ajv": "^6.10.2",
@@ -11737,65 +11671,6 @@
}
}
},
- "read-pkg-up": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
- "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
- "dev": true,
- "requires": {
- "find-up": "^1.0.0",
- "read-pkg": "^1.0.0"
- },
- "dependencies": {
- "find-up": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
- "dev": true,
- "requires": {
- "path-exists": "^2.0.0",
- "pinkie-promise": "^2.0.0"
- }
- },
- "path-exists": {
- "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.0"
- }
- },
- "path-type": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
- "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.2",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
- }
- },
- "pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
- "dev": true
- },
- "read-pkg": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
- "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
- "dev": true,
- "requires": {
- "load-json-file": "^1.0.0",
- "normalize-package-data": "^2.3.2",
- "path-type": "^1.0.0"
- }
- }
- }
- },
"readable-stream": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
@@ -11832,16 +11707,6 @@
"picomatch": "^2.0.4"
}
},
- "redent": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
- "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
- "dev": true,
- "requires": {
- "indent-string": "^2.1.0",
- "strip-indent": "^1.0.1"
- }
- },
"reflect-metadata": {
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
@@ -11888,12 +11753,6 @@
"safe-regex": "^1.1.0"
}
},
- "regexp-tree": {
- "version": "0.1.13",
- "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.13.tgz",
- "integrity": "sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw==",
- "dev": true
- },
"regexp.prototype.flags": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
@@ -11937,9 +11796,9 @@
}
},
"regjsgen": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
- "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
+ "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
"dev": true
},
"regjsparser": {
@@ -12158,6 +12017,12 @@
"acorn": "^7.0.0"
},
"dependencies": {
+ "@types/node": {
+ "version": "12.11.6",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.6.tgz",
+ "integrity": "sha512-4uPUyY1Aofo1YzoypalYHNd2SnKYxH2b6LzXwpryZCJKA2XlagZSynXx5C8sfPH0r1cSltUpaVHV2q5sYXschQ==",
+ "dev": true
+ },
"acorn": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
@@ -12369,12 +12234,12 @@
}
},
"selfsigned": {
- "version": "1.10.6",
- "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.6.tgz",
- "integrity": "sha512-i3+CeqxL7DpAazgVpAGdKMwHuL63B5nhJMh9NQ7xmChGkA3jNFflq6Jyo1LLJYcr3idWiNOPWHCrm4zMayLG4w==",
+ "version": "1.10.7",
+ "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
+ "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
"dev": true,
"requires": {
- "node-forge": "0.8.2"
+ "node-forge": "0.9.0"
}
},
"semver": {
@@ -12647,37 +12512,6 @@
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true
},
- "single-line-log": {
- "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"
- },
- "dependencies": {
- "is-fullwidth-code-point": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
- "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
- "dev": true,
- "requires": {
- "number-is-nan": "^1.0.0"
- }
- },
- "string-width": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
- "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
- "dev": true,
- "requires": {
- "code-point-at": "^1.0.0",
- "is-fullwidth-code-point": "^1.0.0",
- "strip-ansi": "^3.0.0"
- }
- }
- }
- },
"slash": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -13176,12 +13010,6 @@
"chalk": "^2.0.1"
}
},
- "speedometer": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz",
- "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=",
- "dev": true
- },
"split-string": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -13412,30 +13240,12 @@
"ansi-regex": "^2.0.0"
}
},
- "strip-bom": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
- "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
- "dev": true,
- "requires": {
- "is-utf8": "^0.2.0"
- }
- },
"strip-eof": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
"dev": true
},
- "strip-indent": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
- "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
- "dev": true,
- "requires": {
- "get-stdin": "^4.0.1"
- }
- },
"strip-json-comments": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@@ -13453,9 +13263,9 @@
},
"dependencies": {
"schema-utils": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.2.0.tgz",
- "integrity": "sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
+ "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
"dev": true,
"requires": {
"ajv": "^6.10.2",
@@ -13515,29 +13325,12 @@
}
},
"sumchecker": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
- "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.0.tgz",
+ "integrity": "sha512-yreseuC/z4iaodVoq07XULEOO9p4jnQazO7mbrnDSvWAU/y2cbyIKs+gWJptfcGu9R+1l27K8Rkj0bfvqnBpgQ==",
"dev": true,
"requires": {
- "debug": "^2.2.0"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "dev": true,
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "dev": true
- }
+ "debug": "^4.1.0"
}
},
"supports-color": {
@@ -13562,14 +13355,14 @@
"dev": true
},
"tar": {
- "version": "4.4.11",
- "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz",
- "integrity": "sha512-iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==",
+ "version": "4.4.13",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+ "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
"dev": true,
"requires": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
- "minipass": "^2.6.4",
+ "minipass": "^2.8.6",
"minizlib": "^1.2.1",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2",
@@ -13713,12 +13506,6 @@
}
}
},
- "throttleit": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
- "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
- "dev": true
- },
"through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -13736,9 +13523,9 @@
}
},
"thunky": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
- "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
"dev": true
},
"timers-browserify": {
@@ -13854,12 +13641,6 @@
"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
"dev": true
},
- "trim-newlines": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
- "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
- "dev": true
- },
"trim-right": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
diff --git a/package.json b/package.json
index b96876e2..18046847 100644
--- a/package.json
+++ b/package.json
@@ -20,23 +20,23 @@
},
"devDependencies": {
"@angular-builders/custom-webpack": "^8.2.0",
- "@angular-devkit/build-angular": "~0.803.2",
- "@angular-devkit/build-ng-packagr": "~0.803.2",
- "@angular/animations": "^8.2.11",
+ "@angular-devkit/build-angular": "~0.803.14",
+ "@angular-devkit/build-ng-packagr": "~0.803.14",
+ "@angular/animations": "^8.2.12",
"@angular/cdk": "^8.2.3",
- "@angular/cli": "~8.3.2",
- "@angular/common": "~8.2.4",
- "@angular/compiler": "~8.2.4",
- "@angular/compiler-cli": "~8.2.4",
- "@angular/core": "~8.2.4",
+ "@angular/cli": "~8.3.14",
+ "@angular/common": "~8.2.12",
+ "@angular/compiler": "~8.2.12",
+ "@angular/compiler-cli": "~8.2.12",
+ "@angular/core": "~8.2.12",
"@angular/flex-layout": "^8.0.0-beta.27",
- "@angular/forms": "~8.2.4",
- "@angular/language-service": "~8.2.4",
+ "@angular/forms": "~8.2.12",
+ "@angular/language-service": "~8.2.12",
"@angular/material": "^8.2.3",
"@angular/material-moment-adapter": "^8.2.3",
- "@angular/platform-browser": "~8.2.4",
- "@angular/platform-browser-dynamic": "~8.2.4",
- "@angular/router": "~8.2.4",
+ "@angular/platform-browser": "~8.2.12",
+ "@angular/platform-browser-dynamic": "~8.2.12",
+ "@angular/router": "~8.2.12",
"@ngrx/effects": "^8.4.0",
"@ngrx/entity": "^8.4.0",
"@ngrx/router-store": "^8.4.0",
@@ -51,9 +51,9 @@
"@types/filesize": "^4.1.0",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
- "@types/node": "^12.7.3",
+ "@types/node": "^10.14.22",
"@types/semver": "^6.0.2",
- "@types/webpack": "^4.39.1",
+ "@types/webpack": "^4.39.5",
"@types/webpack-merge": "^4.1.5",
"@types/webpack-node-externals": "^1.6.3",
"awesome-node-loader": "^1.1.1",
@@ -66,13 +66,14 @@
"cross-env": "^5.2.1",
"detect-browser": "^4.6.0",
"devtron": "^1.4.0",
- "electron": "^6.0.7",
+ "electron": "^7.0.0",
"electron-builder": "^21.2.0",
"electron-debug": "^3.0.1",
"electron-devtools-installer": "^2.2.4",
- "electron-log": "^3.0.7",
+ "electron-log": "^3.0.8",
"electron-reload": "^1.5.0",
"electron-store": "^4.0.0",
+ "electron-updater": "^4.1.2",
"electron-window-state": "^5.0.3",
"fs-extra": "^8.1.0",
"filesize": "^4.1.2",
diff --git a/projects/ucap-webmessenger-app/src/app/app.component.html b/projects/ucap-webmessenger-app/src/app/app.component.html
index 0680b43f..ee5b4b58 100644
--- a/projects/ucap-webmessenger-app/src/app/app.component.html
+++ b/projects/ucap-webmessenger-app/src/app/app.component.html
@@ -1 +1,2 @@
+
diff --git a/projects/ucap-webmessenger-app/src/app/app.module.ts b/projects/ucap-webmessenger-app/src/app/app.module.ts
index 764e5b3b..ef08b1d7 100644
--- a/projects/ucap-webmessenger-app/src/app/app.module.ts
+++ b/projects/ucap-webmessenger-app/src/app/app.module.ts
@@ -42,6 +42,7 @@ import { AppComponent } from './app.component';
import { GUARDS } from './guards';
import { AppMessengerLayoutModule } from './layouts/messenger/messenger.layout.module';
+import { AppNativeLayoutModule } from './layouts/native/native.layout.module';
@NgModule({
imports: [
@@ -93,6 +94,7 @@ import { AppMessengerLayoutModule } from './layouts/messenger/messenger.layout.m
AppTranslateModule,
AppMessengerLayoutModule,
+ AppNativeLayoutModule,
LoggerModule.forRoot({
level: NgxLoggerLevel.DEBUG
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/index.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/index.ts
new file mode 100644
index 00000000..82221111
--- /dev/null
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/index.ts
@@ -0,0 +1,3 @@
+import { TopBarComponent } from './top-bar.component';
+
+export const COMPONENTS = [TopBarComponent];
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
new file mode 100644
index 00000000..fe1fbbb9
--- /dev/null
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
@@ -0,0 +1,30 @@
+
+ UCAP M Messenger
+
+
+
+
+
+
+
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss
new file mode 100644
index 00000000..68e8fe40
--- /dev/null
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss
@@ -0,0 +1,81 @@
+:host {
+ .app-layout-native-title-bar {
+ -webkit-user-select: none;
+ -webkit-app-region: drag;
+
+ position: fixed;
+ right: 0;
+ top: 0;
+ display: flex;
+ // align-items: center;
+ // justify-content: center;
+ // flex-direction: row-reverse;
+ cursor: pointer;
+ background: white;
+ height: 30px;
+
+ .app-layout-native-title-bar-spacer {
+ flex: 1 1 auto;
+ }
+
+ .app-layout-native-title-bar-actions {
+ position: relative;
+
+ .button {
+ -webkit-app-region: no-drag;
+ outline: 0;
+ cursor: pointer;
+ border: none;
+ height: 100%;
+ min-width: 30px;
+ max-width: 30px;
+ padding: 5px;
+ line-height: 10px;
+ border-radius: 0;
+ background: transparent;
+ transition: background 0.2s linear, color 0.2s linear;
+ text-align: center;
+ font-size: 10px;
+
+ .mat-icon {
+ transform: translateY(-2px);
+ width: 16px;
+ height: 16px;
+ font-size: 16px;
+ }
+
+ &.app-layout-native-title-bar-close,
+ &.app-layout-native-title-bar-maximize,
+ &.app-layout-native-title-bar-minimize {
+ color: black;
+ font-weight: lighter;
+ }
+
+ // &.app-layout-native-title-bar-minimize .mat-icon {
+ // transform: translateY(-43%);
+ // }
+
+ &:hover {
+ &.app-layout-native-title-bar-close {
+ background: #e81123;
+ color: darken(white, 20%);
+ }
+
+ &.app-layout-native-title-bar-minimize {
+ background: darken(#673ab7, 10%);
+ color: darken(white, 20%);
+ }
+
+ &.app-layout-native-title-bar-maximize {
+ background: darken(#673ab7, 10%);
+ color: darken(white, 20%);
+ }
+ }
+ }
+ }
+
+ .app-layout-native-title-bar-title {
+ font-size: 12px;
+ }
+ }
+}
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.spec.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.spec.ts
new file mode 100644
index 00000000..9a37a790
--- /dev/null
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TopBarComponent } from './top-bar.component';
+
+describe('App::Layout::Messenger::TopBarComponent', () => {
+ let component: TopBarComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [TopBarComponent]
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(TopBarComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
new file mode 100644
index 00000000..447bcb84
--- /dev/null
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
@@ -0,0 +1,40 @@
+import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
+import {
+ UCAP_NATIVE_SERVICE,
+ NativeService,
+ WindowState
+} from '@ucap-webmessenger/native';
+import { Observable } from 'rxjs';
+
+@Component({
+ selector: 'app-layout-native-top-bar',
+ templateUrl: './top-bar.component.html',
+ styleUrls: ['./top-bar.component.scss']
+})
+export class TopBarComponent implements OnInit, OnDestroy {
+ windowStateChanged$: Observable;
+
+ WindowState = WindowState;
+
+ constructor(
+ @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService
+ ) {}
+
+ ngOnInit() {
+ this.windowStateChanged$ = this.nativeService.windowStateChanged();
+ }
+
+ ngOnDestroy(): void {}
+
+ onClickClose() {
+ this.nativeService.windowClose();
+ }
+
+ onClickMinimize() {
+ this.nativeService.windowMinimize();
+ }
+
+ onClickMaxmize() {
+ this.nativeService.windowMaximize();
+ }
+}
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/native.layout.module.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/native.layout.module.ts
new file mode 100644
index 00000000..7b4e9b76
--- /dev/null
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/native.layout.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { FlexLayoutModule } from '@angular/flex-layout';
+
+import { MatIconModule } from '@angular/material/icon';
+import { MatToolbarModule } from '@angular/material/toolbar';
+
+import { UCapUiModule } from '@ucap-webmessenger/ui';
+
+import { COMPONENTS } from './components';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FlexLayoutModule,
+ MatIconModule,
+ MatToolbarModule,
+ UCapUiModule
+ ],
+ exports: [...COMPONENTS],
+ declarations: [...COMPONENTS],
+ entryComponents: []
+})
+export class AppNativeLayoutModule {}
diff --git a/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts b/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts
index faac9400..5a5f6297 100644
--- a/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts
+++ b/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts
@@ -1,6 +1,6 @@
import { Observable } from 'rxjs';
-import { NativeService } from '@ucap-webmessenger/native';
+import { NativeService, WindowState } from '@ucap-webmessenger/native';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';
@@ -35,5 +35,23 @@ export class BrowserNativeService implements NativeService {
return this.httpClient.post(path, buf, {});
}
+ windowStateChanged(): Observable {
+ return new Observable(subscriber => {
+ try {
+ subscriber.next(WindowState.Normal);
+ } catch (error) {
+ subscriber.error(error);
+ } finally {
+ subscriber.complete();
+ }
+ });
+ }
+
+ windowClose(): void {}
+
+ windowMinimize(): void {}
+
+ windowMaximize(): void {}
+
constructor(private httpClient: HttpClient) {}
}
diff --git a/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts b/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts
index 39466845..d0002df4 100644
--- a/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts
+++ b/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts
@@ -1,11 +1,15 @@
-import { ipcRenderer } from 'electron';
+import { ipcRenderer, remote, IpcRendererEvent } from 'electron';
-import { Observable } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
-import { NativeService } from '@ucap-webmessenger/native';
+import { NativeService, WindowState } from '@ucap-webmessenger/native';
import { Channel } from '../types/channel.type';
+import { share } from 'rxjs/operators';
export class ElectronNativeService implements NativeService {
+ private windowStateChangedSubject: Subject | null = null;
+ private windowStateChanged$: Observable | null = null;
+
showNotify(
roomSeq: number,
title: string,
@@ -63,5 +67,54 @@ export class ElectronNativeService implements NativeService {
});
}
+ windowStateChanged(): Observable {
+ if (!this.windowStateChangedSubject) {
+ this.windowStateChangedSubject = new Subject();
+ this.windowStateChanged$ = this.windowStateChangedSubject
+ .asObservable()
+ .pipe(share());
+ }
+
+ ipcRenderer.on(
+ Channel.windowStateChanged,
+ (event: IpcRendererEvent, windowState: WindowState) => {
+ console.log('windowStateChanged', windowState);
+ this.windowStateChangedSubject.next(windowState);
+ }
+ );
+ return this.windowStateChanged$;
+ }
+
+ windowClose(): void {
+ const currentWindow = remote.getCurrentWindow();
+ if (!currentWindow) {
+ return;
+ }
+
+ currentWindow.close();
+ }
+
+ windowMinimize(): void {
+ const currentWindow = remote.getCurrentWindow();
+ if (!currentWindow) {
+ return;
+ }
+
+ currentWindow.minimize();
+ }
+
+ windowMaximize(): void {
+ const currentWindow = remote.getCurrentWindow();
+ if (!currentWindow) {
+ return;
+ }
+
+ if (currentWindow.isMaximized()) {
+ currentWindow.unmaximize();
+ } else {
+ currentWindow.maximize();
+ }
+ }
+
constructor() {}
}
diff --git a/projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts b/projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts
index efd46d98..cc86ff5d 100644
--- a/projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts
+++ b/projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts
@@ -1,4 +1,6 @@
export enum Channel {
+ windowStateChanged = 'window-state-changed',
+
showNotify = 'UCAP::showNotify',
checkForUpdates = 'UCAP::checkForUpdates',
showImageViewer = 'UCAP::showImageViewer',
diff --git a/projects/ucap-webmessenger-native/src/lib/services/native.service.ts b/projects/ucap-webmessenger-native/src/lib/services/native.service.ts
index 3e106c71..ff0ef123 100644
--- a/projects/ucap-webmessenger-native/src/lib/services/native.service.ts
+++ b/projects/ucap-webmessenger-native/src/lib/services/native.service.ts
@@ -1,5 +1,7 @@
import { Observable } from 'rxjs';
+import { WindowState } from '../types/window-state.type';
+
export interface NativeService {
showNotify(
roomSeq: number,
@@ -15,4 +17,9 @@ export interface NativeService {
saveFile(path: string, buf: ArrayBuffer): Observable;
readFile(path: string): Observable;
+
+ windowStateChanged(): Observable;
+ windowClose(): void;
+ windowMinimize(): void;
+ windowMaximize(): void;
}
diff --git a/projects/ucap-webmessenger-native/src/lib/types/window-state.type.ts b/projects/ucap-webmessenger-native/src/lib/types/window-state.type.ts
new file mode 100644
index 00000000..819e080b
--- /dev/null
+++ b/projects/ucap-webmessenger-native/src/lib/types/window-state.type.ts
@@ -0,0 +1,7 @@
+export enum WindowState {
+ Minimized = 'minimized',
+ Normal = 'normal',
+ Maximized = 'maximized',
+ FullScreen = 'full-screen',
+ Hidden = 'hidden'
+}
diff --git a/projects/ucap-webmessenger-native/src/public-api.ts b/projects/ucap-webmessenger-native/src/public-api.ts
index 0a83e4cd..8936d54a 100644
--- a/projects/ucap-webmessenger-native/src/public-api.ts
+++ b/projects/ucap-webmessenger-native/src/public-api.ts
@@ -5,5 +5,6 @@
export * from './lib/services/native.service';
export * from './lib/types/token';
+export * from './lib/types/window-state.type';
export * from './lib/ucap-native.module';
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html
index 60b682c7..ac18a03b 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html
@@ -5,15 +5,17 @@
fxLayoutAlign="center center"
>
-
- attach_file
-
-
- sentiment_satisfied_alt
-
-
- g_translate
-
+
+
+
+
+