Merge branch 'master' into docs/deploy-getting-started

Author: NothingEverHappens

.travis.yml

@@ -15,4 +15,4 @@ branches:
 
 install: yarn
 
-script: yarn build && yarn test:all
+script: yarn build && yarn test:all && yarn lint

CONTRIBUTING.md

@@ -80,8 +80,8 @@ Providing the following information will increase the chances of your issue bein
 * **Angular Version** - what version of Angular, Firebase, and AngularFire are you using?
 * **Motivation for or Use Case** - explain what are you trying to do and why the current behavior is a bug for you
 * **Browsers and Operating System** - is this a problem with all browsers?
-* **Reproduce the Error** - provide a live example (using [Plunker][plunker],
-  [JSFiddle][jsfiddle] or [Runnable][runnable]) or a unambiguous set of steps
+* **Reproduce the Error** - provide a live example (using StackBlitz (https://stackblitz.com/edit/angular-fire-start))
+ or a unambiguous set of steps
 * **Related Issues** - has a similar issue been reported before?
 * **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
   causing the problem (line of code or commit)

ISSUE_TEMPLATE.md

@@ -46,12 +46,12 @@ be fixed in the latest versions. -->
 
 ### How to reproduce these conditions
 
-**Failing test unit, Plunkr, or JSFiddle demonstrating the problem**
+**Failing test unit, Stackblitz demonstrating the problem**
 
 <!-- 
 Provide a failing test unit, or create a minimal, complete, and 
-verifiable example (http://stackoverflow.com/help/mcve) using either 
-Plunker (http://plnkr.co/) or JSFiddle (https://jsfiddle.net/).
+verifiable example (http://stackoverflow.com/help/mcve) using 
+StackBlitz (https://stackblitz.com/edit/angular-fire-start).
 -->
 
 **Steps to set up and reproduce**
@@ -60,7 +60,7 @@ Plunker (http://plnkr.co/) or JSFiddle (https://jsfiddle.net/).
 
 **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
 

README.md

@@ -51,7 +51,7 @@ export class MyApp {
 
 [Contributing](CONTRIBUTING.md)
 
-[Stackblitz Template](https://stackblitz.com/edit/angular-1iment) - Remember to set your Firebase configuration in `app/app.module.ts`.
+[Stackblitz Template](https://stackblitz.com/edit/angular-fire-start) - Remember to set your Firebase configuration in `app/app.module.ts`.
 
 [Upgrading to v6.0? Check out our guide.](docs/version-6-upgrade.md)
 

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.
 

package.json

@@ -16,6 +16,11 @@
     "build": "tsc tools/build.ts; node ./tools/build.js",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
+  },
   "schematics": "./dist/packages-dist/collection.json",
   "builders": "./dist/packages-dist/builders.json",
   "keywords": [
@@ -49,6 +54,7 @@
     "firebase-tools": "^8.0.0",
     "fs-extra": "^8.0.1",
     "fuzzy": "^0.1.3",
+    "husky": "^4.2.5",
     "inquirer": "^6.2.2",
     "inquirer-autocomplete-prompt": "^1.0.1",
     "rxfire": "^3.9.7",

sample/server.ts

@@ -9,8 +9,10 @@ import { APP_BASE_HREF } from '@angular/common';
 import { existsSync } from 'fs';
 
 // Polyfill XMLHttpRequest and WS for Firebase
-global['XMLHttpRequest'] = require("xhr2");
-global['WebSocket'] = require("ws");
+/* tslint:disable:no-string-literal */
+global['XMLHttpRequest'] = require('xhr2');
+global['WebSocket'] = require('ws');
+/* tslint:enable:no-string-literal */
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {