major dependencies update (electron 2, angular 6, rxjs 6)

vladimiry · May 4, 2018 · 51ed2a7 · 51ed2a7
1 parent c03e5b7
commit 51ed2a7
Show file tree

Hide file tree

Showing 24 changed files with 491 additions and 464 deletions.
diff --git a/TODO.md b/TODO.md
diff --git a/package.json b/package.json
@@ -67,50 +67,50 @@
     "deep-equal": "1.0.1",
     "electron-log": "2.2.14",
     "electron-unhandled": "1.1.0",
-    "electron-updater": "2.21.8",
+    "electron-updater": "2.21.10",
     "fs-json-store": "1.0.0",
     "fs-json-store-encryption-adapter": "0.0.2",
     "jimp": "0.2.28",
     "keepasshttp-client": "2.2.5",
     "keytar": "4.2.1",
-    "rxjs": "5.5.10",
+    "rxjs": "6.1.0",
     "stacktrace-js": "2.0.0",
     "valid-url": "1.0.9"
   },
   "devDependencies": {
-    "@angular-devkit/build-optimizer": "0.5.7",
-    "@angular-devkit/core": "0.5.7",
-    "@angular/animations": "5.2.10",
-    "@angular/common": "5.2.10",
-    "@angular/compiler": "5.2.10",
-    "@angular/compiler-cli": "5.2.10",
-    "@angular/core": "5.2.10",
-    "@angular/forms": "5.2.10",
-    "@angular/http": "5.2.10",
-    "@angular/language-service": "5.2.10",
-    "@angular/platform-browser": "5.2.10",
-    "@angular/platform-browser-dynamic": "5.2.10",
-    "@angular/router": "5.2.10",
+    "@angular-devkit/build-optimizer": "0.6.0",
+    "@angular-devkit/core": "0.6.0",
+    "@angular/animations": "6.0.0",
+    "@angular/common": "6.0.0",
+    "@angular/compiler": "6.0.0",
+    "@angular/compiler-cli": "6.0.0",
+    "@angular/core": "6.0.0",
+    "@angular/forms": "6.0.0",
+    "@angular/http": "6.0.0",
+    "@angular/language-service": "6.0.0",
+    "@angular/platform-browser": "6.0.0",
+    "@angular/platform-browser-dynamic": "6.0.0",
+    "@angular/router": "6.0.0",
     "@angularclass/hmr": "2.1.3",
-    "@ngrx/effects": "5.2.0",
-    "@ngrx/router-store": "5.2.0",
-    "@ngrx/store": "5.2.0",
-    "@ngtools/webpack": "6.0.0-rc.4",
+    "@ngrx/effects": "6.0.0-beta.1",
+    "@ngrx/router-store": "6.0.0-beta.1",
+    "@ngrx/store": "6.0.0-beta.1",
+    "@ngtools/webpack": "6.0.0",
     "@types/keytar": "4.0.1",
     "@types/mkdirp": "0.5.2",
-    "@types/node": "9.6.6",
+    "@types/node": "8.10.11",
     "@types/randomstring": "1.1.6",
     "@types/sinon": "4.3.1",
     "@types/stacktrace-js": "0.0.32",
     "@types/tapable": "1.0.2",
     "@types/valid-url": "1.0.2",
     "@types/webdriverio": "4.10.1",
     "@types/webpack-env": "1.13.6",
-    "autoprefixer": "8.3.0",
+    "autoprefixer": "8.4.1",
     "ava": "0.25.0",
-    "ava-ts": "0.24.3",
+    "ava-ts": "0.24.5",
     "awesome-typescript-loader": "5.0.0",
-    "bootstrap": "4.1.0",
+    "bootstrap": "4.1.1",
     "cache-loader": "1.2.2",
     "circular-dependency-plugin": "5.0.2",
     "codelyzer": "4.3.0",
@@ -120,9 +120,9 @@
     "css-loader": "0.28.11",
     "cssnano": "3.10.0",
     "devtron": "1.4.0",
-    "electron": "2.0.0-beta.7",
-    "electron-builder": "20.10.0",
-    "electron-builder-squirrel-windows": "20.10.0",
+    "electron": "2.0.0",
+    "electron-builder": "20.11.1",
+    "electron-builder-squirrel-windows": "20.13.1",
     "electron-rebuild": "1.7.3",
     "exports-loader": "0.7.0",
     "extended-define-webpack-plugin": "0.1.3",
@@ -136,11 +136,11 @@
     "mini-css-extract-plugin": "0.4.0",
     "mkdirp": "0.5.1",
     "ngx-bootstrap": "2.0.4",
-    "node-sass": "4.8.3",
+    "node-sass": "4.9.0",
     "npm-run-all": "4.1.2",
     "nsp": "3.2.1",
     "nsp-preprocessor-yarn": "1.1.2",
-    "otpauth": "3.1.3",
+    "otpauth": "3.2.0",
     "postcss-custom-properties": "7.0.0",
     "postcss-loader": "2.1.4",
     "postcss-url": "7.3.2",
@@ -151,30 +151,30 @@
     "raw-loader": "0.5.1",
     "resolve-url-loader": "2.3.0",
     "rewiremock": "3.7.1",
-    "rxjs-tslint-rules": "3.17.0",
+    "rxjs-compat": "6.1.0",
     "sass-lint": "1.12.1",
     "sass-loader": "7.0.1",
     "script-loader": "0.7.2",
-    "sinon": "4.5.0",
+    "sinon": "5.0.3",
     "source-map-loader": "0.2.3",
-    "source-map-support": "0.5.4",
+    "source-map-support": "0.5.5",
     "spectron": "3.8.0",
     "stackframe": "1.0.4",
     "style-loader": "0.21.0",
     "stylus-loader": "3.0.2",
     "to-string-loader": "1.1.5",
     "ts-loader": "4.2.0",
-    "ts-node": "6.0.0",
+    "ts-node": "6.0.2",
     "tsconfig-paths": "3.3.1",
     "tsconfig-paths-webpack-plugin": "3.0.4",
-    "tslint": "5.9.1",
+    "tslint": "5.10.0",
     "tslint-rules-bunch": "0.0.4",
-    "typescript": "2.8.3",
+    "typescript": "2.7.2",
     "url-loader": "1.0.1",
     "wait-on": "2.1.0",
     "webpack": "4.6.0",
-    "webpack-cli": "2.0.15",
-    "webpack-dev-server": "3.1.3",
+    "webpack-cli": "2.1.2",
+    "webpack-dev-server": "3.1.4",
     "webpack-merge": "4.1.2",
     "zone.js": "0.8.26"
   }

