Adding support for ng12

Author: jamesdaniels

package.json

@@ -4,12 +4,12 @@
   "description": "The official Angular library for Firebase.",
   "private": true,
   "scripts": {
-    "test": "npm run build:jasmine && npm run test:node",
+    "test": "npm run build:jasmine && npm run test:node && npm run test:chrome-headless",
     "test:watch": "firebase emulators:exec --project=angularfire2-test \"ng test --watch=true --browsers=Chrome\"",
     "test:chrome": "firebase emulators:exec --project=angularfire2-test \"ng test --watch=false --browsers=Chrome\"",
     "test:chrome-headless": "firebase emulators:exec --project=angularfire2-test \"ng test --watch=false --browsers=ChromeHeadless\"",
     "lint": "ng lint",
-    "test:node": "firebase emulators:exec --project=angularfire2-test \"node -r tsconfig-paths/register ./tools/jasmine.js\"",
+    "test:node": "node -r tsconfig-paths/register ./tools/jasmine.js",
     "test:typings": "node ./tools/run-typings-test.js",
     "test:build": "bash ./test/ng-build/build.sh",
     "test:all": "npm run test:node && npm run test:chrome-headless && npm run test:typings && npm run test:build",
@@ -40,15 +40,15 @@
   },
   "homepage": "https://github.com/angular/angularfire#readme",
   "dependencies": {
-    "@angular-devkit/architect": ">= 0.900 < 0.1200",
-    "@angular-devkit/core": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular-devkit/schematics": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/common": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/compiler": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/core": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/platform-browser": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/platform-browser-dynamic": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/router": "^9.0.0 || ^10.0.0 || ^11.0.0",
+    "@angular-devkit/architect": ">= 0.900 < 0.1300",
+    "@angular-devkit/core": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular-devkit/schematics": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/common": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/compiler": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/core": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/platform-browser": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/platform-browser-dynamic": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/router": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
     "firebase": "^7.0 || ^8.0",
     "firebase-admin": "^8.10.0",
     "firebase-functions": "^3.6.0",
@@ -65,19 +65,19 @@
     "tslib": "^1.10.0 || ^2.0.0",
     "ws": "^7.2.1",
     "xhr2": "^0.1.4",
-    "zone.js": "0.10.2"
+    "zone.js": "~0.11.4"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.1",
     "utf-8-validate": "^5.0.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": ">= 0.900 < 0.1200",
-    "@angular-devkit/build-ng-packagr": ">= 0.900 < 0.1200",
-    "@angular/animations": " ^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/cli": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/compiler-cli": "^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/platform-server": "^9.0.0 || ^10.0.0 || ^11.0.0",
+    "@angular-devkit/build-angular": ">= 0.900 < 0.1300",
+    "@angular-devkit/build-ng-packagr": ">= 0.900 < 0.1300",
+    "@angular/animations": " ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/cli": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/compiler-cli": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/platform-server": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
     "@types/fs-extra": "^7.0.0",
     "@types/gzip-size": "^5.1.1",
     "@types/inquirer": "^0.0.44",
@@ -99,7 +99,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "ncp": "^2.0.0",
-    "ng-packagr": "^10.1.0",
+    "ng-packagr": "^12.0.0",
     "pretty-size": "^2.0.0",
     "protractor": "~7.0.0",
     "reflect-metadata": "0.1.2",
@@ -117,7 +117,7 @@
     "tslint": "~6.1.0",
     "ttypescript": "^1.5.12",
     "typedoc": "^0.16.4",
-    "typescript": ">=4.0.0 <4.1.0"
+    "typescript": ">=4.2.3 <4.3.0"
   },
   "typings": "index.d.ts",
   "resolutions": {

sample/angular.json

@@ -18,7 +18,6 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets",
@@ -29,7 +28,13 @@
             "styles": [
               "src/styles.css"
             ],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "emulated": {
@@ -129,7 +134,9 @@
             "main": "server.ts",
             "tsConfig": "tsconfig.server.json",
             "bundleDependencies": true,
-            "externalDependencies": [ ]
+            "externalDependencies": [ ],
+            "sourceMap": true,
+            "optimization": false
           },
           "configurations": {
             "production": {

sample/package.json

@@ -17,17 +17,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~11.0.0",
-    "@angular/common": "~11.0.0",
-    "@angular/compiler": "~11.0.0",
-    "@angular/core": "~11.0.0",
+    "@angular/animations": "~12.0.0",
+    "@angular/common": "~12.0.0",
+    "@angular/compiler": "~12.0.0",
+    "@angular/core": "~12.0.0",
     "@angular/fire": "../dist/packages-dist",
-    "@angular/forms": "~11.0.0",
-    "@angular/platform-browser": "~11.0.0",
-    "@angular/platform-browser-dynamic": "~11.0.0",
-    "@angular/platform-server": "~11.0.0",
-    "@angular/router": "~11.0.0",
-    "@angular/service-worker": "^11.0.0",
+    "@angular/forms": "~12.0.0",
+    "@angular/platform-browser": "~12.0.0",
+    "@angular/platform-browser-dynamic": "~12.0.0",
+    "@angular/platform-server": "~12.0.0",
+    "@angular/router": "~12.0.0",
+    "@angular/service-worker": "^12.0.0",
     "@nguniversal/express-engine": "~10.1.0",
     "core-js": "^3.6.5",
     "firebase": "^8.0.0",
@@ -36,14 +36,14 @@
     "rxjs": "~6.6.3",
     "tslib": "^2.0.1",
     "whatwg-fetch": "^3.4.1",
-    "zone.js": "0.10.3"
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1001.3",
-    "@angular-devkit/build-angular": "~0.1100.0",
-    "@angular/cli": "~11.0.0",
-    "@angular/compiler-cli": "~11.0.0",
-    "@angular/language-service": "~11.0.0",
+    "@angular-devkit/architect": "~0.1200.0",
+    "@angular-devkit/build-angular": "~12.0.0",
+    "@angular/cli": "~12.0.0",
+    "@angular/compiler-cli": "~12.0.0",
+    "@angular/language-service": "~12.0.0",
     "@firebase/app-types": "^0.6.1",
     "@nguniversal/builders": "^10.1.0",
     "@types/jasmine": "~3.5.0",
@@ -62,13 +62,13 @@
     "inquirer-autocomplete-prompt": "^1.0.1",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.1.1",
+    "karma": "~6.3.2",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "ts-node": "~9.0.0",
     "tslint": "~6.1.3",
-    "typescript": "~4.0.5"
+    "typescript": "~4.2.4"
   }
-}
+}

