Update Firebase (#20)

* Update Firebase

Update Firebase to the current major version, angularfire2 has been renames

* Update codelyzer and linter rules

* Update other packages

* Update lockfile

* Update references to angularfire2

* Change annotation

See: https://firebase.google.com/support/release-notes/js#authentication_15

* Add space inside brace

* Exclude node modules from linter

angular.json

@@ -86,7 +86,9 @@
               "src/tsconfig.app.json",
               "src/tsconfig.spec.json"
             ],
-            "exclude": []
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         }
       }
@@ -109,7 +111,9 @@
             "tsConfig": [
               "e2e/tsconfig.e2e.json"
             ],
-            "exclude": []
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         }
       }

package.json

@@ -12,28 +12,28 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^6.1.4",
-    "@angular/compiler": "^6.1.4",
-    "@angular/core": "^6.1.4",
-    "@angular/forms": "^6.1.4",
-    "@angular/http": "^6.1.4",
-    "@angular/platform-browser": "^6.1.4",
-    "@angular/platform-browser-dynamic": "^6.1.4",
-    "@angular/router": "^6.1.4",
+    "@angular/common": "^6.1.9",
+    "@angular/compiler": "^6.1.9",
+    "@angular/core": "^6.1.9",
+    "@angular/forms": "^6.1.9",
+    "@angular/http": "^6.1.9",
+    "@angular/platform-browser": "^6.1.9",
+    "@angular/platform-browser-dynamic": "^6.1.9",
+    "@angular/router": "^6.1.9",
     "angular2-uuid": "^1.1.1",
-    "angularfire2": "^5.0.0-rc.9",
+    "@angular/fire": "^5.0.2",
     "core-js": "^2.5.7",
-    "firebase": "^4.13.1",
-    "rxjs": "^6.2.2",
+    "firebase": "^5.5.1",
+    "rxjs": "^6.3.3",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.7.0",
-    "@angular/cli": "^6.1.5",
-    "@angular/compiler-cli": "^6.1.4",
+    "@angular/cli": "^6.2.3",
+    "@angular/compiler-cli": "^6.1.9",
     "@types/jasmine": "2.5.38",
-    "@types/node": "^6.0.116",
-    "codelyzer": "~2.0.0",
+    "@types/node": "^6.0.117",
+    "codelyzer": "~4.3.0",
     "jasmine-core": "~2.5.2",
     "jasmine-spec-reporter": "~3.2.0",
     "karma": "^3.0.0",
@@ -42,7 +42,7 @@
     "karma-coverage-istanbul-reporter": "^0.2.0",
     "karma-jasmine": "^1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.4.0",
+    "protractor": "^5.4.1",
     "ts-node": "~2.0.0",
     "tslint": "~4.5.0",
     "typescript": "^2.9.2"

src/app/admin/admin.service.ts

@@ -1,20 +1,20 @@
 
-import {throwError as observableThrowError,  Observable, defer, of, concat } from 'rxjs';
+import { throwError as observableThrowError,  Observable, defer, of, concat } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { AngularFireObject, AngularFireDatabase, AngularFireList } from 'angularfire2/database';
+import { AngularFireObject, AngularFireDatabase, AngularFireList } from '@angular/fire/database';
 import { SponsorIndexModel } from 'app/admin/sponsor-index.model';
 import { SponsorshipBenefitModel } from 'app/benefits/sponsorship-benefit.model';
 import { SponsorModel } from 'app/admin/sponsor.model';
 import { UUID } from 'angular2-uuid';
