fix(various): Putting together 6.0.1 (angular#2386)

* Fixing SSR ng deploy on Windows
* Don't duplicate @firebase/firestore in externalDeps
* Don't duplicate the firebase.json entry on ng add if already present
* Warn on incompatible peers
* Adding NG 10 support
* CSS/JS immutable deployed with ng deploy are immutable
* import from firebase/app
* cross-browser open URL

Co-authored-by: NothingEverHappens <[email protected]>

Author: jamesdaniels

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/fire",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "The official library of Firebase and Angular.",
   "private": true,
   "scripts": {
@@ -39,15 +39,15 @@
   },
   "homepage": "https://github.com/angular/angularfire2#readme",
   "dependencies": {
-    "@angular-devkit/architect": "~0.900",
-    "@angular-devkit/core": "^9.0.0",
-    "@angular-devkit/schematics": "^9.0.0",
-    "@angular/common": "^9.0.0",
-    "@angular/compiler": "^9.0.0",
-    "@angular/core": "^9.0.0",
-    "@angular/platform-browser": "^9.0.0",
-    "@angular/platform-browser-dynamic": "^9.0.0",
-    "@angular/router": "^9.0.0",
+    "@angular-devkit/architect": ">= 0.900 < 0.1100",
+    "@angular-devkit/core": "^9.0.0 || ^10.0.0",
+    "@angular-devkit/schematics": "^9.0.0 || ^10.0.0",
+    "@angular/common": "^9.0.0 || ^10.0.0",
+    "@angular/compiler": "^9.0.0 || ^10.0.0",
+    "@angular/core": "^9.0.0 || ^10.0.0",
+    "@angular/platform-browser": "^9.0.0 || ^10.0.0",
+    "@angular/platform-browser-dynamic": "^9.0.0 || ^10.0.0",
+    "@angular/router": "^9.0.0 || ^10.0.0",
     "firebase": "^7.13.1",
     "firebase-admin": "^8.10.0",
     "firebase-functions": "^3.6.0",
@@ -57,6 +57,7 @@
     "husky": "^4.2.5",
     "inquirer": "^6.2.2",
     "inquirer-autocomplete-prompt": "^1.0.1",
+    "open": "^7.0.3",
     "rxfire": "^3.9.7",
     "rxjs": "^6.5.3",
     "semver": "^7.1.3",
@@ -70,12 +71,12 @@
     "utf-8-validate": "^5.0.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.900",
-    "@angular-devkit/build-ng-packagr": "~0.900",
-    "@angular/animations": " ^9.0.0",
-    "@angular/cli": "^9.0.0",
-    "@angular/compiler-cli": "^9.0.0",
-    "@angular/platform-server": "^9.0.0",
+    "@angular-devkit/build-angular": ">= 0.900 < 0.1100",
+    "@angular-devkit/build-ng-packagr": ">= 0.900 < 0.1100",
+    "@angular/animations": " ^9.0.0 || ^10.0.0",
+    "@angular/cli": "^9.0.0 || ^10.0.0",
+    "@angular/compiler-cli": "^9.0.0 || ^10.0.0",
+    "@angular/platform-server": "^9.0.0 || ^10.0.0",
     "@types/fs-extra": "^7.0.0",
     "@types/gzip-size": "^5.1.1",
     "@types/inquirer": "^0.0.44",
@@ -86,7 +87,7 @@
     "codelyzer": "^5.0.0",
     "concurrently": "^2.2.0",
     "conventional-changelog-cli": "^1.2.0",
-    "firebase-functions-test": "^0.1.7",
+    "firebase-functions-test": "^0.2.0",
     "gzip-size": "^5.1.1",
     "jasmine": "^3.4.0",
     "jasmine-core": "^3.4.0",

sample/angular.json

@@ -126,7 +126,6 @@
             "tsConfig": "tsconfig.server.json",
             "bundleDependencies": false,
             "externalDependencies": [
-              "@firebase/firestore",
               "@firebase/firestore"
             ]
           },

sample/firebase.json

@@ -4,10 +4,15 @@
       "target": "sample",
       "public": "dist/sample/dist/sample/browser",
       "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
+        "**/.*"
       ],
+      "headers": [{
+        "source": "*.[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].+(css|js)",
+        "headers": [{
+          "key": "Cache-Control",
+          "value": "public,max-age=31536000,immutable"
+        }]
+      }],
       "rewrites": [
         {
           "source": "**",

sample/package.json

@@ -19,15 +19,16 @@
     "@angular/common": "~9.1.0",
     "@angular/compiler": "~9.1.0",
     "@angular/core": "~9.1.0",
-    "@angular/fire": "file:../dist/packages-dist",
+    "@angular/fire": "../dist/packages-dist",
     "@angular/forms": "~9.1.0",
     "@angular/platform-browser": "~9.1.0",
     "@angular/platform-browser-dynamic": "~9.1.0",
     "@angular/platform-server": "~9.1.0",
     "@angular/router": "~9.1.0",
     "@angular/service-worker": "~9.1.0",
     "@nguniversal/express-engine": "~9.1.0",
-    "firebase": "^7.13.1",
+    "firebase": "^7.13.2",
+    "proxy-polyfill": "^0.3.1",
     "rxjs": "~6.5.4",
     "tslib": "^1.10.0",
     "zone.js": "~0.10.2"

sample/src/app/app-routing.module.ts

@@ -1,13 +1,16 @@
 import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { Routes, RouterModule } from '@angular/router';
+import { HomeComponent } from './home/home.component';
 
 
-const routes: Routes = [];
+const routes: Routes = [
+  { path: '', component: HomeComponent, pathMatch: 'full' }
+];
 
 @NgModule({
   imports: [RouterModule.forRoot(routes, {
     initialNavigation: 'enabled'
-})],
+  })],
   exports: [RouterModule]
 })
 export class AppRoutingModule { }

