firebase-tools 11.4.2 → 11.5.0

package/lib/commands/hosting-channel-open.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const lodash_1 = require("lodash");
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const open = require("open");
 const command_1 = require("../command");
 const error_1 = require("../error");
@@ -38,7 +38,7 @@ exports.command = new command_1.Command("hosting:channel:open [channelId]")
     channelId = (0, api_1.normalizeName)(channelId);
     const channel = await (0, api_1.getChannel)(projectId, siteId, channelId);
     if (!channel) {
-        throw new error_1.FirebaseError(`Could not find the channel ${(0, cli_color_1.bold)(channelId)} for site ${(0, cli_color_1.bold)(siteId)}.`);
+        throw new error_1.FirebaseError(`Could not find the channel ${(0, colorette_1.bold)(channelId)} for site ${(0, colorette_1.bold)(siteId)}.`);
     }
     (0, utils_1.logLabeledBullet)("hosting:channel", channel.url);
     if (!options.nonInteractive) {

package/lib/commands/hosting-clone.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const ora = require("ora");
 const command_1 = require("../command");
 const error_1 = require("../error");
@@ -46,21 +46,21 @@ For example, to copy the content for a site \`my-site\` from a preview channel \
     if (!sourceVersionName) {
         const sChannel = await (0, api_1.getChannel)("-", sourceSiteId, sourceChannelId);
         if (!sChannel) {
-            throw new error_1.FirebaseError(`Could not find the channel ${(0, cli_color_1.bold)(sourceChannelId)} for site ${(0, cli_color_1.bold)(sourceSiteId)}.`);
+            throw new error_1.FirebaseError(`Could not find the channel ${(0, colorette_1.bold)(sourceChannelId)} for site ${(0, colorette_1.bold)(sourceSiteId)}.`);
         }
         sourceVersionName = (_b = (_a = sChannel.release) === null || _a === void 0 ? void 0 : _a.version) === null || _b === void 0 ? void 0 : _b.name;
         if (!sourceVersionName) {
-            throw new error_1.FirebaseError(`Could not find a version on the channel ${(0, cli_color_1.bold)(sourceChannelId)} for site ${(0, cli_color_1.bold)(sourceSiteId)}.`);
+            throw new error_1.FirebaseError(`Could not find a version on the channel ${(0, colorette_1.bold)(sourceChannelId)} for site ${(0, colorette_1.bold)(sourceSiteId)}.`);
         }
     }
     let tChannel = await (0, api_1.getChannel)("-", targetSiteId, targetChannelId);
     if (!tChannel) {
-        utils.logBullet(`could not find channel ${(0, cli_color_1.bold)(targetChannelId)} in site ${(0, cli_color_1.bold)(targetSiteId)}, creating it...`);
+        utils.logBullet(`could not find channel ${(0, colorette_1.bold)(targetChannelId)} in site ${(0, colorette_1.bold)(targetSiteId)}, creating it...`);
         try {
             tChannel = await (0, api_1.createChannel)("-", targetSiteId, targetChannelId);
         }
         catch (e) {
-            throw new error_1.FirebaseError(`Could not create the channel ${(0, cli_color_1.bold)(targetChannelId)} for site ${(0, cli_color_1.bold)(targetSiteId)}.`, { original: e });
+            throw new error_1.FirebaseError(`Could not create the channel ${(0, colorette_1.bold)(targetChannelId)} for site ${(0, colorette_1.bold)(targetSiteId)}.`, { original: e });
         }
         utils.logSuccess(`Created new channel ${targetChannelId}`);
         try {
@@ -74,7 +74,7 @@ For example, to copy the content for a site \`my-site\` from a preview channel \
     }
     const currentTargetVersionName = (_d = (_c = tChannel.release) === null || _c === void 0 ? void 0 : _c.version) === null || _d === void 0 ? void 0 : _d.name;
     if (equalSiteIds && sourceVersionName === currentTargetVersionName) {
-        utils.logSuccess(`Channels ${(0, cli_color_1.bold)(sourceChannelId)} and ${(0, cli_color_1.bold)(targetChannel)} are serving identical versions. No need to clone.`);
+        utils.logSuccess(`Channels ${(0, colorette_1.bold)(sourceChannelId)} and ${(0, colorette_1.bold)(targetChannel)} are serving identical versions. No need to clone.`);
         return;
     }
     let targetVersionName = sourceVersionName;
@@ -83,7 +83,7 @@ For example, to copy the content for a site \`my-site\` from a preview channel \
         if (!equalSiteIds) {
             const targetVersion = await (0, api_1.cloneVersion)(targetSiteId, sourceVersionName, true);
             if (!targetVersion) {
-                throw new error_1.FirebaseError(`Could not clone the version ${(0, cli_color_1.bold)(sourceVersion)} for site ${(0, cli_color_1.bold)(targetSiteId)}.`);
+                throw new error_1.FirebaseError(`Could not clone the version ${(0, colorette_1.bold)(sourceVersion)} for site ${(0, colorette_1.bold)(targetSiteId)}.`);
             }
             targetVersionName = targetVersion.name;
         }
@@ -94,7 +94,7 @@ For example, to copy the content for a site \`my-site\` from a preview channel \
         throw err;
     }
     spinner.succeed();
-    utils.logSuccess(`Site ${(0, cli_color_1.bold)(sourceSiteId)} ${sourceChannelId ? "channel" : "version"} ${(0, cli_color_1.bold)(sourceChannelId || sourceVersion)} has been cloned to site ${(0, cli_color_1.bold)(targetSiteId)} channel ${(0, cli_color_1.bold)(targetChannelId)}.`);
+    utils.logSuccess(`Site ${(0, colorette_1.bold)(sourceSiteId)} ${sourceChannelId ? "channel" : "version"} ${(0, colorette_1.bold)(sourceChannelId || sourceVersion)} has been cloned to site ${(0, colorette_1.bold)(targetSiteId)} channel ${(0, colorette_1.bold)(targetChannelId)}.`);
     utils.logSuccess(`Channel URL (${targetChannelId}): ${tChannel.url}`);
 });
 function parseProjectId(name) {

package/lib/commands/hosting-disable.js

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

package/lib/commands/hosting-sites-create.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const utils_1 = require("../utils");
 const command_1 = require("../command");
 const api_1 = require("../hosting/api");
@@ -37,14 +37,14 @@ exports.command = new command_1.Command("hosting:sites:create [siteId]")
     }
     catch (e) {
         if (e.status === 409) {
-            throw new error_1.FirebaseError(`Site ${(0, cli_color_1.bold)(siteId)} already exists in project ${(0, cli_color_1.bold)(projectId)}.`, { original: e });
+            throw new error_1.FirebaseError(`Site ${(0, colorette_1.bold)(siteId)} already exists in project ${(0, colorette_1.bold)(projectId)}.`, { original: e });
         }
         throw e;
     }
     logger_1.logger.info();
-    (0, utils_1.logLabeledSuccess)(LOG_TAG, `Site ${(0, cli_color_1.bold)(siteId)} has been created in project ${(0, cli_color_1.bold)(projectId)}.`);
+    (0, utils_1.logLabeledSuccess)(LOG_TAG, `Site ${(0, colorette_1.bold)(siteId)} has been created in project ${(0, colorette_1.bold)(projectId)}.`);
     if (appId) {
-        (0, utils_1.logLabeledSuccess)(LOG_TAG, `Site ${(0, cli_color_1.bold)(siteId)} has been linked to web app ${(0, cli_color_1.bold)(appId)}`);
+        (0, utils_1.logLabeledSuccess)(LOG_TAG, `Site ${(0, colorette_1.bold)(siteId)} has been linked to web app ${(0, colorette_1.bold)(appId)}`);
     }
     (0, utils_1.logLabeledSuccess)(LOG_TAG, `Site URL: ${site.defaultUrl}`);
     logger_1.logger.info();

package/lib/commands/hosting-sites-delete.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const command_1 = require("../command");
 const utils_1 = require("../utils");
 const api_1 = require("../hosting/api");
@@ -22,12 +22,12 @@ exports.command = new command_1.Command("hosting:sites:delete <siteId>")
     if (!siteId) {
         throw new error_1.FirebaseError("siteId is required");
     }
-    logger_1.logger.info(`Deleting a site is a permanent action. If you delete a site, Firebase doesn't maintain records of deployed files or deployment history, and the site ${(0, cli_color_1.underline)(siteId)} cannot be reactivated by you or anyone else.`);
+    logger_1.logger.info(`Deleting a site is a permanent action. If you delete a site, Firebase doesn't maintain records of deployed files or deployment history, and the site ${(0, colorette_1.underline)(siteId)} cannot be reactivated by you or anyone else.`);
     logger_1.logger.info();
     const confirmed = await (0, prompt_1.promptOnce)({
         name: "force",
         type: "confirm",
-        message: `Are you sure you want to delete the Hosting site ${(0, cli_color_1.underline)(siteId)} for project ${(0, cli_color_1.underline)(projectId)}? `,
+        message: `Are you sure you want to delete the Hosting site ${(0, colorette_1.underline)(siteId)} for project ${(0, colorette_1.underline)(projectId)}? `,
         default: false,
     }, options);
     if (!confirmed) {
@@ -35,5 +35,5 @@ exports.command = new command_1.Command("hosting:sites:delete <siteId>")
     }
     await (0, api_1.getSite)(projectId, siteId);
     await (0, api_1.deleteSite)(projectId, siteId);
-    (0, utils_1.logLabeledSuccess)(LOG_TAG, `Successfully deleted site ${(0, cli_color_1.bold)(siteId)} from project ${(0, cli_color_1.bold)(projectId)}`);
+    (0, utils_1.logLabeledSuccess)(LOG_TAG, `Successfully deleted site ${(0, colorette_1.bold)(siteId)} from project ${(0, colorette_1.bold)(projectId)}`);
 });