sample/server.ts

@@ -1,4 +1,4 @@
-import 'zone.js/dist/zone-node';
+import 'zone.js/node';
 
 import { ngExpressEngine } from '@nguniversal/express-engine';
 import * as express from 'express';
@@ -36,7 +36,7 @@ export function app() {
   // Serve static files from /browser
   server.get('*.*', express.static(distFolder, {
     maxAge: '1y'
-  }));
+  }) as any);
 
   // All regular routes use the Universal engine
   server.get('*', (req, res) => {

sample/src/app/database/database.component.ts

@@ -25,7 +25,7 @@ export class DatabaseComponent implements OnInit {
       this.testObjectValue$ = EMPTY;
     } else {
       const doc = database.object('test');
-      const key = makeStateKey(doc.query.toString());
+      const key = makeStateKey<unknown>(doc.query.toString());
       const existing = state.get(key, undefined);
       this.testObjectValue$ = doc.valueChanges().pipe(
         trace('database'),

sample/src/app/firestore-offline/firestore-offline.component.ts

@@ -22,7 +22,7 @@ export class FirestoreOfflineComponent implements OnInit {
 
   constructor(state: TransferState, firestore: AngularFirestoreOffline) {
     const doc = firestore.doc('test/1');
-    const key = makeStateKey(doc.ref.path);
+    const key = makeStateKey<unknown>(doc.ref.path);
     const existing = state.get(key, undefined);
     this.testDocValue$ = firestore.doc('test/1').valueChanges().pipe(
       trace('firestore'),

sample/src/app/firestore/firestore.component.ts

@@ -21,7 +21,7 @@ export class FirestoreComponent implements OnInit {
 
   constructor(state: TransferState, firestore: AngularFirestore) {
     const doc = firestore.doc('test/1');
-    const key = makeStateKey(doc.ref.path);
+    const key = makeStateKey<unknown>(doc.ref.path);
     const existing = state.get(key, undefined);
     this.testDocValue$ = firestore.doc('test/1').valueChanges().pipe(
       trace('firestore'),

sample/src/app/storage/storage.component.ts

@@ -25,7 +25,7 @@ export class StorageComponent implements OnInit {
 
   constructor(storage: AngularFireStorage, state: TransferState) {
     const icon = storage.ref('google-g.png');
-    const key = makeStateKey('google-icon-url');
+    const key = makeStateKey<unknown>('google-icon-url');
     const existing = state.get(key, undefined);
     this.downloadUrl$ = existing ? of(existing) : icon.getDownloadURL().pipe(
       trace('storage'),

sample/src/app/upboats/upboats.component.ts

@@ -21,7 +21,7 @@ export class UpboatsComponent implements OnInit {
     const collection = firestore.collection<Animal>('animals', ref =>
       ref.orderBy('upboats', 'desc').orderBy('updatedAt', 'desc')
     );
-    const key = makeStateKey(collection.ref.path);
+    const key = makeStateKey<Animal[]>(collection.ref.path);
     const existing = state.get(key, undefined);
     this.animals = collection.snapshotChanges().pipe(
       trace('animals'),

sample/src/environments/environment.emulated.ts

@@ -25,4 +25,4 @@ export const environment = {
  * This import should be commented out in production mode because it will have a negative impact
  * on performance if an error is thrown.
  */
-import 'zone.js/dist/zone-error'; // Included with Angular CLI.
+import 'zone.js/plugins/zone-error'; // Included with Angular CLI.