diff --git a/src/electron/main/util.ts b/src/electron/main/util.ts
@@ -4,10 +4,8 @@ import {EventEmitter} from "events";
 import logger from "electron-log";
 import {app, ipcMain} from "electron";
 import {fromError} from "stacktrace-js";
-import {Observable} from "rxjs/Observable";
-import {Subscription} from "rxjs/Subscription";
+import {EMPTY, Observable, Subscription} from "rxjs";
 import {catchError} from "rxjs/operators";
-import {empty} from "rxjs/observable/empty";
 import {Model as StoreModel, Store} from "fs-json-store";
 import {EncryptionAdapter} from "fs-json-store-encryption-adapter";
 
@@ -142,7 +140,7 @@ export const ipcMainOn = <T extends ElectronIpcMainActionType>(
 
                 logger.error(error);
 
-                return empty();
+                return EMPTY;
             });
     });
 };
@@ -187,7 +185,7 @@ export const ipcMainObservable = <T extends ElectronIpcMainActionType> (
 
             logger.error(error);
 
-            return empty();
+            return EMPTY;
         }));
     });
 };

diff --git a/src/electron/renderer/account/index.ts b/src/electron/renderer/account/index.ts
@@ -1,13 +1,7 @@
-import {_throw} from "rxjs/observable/throw";
-import {distinctUntilChanged} from "rxjs/operators/distinctUntilChanged";
-import {filter, map} from "rxjs/operators";
-import {fromEvent} from "rxjs/observable/fromEvent";
-import {interval} from "rxjs/observable/interval";
-import {merge} from "rxjs/observable/merge";
-import {Observable} from "rxjs/Observable";
-import {Subscriber} from "rxjs/Subscriber";
-
+import {fromEvent, interval, merge, Observable, Subscriber, throwError} from "rxjs";
+import {distinctUntilChanged, filter, map} from "rxjs/operators";
 import * as OTPAuth from "otpauth";
