chore(package): finish rxjs upgrade

Author: Awk34

Diff for: templates/app/_package.json

@@ -53,7 +53,6 @@
     "@angularclass/hmr-loader": "^3.0.4",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^6.0.0",
-    "rxjs-compat": "^6.0.0",
     "zone.js": "^0.8.12",
     "@angular/common": "^6.0.4",
     "@angular/compiler": "^6.0.4",
@@ -89,7 +88,7 @@
   <% if(filters.bootstrap) { %>
     "bootstrap": "~3.3.7",
     <% if(filters.uibootstrap) { %>
-    "ngx-bootstrap": "~1.6.3",<% } %>
+    "ngx-bootstrap": "^3.0.0",<% } %>
     <% if(filters.sass) { %>
     "bootstrap-sass": "~3.3.7",<% } %>
     <% if(filters.stylus) { %>

Diff for: templates/app/client/app/main/main.component.js

@@ -1,6 +1,5 @@
 import { Component, OnInit<% if(filters.ws) { %>, OnDestroy<% } %> } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import 'rxjs/add/operator/map';<% if(filters.ws) { %>
+import { HttpClient } from '@angular/common/http';<% if(filters.ws) { %>
 import { SocketService } from '../../components/socket/socket.service';<% } %><% if(filters.ts) { %>
 
 interface Thing {

Diff for: templates/app/client/components/auth(auth)/auth.service.js

@@ -1,7 +1,6 @@
 import { Injectable, EventEmitter, Output } from '@angular/core';
 import { UserService } from './user.service';
 import { HttpClient } from '@angular/common/http';
-import 'rxjs/add/operator/toPromise';
 import { safeCb } from '../util';
 import constants from '../../app/app.constants';
 

Diff for: templates/app/client/components/auth(auth)/user.service.js

@@ -1,10 +1,8 @@
 // @flow
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs/Rx';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/toPromise';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 type UserType = {
     // TODO: use Mongoose model
@@ -22,10 +20,10 @@ export class UserService {
     }
 
     query(): Observable<UserType[]> {
-        return this.http.get('/api/users/') as Observable<UserType[]>;
+        return this.http.get('/api/users/')<% if(filters.ts) { %> as Observable<UserType[]><% } %>;
     }
     get(user<% if(filters.ts) { %>: UserType<% } %> = {id: 'me'}): Observable<UserType> {
-        return this.http.get(`/api/users/${user.id || user._id}`) as Observable<UserType>;
+        return this.http.get(`/api/users/${user.id || user._id}`)<% if(filters.ts) { %> as Observable<UserType><% } %>;
     }
     create(user: UserType) {
         return this.http.post('/api/users/', user);
@@ -35,6 +33,6 @@ export class UserService {
     }
     remove(user) {
         return this.http.delete(`/api/users/${user.id || user._id}`)
-            .map(() => user);
+            .pipe(map(() => user));
     }
 }