sample/src/app/app.component.ts

@@ -4,17 +4,11 @@ import { FirebaseApp } from '@angular/fire';
 @Component({
   selector: 'app-root',
   template: `
-    Hello world!
-    {{ firebaseApp.name }}
-    <app-database></app-database>
-    <app-firestore></app-firestore>
-    <app-remote-config></app-remote-config>
-    <app-storage></app-storage>
+    <router-outlet></router-outlet>
   `,
   styles: [``]
 })
 export class AppComponent {
-  title = 'sample';
   constructor(public readonly firebaseApp: FirebaseApp, appRef: ApplicationRef) {
     appRef.isStable.subscribe(it => console.log('isStable', it));
   }

sample/src/app/app.module.ts

@@ -29,11 +29,21 @@ import { AngularFireAuthGuardModule } from '@angular/fire/auth-guard';
 import { DatabaseComponent } from './database/database.component';
 import { StorageComponent } from './storage/storage.component';
 import { RemoteConfigComponent } from './remote-config/remote-config.component';
+import { HomeComponent } from './home/home.component';
+import { AuthComponent } from './auth/auth.component';
 
 const shouldUseEmulator = () => false;
 
 @NgModule({
-  declarations: [AppComponent, StorageComponent, FirestoreComponent, DatabaseComponent, RemoteConfigComponent],
+  declarations: [
+    AppComponent,
+    StorageComponent,
+    FirestoreComponent,
+    DatabaseComponent,
+    RemoteConfigComponent,
+    HomeComponent,
+    AuthComponent
+  ],
   imports: [
     BrowserModule.withServerTransition({ appId: 'serverApp' }),
     BrowserTransferStateModule,

sample/src/app/auth/auth.component.ts

@@ -1,19 +1,51 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { AngularFireAuth } from '@angular/fire/auth';
+import { auth as rawAuth } from 'firebase/app';
+import { Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { trace } from '@angular/fire/performance';
 
 @Component({
   selector: 'app-auth',
   template: `
     <p>
-      auth works!
+      Auth!
+      {{ (auth.user | async)?.uid | json }}
+      <button (click)="login()" *ngIf="showLoginButton">Log in with Google</button>
+      <button (click)="logout()" *ngIf="showLogoutButton">Log out</button>
     </p>
   `,
   styles: []
 })
-export class AuthComponent implements OnInit {
+export class AuthComponent implements OnInit, OnDestroy {
 
-  constructor() { }
+  private readonly userDisposable: Subscription;
 
-  ngOnInit(): void {
+  showLoginButton = false;
+  showLogoutButton = false;
+
+  constructor(public readonly auth: AngularFireAuth) {
+    this.userDisposable = this.auth.authState.pipe(
+      trace('auth'),
+      map(u => !!u)
+    ).subscribe(isLoggedIn => {
+      this.showLoginButton = !isLoggedIn;
+      this.showLogoutButton = isLoggedIn;
+    });
+  }
+
+  ngOnInit(): void { }
+
+  ngOnDestroy(): void {
+    this.userDisposable.unsubscribe();
+  }
+
+  login() {
+    this.auth.signInWithPopup(new rawAuth.GoogleAuthProvider());
+  }
+
+  logout() {
+    this.auth.signOut();
   }
 
 }

sample/src/app/home/home.component.ts

@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+import { FirebaseApp } from '@angular/fire';
+
+@Component({
+  selector: 'app-home',
+  template: `
+    Hello world!
+    {{ firebaseApp.name }}
+    <app-database></app-database>
+    <app-firestore></app-firestore>
+    <app-remote-config></app-remote-config>
+    <app-storage></app-storage>
+    <app-auth></app-auth>
+  `,
+  styles: [``]
+})
+export class HomeComponent {
+  constructor(public readonly firebaseApp: FirebaseApp) {
+  }
+}

sample/src/app/remote-config/remote-config.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { AngularFireRemoteConfig } from '@angular/fire/remote-config';
+import { AngularFireRemoteConfig, mapToObject } from '@angular/fire/remote-config';
 import { trace } from '@angular/fire/performance';
 import { Observable } from 'rxjs';
 
@@ -18,7 +18,7 @@ export class RemoteConfigComponent implements OnInit {
   readonly change$: Observable<any>;
 
   constructor(public readonly remoteConfig: AngularFireRemoteConfig) {
-    this.change$ = remoteConfig.changes.pipe(trace('remote-config'));
+    this.change$ = remoteConfig.parameters.pipe(trace('remote-config'), mapToObject({}));
   }
 
   ngOnInit(): void {