+
 import {IpcRendererActions} from "_shared/electron-actions";
 import {ipcRendererObservable, ipcRendererOn, waitElements} from "./util";
 
@@ -129,7 +123,7 @@ ipcRendererObservable<IpcRendererActions.Notification.Type>(IpcRendererActions.N
 
         return merge(...observables);
     } catch (error) {
-        return _throw(error);
+        return throwError(error);
     }
 });
 

diff --git a/src/electron/renderer/account/util.ts b/src/electron/renderer/account/util.ts
@@ -1,7 +1,6 @@
 import {ipcRenderer} from "electron";
 import {fromError} from "stacktrace-js";
-import {Observable} from "rxjs/Observable";
-import {Subscription} from "rxjs/Subscription";
+import {Observable, Subscription} from "rxjs";
 import {catchError} from "rxjs/operators";
 import * as logger from "electron-log";
 

diff --git a/src/web/src/app/+accounts/account.component.ts b/src/web/src/app/+accounts/account.component.ts
@@ -1,10 +1,8 @@
 import {AfterViewInit, Component, ElementRef, HostBinding, Input, NgZone, OnDestroy, ViewChild} from "@angular/core";
-import {BehaviorSubject} from "rxjs/BehaviorSubject";
+import {BehaviorSubject, Observable, Subject} from "rxjs";
 import {DidFailLoadEvent} from "electron";
-import {filter, map, pairwise, takeUntil, withLatestFrom} from "rxjs/operators";
-import {Observable} from "rxjs/Observable";
+import {filter, map, pairwise, takeUntil, withLatestFrom, distinctUntilChanged} from "rxjs/operators";
 import {Store} from "@ngrx/store";
-import {Subject} from "rxjs/Subject";
 
 import {KeePassRef} from "_shared/model/keepasshttp";
 import {WebAccount} from "_shared/model/account";
@@ -16,7 +14,6 @@ import {
 } from "_web_app/store/reducers/options";
 import {State} from "_web_app/store/reducers/accounts";
 import {AccountsActions, NavigationActions} from "_web_app/store/actions";
