Fixing some stuff since rc-1 (#2347)

* Adding a sample repo * Drop updateMetatdata * Fix the zone tests * Drop the manual side-effect imports
angular · Mar 30, 2020 · d91965e · d91965e
1 parent f178fdd
commit d91965e
Show file tree

Hide file tree

Showing 72 changed files with 13,476 additions and 215 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,6 @@ Get your first application up and running by following [our quickstart guide](do
 import { Component } from '@angular/core';
 import { AngularFirestore } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
-import 'firebase/firestore';
 
 @Component({
   selector: 'app-root',

diff --git a/docs/firestore/collections.md b/docs/firestore/collections.md
@@ -11,7 +11,6 @@ The `AngularFirestoreCollection` service is a wrapper around the native Firestor
 import { Component } from '@angular/core';
 import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
-import 'firebase/firestore';
 
 export interface Item { name: string; }
 
@@ -90,7 +89,6 @@ There are multiple ways of streaming collection data from Firestore.
 import { Component } from '@angular/core';
 import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
-import 'firebase/firestore';
 
 export interface Item { id: string; name: string; }
 
@@ -143,7 +141,6 @@ import { Component } from '@angular/core';
 import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import 'firebase/firestore';
 
 export interface Shirt { name: string; price: number; }
 export interface ShirtId extends Shirt { id: string; }
@@ -192,7 +189,6 @@ import { Component } from '@angular/core';
 import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import 'firebase/firestore';
 
 export interface AccountDeposit { description: string; amount: number; }
 export interface AccountDepoistId extends AccountDeposit { id: string; }
@@ -238,7 +234,6 @@ import { Component } from '@angular/core';
 import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import 'firebase/firestore';
 
 export interface AccountLogItem { description: string; amount: number; }
 export interface AccountLogItemId extends AccountLogItem { id: string; }
@@ -288,7 +283,6 @@ There are three `DocumentChangeType`s in Firestore: `added`, `removed`, and `mod
 import { Component } from '@angular/core';
 import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
-import 'firebase/firestore';
 
 @Component({
   selector: 'app-root',

diff --git a/docs/firestore/documents.md b/docs/firestore/documents.md
@@ -11,7 +11,6 @@ The `AngularFirestoreDocument` service is a wrapper around the native Firestore
 import { Component } from '@angular/core';
 import { AngularFirestore, AngularFirestoreDocument } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
-import 'firebase/firestore';
 
 export interface Item { name: string; }
 

diff --git a/docs/firestore/querying-collections.md b/docs/firestore/querying-collections.md
@@ -86,7 +86,6 @@ import { Component } from '@angular/core';
 import { AngularFirestore } from '@angular/fire/firestore';
 import { Observable, BehaviorSubject, combineLatest } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import 'firebase/firestore';
 
 export interface Item {
   text: string;

diff --git a/docs/install-and-setup.md b/docs/install-and-setup.md
@@ -93,7 +93,6 @@ Open `/src/app/app.component.ts`, and make sure to modify/delete any tests to ge
 ```ts
 import { Component } from '@angular/core';
 import { AngularFirestore } from '@angular/fire/firestore';
-import 'firebase/firestore';
 
 @Component({
   selector: 'app-root',
@@ -115,7 +114,6 @@ In `/src/app/app.component.ts`:
 import { Component } from '@angular/core';
 import { AngularFirestore } from '@angular/fire/firestore';
 import { Observable } from 'rxjs';
-import 'firebase/firestore';
 
 @Component({
   selector: 'app-root',

diff --git a/docs/rtdb/lists.md b/docs/rtdb/lists.md
@@ -18,7 +18,6 @@ Replace your  `/src/app/app.component.ts` from previous step to look like below.
 ```ts
 import { Component } from '@angular/core';
 import { AngularFireDatabase } from '@angular/fire/database';
-import 'firebase/database';
 
 @Component({
   selector: 'app-root',
@@ -53,7 +52,6 @@ Update `/src/app/app.component.ts` to import `AngularFireList` from `@angular/fi
 import { Component } from '@angular/core';
 import { AngularFireDatabase } from '@angular/fire/database';
 import { Observable } from 'rxjs';
-import 'firebase/database';
 
 @Component({
   selector: 'app-root',
@@ -211,7 +209,6 @@ import { Component } from '@angular/core';
 import { AngularFireDatabase, AngularFireList } from '@angular/fire/database';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import 'firebase/database';
 
 @Component({
   selector: 'app-root',

diff --git a/docs/rtdb/objects.md b/docs/rtdb/objects.md
@@ -18,7 +18,6 @@ If you've followed the earlier step "Installation and Setup"  your `/src/app/app
 import { Component } from '@angular/core';
 import { AngularFireDatabase } from '@angular/fire/database';
 import { Observable } from 'rxjs';
-import 'firebase/database';
 
 @Component({
   selector: 'app-root',
@@ -51,7 +50,6 @@ Then in your template, you can use the `async` pipe to unwrap the binding.
 import { Component } from '@angular/core';
 import { AngularFireDatabase } from '@angular/fire/database';
 import { Observable } from 'rxjs';
-import 'firebase/database';
 
 @Component({
   selector: 'app-root',
@@ -130,7 +128,6 @@ itemRef.remove();
 import { Component } from '@angular/core';
 import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database';
 import { Observable } from 'rxjs';
-import 'firebase/database';
 
 @Component({
   selector: 'app-root',

diff --git a/docs/rtdb/querying-lists.md b/docs/rtdb/querying-lists.md
@@ -82,7 +82,6 @@ import { Component } from '@angular/core';
 import { AngularFireDatabase, AngularFireAction } from '@angular/fire/database';
 import { Observable, Subscription, BehaviorSubject } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import 'firebase/database';
 
 @Component({
   selector: 'app-root',

diff --git a/docs/storage/storage.md b/docs/storage/storage.md
@@ -13,7 +13,6 @@ import { AppComponent } from './app.component';
 import { AngularFireModule } from '@angular/fire';
 import { AngularFireStorageModule } from '@angular/fire/storage';
 import { environment } from '../environments/environment';
-import 'firebase/storage';
 
 @NgModule({
   imports: [
@@ -48,7 +47,6 @@ Once the `AngularFireStorageModule` is registered you can inject the `AngularFir
 ```ts
 import { Component } from '@angular/core';
 import { AngularFireStorage } from '@angular/fire/storage';
-import 'firebase/storage';
 
 @Component({
   selector: 'app-component',
@@ -77,7 +75,6 @@ There are three options for uploading files.
 ```ts
 import { Component } from '@angular/core';
 import { AngularFireStorage } from '@angular/fire/storage';
-import 'firebase/storage';
 
 @Component({
   selector: 'app-root',
@@ -101,7 +98,6 @@ export class AppComponent {
 ```ts
 import { Component } from '@angular/core';
 import { AngularFireStorage } from '@angular/fire/storage';
-import 'firebase/storage';
 
 @Component({
   selector: 'app-root',
@@ -125,7 +121,6 @@ export class AppComponent {
 ```ts
 import { Component } from '@angular/core';
 import { AngularFireStorage } from '@angular/fire/storage';
-import 'firebase/storage';
 
 @Component({
   selector: 'app-root',

diff --git a/docs/version-6-upgrade.md b/docs/version-6-upgrade.md
@@ -15,6 +15,5 @@ We're aiming to release 6.0 with an upgrade schematic to automate most of the re
 * Dropped `@angular/fire/firebase-node` and `@angular/fire/database-depreciated`
 * We make use of Proxy in more modules, you'll need to polyfill if you want to support IE 11
 * We've standardized our DI Token naming conventions across all modules
-* `AngularFirestoreModule` no longer imports `firebase/firestore` on it's own to remain side-effect free, you'll need to `import 'firebase/firestore'` before you inject it. A similar changes has been made to `AngularFireStorage` and `AngularFireDatabase`
 * `AngularFireAuth` has dropped the `auth` property and instead Promise Proxies the underlying Firebase `auth.Auth` instance; allowing your development experience to more closely mirror the JS SDK. Similar changes have been made to `AngularFireFunctions`, `AngularFireMessaging`, and `AngularFirePerformance`.
 * `AngularFireAuthGuard` and `canActivate` have dropped support for raw pipes, this was never working correctly in AOT
diff --git a/package.json b/package.json
@@ -34,15 +34,15 @@
   },
   "homepage": "https://github.com/angular/angularfire2#readme",
   "dependencies": {
-    "@angular-devkit/architect": "^0.900.0-0 || ^0.900.0",
-    "@angular-devkit/core": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular-devkit/schematics": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/common": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/compiler": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/core": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/platform-browser": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/platform-browser-dynamic": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/router": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
+    "@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",
     "firebase": "^7.8.0",
     "firebase-admin": "^8.9.2",
     "firebase-functions": "^3.3.0",
@@ -64,12 +64,12 @@
     "utf-8-validate": "^5.0.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.900.0-0 || ^0.900.0",
-    "@angular-devkit/build-ng-packagr": "^0.900.0-0 || ^0.900.0",
-    "@angular/animations": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/cli": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/compiler-cli": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
-    "@angular/platform-server": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
+    "@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",
     "@types/fs-extra": "^7.0.0",
     "@types/gzip-size": "^5.1.1",
     "@types/inquirer": "^0.0.44",

diff --git a/sample/.editorconfig b/sample/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/sample/.firebaserc b/sample/.firebaserc
@@ -0,0 +1,11 @@
+{
+  "targets": {
+    "aftest-94085": {
+      "hosting": {
+        "sample": [
+          "aftest-94085"
+        ]
+      }
+    }
+  }
+}
diff --git a/sample/.gitignore b/sample/.gitignore
@@ -0,0 +1,47 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+.firebase
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/sample/README.md b/sample/README.md
@@ -0,0 +1,27 @@
+# Sample
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.5.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).