Upgrade to Angular 7 beta 4

jeroenouw · jeroenouw · commit 162bf4ebef74 · 2018-09-27T15:21:02.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,31 +32,31 @@
     "compodoc:w": "compodoc -p src/tsconfig.app.json --serve --watch"
   },
   "dependencies": {
-    "@angular/animations": "^6.0.0",
-    "@angular/cdk": "^6.0.1",
-    "@angular/common": "^6.0.0",
-    "@angular/compiler": "^6.0.0",
-    "@angular/core": "^6.0.0",
-    "@angular/forms": "^6.0.0",
-    "@angular/http": "^6.0.0",
-    "@angular/material": "^6.0.1",
-    "@angular/platform-browser": "^6.0.0",
-    "@angular/platform-browser-dynamic": "^6.0.0",
-    "@angular/platform-server": "^6.0.0",
-    "@angular/router": "^6.0.0",
-    "core-js": "^2.5.3",
-    "firebase": "^5.0.2",
+    "@angular/animations": "^7.0.0-beta.7",
+    "@angular/cdk": "^7.0.0-beta.2",
+    "@angular/common": "^7.0.0-beta.7",
+    "@angular/compiler": "^7.0.0-beta.7",
+    "@angular/core": "^7.0.0-beta.7",
+    "@angular/forms": "^7.0.0-beta.7",
+    "@angular/http": "^7.0.0-beta.7",
+    "@angular/material": "^7.0.0-beta.2",
+    "@angular/platform-browser": "^7.0.0-beta.7",
+    "@angular/platform-browser-dynamic": "^7.0.0-beta.7",
+    "@angular/platform-server": "^7.0.0-beta.7",
+    "@angular/router": "^7.0.0-beta.7",
+    "core-js": "^2.5.7",
+    "firebase": "^5.5.1",
     "hammerjs": "^2.0.8",
-    "rxjs": "^6.1.0",
-    "rxjs-compat": "^6.1.0",
+    "rxjs": "^6.3.3",
+    "rxjs-compat": "^6.3.3",
     "ts-helpers": "*",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.6.0",
-    "@angular/cli": "^6.0.0",
-    "@angular/compiler-cli": "^6.0.0",
-    "@angular/language-service": "^6.0.0",
+    "@angular-devkit/build-angular": "^0.9.0-beta.4",
+    "@angular/cli": "^7.0.0-beta.4",
+    "@angular/compiler-cli": "^7.0.0-beta.7",
+    "@angular/language-service": "^7.0.0-beta.7",
     "@compodoc/compodoc": "^1.1.2",
     "@types/jasmine": "^2.8.7",
     "@types/node": "^10.0.3",
@@ -73,7 +73,7 @@
     "rxjs-tslint": "^0.1.3",
     "ts-node": "^6.0.2",
     "tslint": "^5.10.0",
-    "typescript": "2.7.2",
-    "webpack": "^4.6.0"
+    "typescript": "^3.0.3",
+    "webpack": "^4.20.2"
   }
 }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 
 @Component({
   selector: 'app-root',
diff --git a/src/app/components/auth/phone-signin/phone-signin.component.ts b/src/app/components/auth/phone-signin/phone-signin.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 
 import { WindowService, PhoneNumber, AuthService, AlertService } from '../../shared';
 
diff --git a/src/app/components/blocks/third-block/third-block.component.ts b/src/app/components/blocks/third-block/third-block.component.ts
@@ -12,6 +12,6 @@ export class ThirdBlockComponent  {
   titleFour = 'Material 2';
   contentFour = 'Material Design is a unified system that combines theory, resources, and tools for crafting digital experiences.';
 
-  titleFive = 'Firebase';
+  titleFive = 'firebase/app';
   contentFive = 'Firebase is built on Google infrastructure and scales automatically, for even the largest apps.';
 }
diff --git a/src/app/components/email-me/email-me.component.html b/src/app/components/email-me/email-me.component.html
@@ -2,7 +2,7 @@
   <mat-card>
     <h3>Keep in touch!</h3>
     <mat-form-field class="full-width">
-      <input matInput formControlName="email" placeholder="Your Email" type="email" ngModel required>
+      <input matInput formControlName="email" placeholder="Your Email" type="email" required>
     </mat-form-field>
     <div *ngIf="!form.controls.email.valid  && form.controls.email.dirty">
       <p>Please enter a valid email.</p>
diff --git a/src/app/components/messages/message.service.ts b/src/app/components/messages/message.service.ts
@@ -1,4 +1,4 @@
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/observable';
 import { Subject } from 'rxjs/Subject';
diff --git a/src/app/components/messages/messages.component.ts b/src/app/components/messages/messages.component.ts
@@ -1,4 +1,4 @@
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 import { Component, OnInit, AfterViewChecked, ElementRef, ViewChild } from '@angular/core';
 import { Observable } from 'rxjs/observable';
 import { FormsModule } from '@angular/forms';
diff --git a/src/app/components/profile/profile-settings.component.ts b/src/app/components/profile/profile-settings.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { NgForm, FormsModule, FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
 
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 
 import { Profile, AuthService, AlertService, UserService } from '../shared';
 
diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 import { trigger, state, style, transition, animate, keyframes } from '@angular/animations';
 
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 
 import { User, Profile, UserService, AlertService } from '../shared';
 
diff --git a/src/app/components/shared/layout/header/header.component.ts b/src/app/components/shared/layout/header/header.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 
 import { AuthService, AlertService, UserService } from '../../services';
 
diff --git a/src/app/components/shared/services/auth.service.ts b/src/app/components/shared/services/auth.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 
 import { AlertService } from './alert.service';
 import { UserService } from './user.service';
@@ -19,8 +19,8 @@ export class AuthService {
     const providerGoogle = new firebase.auth.GoogleAuthProvider();
     return firebase.auth().signInWithPopup(providerGoogle)
       .then((result) => {
-        const token = result.credential.accessToken;
-        const currentUser = result.user;
+        // const token = result.credential.accessToken;
+        // const currentUser = result.user;
       })
       .then(response => {
         this.router.navigate(['/']);
@@ -42,9 +42,9 @@ export class AuthService {
     const providerTwitter = new firebase.auth.TwitterAuthProvider();
     return firebase.auth().signInWithPopup(providerTwitter)
       .then((result) => {
-        const token = result.credential.accessToken;
+        // const token = result.credential.accessToken;
         const currentUser = result.user;
-        const secret = result.credential.secret;
+        // const secret = result.credential.secret;
       })
       .then(response => {
         this.router.navigate(['/']);
@@ -86,7 +86,7 @@ export class AuthService {
     const providerGithub = new firebase.auth.GithubAuthProvider();
       return firebase.auth().signInWithPopup(providerGithub)
       .then((result) => {
-        const token = result.credential.accessToken;
+        // const token = result.credential.accessToken;
         const currentUser = result.user;
         this.alertService.showToaster('Verification email is sent to you.');
         this.userService.verificationUserEmail();
@@ -122,7 +122,7 @@ export class AuthService {
     const providerGoogle = new firebase.auth.GoogleAuthProvider();
     return firebase.auth().signInWithPopup(providerGoogle)
       .then((result) => {
-        const token = result.credential.accessToken;
+        // const token = result.credential.accessToken;
         const currentUser = result.user;
       })
       .then(response => {
@@ -178,7 +178,7 @@ export class AuthService {
     const providerGithub = new firebase.auth.GithubAuthProvider();
     return firebase.auth().signInWithPopup(providerGithub)
       .then((result) => {
-        const token = result.credential.accessToken;
+        // const token = result.credential.accessToken;
         const currentUser = result.user;
       })
       .then(response => {
diff --git a/src/app/components/shared/services/user.service.ts b/src/app/components/shared/services/user.service.ts
@@ -1,4 +1,4 @@
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
 import { Injectable } from '@angular/core';
 
 import { User, Profile } from '../models';
diff --git a/src/browserslist b/src/browserslist
diff --git a/src/main.ts b/src/main.ts
@@ -2,8 +2,8 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { enableProdMode } from '@angular/core';
 import { environment } from './environments/environment';
 import { AppModule } from './app/app.module';
-import { getTranslationProviders } from './app/locale/i18n-providers';
-import 'hammerjs';
+// import { getTranslationProviders } from './app/locale/i18n-providers';
+// import 'hammerjs';
 
 if (environment.production) {
   enableProdMode();

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ export class ThirdBlockComponent {`
`12`	`12`	`titleFour = 'Material 2';`
`13`	`13`	`contentFour = 'Material Design is a unified system that combines theory, resources, and tools for crafting digital experiences.';`
`14`	`14`
`15`		`- titleFive = 'Firebase';`
	`15`	`+ titleFive = 'firebase/app';`
`16`	`16`	`contentFive = 'Firebase is built on Google infrastructure and scales automatically, for even the largest apps.';`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as firebase from 'firebase';`
	`1`	`+import * as firebase from 'firebase/app';`
`2`	`2`	`import { Injectable } from '@angular/core';`
`3`	`3`	`import { Observable } from 'rxjs/observable';`
`4`	`4`	`import { Subject } from 'rxjs/Subject';`