-import {distinctUntilChanged} from "rxjs/operators/distinctUntilChanged";
 
 @Component({
     selector: `protonmail-desktop-app-account`,

diff --git a/src/web/src/app/+accounts/accounts.component.ts b/src/web/src/app/+accounts/accounts.component.ts
@@ -1,6 +1,5 @@
-import {distinctUntilChanged} from "rxjs/operators/distinctUntilChanged";
-import {map, takeUntil} from "rxjs/operators";
-import {Subject} from "rxjs/Subject";
+import {distinctUntilChanged, map, takeUntil} from "rxjs/operators";
+import {Subject} from "rxjs";
 import {Component, OnDestroy, OnInit} from "@angular/core";
 import {Store} from "@ngrx/store";
 

diff --git a/src/web/src/app/+accounts/accounts.effects.ts b/src/web/src/app/+accounts/accounts.effects.ts
@@ -1,7 +1,5 @@
-import {Observable} from "rxjs/Observable";
+import {Observable, of, merge as observableMerge} from "rxjs";
 import {catchError, finalize, map, mergeMap, switchMap} from "rxjs/operators";
-import {of} from "rxjs/observable/of";
-import {merge as observableMerge} from "rxjs/observable/merge";
 import {Injectable} from "@angular/core";
 import {Actions, Effect} from "@ngrx/effects";
 import {Store} from "@ngrx/store";

diff --git a/src/web/src/app/+accounts/accounts.guard.ts b/src/web/src/app/+accounts/accounts.guard.ts
@@ -1,6 +1,5 @@
 import {switchMap} from "rxjs/operators";
-import {Observable} from "rxjs/Observable";
-import {of} from "rxjs/observable/of";
+import {Observable, of} from "rxjs";
 import {Injectable} from "@angular/core";
 import {CanActivate} from "@angular/router";
 import {Store} from "@ngrx/store";

diff --git a/src/web/src/app/+accounts/accounts.module.ts b/src/web/src/app/+accounts/accounts.module.ts
@@ -1,6 +1,5 @@
 import {NgModule, NO_ERRORS_SCHEMA} from "@angular/core";
 import {EffectsModule} from "@ngrx/effects";
-import {BsDropdownModule} from "ngx-bootstrap/dropdown";
 
 import {SharedModule} from "_web_app/+shared/shared.module";
 import {AccountsRoutingModule} from "./accounts.routing.module";
@@ -13,7 +12,6 @@ import {AccountsGuard} from "./accounts.guard";
 
 @NgModule({
     imports: [
-        BsDropdownModule,
         SharedModule,
         AccountsRoutingModule,
         EffectsModule.forFeature([AccountsEffects]),

diff --git a/src/web/src/app/+core/effects.service.ts b/src/web/src/app/+core/effects.service.ts
@@ -1,6 +1,5 @@
-import {of} from "rxjs/observable/of";
+import {of, Observable} from "rxjs";
 import {Injectable} from "@angular/core";
-import {Observable} from "rxjs/Observable";
 import {Action} from "@ngrx/store";
 
 import {CoreActions} from "_web_app/store/actions";

diff --git a/src/web/src/app/+core/electron.service.ts b/src/web/src/app/+core/electron.service.ts
@@ -1,5 +1,4 @@
-import {Observable} from "rxjs/Observable";
-import {Subscriber} from "rxjs/Subscriber";
+import {Observable, Subscriber} from "rxjs";
 import {Injectable, NgZone} from "@angular/core";
 
 import {ElectronIpcMainActionType, ElectronIpcRendererActionType} from "_shared/electron-actions/model";

diff --git a/src/web/src/app/+options/account-edit.component.ts b/src/web/src/app/+options/account-edit.component.ts
@@ -1,8 +1,5 @@
 import {map, merge, mergeMap, switchMap, takeUntil, withLatestFrom} from "rxjs/operators";
-import {Observable} from "rxjs/Observable";
-import {Subject} from "rxjs/Subject";
-import {BehaviorSubject} from "rxjs/BehaviorSubject";
-import {of} from "rxjs/observable/of";
+import {Observable, Subject, BehaviorSubject, of} from "rxjs";
 import {AfterViewInit, Component, ElementRef, OnDestroy, OnInit, QueryList, ViewChildren} from "@angular/core";
 import {FormControl, FormGroup, Validators} from "@angular/forms";
 import {ActivatedRoute} from "@angular/router";

diff --git a/src/web/src/app/+options/encryption-presets.component.ts b/src/web/src/app/+options/encryption-presets.component.ts
@@ -1,5 +1,5 @@
 import {map, takeUntil} from "rxjs/operators";
-import {Subject} from "rxjs/Subject";
+import {Subject} from "rxjs";
 import {Component, Input, OnDestroy, OnInit} from "@angular/core";
 import {FormGroup} from "@angular/forms";
 import {Store} from "@ngrx/store";

diff --git a/src/web/src/app/+options/keepass-associate.component.ts b/src/web/src/app/+options/keepass-associate.component.ts
@@ -1,6 +1,5 @@
 import {map, takeUntil} from "rxjs/operators";
-import {Observable} from "rxjs/Observable";
-import {Subject} from "rxjs/Subject";
+import {Observable, Subject} from "rxjs";
 import {Component, Input, OnDestroy, OnInit} from "@angular/core";
 import {FormControl, FormGroup, Validators} from "@angular/forms";
 import {Store} from "@ngrx/store";

diff --git a/src/web/src/app/+options/keepass-reference.component.ts b/src/web/src/app/+options/keepass-reference.component.ts
@@ -1,6 +1,5 @@
 import {catchError, map, take} from "rxjs/operators";
-import {Observable} from "rxjs/Observable";
-import {of} from "rxjs/observable/of";
+import {Observable, of} from "rxjs";
 import {Component, EventEmitter, Input, Output} from "@angular/core";
 import {FormControl, FormGroup, Validators} from "@angular/forms";
 import {Store} from "@ngrx/store";

diff --git a/src/web/src/app/+options/options.effects.ts b/src/web/src/app/+options/options.effects.ts
@@ -1,6 +1,5 @@
 import {catchError, finalize, map, mergeMap, switchMap, withLatestFrom} from "rxjs/operators";
-import {of} from "rxjs/observable/of";
-import {merge as observableMerge} from "rxjs/observable/merge";
+import {of, merge as observableMerge} from "rxjs";
 import {Injectable} from "@angular/core";
 import {Actions, Effect} from "@ngrx/effects";
 import {Store} from "@ngrx/store";

diff --git a/src/web/src/app/+options/settings-configure.guard.ts b/src/web/src/app/+options/settings-configure.guard.ts
@@ -1,6 +1,5 @@
 import {switchMap} from "rxjs/operators";
-import {Observable} from "rxjs/Observable";
-import {of} from "rxjs/observable/of";
+import {Observable, of} from "rxjs";
 import {Injectable} from "@angular/core";
 import {CanActivate} from "@angular/router";
 import {Store} from "@ngrx/store";

diff --git a/src/web/src/app/+shared/keepass-request.component.ts b/src/web/src/app/+shared/keepass-request.component.ts
@@ -1,10 +1,5 @@
-import {catchError, distinctUntilChanged, filter, mergeMap, scan, switchMap, takeUntil, withLatestFrom} from "rxjs/operators";
-import {Observable} from "rxjs/Observable";
-import {BehaviorSubject} from "rxjs/BehaviorSubject";
-import {Subject} from "rxjs/Subject";
-import {interval} from "rxjs/observable/interval";
-import {of} from "rxjs/observable/of";
-import {mapTo} from "rxjs/operators/mapTo";
+import {catchError, distinctUntilChanged, filter, mergeMap, scan, switchMap, takeUntil, withLatestFrom, mapTo} from "rxjs/operators";
+import {Observable, BehaviorSubject, Subject, interval, of} from "rxjs";
 import {Component, EventEmitter, HostBinding, Input, OnDestroy, OnInit, Output} from "@angular/core";
 import {Store} from "@ngrx/store";
 

diff --git a/src/web/src/app/app.module.ts b/src/web/src/app/app.module.ts
@@ -6,7 +6,6 @@ import {EffectsModule} from "@ngrx/effects";
 import {Store, StoreModule} from "@ngrx/store";
 import {APP_BASE_HREF} from "@angular/common";
 import {createInputTransfer, createNewHosts, removeNgStyles} from "@angularclass/hmr";
-import {BsDropdownModule} from "ngx-bootstrap/dropdown";
 import {PopoverModule} from "ngx-bootstrap/popover";
 
 import {CoreModule} from "./+core/core.module";
@@ -26,7 +25,6 @@ import {ErrorItemComponent} from "./components/error-item.component";
         BrowserModule,
         RoutingModule,
         CoreModule,
-        BsDropdownModule.forRoot(),
         PopoverModule.forRoot(),
         StoreModule.forRoot(reducers, {metaReducers}),
         StoreModule.forFeature(AccountsReducer.featureName, AccountsReducer.reducer),

diff --git a/src/web/src/app/components/error-list.component.ts b/src/web/src/app/components/error-list.component.ts
@@ -1,5 +1,5 @@
 import {pairwise, takeUntil} from "rxjs/operators";
-import {Subject} from "rxjs/Subject";
+import {Subject} from "rxjs";
 import {ChangeDetectionStrategy, Component, OnDestroy, OnInit} from "@angular/core";
 import {Store} from "@ngrx/store";
 

diff --git a/src/web/src/app/components/router-proxy.component.ts b/src/web/src/app/components/router-proxy.component.ts
@@ -1,5 +1,5 @@
 import {filter, map, takeUntil} from "rxjs/operators";
-import {Subject} from "rxjs/Subject";
+import {Subject} from "rxjs";
 import {Component, HostBinding, OnDestroy, OnInit} from "@angular/core";
 import {ActivatedRoute} from "@angular/router";