firebase-tools 13.0.3 → 13.2.0

package/lib/emulator/auth/operations.js

@@ -484,13 +484,21 @@ function createAuthUri(state, reqBody) {
             }
         }
     }
-    return {
-        kind: "identitytoolkit#CreateAuthUriResponse",
-        registered,
-        allProviders,
-        sessionId,
-        signinMethods,
-    };
+    if (state.enableImprovedEmailPrivacy) {
+        return {
+            kind: "identitytoolkit#CreateAuthUriResponse",
+            sessionId,
+        };
+    }
+    else {
+        return {
+            kind: "identitytoolkit#CreateAuthUriResponse",
+            registered,
+            allProviders,
+            sessionId,
+            signinMethods,
+        };
+    }
 }
 const SESSION_COOKIE_MIN_VALID_DURATION = 5 * 60;
 exports.SESSION_COOKIE_MAX_VALID_DURATION = 14 * 24 * 60 * 60;
@@ -634,7 +642,14 @@ function sendOobCode(state, reqBody, ctx) {
             mode = "resetPassword";
             (0, errors_1.assert)(reqBody.email, "MISSING_EMAIL");
             email = (0, utils_1.canonicalizeEmailAddress)(reqBody.email);
-            (0, errors_1.assert)(state.getUserByEmail(email), "EMAIL_NOT_FOUND");
+            const maybeUser = state.getUserByEmail(email);
+            if (state.enableImprovedEmailPrivacy && !maybeUser) {
+                return {
+                    kind: "identitytoolkit#GetOobConfirmationCodeResponse",
+                    email,
+                };
+            }
+            (0, errors_1.assert)(maybeUser, "EMAIL_NOT_FOUND");
             break;
         case "VERIFY_EMAIL":
             mode = "verifyEmail";
@@ -1151,7 +1166,7 @@ async function signInWithIdp(state, reqBody) {
     }
     else {
         if (!response.localId) {
-            throw new Error("Internal assertion error: localId not set for exising user.");
+            throw new Error("Internal assertion error: localId not set for existing user.");
         }
         const maybeUser = state.getUserByLocalId(response.localId);
         (0, errors_1.assert)(maybeUser, "USER_NOT_FOUND");
@@ -1199,10 +1214,18 @@ async function signInWithPassword(state, reqBody) {
     }
     const email = (0, utils_1.canonicalizeEmailAddress)(reqBody.email);
     let user = state.getUserByEmail(email);
-    (0, errors_1.assert)(user, "EMAIL_NOT_FOUND");
-    (0, errors_1.assert)(!user.disabled, "USER_DISABLED");
-    (0, errors_1.assert)(user.passwordHash && user.salt, "INVALID_PASSWORD");
-    (0, errors_1.assert)(user.passwordHash === hashPassword(reqBody.password, user.salt), "INVALID_PASSWORD");
+    if (state.enableImprovedEmailPrivacy) {
+        (0, errors_1.assert)(user, "INVALID_LOGIN_CREDENTIALS");
+        (0, errors_1.assert)(!user.disabled, "USER_DISABLED");
+        (0, errors_1.assert)(user.passwordHash && user.salt, "INVALID_LOGIN_CREDENTIALS");
+        (0, errors_1.assert)(user.passwordHash === hashPassword(reqBody.password, user.salt), "INVALID_LOGIN_CREDENTIALS");
+    }
+    else {
+        (0, errors_1.assert)(user, "EMAIL_NOT_FOUND");
+        (0, errors_1.assert)(!user.disabled, "USER_DISABLED");
+        (0, errors_1.assert)(user.passwordHash && user.salt, "INVALID_PASSWORD");
+        (0, errors_1.assert)(user.passwordHash === hashPassword(reqBody.password, user.salt), "INVALID_PASSWORD");
+    }
     const response = {
         kind: "identitytoolkit#VerifyPasswordResponse",
         registered: true,
@@ -1311,14 +1334,20 @@ function getEmulatorProjectConfig(state) {
         signIn: {
             allowDuplicateEmails: !state.oneAccountPerEmail,
         },
+        emailPrivacyConfig: {
+            enableImprovedEmailPrivacy: state.enableImprovedEmailPrivacy,
+        },
     };
 }
 function updateEmulatorProjectConfig(state, reqBody, ctx) {
-    var _a;
+    var _a, _b;
     const updateMask = [];
     if (((_a = reqBody.signIn) === null || _a === void 0 ? void 0 : _a.allowDuplicateEmails) != null) {
         updateMask.push("signIn.allowDuplicateEmails");
     }
+    if (((_b = reqBody.emailPrivacyConfig) === null || _b === void 0 ? void 0 : _b.enableImprovedEmailPrivacy) != null) {
+        updateMask.push("emailPrivacyConfig.enableImprovedEmailPrivacy");
+    }
     ctx.params.query.updateMask = updateMask.join();
     updateConfig(state, reqBody, ctx);
     return getEmulatorProjectConfig(state);

package/lib/emulator/auth/state.js

@@ -414,6 +414,9 @@ class AgentProjectState extends ProjectState {
         this._config = {
             signIn: { allowDuplicateEmails: false },
             blockingFunctions: {},
+            emailPrivacyConfig: {
+                enableImprovedEmailPrivacy: false,
+            },
         };
     }
     get authCloudFunction() {
@@ -425,6 +428,12 @@ class AgentProjectState extends ProjectState {
     set oneAccountPerEmail(oneAccountPerEmail) {
         this._config.signIn.allowDuplicateEmails = !oneAccountPerEmail;
     }
+    get enableImprovedEmailPrivacy() {
+        return !!this._config.emailPrivacyConfig.enableImprovedEmailPrivacy;
+    }
+    set enableImprovedEmailPrivacy(improveEmailPrivacy) {
+        this._config.emailPrivacyConfig.enableImprovedEmailPrivacy = improveEmailPrivacy;
+    }
     get allowPasswordSignup() {
         return true;
     }
@@ -470,10 +479,12 @@ class AgentProjectState extends ProjectState {
         return undefined;
     }
     updateConfig(update, updateMask) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         if (!updateMask) {
             this.oneAccountPerEmail = (_b = !((_a = update.signIn) === null || _a === void 0 ? void 0 : _a.allowDuplicateEmails)) !== null && _b !== void 0 ? _b : true;
             this.blockingFunctionsConfig = (_c = update.blockingFunctions) !== null && _c !== void 0 ? _c : {};
+            this.enableImprovedEmailPrivacy =
+                (_e = (_d = update.emailPrivacyConfig) === null || _d === void 0 ? void 0 : _d.enableImprovedEmailPrivacy) !== null && _e !== void 0 ? _e : false;
             return this.config;
         }
         return applyMask(updateMask, this.config, update);
@@ -546,6 +557,9 @@ class TenantProjectState extends ProjectState {
     get oneAccountPerEmail() {
         return this.parentProject.oneAccountPerEmail;
     }
+    get enableImprovedEmailPrivacy() {
+        return this.parentProject.enableImprovedEmailPrivacy;
+    }
     get authCloudFunction() {
         return this.parentProject.authCloudFunction;
     }

package/lib/frameworks/angular/index.js

@@ -22,7 +22,7 @@ async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "angular.json"))))
         return;
     const version = (0, utils_2.getAngularVersion)(dir);
-    return { mayWantBackend: true, publicDirectory: (0, path_1.join)(dir, "src", "assets"), version };
+    return { mayWantBackend: true, version };
 }
 exports.discover = discover;
 function init(setup, config) {
@@ -59,7 +59,7 @@ async function build(dir, configuration) {
 }
 exports.build = build;
 async function getDevModeHandle(dir, configuration) {
-    const { targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
+    const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
     const { serveTarget } = await (0, utils_2.getContext)(dir, configuration);
     if (!serveTarget)
         throw new Error("Could not find the serveTarget");

package/lib/frameworks/angular/utils.js

@@ -9,7 +9,7 @@ const utils_2 = require("../../utils");
 const semver_1 = require("semver");
 async function localesForTarget(dir, architectHost, target, workspaceProject) {
     var _a;
-    const { targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
+    const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
     const targetOptions = await architectHost.getOptionsForTarget(target);
     if (!targetOptions) {
         const targetString = targetStringFromTarget(target);
@@ -72,9 +72,11 @@ function getValidBuilders(purpose) {
 }
 async function getAllTargets(purpose, dir) {
     const validBuilders = getValidBuilders(purpose);
-    const { NodeJsAsyncHost } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node");
-    const { workspaces } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/core");
-    const { targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
+    const [{ NodeJsAsyncHost }, { workspaces }, { targetStringFromTarget }] = await Promise.all([
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/core"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect"),
+    ]);
     const host = workspaces.createWorkspaceHost(new NodeJsAsyncHost());
     const { workspace } = await workspaces.readWorkspace(dir, host);
     const targets = [];
@@ -98,11 +100,13 @@ async function getAllTargets(purpose, dir) {
 }
 exports.getAllTargets = getAllTargets;
 async function getContext(dir, targetOrConfiguration) {
-    const { NodeJsAsyncHost } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node");
-    const { workspaces } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/core");
-    const { WorkspaceNodeModulesArchitectHost } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect/node");
-    const { Architect, targetFromTargetString, targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
-    const { parse } = (0, utils_1.relativeRequire)(dir, "jsonc-parser");
+    const [{ NodeJsAsyncHost }, { workspaces }, { WorkspaceNodeModulesArchitectHost }, { Architect, targetFromTargetString, targetStringFromTarget }, { parse },] = await Promise.all([
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/core"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect/node"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect"),
+        (0, utils_1.relativeRequire)(dir, "jsonc-parser"),
+    ]);
     const host = workspaces.createWorkspaceHost(new NodeJsAsyncHost());
     const { workspace } = await workspaces.readWorkspace(dir, host);
     const architectHost = new WorkspaceNodeModulesArchitectHost(workspace, dir);
@@ -427,7 +431,7 @@ async function getServerConfig(sourceDir, configuration) {
 }
 exports.getServerConfig = getServerConfig;
 async function getBuildConfig(sourceDir, configuration) {
-    const { targetStringFromTarget } = (0, utils_1.relativeRequire)(sourceDir, "@angular-devkit/architect");
+    const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(sourceDir, "@angular-devkit/architect");
     const { buildTarget, browserTarget, baseHref, prerenderTarget, serverTarget, architectHost, workspaceProject, serveOptimizedImages, ssr, } = await getContext(sourceDir, configuration);
     const targets = (buildTarget
         ? [buildTarget]

package/lib/frameworks/astro/index.js

@@ -17,10 +17,9 @@ async function discover(dir) {
     const version = (0, utils_2.getAstroVersion)(dir);
     if (!version)
         return;
-    const { output, publicDir: publicDirectory } = await (0, utils_2.getConfig)(dir);
+    const { output } = await (0, utils_2.getConfig)(dir);
     return {
         mayWantBackend: output !== "static",
-        publicDirectory,
         version,
     };
 }

package/lib/frameworks/flutter/index.js

@@ -23,7 +23,7 @@ async function discover(dir) {
     const usingFlutter = (_a = pubSpec.dependencies) === null || _a === void 0 ? void 0 : _a.flutter;
     if (!usingFlutter)
         return;
-    return { mayWantBackend: false, publicDirectory: (0, path_1.join)(dir, "web") };
+    return { mayWantBackend: false };
 }
 exports.discover = discover;
 function init(setup, config) {

package/lib/frameworks/index.js

@@ -189,7 +189,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
         if (!results) {
             throw new error_1.FirebaseError((0, utils_1.frameworksCallToAction)("Unable to detect the web framework in use, check firebase-debug.log for more info."));
         }
-        const { framework, mayWantBackend, publicDirectory } = results;
+        const { framework, mayWantBackend } = results;
         const { build, ɵcodegenPublicDirectory, ɵcodegenFunctionsDirectory: codegenProdModeFunctionsDirectory, getDevModeHandle, name, support, docsUrl, supportedRange, getValidBuildTargets = constants_2.GET_DEFAULT_BUILD_TARGETS, shouldUseDevModeHandle = constants_2.DEFAULT_SHOULD_USE_DEV_MODE_HANDLE, } = frameworks_1.WebFrameworks[framework];
         logger_1.logger.info(`\n${(0, utils_1.frameworksCallToAction)(constants_2.SupportLevelWarnings[support](name), docsUrl, "   ", name, results.version, supportedRange, results.vite)}\n`);
         const hostingEmulatorInfo = emulators.find((e) => e.name === types_1.Emulators.HOSTING);
@@ -211,7 +211,6 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             getDevModeHandle &&
             (await getDevModeHandle(getProjectPath(), frameworksBuildTarget, hostingEmulatorInfo));
         if (devModeHandle) {
-            config.public = (0, path_1.relative)(projectRoot, publicDirectory);
             options.frameworksDevModeHandle = devModeHandle;
             if (mayWantBackend && firebaseDefaults) {
                 codegenFunctionsDirectory = codegenDevModeFunctionsDirectory;
@@ -239,10 +238,10 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
                 project,
                 site,
             });
-            config.public = (0, path_1.relative)(projectRoot, hostingDist);
             if (wantsBackend && !omitCloudFunction)
                 codegenFunctionsDirectory = codegenProdModeFunctionsDirectory;
         }
+        config.public = (0, path_1.relative)(projectRoot, hostingDist);
         config.webFramework = `${framework}${codegenFunctionsDirectory ? "_ssr" : ""}`;
         if (codegenFunctionsDirectory) {
             if (firebaseDefaults) {

package/lib/frameworks/next/index.js

@@ -379,7 +379,7 @@ async function getDevModeHandle(dir, _, hostingEmulatorInfo) {
             throw new error_1.FirebaseError(`${clc.bold("firebase serve")} does not support Next.js Middleware. Please use ${clc.bold("firebase emulators:start")} instead.`);
         }
     }
-    let next = (0, utils_1.relativeRequire)(dir, "next");
+    let next = await (0, utils_1.relativeRequire)(dir, "next");
     if ("default" in next)
         next = next.default;
     const nextApp = next({
@@ -405,8 +405,10 @@ async function getConfig(dir) {
         if (!version)
             throw new Error("Unable to find the next dep, try NPM installing?");
         if ((0, semver_1.gte)(version, "12.0.0")) {
-            const { default: loadConfig } = (0, utils_1.relativeRequire)(dir, "next/dist/server/config");
-            const { PHASE_PRODUCTION_BUILD } = (0, utils_1.relativeRequire)(dir, "next/constants");
+            const [{ default: loadConfig }, { PHASE_PRODUCTION_BUILD }] = await Promise.all([
+                (0, utils_1.relativeRequire)(dir, "next/dist/server/config"),
+                (0, utils_1.relativeRequire)(dir, "next/constants"),
+            ]);
             config = await loadConfig(PHASE_PRODUCTION_BUILD, dir);
         }
         else {

package/lib/frameworks/nuxt/index.js

@@ -25,8 +25,8 @@ async function discover(dir) {
         return;
     if (version && (0, semver_1.lt)(version, "3.0.0-0"))
         return;
-    const { dir: { public: publicDirectory }, ssr: mayWantBackend, } = await getConfig(dir);
-    return { publicDirectory, mayWantBackend, version };
+    const { ssr: mayWantBackend } = await getConfig(dir);
+    return { mayWantBackend, version };
 }
 exports.discover = discover;
 async function build(cwd) {

package/lib/frameworks/nuxt2/index.js

@@ -25,8 +25,7 @@ async function discover(rootDir) {
     const version = (0, utils_2.getNuxtVersion)(rootDir);
     if (!version || (version && (0, semver_1.gte)(version, "3.0.0-0")))
         return;
-    const { app } = await getAndLoadNuxt({ rootDir, for: "build" });
-    return { mayWantBackend: true, publicDirectory: app.options.dir.static, version };
+    return { mayWantBackend: true, version };
 }
 exports.discover = discover;
 async function build(rootDir) {

package/lib/frameworks/sveltekit/index.js

@@ -13,11 +13,11 @@ exports.discover = (0, vite_1.viteDiscoverWithNpmDependency)("@sveltejs/kit");
 var vite_2 = require("../vite");
 Object.defineProperty(exports, "getDevModeHandle", { enumerable: true, get: function () { return vite_2.getDevModeHandle; } });
 Object.defineProperty(exports, "supportedRange", { enumerable: true, get: function () { return vite_2.supportedRange; } });
-async function build(root) {
+async function build(root, target) {
     var _a;
     const config = await getConfig(root);
     const wantsBackend = ((_a = config.kit.adapter) === null || _a === void 0 ? void 0 : _a.name) !== "@sveltejs/adapter-static";
-    await (0, vite_1.build)(root);
+    await (0, vite_1.build)(root, target);
     return { wantsBackend };
 }
 exports.build = build;

package/lib/frameworks/utils.js

@@ -189,11 +189,20 @@ function findDependency(name, options = {}) {
     return scanDependencyTree(name, json.dependencies);
 }
 exports.findDependency = findDependency;
-function relativeRequire(dir, mod) {
+async function relativeRequire(dir, mod) {
     try {
         const requireFunc = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require;
         const path = requireFunc.resolve(mod, { paths: [dir] });
-        if ((0, path_1.extname)(path) === ".mjs") {
+        let packageJson;
+        let isEsm = (0, path_1.extname)(path) === ".mjs";
+        if (!isEsm) {
+            packageJson = await readJSON((0, path_1.join)((0, path_1.dirname)(path), "package.json")).catch(() => undefined);
+            isEsm = (packageJson === null || packageJson === void 0 ? void 0 : packageJson.type) === "module";
+        }
+        if (isEsm) {
+            if ((0, path_1.extname)(path) === ".cjs" && (packageJson === null || packageJson === void 0 ? void 0 : packageJson.main)) {
+                return dynamicImport((0, path_1.join)((0, path_1.dirname)(path), packageJson.main));
+            }
             return dynamicImport((0, url_1.pathToFileURL)(path).toString());
         }
         else {

package/lib/frameworks/vite/index.js

@@ -68,13 +68,17 @@ async function discover(dir, plugin, npmDependency) {
     };
 }
 exports.discover = discover;
-async function build(root) {
-    const { build } = (0, utils_1.relativeRequire)(root, "vite");
+async function build(root, target) {
+    const { build } = await (0, utils_1.relativeRequire)(root, "vite");
     await (0, utils_1.warnIfCustomBuildScript)(root, exports.name, exports.DEFAULT_BUILD_SCRIPT);
     const cwd = process.cwd();
     process.chdir(root);
-    await build({ root, mode: "production" });
+    const originalNodeEnv = process.env.NODE_ENV;
+    const envKey = "NODE_ENV";
+    process.env[envKey] = target;
+    await build({ root, mode: target });
     process.chdir(cwd);
+    process.env[envKey] = originalNodeEnv;
     return { rewrites: [{ source: "**", destination: "/index.html" }] };
 }
 exports.build = build;
@@ -104,7 +108,7 @@ async function getDevModeHandle(dir) {
 }
 exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(root) {
-    const { resolveConfig } = (0, utils_1.relativeRequire)(root, "vite");
+    const { resolveConfig } = await (0, utils_1.relativeRequire)(root, "vite");
     const cwd = process.cwd();
     process.chdir(root);
     const config = await resolveConfig({ root }, "build", "production");

package/lib/gcp/apphosting.js

@@ -1,79 +1,120 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureApiEnabled = exports.listLocations = exports.updateTraffic = exports.listRollouts = exports.createRollout = exports.createBuild = exports.getBuild = exports.deleteBackend = exports.listBackends = exports.getBackend = exports.createBackend = exports.API_VERSION = exports.API_HOST = void 0;
+exports.getNextRolloutId = exports.ensureApiEnabled = exports.listLocations = exports.updateTraffic = exports.listRollouts = exports.createRollout = exports.createBuild = exports.listBuilds = exports.getBuild = exports.deleteBackend = exports.listBackends = exports.getBackend = exports.createBackend = exports.client = exports.API_VERSION = exports.API_HOST = void 0;
 const proto = require("../gcp/proto");
 const apiv2_1 = require("../apiv2");
 const projectUtils_1 = require("../projectUtils");
 const api_1 = require("../api");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
+const deploymentTool = require("../deploymentTool");
+const error_1 = require("../error");
 exports.API_HOST = new URL(api_1.apphostingOrigin).host;
 exports.API_VERSION = "v1alpha";
-const client = new apiv2_1.Client({
+exports.client = new apiv2_1.Client({
     urlPrefix: api_1.apphostingOrigin,
     auth: true,
     apiVersion: exports.API_VERSION,
 });
 async function createBackend(projectId, location, backendReqBoby, backendId) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/backends`, backendReqBoby, { queryParams: { backendId } });
+    const res = await exports.client.post(`projects/${projectId}/locations/${location}/backends`, Object.assign(Object.assign({}, backendReqBoby), { labels: Object.assign(Object.assign({}, backendReqBoby.labels), deploymentTool.labels()) }), { queryParams: { backendId } });
     return res.body;
 }
 exports.createBackend = createBackend;
 async function getBackend(projectId, location, backendId) {
     const name = `projects/${projectId}/locations/${location}/backends/${backendId}`;
-    const res = await client.get(name);
+    const res = await exports.client.get(name);
     return res.body;
 }
 exports.getBackend = getBackend;
 async function listBackends(projectId, location) {
     const name = `projects/${projectId}/locations/${location}/backends`;
-    const res = await client.get(name);
+    const res = await exports.client.get(name);
     return res.body;
 }
 exports.listBackends = listBackends;
 async function deleteBackend(projectId, location, backendId) {
     const name = `projects/${projectId}/locations/${location}/backends/${backendId}`;
-    const res = await client.delete(name);
+    const res = await exports.client.delete(name, { queryParams: { force: "true" } });
     return res.body;
 }
 exports.deleteBackend = deleteBackend;
 async function getBuild(projectId, location, backendId, buildId) {
     const name = `projects/${projectId}/locations/${location}/backends/${backendId}/builds/${buildId}`;
-    const res = await client.get(name);
+    const res = await exports.client.get(name);
     return res.body;
 }
 exports.getBuild = getBuild;
+async function listBuilds(projectId, location, backendId) {
+    var _a;
+    const name = `projects/${projectId}/locations/${location}/backends/${backendId}/builds`;
+    let pageToken;
+    const res = {
+        builds: [],
+        unreachable: [],
+    };
+    do {
+        const queryParams = pageToken ? { pageToken } : {};
+        const int = await exports.client.get(name, { queryParams });
+        res.builds.push(...(int.body.builds || []));
+        (_a = res.unreachable) === null || _a === void 0 ? void 0 : _a.push(...(int.body.unreachable || []));
+        pageToken = int.body.nextPageToken;
+    } while (pageToken);
+    res.unreachable = [...new Set(res.unreachable)];
+    return res;
+}
+exports.listBuilds = listBuilds;
 async function createBuild(projectId, location, backendId, buildId, buildInput) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/backends/${backendId}/builds`, buildInput, { queryParams: { buildId } });
+    const res = await exports.client.post(`projects/${projectId}/locations/${location}/backends/${backendId}/builds`, Object.assign(Object.assign({}, buildInput), { labels: Object.assign(Object.assign({}, buildInput.labels), deploymentTool.labels()) }), { queryParams: { buildId } });
     return res.body;
 }
 exports.createBuild = createBuild;
 async function createRollout(projectId, location, backendId, rolloutId, rollout) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/backends/${backendId}/rollouts`, rollout, { queryParams: { rolloutId } });
+    const res = await exports.client.post(`projects/${projectId}/locations/${location}/backends/${backendId}/rollouts`, Object.assign(Object.assign({}, rollout), { labels: Object.assign(Object.assign({}, rollout.labels), deploymentTool.labels()) }), { queryParams: { rolloutId } });
     return res.body;
 }
 exports.createRollout = createRollout;
 async function listRollouts(projectId, location, backendId) {
-    const res = await client.get(`projects/${projectId}/locations/${location}/backends/${backendId}/rollouts`);
-    return res.body.rollouts;
+    const name = `projects/${projectId}/locations/${location}/backends/${backendId}/rollouts`;
+    let pageToken = undefined;
+    const res = {
+        rollouts: [],
+        unreachable: [],
+    };
+    do {
+        const queryParams = pageToken ? { pageToken } : {};
+        const int = await exports.client.get(name, { queryParams });
+        res.rollouts.splice(res.rollouts.length, 0, ...(int.body.rollouts || []));
+        res.unreachable.splice(res.unreachable.length, 0, ...(int.body.unreachable || []));
+        pageToken = int.body.nextPageToken;
+    } while (pageToken);
+    res.unreachable = [...new Set(res.unreachable)];
+    return res;
 }
 exports.listRollouts = listRollouts;
 async function updateTraffic(projectId, location, backendId, traffic) {
-    const fieldMasks = proto.fieldMasks(traffic);
+    const trafficCopy = Object.assign({}, traffic);
+    if ("rolloutPolicy" in traffic) {
+        trafficCopy.rolloutPolicy = {};
+    }
+    const fieldMasks = proto.fieldMasks(trafficCopy);
     const queryParams = {
         updateMask: fieldMasks.join(","),
     };
     const name = `projects/${projectId}/locations/${location}/backends/${backendId}/traffic`;
-    const res = await client.patch(name, Object.assign(Object.assign({}, traffic), { name }), {
+    const res = await exports.client.patch(name, Object.assign(Object.assign({}, traffic), { name }), {
         queryParams,
     });
     return res.body;
 }
 exports.updateTraffic = updateTraffic;
 async function listLocations(projectId) {
-    let pageToken;
+    let pageToken = undefined;
     let locations = [];
     do {
-        const response = await client.get(`projects/${projectId}/locations`);
+        const queryParams = pageToken ? { pageToken } : {};
+        const response = await exports.client.get(`projects/${projectId}/locations`, {
+            queryParams,
+        });
         if (response.body.locations && response.body.locations.length > 0) {
             locations = locations.concat(response.body.locations);
         }
@@ -87,3 +128,31 @@ async function ensureApiEnabled(options) {
     return await (0, ensureApiEnabled_1.ensure)(projectId, exports.API_HOST, "frameworks", true);
 }
 exports.ensureApiEnabled = ensureApiEnabled;
+async function getNextRolloutId(projectId, location, backendId, counter) {
+    var _a;
+    const date = new Date();
+    const year = date.getUTCFullYear();
+    const month = String(date.getUTCMonth() + 1).padStart(2, "0");
+    const day = String(date.getUTCDay()).padStart(2, "0");
+    if (counter) {
+        return `build-${year}-${month}-${day}-${String(counter).padStart(3, "0")}`;
+    }
+    const builds = await exports.listRollouts(projectId, location, backendId);
+    if ((_a = builds.unreachable) === null || _a === void 0 ? void 0 : _a.includes(location)) {
+        throw new error_1.FirebaseError(`Firebase App Hosting is currently unreachable in location ${location}`);
+    }
+    let highest = 0;
+    const test = new RegExp(`projects/${projectId}/locations/${location}/backends/${backendId}/rollouts/build-${year}-${month}-${day}-(\\d+)`);
+    for (const rollout of builds.rollouts) {
+        const match = rollout.name.match(test);
+        if (!match) {
+            continue;
+        }
+        const n = Number(match[1]);
+        if (n > highest) {
+            highest = n;
+        }
+    }
+    return `build-${year}-${month}-${day}-${String(highest + 1).padStart(3, "0")}`;
+}
+exports.getNextRolloutId = getNextRolloutId;

package/lib/gcp/cloudfunctionsv2.js

@@ -91,7 +91,7 @@ async function createFunction(cloudFunction) {
     const components = cloudFunction.name.split("/");
     const functionId = components.splice(-1, 1)[0];
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replaceAll("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", ".") });
     try {
         const res = await client.post(components.join("/"), cloudFunction, { queryParams: { functionId } });
         return res.body;
@@ -144,12 +144,10 @@ async function listFunctionsInternal(projectId, region) {
     }
 }
 async function updateFunction(cloudFunction) {
-    const components = cloudFunction.name.split("/");
-    const functionId = components.splice(-1, 1)[0];
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables");
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
     fieldMasks.push("buildConfig.buildEnvironmentVariables");
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replaceAll("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", ".") });
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),

package/lib/hosting/api.js

@@ -46,15 +46,13 @@ async function getChannel(project = "-", site, channelId) {
 }
 exports.getChannel = getChannel;
 async function listChannels(project = "-", site) {
+    var _a;
     const channels = [];
     let nextPageToken = "";
     for (;;) {
         try {
             const res = await apiClient.get(`/projects/${project}/sites/${site}/channels`, { queryParams: { pageToken: nextPageToken, pageSize: 10 } });
-            const c = res.body.channels;
-            if (c) {
-                channels.push(...c);
-            }
+            channels.push(...((_a = res.body.channels) !== null && _a !== void 0 ? _a : []));
             nextPageToken = res.body.nextPageToken || "";
             if (!nextPageToken) {
                 return channels;
@@ -100,6 +98,7 @@ async function updateVersion(site, versionId, version) {
 }
 exports.updateVersion = updateVersion;
 async function listVersions(site) {
+    var _a;
     let pageToken = undefined;
     const versions = [];
     do {
@@ -110,7 +109,7 @@ async function listVersions(site) {
         const res = await apiClient.get(`projects/-/sites/${site}/versions`, {
             queryParams,
         });
-        versions.push(...res.body.versions);
+        versions.push(...((_a = res.body.versions) !== null && _a !== void 0 ? _a : []));
         pageToken = res.body.nextPageToken;
     } while (pageToken);
     return versions;
@@ -137,15 +136,13 @@ async function createRelease(site, channel, version, partialRelease) {
 }
 exports.createRelease = createRelease;
 async function listSites(project) {
+    var _a;
     const sites = [];
     let nextPageToken = "";
     for (;;) {
         try {
             const res = await apiClient.get(`/projects/${project}/sites`, { queryParams: { pageToken: nextPageToken, pageSize: 10 } });
-            const c = res.body.sites;
-            if (c) {
-                sites.push(...c);
-            }
+            sites.push(...((_a = res.body.sites) !== null && _a !== void 0 ? _a : []));
             nextPageToken = res.body.nextPageToken || "";
             if (!nextPageToken) {
                 return sites;