Merge branch 'master' into stackblitz

Author: NothingEverHappens

ISSUE_TEMPLATE.md

@@ -60,7 +60,7 @@ StackBlitz (https://stackblitz.com/edit/angular-fire-start).
 
 **Sample data and security rules**
 
-<-- include/attach/link to some json sample data (or provide credentials to a sanitized, test Firebase project) -->
+<!-- include/attach/link to some json sample data (or provide credentials to a sanitized, test Firebase project) -->
 
 ### Debug output
 

docs/auth/router-guards.md

@@ -39,7 +39,7 @@ const belongsToAccount = (next) => hasCustomClaim(`account-${next.params.id}`);
 export const routes: Routes = [
     { path: '',      component: AppComponent },
     { path: 'login', component: LoginComponent,        canActivate: [AngularFireAuthGuard], data: { authGuardPipe: redirectLoggedInToItems }},
-    { path: 'items', component: ItemListComponent,     canActivate: [AngularFireAuthGuard], data: { authGuardPipe: redirectUnauthorizedToLogin },
+    { path: 'items', component: ItemListComponent,     canActivate: [AngularFireAuthGuard], data: { authGuardPipe: redirectUnauthorizedToLogin }},
     { path: 'admin', component: AdminComponent,        canActivate: [AngularFireAuthGuard], data: { authGuardPipe: adminOnly }},
     { path: 'accounts/:id', component: AdminComponent, canActivate: [AngularFireAuthGuard], data: { authGuardPipe: belongsToAccount }}
 ];

docs/firestore/collections.md

@@ -191,7 +191,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 export interface AccountDeposit { description: string; amount: number; }
-export interface AccountDepoistId extends AccountDeposit { id: string; }
+export interface AccountDepositId extends AccountDeposit { id: string; }
 
 @Component({
   selector: 'app-root',

docs/functions/functions.md

@@ -110,7 +110,7 @@ import { AngularFireFunctionsModule, ORIGIN } from '@angular/fire/functions';
   ],
   ...
   providers: [
-   { provide: ORIGIN, useValue: 'http://localhost:5005' }
+   { provide: ORIGIN, useValue: 'http://localhost:5001' }
   ]
 })
 export class AppModule {}

docs/install-and-setup.md

@@ -146,7 +146,7 @@ ng serve
 
 Your Angular app will compile and serve locally, visit it we should see an empty list.
 
-In another tab [start adding data to an `items` collection in Firestore](https://firebase.corp.google.com/project/_/database/firestore/data). *As we're not authenticating users yet, be sure to start Firestore in **test mode** or allow reading from the `items` collection in Security Rules (`allow read: if true`).*
+In another tab [start adding data to an `items` collection in Firestore](https://console.firebase.google.com/project/_/database/firestore/data). *As we're not authenticating users yet, be sure to start Firestore in **test mode** or allow reading from the `items` collection in Security Rules (`allow read: if true`).*
 
 Once you've created a `items` collection and are inserting documents, you should see data streaming into your Angular application.
 

src/schematics/ng-add-common.ts

@@ -100,7 +100,7 @@ export const addDependencies = (
       packageJson.devDependencies[depName] || dep.version;
     } else {
       packageJson.dependencies[depName] =
-      packageJson.dependencies[depName] || deps.version;
+      packageJson.dependencies[depName] || dep.version;
     }
   });