Bump electron/npm depends for /web front-end (thrasher-corp#535)

* Bump electron from 3.0.8 to 7.2.4 in /web Bumps [electron](https://github.com/electron/electron) from 3.0.8 to 7.2.4. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md) - [Commits](electron/electron@v3.0.8...v7.2.4) Signed-off-by: dependabot[bot] <[email protected]> * web: periodic update of depends * Fix front-end linter/console errors Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Adrian Gallagher <[email protected]>
djimmo · Aug 6, 2020 · 3107f70 · 3107f70
1 parent 0e30756
commit 3107f70
Show file tree

Hide file tree

Showing 6 changed files with 3,600 additions and 2,562 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -48,13 +48,14 @@
     "start:web": "ng serve --o"
   },
   "dependencies": {
-    "node-sass": "^4.10.0",
+    "@angular-devkit/build-angular": "^0.13.0",
+    "node-sass": "^4.14.1",
+    "hammerjs": "^2.0.8",
     "rxjs-compat": "^6.3.3",
-    "rxjs-tslint": "^0.1.5"
+    "rxjs-tslint": "^0.1.8"
   },
   "devDependencies": {
     "@amcharts/amcharts3-angular": "2.2.2",
-    "@angular-devkit/build-angular": "~0.10.0",
     "@angular/animations": "^7.0.3",
     "@angular/cdk": "^7.0.3",
     "@angular/cli": "^7.0.5",
@@ -79,9 +80,9 @@
     "core-js": "^2.5.7",
     "cross-env": "^5.2.0",
     "dotenv": "^6.1.0",
-    "electron": "^3.0.8",
+    "electron": "^7.2.4",
     "electron-builder": "^20.34.0",
-    "electron-reload": "^1.3.0",
+    "electron-reload": "^1.5.0",
     "fs-extra": "^7.0.1",
     "jasmine-core": "^3.3.0",
     "jasmine-spec-reporter": "^4.2.1",

diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts
@@ -59,8 +59,6 @@ import { AppRoutingModule } from './app-routing.module';
 
 import { Wallet } from './shared/classes/wallet';
 
-
-import * as Rx from 'rxjs/Rx';
 import { TradeHistoryComponent } from './shared/trade-history/trade-history.component';
 import { PriceHistoryComponent } from './shared/price-history/price-history.component';
 import { MyOrdersComponent } from './shared/my-orders/my-orders.component';

diff --git a/web/src/app/services/websocket-response-handler/websocket-response-handler.service.ts b/web/src/app/services/websocket-response-handler/websocket-response-handler.service.ts
@@ -1,7 +1,7 @@
 
 import {share, map} from 'rxjs/operators';
-import { NgModule, Injectable, Optional, SkipSelf } from '@angular/core';
-import { Observable, Subject } from 'rxjs/Rx';
+import { NgModule, Optional, SkipSelf } from '@angular/core';
+import { Observable, Subject } from 'rxjs';
 import { WebsocketService } from './../../services/websocket/websocket.service';
 import { WebSocketMessage } from './../../shared/classes/websocket';
 

diff --git a/web/src/app/services/websocket/websocket.service.ts b/web/src/app/services/websocket/websocket.service.ts
@@ -1,5 +1,5 @@
-import { Injectable, Optional, SkipSelf, NgModule } from '@angular/core';
-import { Subject, Observable, Observer } from 'rxjs/Rx';
+import { Optional, SkipSelf, NgModule } from '@angular/core';
+import { Subject, Observable, Observer } from 'rxjs';
 import { WebSocketMessage } from './../../shared/classes/websocket';
 
 @NgModule()

diff --git a/web/src/polyfills.ts b/web/src/polyfills.ts
@@ -22,6 +22,7 @@
  * Zone JS is required by Angular itself.
  */
 import 'zone.js/dist/zone-mix'; // Included with Angular CLI.
+import 'hammerjs';
 
 
 /***************************************************************************************************