firebase-tools 11.4.2 → 11.7.0

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.backendFromV1Alpha1 = exports.buildFromV1Alpha1 = void 0;
-const backend = require("../../backend");
+exports.buildFromV1Alpha1 = void 0;
 const build = require("../../build");
 const proto_1 = require("../../../../gcp/proto");
 const parsing_1 = require("./parsing");
@@ -27,33 +26,13 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
     bd.requiredAPIs = parseRequiredAPIs(manifest);
     for (const id of Object.keys(manifest.endpoints)) {
         const me = manifest.endpoints[id];
-        assertManifestEndpoint(me, id);
+        assertBuildEndpoint(me, id);
         const be = parseEndpointForBuild(id, me, project, region, runtime);
         bd.endpoints[id] = be;
     }
     return bd;
 }
 exports.buildFromV1Alpha1 = buildFromV1Alpha1;
-function backendFromV1Alpha1(yaml, project, region, runtime) {
-    const manifest = JSON.parse(JSON.stringify(yaml));
-    const bkend = backend.empty();
-    bkend.requiredAPIs = parseRequiredAPIs(manifest);
-    (0, parsing_1.requireKeys)("", manifest, "endpoints");
-    (0, parsing_1.assertKeyTypes)("", manifest, {
-        specVersion: "string",
-        params: "array",
-        requiredAPIs: "array",
-        endpoints: "object",
-    });
-    for (const id of Object.keys(manifest.endpoints)) {
-        for (const parsed of parseEndpoints(manifest, id, project, region, runtime)) {
-            bkend.endpoints[parsed.region] = bkend.endpoints[parsed.region] || {};
-            bkend.endpoints[parsed.region][parsed.id] = parsed;
-        }
-    }
-    return bkend;
-}
-exports.backendFromV1Alpha1 = backendFromV1Alpha1;
 function parseRequiredAPIs(manifest) {
     const requiredAPIs = manifest.requiredAPIs || [];
     for (const { api, reason } of requiredAPIs) {
@@ -66,22 +45,22 @@ function parseRequiredAPIs(manifest) {
     }
     return requiredAPIs;
 }
-function assertManifestEndpoint(ep, id) {
+function assertBuildEndpoint(ep, id) {
     const prefix = `endpoints[${id}]`;
     (0, parsing_1.assertKeyTypes)(prefix, ep, {
         region: "array",
-        platform: (platform) => backend.AllFunctionsPlatforms.includes(platform),
+        platform: (platform) => build.AllFunctionsPlatforms.includes(platform),
         entryPoint: "string",
-        availableMemoryMb: (mem) => mem === null || backend.isValidMemoryOption(mem),
-        maxInstances: "number?",
-        minInstances: "number?",
-        concurrency: "number?",
+        availableMemoryMb: (mem) => mem === null || isCEL(mem) || build.isValidMemoryOption(mem),
+        maxInstances: "Field<number>?",
+        minInstances: "Field<number>?",
+        concurrency: "Field<number>?",
         serviceAccount: "string?",
         serviceAccountEmail: "string?",
-        timeoutSeconds: "number?",
+        timeoutSeconds: "Field<number>?",
         vpc: "object?",
         labels: "object?",
-        ingressSettings: (setting) => setting === null || backend.AllIngressSettings.includes(setting),
+        ingressSettings: (setting) => setting === null || build.AllIngressSettings.includes(setting),
         environmentVariables: "object?",
         secretEnvironmentVariables: "array?",
         httpsTrigger: "object",
@@ -90,12 +69,12 @@ function assertManifestEndpoint(ep, id) {
         scheduleTrigger: "object",
         taskQueueTrigger: "object",
         blockingTrigger: "object",
-        cpu: (cpu) => cpu === null || typeof cpu === "number" || cpu === "gcf_gen1",
+        cpu: (cpu) => cpu === null || isCEL(cpu) || cpu === "gcf_gen1" || typeof cpu === "number",
     });
     if (ep.vpc) {
         (0, parsing_1.assertKeyTypes)(prefix + ".vpc", ep.vpc, {
             connector: "string",
-            egressSettings: (setting) => setting === null || backend.AllVpcEgressSettings.includes(setting),
+            egressSettings: (setting) => setting === null || build.AllVpcEgressSettings.includes(setting),
         });
         (0, parsing_1.requireKeys)(prefix + ".vpc", ep.vpc, "connector");
     }
@@ -124,44 +103,46 @@ function assertManifestEndpoint(ep, id) {
     if (triggerCount > 1) {
         throw new error_1.FirebaseError("Multiple triggers defined for endpoint" + id);
     }
-    if (backend.isEventTriggered(ep)) {
+    if (build.isEventTriggered(ep)) {
         (0, parsing_1.requireKeys)(prefix + ".eventTrigger", ep.eventTrigger, "eventType", "eventFilters");
         (0, parsing_1.assertKeyTypes)(prefix + ".eventTrigger", ep.eventTrigger, {
             eventFilters: "object",
             eventFilterPathPatterns: "object",
             eventType: "string",
-            retry: "boolean",
-            region: "string",
+            retry: "Field<boolean>",
+            region: "Field<string>",
             serviceAccount: "string?",
             serviceAccountEmail: "string?",
             channel: "string",
         });
     }
-    else if (backend.isHttpsTriggered(ep)) {
+    else if (build.isHttpsTriggered(ep)) {
         (0, parsing_1.assertKeyTypes)(prefix + ".httpsTrigger", ep.httpsTrigger, {
             invoker: "array?",
         });
     }
-    else if (backend.isCallableTriggered(ep)) {
+    else if (build.isCallableTriggered(ep)) {
     }
-    else if (backend.isScheduleTriggered(ep)) {
+    else if (build.isScheduleTriggered(ep)) {
         (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger", ep.scheduleTrigger, {
-            schedule: "string",
-            timeZone: "string?",
+            schedule: "Field<string>",
+            timeZone: "Field<string>?",
             retryConfig: "object?",
         });
-        (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger.retryConfig", ep.scheduleTrigger.retryConfig || {}, {
-            retryCount: "number?",
-            maxDoublings: "number?",
-            minBackoffSeconds: "number?",
-            maxBackoffSeconds: "number?",
-            maxRetrySeconds: "number?",
-            minBackoffDuration: "string?",
-            maxBackoffDuration: "string?",
-            maxRetryDuration: "string?",
-        });
+        if (ep.scheduleTrigger.retryConfig) {
+            (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger.retryConfig", ep.scheduleTrigger.retryConfig, {
+                retryCount: "Field<number>?",
+                maxDoublings: "Field<number>?",
+                minBackoffSeconds: "Field<number>?",
+                maxBackoffSeconds: "Field<number>?",
+                maxRetrySeconds: "Field<number>?",
+                maxRetryDuration: "string?",
+                minBackoffDuration: "string?",
+                maxBackoffDuration: "string?",
+            });
+        }
     }
-    else if (backend.isTaskQueueTriggered(ep)) {
+    else if (build.isTaskQueueTriggered(ep)) {
         (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger", ep.taskQueueTrigger, {
             rateLimits: "object?",
             retryConfig: "object?",
@@ -169,21 +150,21 @@ function assertManifestEndpoint(ep, id) {
         });
         if (ep.taskQueueTrigger.rateLimits) {
             (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.rateLimits", ep.taskQueueTrigger.rateLimits, {
-                maxConcurrentDispatches: "number?",
-                maxDispatchesPerSecond: "number?",
+                maxConcurrentDispatches: "Field<number>?",
+                maxDispatchesPerSecond: "Field<number>?",
             });
         }
         if (ep.taskQueueTrigger.retryConfig) {
             (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.retryConfig", ep.taskQueueTrigger.retryConfig, {
-                maxAttempts: "number?",
-                maxRetrySeconds: "number?",
-                minBackoffSeconds: "number?",
-                maxBackoffSeconds: "number?",
-                maxDoublings: "number?",
+                maxAttempts: "Field<number>?",
+                maxRetrySeconds: "Field<number>?",
+                minBackoffSeconds: "Field<number>?",
+                maxBackoffSeconds: "Field<number>?",
+                maxDoublings: "Field<number>?",
             });
         }
     }
-    else if (backend.isBlockingTriggered(ep)) {
+    else if (build.isBlockingTriggered(ep)) {
         (0, parsing_1.requireKeys)(prefix + ".blockingTrigger", ep.blockingTrigger, "eventType");
         (0, parsing_1.assertKeyTypes)(prefix + ".blockingTrigger", ep.blockingTrigger, {
             eventType: "string",
@@ -198,12 +179,14 @@ function assertManifestEndpoint(ep, id) {
 function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     var _a;
     let triggered;
-    if (backend.isEventTriggered(ep)) {
+    if (build.isEventTriggered(ep)) {
         const eventTrigger = {
             eventType: ep.eventTrigger.eventType,
             retry: ep.eventTrigger.retry,
         };
-        (0, proto_1.renameIfPresent)(eventTrigger, ep.eventTrigger, "serviceAccount", "serviceAccountEmail");
+        if ("serviceAccountEmail" in ep.eventTrigger) {
+            eventTrigger.serviceAccount = ep.eventTrigger.serviceAccountEmail;
+        }
         (0, proto_1.copyIfPresent)(eventTrigger, ep.eventTrigger, "serviceAccount", "eventFilterPathPatterns", "region");
         (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "channel", (c) => resolveChannelName(project, c, defaultRegion));
         (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "eventFilters", (filters) => {
@@ -215,20 +198,23 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         });
         triggered = { eventTrigger };
     }
-    else if (backend.isHttpsTriggered(ep)) {
+    else if (build.isHttpsTriggered(ep)) {
         triggered = { httpsTrigger: {} };
         (0, proto_1.copyIfPresent)(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
     }
-    else if (backend.isCallableTriggered(ep)) {
+    else if (build.isCallableTriggered(ep)) {
         triggered = { callableTrigger: {} };
     }
-    else if (backend.isScheduleTriggered(ep)) {
+    else if (build.isScheduleTriggered(ep)) {
         const st = {
             schedule: ep.scheduleTrigger.schedule || "",
             timeZone: (_a = ep.scheduleTrigger.timeZone) !== null && _a !== void 0 ? _a : null,
         };
         if (ep.scheduleTrigger.retryConfig) {
             st.retryConfig = {};
+            (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "maxBackoffSeconds", "maxBackoffDuration", (duration) => (duration === null ? null : (0, proto_1.secondsFromDuration)(duration)));
+            (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "minBackoffSeconds", "minBackoffDuration", (duration) => (duration === null ? null : (0, proto_1.secondsFromDuration)(duration)));
+            (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "maxRetrySeconds", "maxRetryDuration", (duration) => (duration === null ? null : (0, proto_1.secondsFromDuration)(duration)));
             (0, proto_1.copyIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "retryCount", "minBackoffSeconds", "maxBackoffSeconds", "maxRetrySeconds", "maxDoublings");
             (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "minBackoffSeconds", "minBackoffDuration", (0, functional_1.nullsafeVisitor)(proto_1.secondsFromDuration));
             (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "maxBackoffSeconds", "maxBackoffDuration", (0, functional_1.nullsafeVisitor)(proto_1.secondsFromDuration));
@@ -239,7 +225,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         }
         triggered = { scheduleTrigger: st };
     }
-    else if (backend.isTaskQueueTriggered(ep)) {
+    else if (build.isTaskQueueTriggered(ep)) {
         const tq = {};
         if (ep.taskQueueTrigger.invoker) {
             tq.invoker = ep.taskQueueTrigger.invoker;
@@ -261,7 +247,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         }
         triggered = { taskQueueTrigger: tq };
     }
-    else if (backend.isBlockingTriggered(ep)) {
+    else if (ep.blockingTrigger) {
         triggered = { blockingTrigger: ep.blockingTrigger };
     }
     else {
@@ -270,7 +256,9 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     }
     const parsed = Object.assign({ platform: ep.platform || "gcfv2", region: ep.region || [defaultRegion], project,
         runtime, entryPoint: ep.entryPoint }, triggered);
-    (0, proto_1.renameIfPresent)(parsed, ep, "serviceAccount", "serviceAccountEmail");
+    if ("serviceAccountEmail" in ep) {
+        parsed.serviceAccount = ep.serviceAccountEmail;
+    }
     (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "cpu", "maxInstances", "minInstances", "concurrency", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "serviceAccount");
     (0, proto_1.convertIfPresent)(parsed, ep, "secretEnvironmentVariables", (senvs) => {
         if (!senvs) {
@@ -282,69 +270,6 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     });
     return parsed;
 }
-function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
-    const allParsed = [];
-    const prefix = `endpoints[${id}]`;
-    const ep = manifest.endpoints[id];
-    assertManifestEndpoint(ep, id);
-    for (const region of ep.region || [defaultRegion]) {
-        let triggered;
-        if (backend.isEventTriggered(ep)) {
-            const eventTrigger = {
-                eventType: ep.eventTrigger.eventType,
-                retry: false,
-            };
-            (0, proto_1.renameIfPresent)(eventTrigger, ep.eventTrigger, "serviceAccount", "serviceAccountEmail");
-            (0, proto_1.copyIfPresent)(eventTrigger, ep.eventTrigger, "eventFilterPathPatterns", "retry", "serviceAccount", "region");
-            (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "channel", (c) => resolveChannelName(project, c, defaultRegion));
-            (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "eventFilters", (filters) => {
-                const copy = Object.assign({}, filters);
-                if (copy["topic"] && !copy["topic"].startsWith("projects/")) {
-                    copy["topic"] = `projects/${project}/topics/${copy["topic"]}`;
-                }
-                return copy;
-            });
-            triggered = { eventTrigger };
-        }
-        else if (backend.isHttpsTriggered(ep)) {
-            triggered = { httpsTrigger: {} };
-            (0, proto_1.copyIfPresent)(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
-        }
-        else if (backend.isCallableTriggered(ep)) {
-            triggered = { callableTrigger: {} };
-        }
-        else if (backend.isScheduleTriggered(ep)) {
-            triggered = { scheduleTrigger: ep.scheduleTrigger };
-        }
-        else if (backend.isTaskQueueTriggered(ep)) {
-            triggered = { taskQueueTrigger: ep.taskQueueTrigger };
-        }
-        else if (backend.isBlockingTriggered(ep)) {
-            triggered = { blockingTrigger: ep.blockingTrigger };
-        }
-        else {
-            throw new error_1.FirebaseError(`Do not recognize trigger type for endpoint ${id}. Try upgrading ` +
-                "firebase-tools with npm install -g firebase-tools@latest");
-        }
-        (0, parsing_1.requireKeys)(prefix, ep, "entryPoint");
-        const parsed = Object.assign({ platform: ep.platform || "gcfv2", id,
-            region,
-            project,
-            runtime, entryPoint: ep.entryPoint }, triggered);
-        (0, proto_1.renameIfPresent)(parsed, ep, "serviceAccount", "serviceAccountEmail");
-        (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccount", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "cpu");
-        (0, proto_1.convertIfPresent)(parsed, ep, "secretEnvironmentVariables", (senvs) => {
-            if (!senvs) {
-                return null;
-            }
-            return senvs.map(({ key, secret }) => {
-                return { key, secret: secret || key, projectId: project };
-            });
-        });
-        allParsed.push(parsed);
-    }
-    return allParsed;
-}
 function resolveChannelName(projectId, channel, defaultRegion) {
     if (!channel.includes("/")) {
         const location = defaultRegion;
@@ -365,3 +290,6 @@ function resolveChannelName(projectId, channel, defaultRegion) {
         return "projects/" + projectId + "/locations/" + location + "/channels/" + channelId;
     }
 }
+function isCEL(expr) {
+    return typeof expr === "string" && expr.includes("{{") && expr.includes("}}");
+}

package/lib/deploy/functions/runtimes/node/parseRuntimeAndValidateSDK.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRuntimeChoice = exports.DEPRECATED_NODE_VERSION_INFO = exports.UNSUPPORTED_NODE_VERSION_PACKAGE_JSON_MSG = exports.UNSUPPORTED_NODE_VERSION_FIREBASE_JSON_MSG = exports.RUNTIME_NOT_SET = void 0;
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../../../error");
 const track_1 = require("../../../../track");
 const runtimes = require("../../runtimes");

package/lib/deploy/functions/runtimes/node/parseTriggers.js

@@ -116,7 +116,7 @@ function addResourcesToBuild(projectId, runtime, annotation, want) {
             proto.copyIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "maxAttempts", "maxDoublings");
             proto.convertIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "minBackoffSeconds", "minBackoff", toSeconds);
             proto.convertIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "maxBackoffSeconds", "maxBackoff", toSeconds);
-            proto.convertIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "maxRetryDurationSeconds", "maxRetryDuration", toSeconds);
+            proto.convertIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "maxRetrySeconds", "maxRetryDuration", toSeconds);
         }
     }
     else if (annotation.httpsTrigger) {
@@ -185,11 +185,7 @@ function addResourcesToBuild(projectId, runtime, annotation, want) {
     const endpoint = Object.assign({ platform: annotation.platform || "gcfv1", region: regions, project: projectId, entryPoint: annotation.entryPoint, runtime: runtime }, triggered);
     proto.renameIfPresent(endpoint, annotation, "serviceAccount", "serviceAccountEmail");
     if (annotation.vpcConnector != null) {
-        let maybeId = annotation.vpcConnector;
-        if (maybeId && !maybeId.includes("/")) {
-            maybeId = `projects/${projectId}/locations/$REGION/connectors/${maybeId}`;
-        }
-        endpoint.vpc = { connector: maybeId };
+        endpoint.vpc = { connector: annotation.vpcConnector };
         proto.renameIfPresent(endpoint.vpc, annotation, "egressSettings", "vpcConnectorEgressSettings");
     }
     proto.copyIfPresent(endpoint, annotation, "concurrency", "labels", "maxInstances", "minInstances", "availableMemoryMb");

package/lib/deploy/functions/runtimes/node/versioning.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkFunctionsSDKVersion = exports.getLatestSDKVersion = exports.getFunctionsSDKVersion = exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const semver = require("semver");
 const spawn = require("cross-spawn");
 const utils = require("../../../../utils");
 const logger_1 = require("../../../../logger");
 const track_1 = require("../../../../track");
 const MIN_SDK_VERSION = "2.0.0";
-exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = clc.bold.yellow("functions: ") +
+exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = clc.bold(clc.yellow("functions: ")) +
     "You must have a " +
     clc.bold("firebase-functions") +
     " version that is at least 2.0.0. Please run " +
@@ -62,12 +62,12 @@ function checkFunctionsSDKVersion(currentVersion) {
         if (semver.eq(currentVersion, latest)) {
             return;
         }
-        utils.logWarning(clc.bold.yellow("functions: ") +
+        utils.logWarning(clc.bold(clc.yellow("functions: ")) +
             "package.json indicates an outdated version of firebase-functions. Please upgrade using " +
             clc.bold("npm install --save firebase-functions@latest") +
             " in your functions directory.");
         if (semver.major(currentVersion) < semver.major(latest)) {
-            utils.logWarning(clc.bold.yellow("functions: ") +
+            utils.logWarning(clc.bold(clc.yellow("functions: ")) +
                 "Please note that there will be breaking changes when you upgrade.");
         }
     }

package/lib/deploy/functions/validate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.secretsAreValid = exports.functionIdsAreValid = exports.functionsDirectoryExists = exports.endpointsAreUnique = exports.cpuConfigIsValid = exports.endpointsAreValid = void 0;
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const secretManager_1 = require("../../gcp/secretManager");
 const logger_1 = require("../../logger");

package/lib/deploy/hosting/deploy.js

@@ -7,24 +7,21 @@ const listFiles_1 = require("../../listFiles");
 const logger_1 = require("../../logger");
 const track_1 = require("../../track");
 const utils_1 = require("../../utils");
-const clc = require("cli-color");
-const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-const _ERASE_LINE = "\x1b[2K";
+const colorette_1 = require("colorette");
+const ora = require("ora");
 async function deploy(context, options) {
     var _a, _b;
     if (!((_a = context.hosting) === null || _a === void 0 ? void 0 : _a.deploys)) {
         return;
     }
-    let spins = 0;
+    const spinner = ora();
     function updateSpinner(newMessage, debugging) {
         if (debugging) {
             (0, utils_1.logLabeledBullet)("hosting", newMessage);
         }
         else {
-            process.stdout.write(_ERASE_LINE + clc.move(-9999, 0));
-            process.stdout.write(clc.bold.cyan(SPINNER[spins % SPINNER.length] + "  hosting: ") + newMessage);
+            spinner.text = `${(0, colorette_1.bold)((0, colorette_1.cyan)(" hosting:"))} ${newMessage}`;
         }
-        spins++;
     }
     async function runDeploys(deploys, debugging) {
         var _a;
@@ -40,7 +37,7 @@ async function deploy(context, options) {
         const t0 = Date.now();
         const publicDir = options.config.path(deploy.config.public);
         const files = (0, listFiles_1.listFiles)(publicDir, deploy.config.ignore);
-        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, `found ${files.length} files in ${clc.bold(deploy.config.public)}`);
+        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, `found ${files.length} files in ${(0, colorette_1.bold)(deploy.config.public)}`);
         let concurrency = 200;
         const envConcurrency = (0, utils_1.envOverride)("FIREBASE_HOSTING_UPLOAD_CONCURRENCY", "");
         if (envConcurrency) {
@@ -59,6 +56,9 @@ async function deploy(context, options) {
             uploadConcurrency: concurrency,
         });
         const progressInterval = setInterval(() => updateSpinner(uploader.statusMessage(), debugging), debugging ? 2000 : 200);
+        if (!debugging) {
+            spinner.start();
+        }
         try {
             await uploader.start();
         }
@@ -68,9 +68,10 @@ async function deploy(context, options) {
         }
         finally {
             clearInterval(progressInterval);
+            updateSpinner(uploader.statusMessage(), debugging);
         }
         if (!debugging) {
-            process.stdout.write(_ERASE_LINE + clc.move(-9999, 0));
+            spinner.stop();
         }
         (0, utils_1.logLabeledSuccess)("hosting[" + deploy.site + "]", "file upload complete");
         const dt = Date.now() - t0;

package/lib/deploy/hosting/uploader.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uploader = void 0;
 const lodash_1 = require("lodash");
 const abort_controller_1 = require("abort-controller");
-const clc = require("cli-color");
+const clc = require("colorette");
 const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
@@ -19,7 +19,7 @@ const MAX_UPLOAD_TIMEOUT = 7200000;
 function progressMessage(message, current, total) {
     current = Math.min(current, total);
     const percent = Math.floor(((current * 1.0) / total) * 100).toString();
-    return `${message} [${current}/${total}] (${clc.bold.green(`${percent}%`)})`;
+    return `${message} [${current}/${total}] (${clc.bold(clc.green(`${percent}%`))})`;
 }
 class Uploader {
     constructor(options) {

package/lib/deploy/hosting/validate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDeploy = void 0;
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const projectPath_1 = require("../../projectPath");
 const fsutils_1 = require("../../fsutils");
@@ -33,7 +33,7 @@ function validateDeploy(deploy, options) {
         else {
             const i18nPath = path.join(cfg.public, cfg.i18n.root);
             if (!(0, fsutils_1.dirExistsSync)((0, projectPath_1.resolveProjectPath)(options, i18nPath))) {
-                (0, utils_1.logLabeledWarning)("hosting", `Couldn't find specified i18n root directory ${clc.bold(cfg.i18n.root)} in public directory ${clc.bold(cfg.public)}.`);
+                (0, utils_1.logLabeledWarning)("hosting", `Couldn't find specified i18n root directory ${clc.bold(cfg.i18n.root)} in public directory ${clc.bold(cfg.public || "")}.`);
             }
         }
     }

package/lib/deploy/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
 const logger_1 = require("../logger");
 const api_1 = require("../api");
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const lodash_1 = require("lodash");
 const projectUtils_1 = require("../projectUtils");
 const utils_1 = require("../utils");
@@ -52,7 +52,7 @@ const deploy = async function (targetNames, options, customContext = {}) {
     for (const targetName of targetNames) {
         const target = TARGETS[targetName];
         if (!target) {
-            return Promise.reject(new error_1.FirebaseError(`${(0, cli_color_1.bold)(targetName)} is not a valid deploy target`));
+            return Promise.reject(new error_1.FirebaseError(`${(0, colorette_1.bold)(targetName)} is not a valid deploy target`));
         }
         predeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "predeploy"));
         prepares.push(target.prepare);
@@ -61,9 +61,9 @@ const deploy = async function (targetNames, options, customContext = {}) {
         postdeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "postdeploy"));
     }
     logger_1.logger.info();
-    logger_1.logger.info((0, cli_color_1.bold)((0, cli_color_1.white)("===") + " Deploying to '" + projectId + "'..."));
+    logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.white)("===") + " Deploying to '" + projectId + "'..."));
     logger_1.logger.info();
-    (0, utils_1.logBullet)("deploying " + (0, cli_color_1.bold)(targetNames.join(", ")));
+    (0, utils_1.logBullet)("deploying " + (0, colorette_1.bold)(targetNames.join(", ")));
     await chain(predeploys, context, options, payload);
     await chain(prepares, context, options, payload);
     await chain(deploys, context, options, payload);
@@ -75,13 +75,13 @@ const deploy = async function (targetNames, options, customContext = {}) {
     const duration = Date.now() - startTime;
     await (0, track_1.track)("Product Deploy", [...targetNames].sort().join(","), duration);
     logger_1.logger.info();
-    (0, utils_1.logSuccess)(cli_color_1.bold.underline("Deploy complete!"));
+    (0, utils_1.logSuccess)((0, colorette_1.bold)((0, colorette_1.underline)("Deploy complete!")));
     logger_1.logger.info();
     const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
-    logger_1.logger.info((0, cli_color_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
+    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
     if (deployedHosting) {
         (0, lodash_1.each)(context.hosting.deploys, (deploy) => {
-            logger_1.logger.info((0, cli_color_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)(api_1.hostingOrigin, deploy.site));
+            logger_1.logger.info((0, colorette_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)(api_1.hostingOrigin, deploy.site));
         });
         const versionNames = context.hosting.deploys.map((deploy) => deploy.version);
         return { hosting: versionNames.length === 1 ? versionNames[0] : versionNames };

package/lib/deploy/lifecycleHooks.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lifecycleHooks = void 0;
 const utils = require("../utils");
-const clc = require("cli-color");
+const clc = require("colorette");
 const childProcess = require("child_process");
 const error_1 = require("../error");
 const needProjectId = require("../projectUtils").needProjectId;
@@ -82,7 +82,10 @@ function runTargetCommands(target, hook, overallOptions, config) {
     }
     return runAllCommands
         .then(() => {
-        utils.logSuccess(clc.green.bold(logIdentifier + ":") + " Finished running " + clc.bold(hook) + " script.");
+        utils.logSuccess(clc.green(clc.bold(logIdentifier + ":")) +
+            " Finished running " +
+            clc.bold(hook) +
+            " script.");
     })
         .catch((err) => {
         throw new error_1.FirebaseError(logIdentifier + " " + hook + " error: " + err.message);

package/lib/deploy/storage/prepare.js

@@ -24,13 +24,11 @@ async function default_1(context, options) {
             }
         }
     }
-    _.set(context, "storage.rules", rulesConfig);
     const rulesDeploy = new rulesDeploy_1.RulesDeploy(options, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE);
-    _.set(context, "storage.rulesDeploy", rulesDeploy);
+    const rulesConfigsToDeploy = [];
     if (!Array.isArray(rulesConfig)) {
         const defaultBucket = await gcp.storage.getDefaultBucket(options.project);
         rulesConfig = [Object.assign(rulesConfig, { bucket: defaultBucket })];
-        _.set(context, "storage.rules", rulesConfig);
     }
     for (const ruleConfig of rulesConfig) {
         const target = ruleConfig.target;
@@ -39,12 +37,16 @@ async function default_1(context, options) {
         }
         if (allStorage || onlyTargets.has(target)) {
             rulesDeploy.addFile(ruleConfig.rules);
+            rulesConfigsToDeploy.push(ruleConfig);
             onlyTargets.delete(target);
         }
     }
     if (!allStorage && onlyTargets.size !== 0) {
         throw new error_1.FirebaseError(`Could not find rules for the following storage targets: ${[...onlyTargets].join(", ")}`);
     }
+    _.set(context, "storage.rules", rulesConfig);
+    _.set(context, "storage.rulesConfigsToDeploy", rulesConfigsToDeploy);
+    _.set(context, "storage.rulesDeploy", rulesDeploy);
     await rulesDeploy.compile();
 }
 exports.default = default_1;

package/lib/deploy/storage/release.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
 const rulesDeploy_1 = require("../../rulesDeploy");
 async function default_1(context, options) {
-    const rules = (0, lodash_1.get)(context, "storage.rules", []);
+    const rulesConfigsToDeploy = (0, lodash_1.get)(context, "storage.rulesConfigsToDeploy", []);
     const rulesDeploy = (0, lodash_1.get)(context, "storage.rulesDeploy");
-    if (!rules.length || !rulesDeploy) {
-        return;
+    if (!rulesConfigsToDeploy.length || !rulesDeploy) {
+        return [];
     }
     const toRelease = [];
-    for (const ruleConfig of rules) {
+    for (const ruleConfig of rulesConfigsToDeploy) {
         if (ruleConfig.target) {
             options.rc.target(options.project, "storage", ruleConfig.target).forEach((bucket) => {
                 toRelease.push({ bucket: bucket, rules: ruleConfig.rules });
@@ -19,8 +19,9 @@ async function default_1(context, options) {
             toRelease.push({ bucket: ruleConfig.bucket, rules: ruleConfig.rules });
         }
     }
-    await Promise.all(toRelease.map((release) => {
-        return rulesDeploy.release(release.rules, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE, release.bucket);
+    await Promise.all(toRelease.map((r) => {
+        return rulesDeploy.release(r.rules, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE, r.bucket);
     }));
+    return toRelease.map((r) => r.bucket);
 }
 exports.default = default_1;