Cleaning up

Author: jamesdaniels

package.json

@@ -33,15 +33,15 @@
   },
   "homepage": "https://github.com/angular/angularfire2#readme",
   "dependencies": {
-    "@angular-devkit/architect": "^0.800.0-rc.4 || >=8.0.0 <9 || ^9.0.0-0",
-    "@angular-devkit/core": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular-devkit/schematics": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular/common": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular/compiler": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular/core": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular/platform-browser": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular/platform-browser-dynamic": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular/router": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular-devkit/architect": "<0.900 || ^0.800.0 || ^0.900.0-0 || ^9.0.0-0",
+    "@angular-devkit/core": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular-devkit/schematics": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular/common": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular/compiler": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular/core": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular/platform-browser": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular/platform-browser-dynamic": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular/router": ">=6.0.0 <9 || ^9.0.0-0",
     "firebase": ">= 5.5.7 <7",
     "firebase-tools": "^6.10.0",
     "fuzzy": "^0.1.3",
@@ -50,16 +50,16 @@
     "rxjs": "^6.0.0",
     "ws": "^3.3.2",
     "xhr2": "^0.1.4",
-    "zone.js": "^0.8.0 || ^0.9.0"
+    "zone.js": "<0.10"
   },
   "optionalDependencies": {
     "bufferutil": "~3.0.0",
     "utf-8-validate": "~4.0.0"
   },
   "devDependencies": {
-    "@angular/animations": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular/compiler-cli": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
-    "@angular/platform-server": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/animations": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular/compiler-cli": ">=6.0.0 <9 || ^9.0.0-0",
+    "@angular/platform-server": ">=6.0.0 <9 || ^9.0.0-0",
     "@types/inquirer": "^0.0.44",
     "@types/jasmine": "^2.5.36",
     "@types/request": "0.0.30",

src/schematics/ng-add.ts

@@ -2,7 +2,7 @@ import { SchematicsException, Tree, SchematicContext } from '@angular-devkit/sch
 import { NodePackageInstallTask, RunSchematicTask } from '@angular-devkit/schematics/tasks';
 import { FirebaseJSON, FirebaseRc, FirebaseHostingConfig } from './interfaces';
 import { experimental, JsonParseMode, parseJson } from '@angular-devkit/core';
-import { from, of } from 'rxjs';
+import { from } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { Project } from './interfaces';
 import { listProjects, projectPrompt } from './utils';
@@ -157,12 +157,11 @@ interface DeployOptions {
 
 // You don't have to export the function as default. You can also have more than one rule factory
 // per file.
-export const setupNgDeploy = ({ project }: DeployOptions) => (host: Tree) => {
-  return from(listProjects()).pipe(
+export const setupNgDeploy = ({ project }: DeployOptions) => (host: Tree) =>
+  from(listProjects()).pipe(
     switchMap((projects: Project[]) => projectPrompt(projects)),
     map(({ firebaseProject }: any) => setupFirebaseProject(host, { firebaseProject, project }))
   );
-}
 
 export const ngAdd = (options: DeployOptions) => (host: Tree, context: SchematicContext) => {
   const packageJson = host.exists('package.json') && safeReadJSON('package.json', host);