package/lib/commands/hosting-sites-list.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const Table = require("cli-table");
 const command_1 = require("../command");
 const api_1 = require("../hosting/api");
@@ -21,7 +21,7 @@ exports.command = new command_1.Command("hosting:sites:list")
         table.push([siteId, site.defaultUrl, site.appId || "--"]);
     }
     logger_1.logger.info();
-    logger_1.logger.info(`Sites for project ${(0, cli_color_1.bold)(projectId)}`);
+    logger_1.logger.info(`Sites for project ${(0, colorette_1.bold)(projectId)}`);
     logger_1.logger.info();
     logger_1.logger.info(table.toString());
     return { sites };

package/lib/commands/init.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
@@ -100,11 +100,11 @@ exports.command = new command_1.Command("init [feature]")
     if (warnings.length) {
         warningText =
             "\nBefore we get started, keep in mind:\n\n  " +
-                clc.yellow.bold("* ") +
-                warnings.join("\n  " + clc.yellow.bold("* ")) +
+                clc.yellow(clc.bold("* ")) +
+                warnings.join("\n  " + clc.yellow(clc.bold("* "))) +
                 "\n";
     }
-    logger_1.logger.info(clc.yellow.bold(BANNER_TEXT) +
+    logger_1.logger.info(clc.yellow(clc.bold(BANNER_TEXT)) +
         "\nYou're about to initialize a Firebase project in this directory:\n\n  " +
         clc.bold(config.projectDir) +
         "\n" +
@@ -150,7 +150,7 @@ exports.command = new command_1.Command("init [feature]")
         var _a;
         if (!setup.features || ((_a = setup.features) === null || _a === void 0 ? void 0 : _a.length) === 0) {
             return utils.reject("Must select at least one feature. Use " +
-                clc.bold.underline("SPACEBAR") +
+                clc.bold(clc.underline("SPACEBAR")) +
                 " to select features, or specify a feature by running " +
                 clc.bold("firebase init [feature_name]"));
         }

package/lib/commands/login-add.js

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

package/lib/commands/login-ci.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -19,7 +19,7 @@ exports.command = new command_1.Command("login:ci")
     const userCredentials = await auth.loginGoogle(options.localhost);
     logger_1.logger.info();
     utils.logSuccess("Success! Use this token to login on a CI server:\n\n" +
-        clc.bold(userCredentials.tokens.refresh_token) +
+        clc.bold(userCredentials.tokens.refresh_token || "") +
         '\n\nExample: firebase deploy --token "$FIREBASE_TOKEN"\n');
     return userCredentials;
 });

