firebase-tools 11.4.0 → 11.5.0

package/lib/hosting/normalizedHostingConfigs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizedHostingConfigs = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const lodash_1 = require("lodash");
 const error_1 = require("../error");
 function filterOnly(configs, onlyString) {
@@ -34,7 +34,7 @@ function filterOnly(configs, onlyString) {
             filteredConfigs.push(configsByTarget.get(onlyTarget));
         }
         else {
-            throw new error_1.FirebaseError(`Hosting site or target ${(0, cli_color_1.bold)(onlyTarget)} not detected in firebase.json`);
+            throw new error_1.FirebaseError(`Hosting site or target ${(0, colorette_1.bold)(onlyTarget)} not detected in firebase.json`);
         }
     }
     return filteredConfigs;
@@ -82,7 +82,7 @@ function normalizedHostingConfigs(cmdOptions, options = {}) {
             if (cfg.target) {
                 const matchingTargets = cmdOptions.rc.requireTarget(cmdOptions.project, "hosting", cfg.target);
                 if (matchingTargets.length > 1) {
-                    throw new error_1.FirebaseError(`Hosting target ${(0, cli_color_1.bold)(cfg.target)} is linked to multiple sites, ` +
+                    throw new error_1.FirebaseError(`Hosting target ${(0, colorette_1.bold)(cfg.target)} is linked to multiple sites, ` +
                         `but only one is permitted. ` +
                         `To clear, run:\n\n  firebase target:clear hosting ${cfg.target}`);
                 }

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 const program = require("commander");
-const clc = require("cli-color");
+const clc = require("colorette");
 const leven = require("leven");
 const logger_1 = require("./logger");
 const utils_1 = require("./utils");
@@ -9,7 +9,7 @@ program.version(pkg.version);
 program.option("-P, --project <alias_or_project_id>", "the Firebase project to use for this command");
 program.option("--account <email>", "the Google account to use for authorization");
 program.option("-j, --json", "output JSON instead of text, also triggers non-interactive mode");
-program.option("--token <token>", "supply an auth token for this command");
+program.option("--token <token>", "DEPRECATED - will be removed in a future major version - supply an auth token for this command");
 program.option("--non-interactive", "error out of the command instead of waiting for prompts");
 program.option("-i, --interactive", "force prompts to be displayed");
 program.option("--debug", "print verbose debug output and keep a debug log file");
@@ -56,7 +56,7 @@ const RENAMED_COMMANDS = {
 program.action((_, args) => {
     (0, utils_1.setupLoggers)();
     const cmd = args[0];
-    logger_1.logger.error(clc.bold.red("Error:"), clc.bold(cmd), "is not a Firebase command");
+    logger_1.logger.error(clc.bold(clc.red("Error:")), clc.bold(cmd), "is not a Firebase command");
     if (RENAMED_COMMANDS[cmd]) {
         logger_1.logger.error();
         logger_1.logger.error(clc.bold(cmd) + " has been renamed, please run", clc.bold("firebase " + RENAMED_COMMANDS[cmd]), "instead");

package/lib/init/features/database.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const prompt_1 = require("../../prompt");
 const logger_1 = require("../../logger");
 const utils = require("../../utils");

package/lib/init/features/emulators.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const _ = require("lodash");
 const utils = require("../../utils");
 const prompt_1 = require("../../prompt");

package/lib/init/features/firestore/index.js

@@ -9,9 +9,9 @@ const checkDatabaseType_1 = require("../../../firestore/checkDatabaseType");
 const rules = require("./rules");
 const indexes = require("./indexes");
 const error_1 = require("../../../error");
-const clc = require("cli-color");
+const clc = require("colorette");
 async function checkProjectSetup(setup, config, options) {
-    const firestoreUnusedError = new error_1.FirebaseError(`It looks like you haven't used Cloud Firestore in this project before. Go to ${clc.bold.underline(`https://console.firebase.google.com/project/${setup.projectId}/firestore`)} to create your Cloud Firestore database.`, { exit: 1 });
+    const firestoreUnusedError = new error_1.FirebaseError(`It looks like you haven't used Cloud Firestore in this project before. Go to ${clc.bold(clc.underline(`https://console.firebase.google.com/project/${setup.projectId}/firestore`))} to create your Cloud Firestore database.`, { exit: 1 });
     const isFirestoreEnabled = await apiEnabled.check(setup.projectId, "firestore.googleapis.com", "", true);
     if (!isFirestoreEnabled) {
         throw firestoreUnusedError;

package/lib/init/features/firestore/indexes.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initIndexes = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const error_1 = require("../../../error");
 const iv2 = require("../../../firestore/indexes");

package/lib/init/features/firestore/rules.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initRules = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const gcp = require("../../../gcp");
 const fsutils = require("../../../fsutils");

package/lib/init/features/functions/golang.js

@@ -4,12 +4,12 @@ const util_1 = require("util");
 const fs = require("fs");
 const path = require("path");
 const spawn = require("cross-spawn");
+const clc = require("colorette");
 const error_1 = require("../../../error");
 const prompt_1 = require("../../../prompt");
 const utils = require("../../../utils");
 const go = require("../../../deploy/functions/runtimes/golang");
 const logger_1 = require("../../../logger");
-const clc = require("cli-color");
 const RUNTIME_VERSION = "1.13";
 const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/golang");
 const MAIN_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "functions.go"), "utf8");

package/lib/init/features/functions/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
+const _ = require("lodash");
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const requirePermissions_1 = require("../../../requirePermissions");
@@ -44,6 +45,12 @@ async function doSetup(setup, config, options) {
         default: "javascript",
         choices,
     });
+    _.set(setup, "config.functions.ignore", [
+        "node_modules",
+        ".git",
+        "firebase-debug.log",
+        "firebase-debug.*.log",
+    ]);
     return require("./" + language).setup(setup, config);
 }
 exports.doSetup = doSetup;

package/lib/init/features/hosting/github.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGitHub = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const fs = require("fs");
 const yaml = require("js-yaml");
 const js_yaml_1 = require("js-yaml");
@@ -32,7 +32,7 @@ async function initGitHub(setup) {
         return (0, utils_1.reject)("Could not determine Project ID, can't set up GitHub workflow.", { exit: 1 });
     }
     if (!setup.config.hosting) {
-        return (0, utils_1.reject)(`Didn't find a Hosting config in firebase.json. Run ${(0, cli_color_1.bold)("firebase init hosting")} instead.`);
+        return (0, utils_1.reject)(`Didn't find a Hosting config in firebase.json. Run ${(0, colorette_1.bold)("firebase init hosting")} instead.`);
     }
     logger_1.logger.info();
     const gitRoot = getGitFolderPath();
@@ -46,7 +46,7 @@ async function initGitHub(setup) {
     const userDetails = await getGitHubUserDetails(ghAccessToken);
     const ghUserName = userDetails.login;
     logger_1.logger.info();
-    (0, utils_1.logSuccess)(`Success! Logged into GitHub as ${(0, cli_color_1.bold)(ghUserName)}`);
+    (0, utils_1.logSuccess)(`Success! Logged into GitHub as ${(0, colorette_1.bold)(ghUserName)}`);
     logger_1.logger.info();
     const { repo, key, keyId } = await promptForRepo(setup, ghAccessToken);
     const { default_branch: defaultBranch, id: repoId } = await getRepoDetails(repo, ghAccessToken);
@@ -56,13 +56,13 @@ async function initGitHub(setup) {
     const serviceAccountName = `github-action-${repoId}`;
     const serviceAccountJSON = await createServiceAccountAndKeyWithRetry(setup, repo, serviceAccountName);
     logger_1.logger.info();
-    (0, utils_1.logSuccess)(`Created service account ${(0, cli_color_1.bold)(serviceAccountName)} with Firebase Hosting admin permissions.`);
+    (0, utils_1.logSuccess)(`Created service account ${(0, colorette_1.bold)(serviceAccountName)} with Firebase Hosting admin permissions.`);
     const spinnerSecrets = ora(`Uploading service account secrets to repository: ${repo}`);
     spinnerSecrets.start();
     const encryptedServiceAccountJSON = encryptServiceAccountJSON(serviceAccountJSON, key);
     await uploadSecretToGitHub(repo, ghAccessToken, await encryptedServiceAccountJSON, keyId, githubSecretName);
     spinnerSecrets.stop();
-    (0, utils_1.logSuccess)(`Uploaded service account JSON to GitHub as secret ${(0, cli_color_1.bold)(githubSecretName)}.`);
+    (0, utils_1.logSuccess)(`Uploaded service account JSON to GitHub as secret ${(0, colorette_1.bold)(githubSecretName)}.`);
     (0, utils_1.logBullet)(`You can manage your secrets at https://github.com/${repo}/settings/secrets.`);
     logger_1.logger.info();
     if (setup.config.hosting.predeploy) {
@@ -81,7 +81,7 @@ async function initGitHub(setup) {
     if (shouldWriteYMLHostingFile) {
         writeChannelActionYMLFile(YML_FULL_PATH_PULL_REQUEST, githubSecretName, setup.projectId, script);
         logger_1.logger.info();
-        (0, utils_1.logSuccess)(`Created workflow file ${(0, cli_color_1.bold)(YML_FULL_PATH_PULL_REQUEST)}`);
+        (0, utils_1.logSuccess)(`Created workflow file ${(0, colorette_1.bold)(YML_FULL_PATH_PULL_REQUEST)}`);
     }
     const { setupDeploys, branch } = await promptToSetupDeploys(ymlDeployDoc.branch || defaultBranch);
     if (setupDeploys) {
@@ -102,12 +102,12 @@ async function initGitHub(setup) {
         if (shouldWriteYMLDeployFile) {
             writeDeployToProdActionYMLFile(YML_FULL_PATH_MERGE, branch, githubSecretName, setup.projectId, script);
             logger_1.logger.info();
-            (0, utils_1.logSuccess)(`Created workflow file ${(0, cli_color_1.bold)(YML_FULL_PATH_MERGE)}`);
+            (0, utils_1.logSuccess)(`Created workflow file ${(0, colorette_1.bold)(YML_FULL_PATH_MERGE)}`);
         }
     }
     logger_1.logger.info();
     (0, utils_1.logLabeledBullet)("Action required", `Visit this URL to revoke authorization for the Firebase CLI GitHub OAuth App:`);
-    logger_1.logger.info(cli_color_1.bold.underline(`https://github.com/settings/connections/applications/${api_1.githubClientId}`));
+    logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.underline)(`https://github.com/settings/connections/applications/${api_1.githubClientId}`)));
     (0, utils_1.logLabeledBullet)("Action required", `Push any new workflow file(s) to your repo`);
 }
 exports.initGitHub = initGitHub;
@@ -253,7 +253,7 @@ async function promptForRepo(options, ghAccessToken) {
                         (0, utils_1.logWarning)("The provided authorization cannot be used with this repository. If this repository is in an organization, did you remember to grant access?", "error");
                         logger_1.logger.info();
                         (0, utils_1.logLabeledBullet)("Action required", `Visit this URL to ensure access has been granted to the appropriate organization(s) for the Firebase CLI GitHub OAuth App:`);
-                        logger_1.logger.info(cli_color_1.bold.underline(`https://github.com/settings/connections/applications/${api_1.githubClientId}`));
+                        logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.underline)(`https://github.com/settings/connections/applications/${api_1.githubClientId}`)));
                         logger_1.logger.info();
                     }
                     return false;

package/lib/init/features/hosting/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const apiv2_1 = require("../../../apiv2");
 const github_1 = require("./github");

package/lib/init/features/project.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const _ = require("lodash");
 const error_1 = require("../../error");
 const projects_1 = require("../../management/projects");

package/lib/init/features/remoteconfig.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
 const prompt_1 = require("../../prompt");
 const fsutils = require("../../fsutils");
-const clc = require("cli-color");
+const clc = require("colorette");
 async function doSetup(setup, config) {
     setup.config.remoteconfig = {};
     const jsonFilePath = await (0, prompt_1.promptOnce)({

package/lib/init/features/storage.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const logger_1 = require("../../logger");
 const prompt_1 = require("../../prompt");

package/lib/init/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 const lodash_1 = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const features = require("./features");

package/lib/logError.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logError = void 0;
 const logger_1 = require("./logger");
-const clc = require("cli-color");
+const clc = require("colorette");
 function logError(error) {
     if (error.children && error.children.length) {
-        logger_1.logger.error(clc.bold.red("Error:"), clc.underline(error.message) + ":");
+        logger_1.logger.error(clc.bold(clc.red("Error:")), clc.underline(error.message) + ":");
         error.children.forEach((child) => {
             let out = "- ";
             if (child.name) {
@@ -20,7 +20,7 @@ function logError(error) {
             logger_1.logger.debug(error.original.stack);
         }
         logger_1.logger.error();
-        logger_1.logger.error(clc.bold.red("Error:"), error.message);
+        logger_1.logger.error(clc.bold(clc.red("Error:")), error.message);
     }
     if (error.context) {
         logger_1.logger.debug("Error Context:", JSON.stringify(error.context, undefined, 2));

package/lib/management/projects.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFirebaseProject = exports.listFirebaseProjects = exports.getAvailableCloudProjectPage = exports.getFirebaseProjectPage = exports.addFirebaseToCloudProject = exports.createCloudProject = exports.promptAvailableProjectId = exports.getOrPromptProject = exports.addFirebaseToCloudProjectAndLog = exports.createFirebaseProjectAndLog = exports.PROJECTS_CREATE_QUESTIONS = exports.ProjectParentResourceType = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ora = require("ora");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");

package/lib/parseBoltRules.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBoltRules = void 0;
 const fs = require("fs");
 const spawn = require("cross-spawn");
-const clc = require("cli-color");
+const clc = require("colorette");
 const _ = require("lodash");
 const error_1 = require("./error");
 function parseBoltRules(filename) {

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false, crossservicerules: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/lib/profileReport.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProfileReport = exports.extractReadableIndex = exports.formatBytes = exports.formatNumber = exports.pathString = exports.extractJSON = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const Table = require("cli-table");
 const fs = require("fs");
 const _ = require("lodash");
@@ -515,7 +515,7 @@ class ProfileReport {
                 write(title + "\n");
             }
             else {
-                write(clc.bold.yellow(title) + "\n");
+                write(clc.bold(clc.yellow(title)) + "\n");
             }
         };
         const writeTable = (title, table) => {

package/lib/projectUtils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAliases = exports.needProjectNumber = exports.needProjectId = exports.getProjectId = void 0;
 const projects_1 = require("./management/projects");
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const { FirebaseError } = require("./error");
 function getProjectId({ projectId, project, }) {

package/lib/rc.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RC = exports.loadRC = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const cjson = require("cjson");
 const fs = require("fs");
 const path = require("path");

package/lib/requireAuth.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireAuth = void 0;
 const google_auth_library_1 = require("google-auth-library");
-const clc = require("cli-color");
+const clc = require("colorette");
 const api = require("./api");
 const apiv2 = require("./apiv2");
 const error_1 = require("./error");
@@ -32,9 +32,13 @@ async function requireAuth(options) {
     let tokenOpt = utils.getInheritedOption(options, "token");
     if (tokenOpt) {
         logger_1.logger.debug("> authorizing via --token option");
+        utils.logWarning("Authenticating with `--token` is deprecated and will be removed in a future major version of `firebase-tools`. " +
+            "Instead, use a service account key with `GOOGLE_APPLICATION_CREDENTIALS`: https://cloud.google.com/docs/authentication/getting-started");
     }
     else if (process.env.FIREBASE_TOKEN) {
         logger_1.logger.debug("> authorizing via FIREBASE_TOKEN environment variable");
+        utils.logWarning("Authenticating with `FIREBASE_TOKEN` is deprecated and will be removed in a future major version of `firebase-tools`. " +
+            "Instead, use a service account key with `GOOGLE_APPLICATION_CREDENTIALS`: https://cloud.google.com/docs/authentication/getting-started");
     }
     else if (user) {
         logger_1.logger.debug(`> authorizing via signed-in user (${user.email})`);

package/lib/requireDatabaseInstance.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireDatabaseInstance = exports.MISSING_DEFAULT_INSTANCE_ERROR_MESSAGE = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("./error");
 const getDefaultDatabaseInstance_1 = require("./getDefaultDatabaseInstance");
-exports.MISSING_DEFAULT_INSTANCE_ERROR_MESSAGE = `It looks like you haven't created a Realtime Database instance in this project before. Please run ${clc.bold.underline("firebase init database")} to create your default Realtime Database instance.`;
+exports.MISSING_DEFAULT_INSTANCE_ERROR_MESSAGE = `It looks like you haven't created a Realtime Database instance in this project before. Please run ${clc.bold(clc.underline("firebase init database"))} to create your default Realtime Database instance.`;
 async function requireDatabaseInstance(options) {
     if (options.instance) {
         return;

package/lib/requirePermissions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requirePermissions = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const projectUtils_1 = require("./projectUtils");
 const requireAuth_1 = require("./requireAuth");
 const logger_1 = require("./logger");
@@ -19,7 +19,7 @@ async function requirePermissions(options, permissions = []) {
     try {
         const iamResult = await (0, iam_1.testIamPermissions)(projectId, requiredPermissions);
         if (!iamResult.passed) {
-            throw new error_1.FirebaseError(`Authorization failed. This account is missing the following required permissions on project ${(0, cli_color_1.bold)(projectId)}:\n\n  ${iamResult.missing.join("\n  ")}`);
+            throw new error_1.FirebaseError(`Authorization failed. This account is missing the following required permissions on project ${(0, colorette_1.bold)(projectId)}:\n\n  ${iamResult.missing.join("\n  ")}`);
         }
     }
     catch (err) {

package/lib/rulesDeploy.js

@@ -2,16 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RulesDeploy = exports.RulesetServiceType = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const colorette_1 = require("colorette");
 const fs = require("fs-extra");
 const gcp = require("./gcp");
 const logger_1 = require("./logger");
 const error_1 = require("./error");
 const utils = require("./utils");
 const prompt_1 = require("./prompt");
+const getProjectNumber_1 = require("./getProjectNumber");
+const resourceManager_1 = require("./gcp/resourceManager");
+const previews_1 = require("./previews");
 const QUOTA_EXCEEDED_STATUS_CODE = 429;
 const RULESET_COUNT_LIMIT = 1000;
 const RULESETS_TO_GC = 10;
+const CROSS_SERVICE_FUNCTIONS = /firestore\.(get|exists)/;
+const CROSS_SERVICE_RULES_ROLE = "roles/firebaserules.firestoreServiceAgent";
 var RulesetServiceType;
 (function (RulesetServiceType) {
     RulesetServiceType["CLOUD_FIRESTORE"] = "cloud.firestore";
@@ -37,7 +42,7 @@ class RulesDeploy {
         }
         catch (e) {
             logger_1.logger.debug("[rules read error]", e.stack);
-            throw new error_1.FirebaseError("Error reading rules file " + clc.bold(path));
+            throw new error_1.FirebaseError(`Error reading rules file ${(0, colorette_1.bold)(path)}`);
         }
         this.rulesFiles[path] = [{ name: path, content: src }];
     }
@@ -54,18 +59,50 @@ class RulesDeploy {
         }
         return { latestName, latestContent };
     }
+    async checkStorageRulesIamPermissions(rulesContent) {
+        if ((rulesContent === null || rulesContent === void 0 ? void 0 : rulesContent.match(CROSS_SERVICE_FUNCTIONS)) === null) {
+            return;
+        }
+        if (this.options.nonInteractive) {
+            return;
+        }
+        const projectNumber = await (0, getProjectNumber_1.getProjectNumber)(this.options);
+        const saEmail = `service-${projectNumber}@gcp-sa-firebasestorage.iam.gserviceaccount.com`;
+        try {
+            if (await (0, resourceManager_1.serviceAccountHasRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true)) {
+                return;
+            }
+            const addRole = await (0, prompt_1.promptOnce)({
+                type: "confirm",
+                name: "rulesRole",
+                message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
+                default: true,
+            }, this.options);
+            if (addRole) {
+                await (0, resourceManager_1.addServiceAccountToRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true);
+                utils.logLabeledBullet(RulesetType[this.type], "updated service account for cross-service rules...");
+            }
+        }
+        catch (e) {
+            logger_1.logger.warn("[rules] Error checking or updating Cloud Storage for Firebase service account permissions.");
+            logger_1.logger.warn("[rules] Cross-service Storage rules may not function properly", e.message);
+        }
+    }
     async createRulesets(service) {
+        var _a;
         const createdRulesetNames = [];
         const { latestName: latestRulesetName, latestContent: latestRulesetContent } = await this.getCurrentRules(service);
         const newRulesetsByFilename = new Map();
-        for (const filename of Object.keys(this.rulesFiles)) {
-            const files = this.rulesFiles[filename];
+        for (const [filename, files] of Object.entries(this.rulesFiles)) {
             if (latestRulesetName && _.isEqual(files, latestRulesetContent)) {
-                utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} latest version of ${clc.bold(filename)} already up to date, skipping upload...`);
+                utils.logLabeledBullet(RulesetType[this.type], `latest version of ${(0, colorette_1.bold)(filename)} already up to date, skipping upload...`);
                 this.rulesetNames[filename] = latestRulesetName;
                 continue;
             }
-            utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} uploading rules ${clc.bold(filename)}...`);
+            if (previews_1.previews.crossservicerules && service === RulesetServiceType.FIREBASE_STORAGE) {
+                await this.checkStorageRulesIamPermissions((_a = files[0]) === null || _a === void 0 ? void 0 : _a.content);
+            }
+            utils.logLabeledBullet(RulesetType[this.type], `uploading rules ${(0, colorette_1.bold)(filename)}...`);
             newRulesetsByFilename.set(filename, gcp.rules.createRuleset(this.options.project, files));
         }
         try {
@@ -79,8 +116,7 @@ class RulesDeploy {
             if (err.status !== QUOTA_EXCEEDED_STATUS_CODE) {
                 throw err;
             }
-            utils.logBullet(clc.bold.yellow(RulesetType[this.type] + ":") +
-                " quota exceeded error while uploading rules");
+            utils.logLabeledBullet(RulesetType[this.type], "quota exceeded error while uploading rules");
             const history = await gcp.rules.listAllRulesets(this.options.project);
             if (history.length > RULESET_COUNT_LIMIT) {
                 const confirm = await (0, prompt_1.promptOnce)({
@@ -99,7 +135,7 @@ class RulesDeploy {
                         await gcp.rules.deleteRuleset(this.options.project, gcp.rules.getRulesetId(entry));
                         logger_1.logger.debug(`[rules] Deleted ${entry.name}`);
                     }
-                    utils.logBullet(clc.bold.yellow(RulesetType[this.type] + ":") + " retrying rules upload");
+                    utils.logLabeledWarning(RulesetType[this.type], "retrying rules upload");
                     return this.createRulesets(service);
                 }
             }
@@ -113,10 +149,10 @@ class RulesDeploy {
         await gcp.rules.updateOrCreateRelease(this.options.project, this.rulesetNames[filename], resourceName === RulesetServiceType.FIREBASE_STORAGE
             ? `${resourceName}/${subResourceName}`
             : resourceName);
-        utils.logSuccess(`${clc.bold.green(RulesetType[this.type] + ":")} released rules ${clc.bold(filename)} to ${clc.bold(resourceName)}`);
+        utils.logLabeledSuccess(RulesetType[this.type], `released rules ${(0, colorette_1.bold)(filename)} to ${(0, colorette_1.bold)(resourceName)}`);
     }
     async compileRuleset(filename, files) {
-        utils.logBullet(`${clc.bold.cyan(this.type + ":")} checking ${clc.bold(filename)} for compilation errors...`);
+        utils.logLabeledBullet(this.type, `checking ${(0, colorette_1.bold)(filename)} for compilation errors...`);
         const response = await gcp.rules.testRuleset(this.options.project, files);
         if (_.get(response, "body.issues", []).length) {
             const warnings = [];
@@ -137,11 +173,11 @@ class RulesDeploy {
             }
             if (errors.length > 0) {
                 const add = errors.length === 1 ? "" : "s";
-                const message = `Compilation error${add} in ${clc.bold(filename)}:\n${errors.join("\n")}`;
+                const message = `Compilation error${add} in ${(0, colorette_1.bold)(filename)}:\n${errors.join("\n")}`;
                 throw new error_1.FirebaseError(message, { exit: 1 });
             }
         }
-        utils.logSuccess(`${clc.bold.green(this.type + ":")} rules file ${clc.bold(filename)} compiled successfully`);
+        utils.logLabeledSuccess(this.type, `rules file ${(0, colorette_1.bold)(filename)} compiled successfully`);
     }
 }
 exports.RulesDeploy = RulesDeploy;

package/lib/serve/hosting.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = exports.start = exports.stop = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const superstatic = require("superstatic").server;
 const morgan = require("morgan");
 const detectProjectRoot_1 = require("../detectProjectRoot");
@@ -60,6 +60,7 @@ function startServer(options, config, port, init) {
         port: port,
         host: options.host,
         config: config,
+        compression: true,
         cwd: (0, detectProjectRoot_1.detectProjectRoot)(options),
         stack: "strict",
         before: {