firebase-tools 11.2.2 → 11.4.1

package/README.md

@@ -174,11 +174,11 @@ Use `firebase:deploy --only remoteconfig` to update and publish a project's Fire
 
 The Firebase CLI can use one of four authentication methods listed in descending priority:
 
-- **User Token** - provide an explicit long-lived Firebase user token generated from `firebase login:ci`. Note that these tokens are extremely sensitive long-lived credentials and are not the right option for most cases. Consider using service account authorization instead. The token can be set in one of two ways:
+- **User Token** - **DEPRECATED: this authentication method will be removed in a future major version of `firebase-tools`; use a service account to authenticate instead** - provide an explicit long-lived Firebase user token generated from `firebase login:ci`. Note that these tokens are extremely sensitive long-lived credentials and are not the right option for most cases. Consider using service account authorization instead. The token can be set in one of two ways:
   - Set the `--token` flag on any command, for example `firebase --token="<token>" projects:list`.
   - Set the `FIREBASE_TOKEN` environment variable.
 - **Local Login** - run `firebase login` to log in to the CLI directly as yourself. The CLI will cache an authorized user credential on your machine.
-- **Service Account** - set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to point to the path of a JSON service account key file.
+- **Service Account** - set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to point to the path of a JSON service account key file. For more details, see Google Cloud's [Getting started with authentication](https://cloud.google.com/docs/authentication/getting-started) guide.
 - **Application Default Credentials** - if you use the `gcloud` CLI and log in with `gcloud auth application-default login`, the Firebase CLI will use them if none of the above credentials are present.
 
 ### Multiple Accounts