package/lib/commands/login-list.js

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

package/lib/commands/login-use.js

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

package/lib/commands/login.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
 const configstore_1 = require("../configstore");

package/lib/commands/logout.js

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

package/lib/commands/open.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const open = require("open");
 const error_1 = require("../error");
 const api = require("../api");
@@ -79,10 +79,10 @@ exports.command = new command_1.Command("open [link]")
         throw new error_1.FirebaseError(`Unable to determine URL for link: ${link}`);
     }
     if (link.arg !== linkName) {
-        logger_1.logger.info(`${clc.bold.cyan("Tip:")} You can also run ${clc.bold.underline(`firebase open ${link.arg}`)}`);
+        logger_1.logger.info(`${clc.bold(clc.cyan("Tip:"))} You can also run ${clc.bold(clc.underline(`firebase open ${link.arg}`))}`);
         logger_1.logger.info();
     }
     logger_1.logger.info(`Opening ${clc.bold(link.name)} link in your default browser:`);
-    logger_1.logger.info(clc.bold.underline(url));
+    logger_1.logger.info(clc.bold(clc.underline(url)));
     open(url);
 });

package/lib/commands/projects-list.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ora = require("ora");
 const Table = require("cli-table");
 const command_1 = require("../command");
@@ -22,7 +22,7 @@ function logProjectsList(projects, currentProjectId) {
     const table = new Table({ head: tableHead, style: { head: ["green"] } });
     projects.forEach(({ projectId, projectNumber, displayName, resources }) => {
         if (projectId === currentProjectId) {
-            projectId = clc.cyan.bold(`${projectId} (current)`);
+            projectId = clc.cyan(clc.bold(`${projectId} (current)`));
         }
         table.push([
             displayName || NOT_SPECIFIED,

package/lib/commands/serve.js

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

package/lib/commands/target-apply.js

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

package/lib/commands/target-clear.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");

package/lib/commands/target-remove.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");

package/lib/commands/target.js

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

package/lib/commands/use.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const projects_1 = require("../management/projects");
 const logger_1 = require("../logger");
@@ -11,12 +11,12 @@ const command_2 = require("../command");
 const utils = require("../utils");
 function listAliases(options) {
     if (options.rc.hasProjects) {
-        logger_1.logger.info("Project aliases for", clc.bold(options.projectRoot) + ":");
+        logger_1.logger.info("Project aliases for", clc.bold(options.projectRoot || "") + ":");
         logger_1.logger.info();
         for (const [alias, projectId] of Object.entries(options.rc.projects)) {
             const listing = alias + " (" + projectId + ")";
             if (options.project === projectId || options.projectAlias === alias) {
-                logger_1.logger.info(clc.cyan.bold("* " + listing));
+                logger_1.logger.info(clc.cyan(clc.bold("* " + listing)));
             }
             else {
                 logger_1.logger.info("  " + listing);
@@ -121,8 +121,8 @@ exports.command = new command_1.Command("use [alias_or_project_id]")
                 options.rc.addProjectAlias(results.alias, results.project);
                 utils.makeActiveProject(options.projectRoot, results.alias);
                 logger_1.logger.info();
-                logger_1.logger.info("Created alias", clc.bold(results.alias), "for", results.project + ".");
-                logger_1.logger.info("Now using alias", clc.bold(results.alias) + " (" + results.project + ")");
+                logger_1.logger.info("Created alias", clc.bold(results.alias || ""), "for", results.project + ".");
+                logger_1.logger.info("Now using alias", clc.bold(results.alias || "") + " (" + results.project + ")");
             });
         });
     }
@@ -143,10 +143,10 @@ exports.command = new command_1.Command("use [alias_or_project_id]")
             return utils.reject("No active project");
         }
         if (options.projectAlias) {
-            logger_1.logger.info("Active Project:", clc.bold.cyan(options.projectAlias + " (" + options.project + ")"));
+            logger_1.logger.info("Active Project:", clc.bold(clc.cyan(options.projectAlias + " (" + options.project + ")")));
         }
         else if (options.project) {
-            logger_1.logger.info("Active Project:", clc.bold.cyan(options.project));
+            logger_1.logger.info("Active Project:", clc.bold(clc.cyan(options.project)));
         }
         else {
             let msg = "No project is currently active";

package/lib/config.js

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

package/lib/deploy/database/prepare.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepare = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const path = require("path");
 const error_1 = require("../../error");
 const parseBoltRules_1 = require("../../parseBoltRules");
@@ -39,12 +39,12 @@ function prepare(context, options) {
         deploys: deploys,
         ruleFiles: ruleFiles,
     };
-    utils.logBullet(clc.bold.cyan("database: ") + "checking rules syntax...");
+    utils.logBullet(clc.bold(clc.cyan("database: ")) + "checking rules syntax...");
     return Promise.all(deploys.map((deploy) => {
         return rtdb
             .updateRules(context.projectId, deploy.instance, ruleFiles[deploy.rules], { dryRun: true })
             .then(() => {
-            utils.logSuccess(clc.bold.green("database: ") +
+            utils.logSuccess(clc.bold(clc.green("database: ")) +
                 "rules syntax for database " +
                 clc.bold(deploy.instance) +
                 " is valid");

package/lib/deploy/database/release.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.release = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const rtdb = require("../../rtdb");
 const utils = require("../../utils");
 function release(context) {
@@ -13,14 +13,14 @@ function release(context) {
     }
     const deploys = context.database.deploys;
     const ruleFiles = context.database.ruleFiles;
-    utils.logBullet(clc.bold.cyan("database: ") + "releasing rules...");
+    utils.logBullet(clc.bold(clc.cyan("database: ")) + "releasing rules...");
     return Promise.all(deploys.map((deploy) => {
         return rtdb
             .updateRules(context.projectId, deploy.instance, ruleFiles[deploy.rules], {
             dryRun: false,
         })
             .then(() => {
-            utils.logSuccess(clc.bold.green("database: ") +
+            utils.logSuccess(clc.bold(clc.green("database: ")) +
                 "rules for database " +
                 clc.bold(deploy.instance) +
                 " released successfully");

package/lib/deploy/extensions/deploymentSummary.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deletesSummary = exports.configuresSummary = exports.updatesSummary = exports.createsSummary = exports.humanReadable = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const refs = require("../../extensions/refs");
 const humanReadable = (dep) => `${clc.bold(dep.instanceId)} (${dep.ref ? `${refs.toExtensionVersionRef(dep.ref)}` : `Installed from local source`})`;
 exports.humanReadable = humanReadable;

package/lib/deploy/extensions/errors.js

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

package/lib/deploy/extensions/secrets.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkSpecForSecrets = exports.handleSecretParams = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const secretUtils = require("../../extensions/secretsUtils");
 const secretManager = require("../../gcp/secretManager");
 const planner_1 = require("./planner");

package/lib/deploy/extensions/tasks.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteExtensionInstanceTask = exports.configureExtensionInstanceTask = exports.updateExtensionInstanceTask = exports.createExtensionInstanceTask = exports.extensionsDeploymentHandler = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const extensionsApi = require("../../extensions/extensionsApi");
 const extensionsHelper_1 = require("../../extensions/extensionsHelper");
@@ -146,5 +146,5 @@ function deleteExtensionInstanceTask(projectId, instanceSpec) {
 exports.deleteExtensionInstanceTask = deleteExtensionInstanceTask;
 function printSuccess(instanceId, type, validateOnly) {
     const action = validateOnly ? `validated ${type} for` : `${type}d`;
-    utils.logSuccess(clc.bold.green("extensions") + ` Successfully ${action} ${instanceId}`);
+    utils.logSuccess(clc.bold(clc.green("extensions")) + ` Successfully ${action} ${instanceId}`);
 }

package/lib/deploy/firestore/deploy.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const indexes_1 = require("../../firestore/indexes");
 const logger_1 = require("../../logger");
@@ -30,7 +30,7 @@ async function deployIndexes(context, options) {
     }
     const fieldOverrides = indexesSrc.fieldOverrides || [];
     await new indexes_1.FirestoreIndexes().deploy(options, indexes, fieldOverrides);
-    utils.logSuccess(`${clc.bold.green("firestore:")} deployed indexes in ${clc.bold(indexesFileName)} successfully`);
+    utils.logSuccess(`${clc.bold(clc.green("firestore:"))} deployed indexes in ${clc.bold(indexesFileName)} successfully`);
 }
 async function default_1(context, options) {
     await Promise.all([deployRules(context), deployIndexes(context, options)]);

package/lib/deploy/firestore/prepare.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const loadCJSON_1 = require("../../loadCJSON");
 const rulesDeploy_1 = require("../../rulesDeploy");
 const utils = require("../../utils");
@@ -23,7 +23,7 @@ function prepareIndexes(context, options) {
     const indexesFileName = options.config.src.firestore.indexes;
     const indexesPath = options.config.path(indexesFileName);
     const parsedSrc = (0, loadCJSON_1.loadCJSON)(indexesPath);
-    utils.logBullet(`${clc.bold.cyan("firestore:")} reading indexes from ${clc.bold(indexesFileName)}...`);
+    utils.logBullet(`${clc.bold(clc.cyan("firestore:"))} reading indexes from ${clc.bold(indexesFileName)}...`);
     context.firestore = context.firestore || {};
     context.firestore.indexes = {
         name: indexesFileName,

package/lib/deploy/functions/backend.js

@@ -79,7 +79,7 @@ function memoryToGen2Cpu(memory) {
         2048: 1,
         4096: 2,
         8192: 2,
-        16384: 3,
+        16384: 2,
         32768: 4,
     }[memory];
 }

package/lib/deploy/functions/build.js

@@ -109,6 +109,9 @@ function toBackend(build, paramValues) {
             r.resolveInts(bkEndpoint, bdEndpoint, "timeoutSeconds", "maxInstances", "minInstances", "concurrency");
             proto.convertIfPresent(bkEndpoint, bdEndpoint, "cpu", (0, functional_1.nullsafeVisitor)((cpu) => (cpu === "gcf_gen1" ? cpu : r.resolveInt(cpu))));
             if (bdEndpoint.vpc) {
+                if (bdEndpoint.vpc.connector && !bdEndpoint.vpc.connector.includes("/")) {
+                    bdEndpoint.vpc.connector = `projects/${bdEndpoint.project}/locations/${region}/connectors/${bdEndpoint.vpc.connector}`;
+                }
                 bkEndpoint.vpc = { connector: params.resolveString(bdEndpoint.vpc.connector, paramValues) };
                 proto.copyIfPresent(bkEndpoint.vpc, bdEndpoint.vpc, "egressSettings");
             }

package/lib/deploy/functions/checkIam.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureServiceAgentRoles = exports.mergeBindings = exports.obtainDefaultComputeServiceAgentBindings = exports.obtainPubSubServiceAgentBindings = exports.checkHttpIam = exports.checkServiceAccountIam = exports.EVENTARC_EVENT_RECEIVER_ROLE = exports.RUN_INVOKER_ROLE = exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const logger_1 = require("../../logger");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const error_1 = require("../../error");
@@ -28,7 +28,7 @@ async function checkServiceAccountIam(projectId) {
         return;
     }
     if (!passed) {
-        throw new error_1.FirebaseError(`Missing permissions required for functions deploy. You must have permission ${(0, cli_color_1.bold)("iam.serviceAccounts.ActAs")} on service account ${(0, cli_color_1.bold)(saEmail)}.\n\n` +
+        throw new error_1.FirebaseError(`Missing permissions required for functions deploy. You must have permission ${(0, colorette_1.bold)("iam.serviceAccounts.ActAs")} on service account ${(0, colorette_1.bold)(saEmail)}.\n\n` +
             `To address this error, ask a project Owner to assign your account the "Service Account User" role from this URL:\n\n` +
             `https://console.cloud.google.com/iam-admin/iam?project=${projectId}`);
     }
@@ -60,7 +60,7 @@ async function checkHttpIam(context, options, payload) {
     }
     if (!passed) {
         void (0, track_1.track)("Error (User)", "deploy:functions:http_create_missing_iam");
-        throw new error_1.FirebaseError(`Missing required permission on project ${(0, cli_color_1.bold)(context.projectId)} to deploy new HTTPS functions. The permission ${(0, cli_color_1.bold)(PERMISSION)} is required to deploy the following functions:\n\n- ` +
+        throw new error_1.FirebaseError(`Missing required permission on project ${(0, colorette_1.bold)(context.projectId)} to deploy new HTTPS functions. The permission ${(0, colorette_1.bold)(PERMISSION)} is required to deploy the following functions:\n\n- ` +
             newHttpsEndpoints.map((func) => func.id).join("\n- ") +
             `\n\nTo address this error, please ask a project Owner to assign your account the "Cloud Functions Admin" role at the following URL:\n\nhttps://console.cloud.google.com/iam-admin/iam?project=${context.projectId}`);
     }

package/lib/deploy/functions/containerCleaner.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerHelper = exports.deleteGcfArtifacts = exports.listGcfPaths = exports.ContainerRegistryCleaner = exports.NoopArtifactRegistryCleaner = exports.ArtifactRegistryCleaner = exports.cleanupBuildImages = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const api_1 = require("../../api");
 const logger_1 = require("../../logger");
@@ -34,7 +34,7 @@ async function retry(func) {
     }
 }
 async function cleanupBuildImages(haveFunctions, deletedFunctions, cleaners = {}) {
-    utils.logBullet(clc.bold.cyan("functions: ") + "cleaning up build files...");
+    utils.logBullet(clc.bold(clc.cyan("functions: ")) + "cleaning up build files...");
     const failedDomains = new Set();
     const cleanup = [];
     const arCleaner = cleaners.ar || new ArtifactRegistryCleaner();