-import { AngularFireAuth } from 'angularfire2/auth';
+import { AngularFireAuth } from '@angular/fire/auth';
 import { first, flatMap, map, mapTo } from 'rxjs/operators';
 
 @Injectable()
 export class AdminService {
     constructor(private auth: AngularFireAuth,
                 private db: AngularFireDatabase) {}
 
-    loginUser(email: string, password: string): Promise<void> {
+    loginUser(email: string, password: string): Promise<firebase.auth.UserCredential> {
         return this.auth.auth.signInWithEmailAndPassword(email, password);
     }
 

src/app/app.module.ts

@@ -15,10 +15,10 @@ import { EventsComponent } from 'app/events/events.component';
 import { PresentationComponent } from 'app/presentation/presentation.component';
 import { BenefitsService } from 'app/benefits/benefits.service';
 
-import { AngularFireModule } from 'angularfire2';
-import { AngularFirestoreModule } from 'angularfire2/firestore';
 import { firebase } from '../environments/firebase';
-import { AngularFireDatabase, AngularFireDatabaseModule } from 'angularfire2/database';
+import { AngularFireModule } from '@angular/fire';
+import { AngularFirestoreModule } from '@angular/fire/firestore';
+import { AngularFireDatabase, AngularFireDatabaseModule } from '@angular/fire/database';
 import { ChangesSavedComponent } from 'app/changes-saved/changes-saved.component';
 import { HomeLinkComponent } from 'app/home-link/home-link.component';
 import { HomeButtonComponent } from 'app/home-button/home-button.component';
@@ -33,7 +33,7 @@ import { AdminComponent } from 'app/admin/admin.component';
 import { AdminService } from 'app/admin/admin.service';
 import { NewSponsorComponent } from 'app/newSponsor/new-sponsor.component';
 import { LoginComponent } from 'app/login/login.component';
-import { AngularFireAuth } from 'angularfire2/auth';
+import { AngularFireAuth } from '@angular/fire/auth';
 import { AuthGuard } from 'app/auth-guard';
 import { NotFoundComponent } from 'app/404/not-found.component';
 import { SchedulesComponent } from 'app/schedule/schedule.component';

src/app/benefits/benefits.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { SponsorshipBenefitModel } from 'app/benefits/sponsorship-benefit.model';
-import { AngularFireDatabase, AngularFireList, AngularFireObject } from 'angularfire2/database';
+import { AngularFireDatabase, AngularFireList, AngularFireObject } from '@angular/fire/database';
 import { Observable } from 'rxjs';
 
 @Injectable()

src/app/events/events.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { AngularFireDatabase, AngularFireObject } from 'angularfire2/database';
+import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database';
 import { EventsSummaryModel } from 'app/events/events.model';
 import { Observable } from 'rxjs';
 

src/app/people/people.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { PersonModel } from 'app/people/person.model';
 import { Observable } from 'rxjs';
-import { AngularFireDatabase, AngularFireObject } from 'angularfire2/database';
+import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database';
 
 @Injectable()
 export class PeopleService {

src/app/presentation/presentation.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { AngularFireDatabase, AngularFireObject } from 'angularfire2/database';
-import { FirebaseApp } from 'angularfire2';
+import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database';
+import { FirebaseApp } from '@angular/fire';
 import { PresentationModel } from 'app/presentation/presentation.model';
 import { Observable, of } from 'rxjs';
 import 'firebase/storage';

src/app/sponsors/sponsors.service.ts

@@ -1,4 +1,4 @@
-import { AngularFireDatabase, AngularFireObject } from 'angularfire2/database';
+import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database';
 import { Injectable } from '@angular/core';
 import { BehaviorSubject ,  Observable } from 'rxjs';
 import { SponsorshipTier } from 'app/sponsors/sponsorship-tier.enum';

src/app/tech/tech.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { TechListingModel } from 'app/tech/tech-listing.model';
-import { AngularFireObject, AngularFireDatabase } from 'angularfire2/database';
+import { AngularFireObject, AngularFireDatabase } from '@angular/fire/database';
 import { Observable } from 'rxjs';
 
 @Injectable()

src/app/workshops/workshop.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { AngularFireDatabase, AngularFireObject } from 'angularfire2/database';
+import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database';
 import { EventsSummaryModel } from 'app/events/events.model';
 import { WorkshopModel } from 'app/workshops/workshop.model';
 import { Observable } from 'rxjs';

tslint.json

@@ -3,16 +3,23 @@
     "node_modules/codelyzer"
   ],
   "rules": {
+    "arrow-return-shorthand": true,
     "callable-types": true,
     "class-name": true,
     "comment-format": [
       true,
       "check-space"
     ],
     "curly": true,
+    "deprecation": {
+      "severity": "warn"
+    },
     "eofline": true,
     "forin": true,
-    "import-blacklist": [true],
+    "import-blacklist": [
+      true,
+      "rxjs/Rx"
+    ],
     "import-spacing": true,
     "indent": [
       true,
@@ -27,8 +34,14 @@
     "member-access": false,
     "member-ordering": [
       true,
-      "static-before-instance",
-      "variables-before-functions"
+      {
+        "order": [
+          "static-field",
+          "instance-field",
+          "static-method",
+          "instance-method"
+        ]
+      }
     ],
     "no-arg": true,
     "no-bitwise": true,
@@ -42,16 +55,23 @@
     ],
     "no-construct": true,
     "no-debugger": true,
-    "no-duplicate-variable": true,
+    "no-duplicate-super": true,
     "no-empty": false,
     "no-empty-interface": true,
     "no-eval": true,
-    "no-inferrable-types": [true, "ignore-params"],
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-misused-new": true,
+    "no-non-null-assertion": true,
+    "no-redundant-jsdoc": true,
     "no-shadowed-variable": true,
     "no-string-literal": false,
     "no-string-throw": true,
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": true,
+    "no-unnecessary-initializer": true,
     "no-unused-expression": true,
     "no-use-before-declare": true,
     "no-var-keyword": true,
@@ -70,6 +90,7 @@
     ],
     "radix": true,
     "semicolon": [
+      true,
       "always"
     ],
     "triple-equals": [
@@ -86,7 +107,6 @@
         "variable-declaration": "nospace"
       }
     ],
-    "typeof-compare": true,
     "unified-signatures": true,
     "variable-name": false,
     "whitespace": [
@@ -97,9 +117,7 @@
       "check-separator",
       "check-type"
     ],
-
-    "directive-selector": [true, "attribute", "app", "camelCase"],
-    "component-selector": [true, "element", "app", "kebab-case"],
+    "no-output-on-prefix": true,
     "use-input-property-decorator": true,
     "use-output-property-decorator": true,
     "use-host-property-decorator": true,
@@ -108,9 +126,6 @@
     "use-life-cycle-interface": true,
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
-    "directive-class-suffix": true,
-    "no-access-missing-member": true,
-    "templates-use-public": true,
-    "invoke-injectable": true
+    "directive-class-suffix": true
   }
 }