@@ -224,21 +224,14 @@ or `HTTP_PROXY` value in your environment to the URL of your proxy (e.g.
 The Firebase CLI requires a browser to complete authentication, but is fully
 compatible with CI and other headless environments.
 
-1. On a machine with a browser, install the Firebase CLI.
-2. Run `firebase login:ci` to log in and print out a new [refresh token](https://developers.google.com/identity/protocols/OAuth2)
-   (the current CLI session will not be affected).
-3. Store the output token in a secure but accessible way in your CI system.
+Complete the following steps to run Firebase commands in a CI environment. Find detailed instructions for each step in Google Cloud's [Getting started with authentication](https://cloud.google.com/docs/authentication/getting-started) guide.
 
-There are two ways to use this token when running Firebase commands:
+1. Create a service account and grant it the appropriate level of access to your project.
+1. Create a service account key (JSON file) for that service account.
+1. Store the key file in a secure, accessible way in your CI system.
+1. Set `GOOGLE_APPLICATION_CREDENTIALS=/path/to/key.json` in your CI system when running Firebase commands.
 
-1. Store the token as the environment variable `FIREBASE_TOKEN` and it will
-   automatically be utilized.
-2. Run all commands with the `--token <token>` flag in your CI system.
-
-The order of precedence for token loading is flag, environment variable, active project.
-
-On any machine with the Firebase CLI, running `firebase logout --token <token>`
-will immediately revoke access for the specified token.
+To disable access for the service account, [find the service account](https://console.cloud.google.com/projectselector/iam-admin/serviceaccounts) for your project in the Google Cloud Console, and then either remove the key, or disable or delete the service account.
 
 ## Using as a Module
 

package/lib/apiv2.js

@@ -15,6 +15,7 @@ const responseToError_1 = require("./responseToError");
 const FormData = require("form-data");
 const pkg = require("../package.json");
 const CLI_VERSION = pkg.version;
+const GOOG_QUOTA_USER = "x-goog-quota-user";
 let accessToken = "";
 let refreshToken = "";
 function setRefreshToken(token = "") {
@@ -309,6 +310,10 @@ class Client {
         }
         const logURL = this.requestURL(options);
         logger_1.logger.debug(`>>> [apiv2][query] ${options.method} ${logURL} ${queryParamsLog}`);
+        const headers = options.headers;
+        if (headers && headers.has(GOOG_QUOTA_USER)) {
+            logger_1.logger.debug(`>>> [apiv2][(partial)header] ${options.method} ${logURL} x-goog-quota-user=${headers.get(GOOG_QUOTA_USER) || ""}`);
+        }
         if (options.body !== undefined) {
             let logBody = "[omitted]";
             if (!((_b = options.skipLog) === null || _b === void 0 ? void 0 : _b.body)) {

package/lib/checkValidTargetFilters.js

@@ -19,6 +19,7 @@ function targetsHaveFilters(...targets) {
 function targetsHaveNoFilters(...targets) {
     return targets.some((t) => !t.includes(":"));
 }
+const FILTERABLE_TARGETS = new Set(["hosting", "functions", "firestore", "storage", "database"]);
 async function checkValidTargetFilters(options) {
     const only = !options.only ? [] : options.only.split(",");
     return new Promise((resolve, reject) => {
@@ -28,10 +29,10 @@ async function checkValidTargetFilters(options) {
         if (options.except) {
             return reject(new error_1.FirebaseError("Cannot specify both --only and --except"));
         }
-        const nonFilteredTypes = deploy_1.VALID_DEPLOY_TARGETS.filter((t) => !["hosting", "functions", "firestore"].includes(t));
+        const nonFilteredTypes = deploy_1.VALID_DEPLOY_TARGETS.filter((t) => !FILTERABLE_TARGETS.has(t));
         const targetsForNonFilteredTypes = targetsForTypes(only, ...nonFilteredTypes);
         if (targetsForNonFilteredTypes.length && targetsHaveFilters(...targetsForNonFilteredTypes)) {
-            return reject(new error_1.FirebaseError("Filters specified with colons (e.g. --only functions:func1,functions:func2) are only supported for functions, hosting, and firestore"));
+            return reject(new error_1.FirebaseError("Filters specified with colons (e.g. --only functions:func1,functions:func2) are only supported for functions, hosting, storage, and firestore"));
         }
         const targetsForFunctions = targetsForTypes(only, "functions");
         if (targetsForFunctions.length &&

package/lib/command.js

@@ -64,6 +64,7 @@ class Command {
         });
         if (this.helpText) {
             cmd.on("--help", () => {
+                console.log();
                 console.log(this.helpText);
             });
         }

package/lib/commands/hosting-clone.js

@@ -12,6 +12,11 @@ const { marked } = require("marked");
 const logger_1 = require("../logger");
 exports.command = new command_1.Command("hosting:clone <source> <targetChannel>")
     .description("clone a version from one site to another")
+    .help(`<source> and <targetChannel> accept the following format: <siteId>:<channelId>
+
+For example, to copy the content for a site \`my-site\` from a preview channel \`staging\` to a \`live\` channel, the command would look be:
+
+  firebase hosting:clone my-site:foo my-site:live`)
     .before(requireAuth_1.requireAuth)
     .action(async (source = "", targetChannel = "") => {
     var _a, _b, _c, _d;

package/lib/commands/login-ci.js

@@ -14,6 +14,8 @@ exports.command = new command_1.Command("login:ci")
     if (options.nonInteractive) {
         throw new error_1.FirebaseError("Cannot run login:ci in non-interactive mode.");
     }
+    utils.logWarning("Authenticating with a `login:ci` 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");
     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" +

package/lib/database/rulesConfig.js

@@ -19,6 +19,23 @@ function getRulesConfig(projectId, options) {
     if (dbConfig === undefined) {
         return [];
     }
+    const rc = options.rc;
+    let allDatabases = !options.only;
+    const onlyDatabases = new Set();
+    if (options.only) {
+        const split = options.only.split(",");
+        if (split.includes("database")) {
+            allDatabases = true;
+        }
+        else {
+            for (const value of split) {
+                if (value.startsWith("database:")) {
+                    const target = value.split(":")[1];
+                    onlyDatabases.add(target);
+                }
+            }
+        }
+    }
     if (!Array.isArray(dbConfig)) {
         if (dbConfig && dbConfig.rules) {
             utils.assertIsStringOrUndefined(options.instance);
@@ -31,22 +48,32 @@ function getRulesConfig(projectId, options) {
         }
     }
     const results = [];
-    const rc = options.rc;
     for (const c of dbConfig) {
-        if (c.target) {
-            rc.requireTarget(projectId, "database", c.target);
-            const instances = rc.target(projectId, "database", c.target);
-            for (const i of instances) {
-                results.push({ instance: i, rules: c.rules });
+        const { instance, target } = c;
+        if (target) {
+            if (allDatabases || onlyDatabases.has(target)) {
+                rc.requireTarget(projectId, "database", target);
+                const instances = rc.target(projectId, "database", target);
+                for (const i of instances) {
+                    results.push({ instance: i, rules: c.rules });
+                }
+                onlyDatabases.delete(target);
             }
         }
-        else if (c.instance) {
-            results.push(c);
+        else if (instance) {
+            if (allDatabases) {
+                results.push(c);
+            }
         }
         else {
             throw new error_1.FirebaseError('Must supply either "target" or "instance" in database config');
         }
     }
+    if (!allDatabases && onlyDatabases.size !== 0) {
+        throw new error_1.FirebaseError(`Could not find configurations in firebase.json for the following database targets: ${[
+            ...onlyDatabases,
+        ].join(", ")}`);
+    }
     return results;
 }
 exports.getRulesConfig = getRulesConfig;

package/lib/deploy/functions/build.js

@@ -93,7 +93,7 @@ function discoverTrigger(endpoint, paramValues) {
     if ("httpsTrigger" in endpoint) {
         const bkHttps = {};
         if (endpoint.httpsTrigger.invoker) {
-            bkHttps.invoker = [endpoint.httpsTrigger.invoker];
+            bkHttps.invoker = endpoint.httpsTrigger.invoker;
         }
         trigger = { httpsTrigger: bkHttps };
     }
@@ -113,12 +113,22 @@ function discoverTrigger(endpoint, paramValues) {
             eventFilters: bkEventFilters,
             retry: resolveBoolean(endpoint.eventTrigger.retry || false),
         };
+        if (endpoint.eventTrigger.eventFilterPathPatterns) {
+            const bkEventFiltersPathPatterns = {};
+            for (const [key, value] of Object.entries(endpoint.eventTrigger.eventFilterPathPatterns)) {
+                bkEventFiltersPathPatterns[key] = params.resolveString(value, paramValues);
+            }
+            bkEvent.eventFilterPathPatterns = bkEventFiltersPathPatterns;
+        }
         if (endpoint.eventTrigger.serviceAccount) {
             bkEvent.serviceAccountEmail = endpoint.eventTrigger.serviceAccount;
         }
         if (endpoint.eventTrigger.region) {
             bkEvent.region = resolveString(endpoint.eventTrigger.region);
         }
+        if (endpoint.eventTrigger.channel) {
+            bkEvent.channel = endpoint.eventTrigger.channel;
+        }
         trigger = { eventTrigger: bkEvent };
     }
     else if ("scheduleTrigger" in endpoint) {

package/lib/deploy/functions/release/index.js

@@ -67,6 +67,10 @@ async function release(context, options, payload) {
     const allErrors = summary.results.filter((r) => r.error).map((r) => r.error);
     if (allErrors.length) {
         const opts = allErrors.length === 1 ? { original: allErrors[0] } : { children: allErrors };
+        logger_1.logger.debug("Functions deploy failed.");
+        for (const error of allErrors) {
+            logger_1.logger.debug(JSON.stringify(error, null, 2));
+        }
         throw new error_1.FirebaseError("There was an error deploying functions", Object.assign(Object.assign({}, opts), { exit: 2 }));
     }
 }

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

@@ -28,10 +28,12 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
     (0, parsing_1.requireKeys)("", manifest, "endpoints");
     (0, parsing_1.assertKeyTypes)("", manifest, {
         specVersion: "string",
+        params: "array",
         requiredAPIs: "array",
         endpoints: "object",
     });
     const bd = build.empty();
+    bd.params = manifest.params || [];
     bd.requiredAPIs = parseRequiredAPIs(manifest);
     for (const id of Object.keys(manifest.endpoints)) {
         const me = manifest.endpoints[id];
@@ -49,6 +51,7 @@ function backendFromV1Alpha1(yaml, project, region, runtime) {
     (0, parsing_1.requireKeys)("", manifest, "endpoints");
     (0, parsing_1.assertKeyTypes)("", manifest, {
         specVersion: "string",
+        params: "array",
         requiredAPIs: "array",
         endpoints: "object",
     });

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

@@ -126,7 +126,7 @@ function addResourcesToBuild(projectId, runtime, annotation, want) {
                 logger_1.logger.warn(`Ignoring retry policy for HTTPS function ${annotation.name}`);
             }
             if (annotation.httpsTrigger.invoker) {
-                trigger.invoker = annotation.httpsTrigger.invoker[0];
+                trigger.invoker = annotation.httpsTrigger.invoker;
             }
             triggered = { httpsTrigger: trigger };
         }

package/lib/deploy/functions/services/storage.js

@@ -19,7 +19,7 @@ exports.obtainStorageBindings = obtainStorageBindings;
 async function ensureStorageTriggerRegion(endpoint) {
     const { eventTrigger } = endpoint;
     if (!eventTrigger.region) {
-        logger_1.logger.debug("Looking up bucket region for the storage event trigger");
+        logger_1.logger.debug(`Looking up bucket region for the storage event trigger on bucket ${eventTrigger.eventFilters.bucket}`);
         try {
             const bucket = await storage.getBucket(eventTrigger.eventFilters.bucket);
             eventTrigger.region = bucket.location.toLowerCase();

package/lib/deploy/hosting/convertConfig.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertConfig = void 0;
 const error_1 = require("../../error");
 const backend_1 = require("../functions/backend");
+const backend = require("../functions/backend");
+const utils_1 = require("../../utils");
 function has(obj, k) {
     return obj[k] !== undefined;
 }
@@ -39,24 +41,66 @@ async function convertConfig(context, payload, config, finalize) {
     if (!config) {
         return out;
     }
-    const endpointBeingDeployed = (serviceId, region = "us-central1") => {
-        var _a;
+    const endpointFromBackend = (targetBackend, functionsEndpointInfo) => {
+        const backendsForId = backend.allEndpoints(targetBackend).filter((endpoint) => {
+            return endpoint.id === functionsEndpointInfo.serviceId;
+        });
+        const matchingBackends = backendsForId.filter((endpoint) => {
+            return ((!functionsEndpointInfo.region || endpoint.region === functionsEndpointInfo.region) &&
+                (!functionsEndpointInfo.platform || endpoint.platform === functionsEndpointInfo.platform));
+        });
+        if (matchingBackends.length > 1) {
+            throw new error_1.FirebaseError(`More than one backend found for function name: ${functionsEndpointInfo.serviceId}. If the function is deployed in multiple regions, you must specify a region.`);
+        }
+        if (matchingBackends.length === 1) {
+            const endpoint = matchingBackends[0];
+            if (endpoint && (0, backend_1.isHttpsTriggered)(endpoint)) {
+                return endpoint;
+            }
+        }
+        return;
+    };
+    const endpointBeingDeployed = (functionsEndpointInfo) => {
         for (const { wantBackend } of Object.values(payload.functions || {})) {
-            const endpoint = (_a = wantBackend === null || wantBackend === void 0 ? void 0 : wantBackend.endpoints[region]) === null || _a === void 0 ? void 0 : _a[serviceId];
-            if (endpoint && (0, backend_1.isHttpsTriggered)(endpoint) && endpoint.platform === "gcfv2")
+            if (!wantBackend) {
+                continue;
+            }
+            const endpoint = endpointFromBackend(wantBackend, functionsEndpointInfo);
+            if (endpoint) {
                 return endpoint;
+            }
         }
-        return undefined;
+        return;
     };
-    const matchingEndpoint = async (serviceId, region = "us-central1") => {
-        const pendingEndpoint = endpointBeingDeployed(serviceId, region);
+    const matchingEndpoint = async (functionsEndpointInfo) => {
+        const pendingEndpoint = endpointBeingDeployed(functionsEndpointInfo);
         if (pendingEndpoint)
             return pendingEndpoint;
         const backend = await (0, backend_1.existingBackend)(context);
         return (0, backend_1.allEndpoints)(backend).find((it) => (0, backend_1.isHttpsTriggered)(it) &&
-            it.platform === "gcfv2" &&
-            it.id === serviceId &&
-            it.region === region);
+            it.id === functionsEndpointInfo.serviceId &&
+            (!functionsEndpointInfo.platform || it.platform === functionsEndpointInfo.platform) &&
+            (!functionsEndpointInfo.region || it.region === functionsEndpointInfo.region));
+    };
+    const findEndpointWithValidRegion = async (rewrite, context) => {
+        if ("function" in rewrite) {
+            const foundEndpointToBeDeployed = endpointBeingDeployed({
+                serviceId: rewrite.function,
+                region: rewrite.region,
+            });
+            if (foundEndpointToBeDeployed) {
+                return foundEndpointToBeDeployed;
+            }
+            const existingBackend = await backend.existingBackend(context);
+            const endpointAlreadyDeployed = endpointFromBackend(existingBackend, {
+                serviceId: rewrite.function,
+                region: rewrite.region,
+            });
+            if (endpointAlreadyDeployed) {
+                return endpointAlreadyDeployed;
+            }
+        }
+        return;
     };
     if (Array.isArray(config.rewrites)) {
         out.rewrites = [];
@@ -66,19 +110,33 @@ async function convertConfig(context, payload, config, finalize) {
                 vRewrite.path = rewrite.destination;
             }
             else if ("function" in rewrite) {
-                if (!finalize && endpointBeingDeployed(rewrite.function, rewrite.region))
+                if (!finalize &&
+                    endpointBeingDeployed({
+                        serviceId: rewrite.function,
+                        platform: "gcfv2",
+                        region: rewrite.region,
+                    })) {
                     continue;
-                const endpoint = await matchingEndpoint(rewrite.function, rewrite.region);
+                }
+                const endpoint = await matchingEndpoint({
+                    serviceId: rewrite.function,
+                    platform: "gcfv2",
+                    region: rewrite.region,
+                });
                 if (endpoint) {
                     vRewrite.run = { serviceId: endpoint.id, region: endpoint.region };
                 }
                 else {
                     vRewrite.function = rewrite.function;
-                    if (rewrite.region) {
-                        vRewrite.functionRegion = rewrite.region;
+                    const foundEndpoint = await findEndpointWithValidRegion(rewrite, context);
+                    if (foundEndpoint) {
+                        vRewrite.functionRegion = foundEndpoint.region;
                     }
                     else {
-                        vRewrite.functionRegion = "us-central1";
+                        if (rewrite.region && rewrite.region !== "us-central1") {
+                            throw new error_1.FirebaseError(`Unable to find a valid endpoint for function \`${vRewrite.function}\``);
+                        }
+                        (0, utils_1.logLabeledWarning)(`hosting[${config.site}]`, `Unable to find a valid endpoint for function \`${vRewrite.function}\`, but still including it in the config`);
                     }
                 }
             }
@@ -86,8 +144,14 @@ async function convertConfig(context, payload, config, finalize) {
                 vRewrite.dynamicLinks = rewrite.dynamicLinks;
             }
             else if ("run" in rewrite) {
-                if (!finalize && endpointBeingDeployed(rewrite.run.serviceId, rewrite.run.region))
+                if (!finalize &&
+                    endpointBeingDeployed({
+                        serviceId: rewrite.run.serviceId,
+                        platform: "gcfv2",
+                        region: rewrite.run.region,
+                    })) {
                     continue;
+                }
                 vRewrite.run = Object.assign({ region: "us-central1" }, rewrite.run);
             }
             out.rewrites.push(vRewrite);

package/lib/deploy/hosting/deploy.js

@@ -36,7 +36,7 @@ async function deploy(context, options) {
             (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, 'no "public" directory to upload, continuing with release');
             return runDeploys(deploys, debugging);
         }
-        (0, utils_1.logLabeledBullet)("hosting[" + deploy.site + "]", "beginning deploy...");
+        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, "beginning deploy...");
         const t0 = Date.now();
         const publicDir = options.config.path(deploy.config.public);
         const files = (0, listFiles_1.listFiles)(publicDir, deploy.config.ignore);

package/lib/deploy/index.js

@@ -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", { exit: 1 }));
+            return Promise.reject(new error_1.FirebaseError(`${(0, cli_color_1.bold)(targetName)} is not a valid deploy target`));
         }
         predeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "predeploy"));
         prepares.push(target.prepare);

package/lib/deploy/storage/prepare.js

@@ -3,25 +3,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
 const gcp = require("../../gcp");
 const rulesDeploy_1 = require("../../rulesDeploy");
+const error_1 = require("../../error");
 async function default_1(context, options) {
     let rulesConfig = options.config.get("storage");
     if (!rulesConfig) {
         return;
     }
+    const onlyTargets = new Set();
+    let allStorage = !options.only;
+    if (options.only) {
+        const split = options.only.split(",");
+        if (split.includes("storage")) {
+            allStorage = true;
+        }
+        else {
+            for (const value of split) {
+                if (value.startsWith("storage:")) {
+                    onlyTargets.add(value.split(":")[1]);
+                }
+            }
+        }
+    }
     _.set(context, "storage.rules", rulesConfig);
     const rulesDeploy = new rulesDeploy_1.RulesDeploy(options, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE);
     _.set(context, "storage.rulesDeploy", rulesDeploy);
-    if (typeof rulesConfig === "object" && rulesConfig !== null) {
+    if (!Array.isArray(rulesConfig)) {
         const defaultBucket = await gcp.storage.getDefaultBucket(options.project);
         rulesConfig = [Object.assign(rulesConfig, { bucket: defaultBucket })];
         _.set(context, "storage.rules", rulesConfig);
     }
-    rulesConfig.forEach((ruleConfig) => {
-        if (ruleConfig.target) {
-            options.rc.requireTarget(context.projectId, "storage", ruleConfig.target);
+    for (const ruleConfig of rulesConfig) {
+        const target = ruleConfig.target;
+        if (target) {
+            options.rc.requireTarget(context.projectId, "storage", target);
         }
-        rulesDeploy.addFile(ruleConfig.rules);
-    });
+        if (allStorage || onlyTargets.has(target)) {
+            rulesDeploy.addFile(ruleConfig.rules);
+            onlyTargets.delete(target);
+        }
+    }
+    if (!allStorage && onlyTargets.size !== 0) {
+        throw new error_1.FirebaseError(`Could not find rules for the following storage targets: ${[...onlyTargets].join(", ")}`);
+    }
     await rulesDeploy.compile();
 }
 exports.default = default_1;

package/lib/downloadUtils.js

@@ -20,7 +20,7 @@ async function downloadToTmp(remoteUrl) {
         resolveOnHTTPError: true,
     });
     if (res.status !== 200) {
-        throw new error_1.FirebaseError(`download failed, status ${res.status}`, { exit: 1 });
+        throw new error_1.FirebaseError(`download failed, status ${res.status}: ${await res.response.text()}`);
     }
     const total = parseInt(res.response.headers.get("content-length") || "0", 10);
     const totalMb = Math.ceil(total / 1000000);

package/lib/emulator/controller.js

@@ -301,7 +301,6 @@ async function startAll(options, showUI = true) {
         const extensionsBackends = await extensionEmulator.getExtensionBackends();
         const filteredExtensionsBackends = extensionEmulator.filterUnemulatedTriggers(options, extensionsBackends);
         emulatableBackends.push(...filteredExtensionsBackends);
-        void (0, track_1.track)("Emulator Run", types_1.Emulators.EXTENSIONS);
         await startEmulator(extensionEmulator);
     }
     if (emulatableBackends.length) {

package/lib/emulator/downloadableEmulators.js

@@ -55,7 +55,7 @@ exports.DownloadDetails = {
             version: "SNAPSHOT",
             downloadPath: path.join(CACHE_DIR, "ui-vSNAPSHOT.zip"),
             unzipDir: path.join(CACHE_DIR, "ui-vSNAPSHOT"),
-            binaryPath: path.join(CACHE_DIR, "ui-vSNAPSHOT", "server.bundle.js"),
+            binaryPath: path.join(CACHE_DIR, "ui-vSNAPSHOT", "server", "server.js"),
             opts: {
                 cacheDir: CACHE_DIR,
                 remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-vSNAPSHOT.zip",
@@ -67,15 +67,15 @@ exports.DownloadDetails = {
             },
         }
         : {
-            version: "1.7.0",
-            downloadPath: path.join(CACHE_DIR, "ui-v1.7.0.zip"),
-            unzipDir: path.join(CACHE_DIR, "ui-v1.7.0"),
-            binaryPath: path.join(CACHE_DIR, "ui-v1.7.0", "server.bundle.js"),
+            version: "1.8.1",
+            downloadPath: path.join(CACHE_DIR, "ui-v1.8.1.zip"),
+            unzipDir: path.join(CACHE_DIR, "ui-v1.8.1"),
+            binaryPath: path.join(CACHE_DIR, "ui-v1.8.1", "server", "server.js"),
             opts: {
                 cacheDir: CACHE_DIR,
-                remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v1.7.0.zip",
-                expectedSize: 4053708,
-                expectedChecksum: "aea9ae19091df5974a88a8847aaf127c",
+                remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v1.8.1.zip",
+                expectedSize: 3056552,
+                expectedChecksum: "92590fdda20f9883588438d9551111b5",
                 namePrefix: "ui",
             },
         },

package/lib/emulator/functionsEmulator.js

@@ -646,6 +646,9 @@ class FunctionsEmulator {
         envs.GCLOUD_PROJECT = this.args.projectId;
         envs.K_REVISION = "1";
         envs.PORT = "80";
+        if (trigger === null || trigger === void 0 ? void 0 : trigger.timeoutSeconds) {
+            envs.FUNCTIONS_EMULATOR_TIMEOUT_SECONDS = trigger.timeoutSeconds.toString();
+        }
         if (trigger) {
             const target = trigger.entryPoint;
             envs.FUNCTION_TARGET = target;