Bumping Firebase CLI version

Author: jamesdaniels

package.json

@@ -52,7 +52,7 @@
     "firebase": "^7.0 || ^8.0",
     "firebase-admin": "^8.10.0",
     "firebase-functions": "^3.6.0",
-    "firebase-tools": "^8.0.0",
+    "firebase-tools": "^8.0.0 || ^9.0.0",
     "fs-extra": "^8.0.1",
     "fuzzy": "^0.1.3",
     "husky": "^4.2.5",

src/schematics/deploy/actions.ts

@@ -254,16 +254,20 @@ export default async function deploy(
     const winston = require('winston');
     const tripleBeam = require('triple-beam');
 
-    firebaseTools.logger.add(
-      new winston.transports.Console({
-        level: 'info',
-        format: winston.format.printf((info) =>
-          [info.message, ...(info[tripleBeam.SPLAT] || [])]
-            .filter((chunk) => typeof chunk === 'string')
-            .join(' ')
-        )
-      })
-    );
+    const logger = new winston.transports.Console({
+      level: 'info',
+      format: winston.format.printf((info) =>
+        [info.message, ...(info[tripleBeam.SPLAT] || [])]
+          .filter((chunk) => typeof chunk === 'string')
+          .join(' ')
+      )
+    });
+
+    if (parseInt(firebaseTools.cli.version(), 10) >= 9) {
+      firebaseTools.logger.logger.add(logger);
+    } else {
+      firebaseTools.logger.add(logger);
+    }
 
     if (serverBuildTarget) {
       await deployToFunction(

src/schematics/deploy/builder.ts

@@ -3,7 +3,6 @@ import deploy, { DeployBuilderOptions } from './actions';
 import { BuildTarget } from '../interfaces';
 import { getFirebaseProjectName } from '../utils';
 
-
 // Call the createBuilder() function to create a builder. This mirrors
 // createJobHandler() but add typings specific to Architect Builders.
 export default createBuilder(
@@ -31,6 +30,7 @@ export default createBuilder(
     }
 
     try {
+      process.env.FIREBASE_DEPLOY_AGENT = 'angularfire';
       await deploy(
         require('firebase-tools'),
         context,

src/schematics/deploy/schema.json

@@ -1,7 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "FirebaseDeploySchema",
-  // Include id field to remain compatible with older Angular
   "id": "FirebaseDeploySchema",
   "title": "Firebase Deploy",
   "description": "Ng Deploy target options for Firebase.",

src/schematics/interfaces.ts

@@ -20,7 +20,17 @@ export interface FirebaseTools {
   };
 
   logger: {
-    add(...args: any[]): any
+    // firebase-tools v8
+    add: (...args: any[]) => any
+  } & {
+    // firebase-tools v9
+    logger: {
+      add: (...args: any[]) => any;
+    }
+  };
+
+  cli: {
+    version(): string;
   };
 
   login(): Promise<void>;