firebase-tools 13.0.0 → 13.0.2

package/lib/api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.githubApiOrigin = exports.githubOrigin = exports.frameworksOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.deployOrigin = exports.consoleOrigin = exports.authOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
+exports.githubApiOrigin = exports.githubOrigin = exports.apphostingOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.deployOrigin = exports.consoleOrigin = exports.authOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
 exports.setScopes = exports.getScopes = exports.githubClientSecret = exports.githubClientId = exports.secretManagerOrigin = void 0;
 const constants_1 = require("./emulator/constants");
 const logger_1 = require("./logger");
@@ -59,7 +59,7 @@ exports.firebaseStorageOrigin = utils.envOverride("FIREBASE_FIREBASESTORAGE_URL"
 exports.hostingApiOrigin = utils.envOverride("FIREBASE_HOSTING_API_URL", "https://firebasehosting.googleapis.com");
 exports.cloudRunApiOrigin = utils.envOverride("CLOUD_RUN_API_URL", "https://run.googleapis.com");
 exports.serviceUsageOrigin = utils.envOverride("FIREBASE_SERVICE_USAGE_URL", "https://serviceusage.googleapis.com");
-exports.frameworksOrigin = utils.envOverride("FRAMEWORKS_URL", "https://placeholder.googleapis.com");
+exports.apphostingOrigin = utils.envOverride("APPHOSTING_URL", "https://firebaseapphosting.googleapis.com");
 exports.githubOrigin = utils.envOverride("GITHUB_URL", "https://github.com");
 exports.githubApiOrigin = utils.envOverride("GITHUB_API_URL", "https://api.github.com");
 exports.secretManagerOrigin = utils.envOverride("CLOUD_SECRET_MANAGER_URL", "https://secretmanager.googleapis.com");

package/lib/commands/{frameworks-backends-create.js → apphosting-backends-create.js}

@@ -4,11 +4,14 @@ exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
 const requireInteractive_1 = require("../requireInteractive");
-const frameworks_1 = require("../init/features/frameworks");
-exports.command = new command_1.Command("backends:create")
+const apphosting_1 = require("../init/features/apphosting");
+const apphosting_2 = require("../gcp/apphosting");
+exports.command = new command_1.Command("apphosting:backends:create")
     .description("Create a backend in a Firebase project")
+    .option("-l, --location <location>", "Specify the region of the backend", "")
+    .before(apphosting_2.ensureApiEnabled)
     .before(requireInteractive_1.default)
     .action(async (options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    await (0, frameworks_1.doSetup)(options, projectId);
+    await (0, apphosting_1.doSetup)(options, projectId);
 });

package/lib/commands/{frameworks-backends-delete.js → apphosting-backends-delete.js}

@@ -4,11 +4,11 @@ exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
 const error_1 = require("../error");
-const gcp = require("../gcp/frameworks");
 const prompt_1 = require("../prompt");
-const utils = require("../utils");
 const logger_1 = require("../logger");
-const constants_1 = require("../init/features/frameworks/constants");
+const constants_1 = require("../init/features/apphosting/constants");
+const utils = require("../utils");
+const apphosting = require("../gcp/apphosting");
 const Table = require("cli-table");
 const COLUMN_LENGTH = 20;
 const TABLE_HEAD = [
@@ -19,11 +19,12 @@ const TABLE_HEAD = [
     "Created Date",
     "Updated Date",
 ];
-exports.command = new command_1.Command("backends:delete")
+exports.command = new command_1.Command("apphosting:backends:delete")
     .description("Delete a backend from a Firebase project")
     .option("-l, --location <location>", "App Backend location", "")
     .option("-s, --backend <backend>", "Backend Id", "")
     .withForce()
+    .before(apphosting.ensureApiEnabled)
     .action(async (options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     let location = options.location;
@@ -32,12 +33,13 @@ exports.command = new command_1.Command("backends:delete")
         throw new error_1.FirebaseError("Backend id can't be empty.");
     }
     if (!location) {
+        const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
         location = await (0, prompt_1.promptOnce)({
             name: "region",
             type: "list",
             default: constants_1.DEFAULT_REGION,
             message: "Please select the region of the backend you'd like to delete:",
-            choices: constants_1.ALLOWED_REGIONS,
+            choices: allowedLocations,
         });
     }
     const table = new Table({
@@ -47,7 +49,7 @@ exports.command = new command_1.Command("backends:delete")
     table.colWidths = COLUMN_LENGTH;
     let backend;
     try {
-        backend = await gcp.getBackend(projectId, location, backendId);
+        backend = await apphosting.getBackend(projectId, location, backendId);
         populateTable(backend, table);
     }
     catch (err) {
@@ -67,7 +69,7 @@ exports.command = new command_1.Command("backends:delete")
         throw new error_1.FirebaseError("Deletion Aborted");
     }
     try {
-        await gcp.deleteBackend(projectId, location, backendId);
+        await apphosting.deleteBackend(projectId, location, backendId);
         utils.logSuccess(`Successfully deleted the backend: ${backendId}`);
     }
     catch (err) {

package/lib/commands/{frameworks-backends-get.js → apphosting-backends-get.js}

@@ -3,30 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
-const gcp = require("../gcp/frameworks");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
+const utils_1 = require("../utils");
+const apphosting = require("../gcp/apphosting");
 const Table = require("cli-table");
 const COLUMN_LENGTH = 20;
-const TABLE_HEAD = [
-    "Backend Id",
-    "Repository Name",
-    "Location",
-    "URL",
-    "Created Date",
-    "Updated Date",
-];
-exports.command = new command_1.Command("backends:get")
+const TABLE_HEAD = ["Backend Id", "Repository", "Location", "URL", "Created Date", "Updated Date"];
+exports.command = new command_1.Command("apphosting:backends:get <backendId>")
     .description("Get backend details of a Firebase project")
     .option("-l, --location <location>", "App Backend location", "-")
-    .option("-b, --backend <backend>", "Backend Id", "")
-    .action(async (options) => {
+    .before(apphosting.ensureApiEnabled)
+    .action(async (backendId, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const location = options.location;
-    const backendId = options.backend;
-    if (!backendId) {
-        throw new error_1.FirebaseError("Backend id can't be empty.");
-    }
     let backendsList = [];
     const table = new Table({
         head: TABLE_HEAD,
@@ -35,27 +25,26 @@ exports.command = new command_1.Command("backends:get")
     table.colWidths = COLUMN_LENGTH;
     try {
         if (location !== "-") {
-            const backendInRegion = await gcp.getBackend(projectId, location, backendId);
+            const backendInRegion = await apphosting.getBackend(projectId, location, backendId);
             backendsList.push(backendInRegion);
             populateTable(backendInRegion, table);
         }
         else {
-            const allBackend = await gcp.listBackends(projectId, location);
-            backendsList = allBackend.backends.filter((bkd) => bkd.name.split("/").pop() === backendId);
+            const resp = await apphosting.listBackends(projectId, "-");
+            const allBackends = resp.backends || [];
+            backendsList = allBackends.filter((bkd) => bkd.name.split("/").pop() === backendId);
             backendsList.forEach((bkd) => populateTable(bkd, table));
         }
-        if (backendsList.length !== 0) {
-            logger_1.logger.info(table.toString());
-        }
-        else {
-            logger_1.logger.info();
-            logger_1.logger.info(`There are no backends with id: ${backendId}`);
-        }
     }
     catch (err) {
         throw new error_1.FirebaseError(`Failed to get backend: ${backendId}. Please check the parameters you have provided.`, { original: err });
     }
-    return backendsList;
+    if (backendsList.length === 0) {
+        (0, utils_1.logWarning)(`Found no backend with id: ${backendId}`);
+        return;
+    }
+    logger_1.logger.info(table.toString());
+    return backendsList[0];
 });
 function populateTable(backend, table) {
     var _a;

package/lib/commands/{frameworks-backends-list.js → apphosting-backends-list.js}

@@ -3,23 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
-const gcp = require("../gcp/frameworks");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const colorette_1 = require("colorette");
+const apphosting = require("../gcp/apphosting");
 const Table = require("cli-table");
 const COLUMN_LENGTH = 20;
-const TABLE_HEAD = [
-    "Backend Id",
-    "Repository Name",
-    "Location",
-    "URL",
-    "Created Date",
-    "Updated Date",
-];
-exports.command = new command_1.Command("backends:list")
+const TABLE_HEAD = ["Backend Id", "Repository", "Location", "URL", "Created Date", "Updated Date"];
+exports.command = new command_1.Command("apphosting:backends:list")
     .description("List backends of a Firebase project.")
     .option("-l, --location <location>", "App Backend location", "-")
+    .before(apphosting.ensureApiEnabled)
     .action(async (options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const location = options.location;
@@ -30,12 +23,9 @@ exports.command = new command_1.Command("backends:list")
     table.colWidths = COLUMN_LENGTH;
     const backendsList = [];
     try {
-        const backendsPerRegion = await gcp.listBackends(projectId, location);
-        backendsList.push(backendsPerRegion);
-        populateTable(backendsPerRegion, location, table);
-        logger_1.logger.info();
-        logger_1.logger.info(`Backends for project ${(0, colorette_1.bold)(projectId)}`);
-        logger_1.logger.info();
+        const backendsPerRegion = await apphosting.listBackends(projectId, location);
+        backendsList.push(...(backendsPerRegion.backends || []));
+        populateTable(backendsList, table);
         logger_1.logger.info(table.toString());
     }
     catch (err) {
@@ -43,9 +33,9 @@ exports.command = new command_1.Command("backends:list")
     }
     return backendsList;
 });
-function populateTable(backendsLists, location, table) {
+function populateTable(backends, table) {
     var _a;
-    for (const backend of backendsLists.backends) {
+    for (const backend of backends) {
         const [location, , backendId] = backend.name.split("/").slice(3, 6);
         const entry = [
             backendId,

package/lib/commands/apphosting-builds-create.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const apphosting = require("../gcp/apphosting");
+const logger_1 = require("../logger");
+const command_1 = require("../command");
+const utils_1 = require("../utils");
+const projectUtils_1 = require("../projectUtils");
+exports.command = new command_1.Command("apphosting:builds:create <backendId>")
+    .description("Create a build for an App Hosting backend")
+    .option("-l, --location <location>", "Specify the region of the backend", "us-central1")
+    .option("-i, --id <buildId>", "Id of the build. If not present, autogenerate a random id", "")
+    .option("-b, --branch <branch>", "Repository branch to deploy. Defaults to 'main'", "main")
+    .before(apphosting.ensureApiEnabled)
+    .action(async (backendId, options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const buildId = options.buildId || (0, utils_1.generateId)();
+    const branch = options.branch;
+    const op = await apphosting.createBuild(projectId, location, backendId, buildId, {
+        source: {
+            codebase: {
+                branch: "main",
+            },
+        },
+    });
+    logger_1.logger.info(`Started a build for backend ${backendId} on branch ${branch}.`);
+    logger_1.logger.info("Check status by running:");
+    logger_1.logger.info(`\tfirebase apphosting:builds:get ${backendId} ${buildId} --location ${location}`);
+    return op;
+});

package/lib/commands/apphosting-builds-get.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const apphosting = require("../gcp/apphosting");
+const logger_1 = require("../logger");
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+exports.command = new command_1.Command("apphosting:builds:get <backendId> <buildId>")
+    .description("Create a build for an App Hosting backend")
+    .option("-l, --location <location>", "Specify the region of the backend", "us-central1")
+    .before(apphosting.ensureApiEnabled)
+    .action(async (backendId, buildId, options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const build = await apphosting.getBuild(projectId, location, backendId, buildId);
+    logger_1.logger.info(JSON.stringify(build, null, 2));
+    return build;
+});

package/lib/commands/apphosting-rollouts-create.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const apphosting = require("../gcp/apphosting");
+const logger_1 = require("../logger");
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const utils_1 = require("../utils");
+exports.command = new command_1.Command("apphosting:rollouts:create <backendId> <buildId>")
+    .description("Create a build for an App Hosting backend")
+    .option("-l, --location <location>", "Specify the region of the backend", "us-central1")
+    .option("-i, --id <rolloutId>", "Id of the rollout. If not present, autogenerate a random id", "")
+    .before(apphosting.ensureApiEnabled)
+    .action(async (backendId, buildId, options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const rolloutId = options.buildId || (0, utils_1.generateId)();
+    const build = `projects/${projectId}/backends/${backendId}/builds/${buildId}`;
+    const op = await apphosting.createRollout(projectId, location, backendId, rolloutId, {
+        build,
+    });
+    logger_1.logger.info(`Started a rollout for backend ${backendId} with build ${buildId}.`);
+    logger_1.logger.info("Check status by running:");
+    logger_1.logger.info(`\tfirebase apphosting:rollouts:list --location ${location}`);
+    return op;
+});

package/lib/commands/apphosting-rollouts-list.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const apphosting = require("../gcp/apphosting");
+const logger_1 = require("../logger");
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+exports.command = new command_1.Command("apphosting:rollouts:list <backendId>")
+    .description("List rollouts of an App Hosting backend")
+    .option("-l, --location <location>", "Rgion of the rollouts. Defaults to listing rollouts from all regions", "-")
+    .before(apphosting.ensureApiEnabled)
+    .action(async (backendId, options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const rollouts = await apphosting.listRollouts(projectId, location, backendId);
+    logger_1.logger.info(JSON.stringify(rollouts, null, 2));
+    return rollouts;
+});

package/lib/commands/index.js

@@ -145,12 +145,18 @@ function load(client) {
         client.internaltesting.functions.discover = loadCommand("internaltesting-functions-discover");
     }
     if (experiments.isEnabled("internalframeworks")) {
-        client.frameworks = {};
-        client.frameworks.backends = {};
-        client.frameworks.backends.list = loadCommand("frameworks-backends-list");
-        client.frameworks.backends.create = loadCommand("frameworks-backends-create");
-        client.frameworks.backends.get = loadCommand("frameworks-backends-get");
-        client.frameworks.backends.delete = loadCommand("frameworks-backends-delete");
+        client.apphosting = {};
+        client.apphosting.backends = {};
+        client.apphosting.backends.list = loadCommand("apphosting-backends-list");
+        client.apphosting.backends.create = loadCommand("apphosting-backends-create");
+        client.apphosting.backends.get = loadCommand("apphosting-backends-get");
+        client.apphosting.backends.delete = loadCommand("apphosting-backends-delete");
+        client.apphosting.builds = {};
+        client.apphosting.builds.get = loadCommand("apphosting-builds-get");
+        client.apphosting.builds.create = loadCommand("apphosting-builds-create");
+        client.apphosting.rollouts = {};
+        client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
+        client.apphosting.rollouts.list = loadCommand("apphosting-rollouts-list");
     }
     client.login = loadCommand("login");
     client.login.add = loadCommand("login-add");

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

@@ -3,9 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureFirestoreTriggerRegion = void 0;
 const firestore = require("../../../gcp/firestore");
 const error_1 = require("../../../error");
+const dbCache = new Map();
+async function getDatabase(project, databaseId) {
+    const key = `${project}/${databaseId}`;
+    if (dbCache.has(key)) {
+        return dbCache.get(key);
+    }
+    const db = await firestore.getDatabase(project, databaseId);
+    dbCache.set(key, db);
+    return db;
+}
 async function ensureFirestoreTriggerRegion(endpoint) {
     var _a;
-    const db = await firestore.getDatabase(endpoint.project, ((_a = endpoint.eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.database) || "(default)");
+    const db = await getDatabase(endpoint.project, ((_a = endpoint.eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.database) || "(default)");
     const dbRegion = db.locationId;
     if (!endpoint.eventTrigger.region) {
         endpoint.eventTrigger.region = dbRegion;

package/lib/frameworks/angular/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ɵcodegenFunctionsDirectory = exports.shouldUseDevModeHandle = exports.getValidBuildTargets = exports.ɵcodegenPublicDirectory = exports.getDevModeHandle = exports.build = exports.init = exports.discover = exports.docsUrl = exports.type = exports.support = exports.name = void 0;
+exports.ɵcodegenFunctionsDirectory = exports.shouldUseDevModeHandle = exports.getValidBuildTargets = exports.ɵcodegenPublicDirectory = exports.getDevModeHandle = exports.build = exports.init = exports.discover = exports.supportedRange = exports.docsUrl = exports.type = exports.support = exports.name = void 0;
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const cross_spawn_1 = require("cross-spawn");
@@ -15,16 +15,18 @@ exports.support = "preview";
 exports.type = 3;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/angular";
 const DEFAULT_BUILD_SCRIPT = ["ng build"];
+exports.supportedRange = "14 - 17";
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "angular.json"))))
         return;
-    return { mayWantBackend: true, publicDirectory: (0, path_1.join)(dir, "src", "assets") };
+    const version = (0, utils_2.getAngularVersion)(dir);
+    return { mayWantBackend: true, publicDirectory: (0, path_1.join)(dir, "src", "assets"), version };
 }
 exports.discover = discover;
 function init(setup, config) {
-    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@latest ng new ${setup.projectId} --directory ${setup.hosting.source} --skip-git`, {
+    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@"${exports.supportedRange}" ng new ${setup.projectId} --directory ${setup.hosting.source} --skip-git`, {
         stdio: "inherit",
         cwd: config.projectDir,
     });

package/lib/frameworks/angular/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBuildConfig = exports.getServerConfig = exports.getBrowserConfig = exports.getContext = exports.getAllTargets = void 0;
+exports.getAngularVersion = exports.getBuildConfig = exports.getServerConfig = exports.getBrowserConfig = exports.getContext = exports.getAllTargets = void 0;
 const utils_1 = require("../utils");
 const error_1 = require("../../error");
 const path_1 = require("path");
 const assert_1 = require("assert");
 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");
@@ -182,7 +183,9 @@ async function getContext(dir, targetOrConfiguration) {
         }
     }
     if (deployTarget) {
-        const options = await architectHost.getOptionsForTarget(deployTarget);
+        const options = await architectHost
+            .getOptionsForTarget(deployTarget)
+            .catch(() => { var _a; return (_a = workspaceProject.targets.get(deployTarget.target)) === null || _a === void 0 ? void 0 : _a.options; });
         if (!options)
             throw new error_1.FirebaseError("Unable to get options for ng-deploy.");
         if (options.buildTarget) {
@@ -201,6 +204,10 @@ async function getContext(dir, targetOrConfiguration) {
             (0, utils_2.assertIsString)(options.serverTarget);
             serverTarget = targetFromTargetString(options.serverTarget);
         }
+        if (options.serveTarget) {
+            (0, utils_2.assertIsString)(options.serveTarget);
+            serveTarget = targetFromTargetString(options.serveTarget);
+        }
         if (options.serveOptimizedImages) {
             serveOptimizedImages = true;
         }
@@ -441,3 +448,13 @@ async function getBuildConfig(sourceDir, configuration) {
     };
 }
 exports.getBuildConfig = getBuildConfig;
+function getAngularVersion(cwd) {
+    const dependency = (0, utils_1.findDependency)("@angular/core", { cwd, depth: 0, omitDev: false });
+    if (!dependency)
+        return undefined;
+    const angularVersionSemver = (0, semver_1.coerce)(dependency.version);
+    if (!angularVersionSemver)
+        return dependency.version;
+    return angularVersionSemver.toString();
+}
+exports.getAngularVersion = getAngularVersion;

package/lib/frameworks/astro/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.build = exports.discover = exports.type = exports.support = exports.name = void 0;
+exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.build = exports.discover = exports.supportedRange = exports.type = exports.support = exports.name = void 0;
 const cross_spawn_1 = require("cross-spawn");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -10,15 +10,18 @@ const utils_2 = require("./utils");
 exports.name = "Astro";
 exports.support = "experimental";
 exports.type = 2;
+exports.supportedRange = "2 - 3";
 async function discover(dir) {
     if (!(0, fs_extra_1.existsSync)((0, path_1.join)(dir, "package.json")))
         return;
-    if (!(0, utils_2.getAstroVersion)(dir))
+    const version = (0, utils_2.getAstroVersion)(dir);
+    if (!version)
         return;
     const { output, publicDir: publicDirectory } = await (0, utils_2.getConfig)(dir);
     return {
         mayWantBackend: output !== "static",
         publicDirectory,
+        version,
     };
 }
 exports.discover = discover;

package/lib/frameworks/astro/utils.js

@@ -4,6 +4,7 @@ exports.getAstroVersion = exports.getConfig = exports.getBootstrapScript = void
 const path_1 = require("path");
 const utils_1 = require("../utils");
 const semver_1 = require("semver");
+const url_1 = require("url");
 const { dynamicImport } = require(true && "../../dynamicImport");
 function getBootstrapScript() {
     return `const entry = import('./entry.mjs');\nexport const handle = async (req, res) => (await entry).handler(req, res)`;
@@ -26,8 +27,8 @@ async function getConfig(cwd) {
         config = astroConfig;
     }
     return {
-        outDir: (0, path_1.relative)(cwd, config.outDir.pathname),
-        publicDir: (0, path_1.relative)(cwd, config.publicDir.pathname),
+        outDir: (0, path_1.relative)(cwd, (0, url_1.fileURLToPath)(config.outDir)),
+        publicDir: (0, path_1.relative)(cwd, (0, url_1.fileURLToPath)(config.publicDir)),
         output: config.output,
         adapter: config.adapter,
     };

package/lib/frameworks/constants.js

@@ -6,10 +6,10 @@ const experiments = require("../experiments");
 exports.NPM_COMMAND_TIMEOUT_MILLIES = 10000;
 exports.SupportLevelWarnings = {
     ["experimental"]: (framework) => `Thank you for trying our ${clc.italic("experimental")} support for ${framework} on Firebase Hosting.
-   ${clc.yellow(`While this integration is maintained by Googlers it is not a supported Firebase product.
+   ${clc.red(`While this integration is maintained by Googlers it is not a supported Firebase product.
    Issues filed on GitHub will be addressed on a best-effort basis by maintainers and other community members.`)}`,
     ["preview"]: (framework) => `Thank you for trying our ${clc.italic("early preview")} of ${framework} support on Firebase Hosting.
-   ${clc.yellow("During the preview, support is best-effort and breaking changes can be expected. Proceed with caution.")}`,
+   ${clc.red("During the preview, support is best-effort and breaking changes can be expected. Proceed with caution.")}`,
 };
 exports.DEFAULT_DOCS_URL = "https://firebase.google.com/docs/hosting/frameworks/frameworks-overview";
 exports.FILE_BUG_URL = "https://github.com/firebase/firebase-tools/issues/new?template=bug_report.md";
@@ -26,11 +26,35 @@ exports.VALID_ENGINES = { node: [16, 18, 20] };
 exports.VALID_LOCALE_FORMATS = [/^ALL_[a-z]+$/, /^[a-z]+_ALL$/, /^[a-z]+(_[a-z]+)?$/];
 exports.DEFAULT_REGION = "us-central1";
 exports.ALLOWED_SSR_REGIONS = [
-    { name: "us-central1 (Iowa)", value: "us-central1" },
-    { name: "us-west1 (Oregon)", value: "us-west1" },
-    { name: "us-east1 (South Carolina)", value: "us-east1" },
-    { name: "europe-west1 (Belgium)", value: "europe-west1" },
-    { name: "asia-east1 (Taiwan)", value: "asia-east1" },
+    { name: "us-central1 (Iowa)", value: "us-central1", recommended: true },
+    { name: "us-east1 (South Carolina)", value: "us-east1", recommended: true },
+    { name: "us-east4 (Northern Virginia)", value: "us-east4" },
+    { name: "us-west1 (Oregon)", value: "us-west1", recommended: true },
+    { name: "us-west2 (Los Angeles)", value: "us-west2" },
+    { name: "us-west3 (Salt Lake City)", value: "us-west3" },
+    { name: "us-west4 (Las Vegas)", value: "us-west4" },
+    { name: "asia-east1 (Taiwan)", value: "asia-east1", recommended: true },
+    { name: "asia-east2 (Hong Kong)", value: "asia-east2" },
+    { name: "asia-northeast1 (Tokyo)", value: "asia-northeast1" },
+    { name: "asia-northeast2 (Osaka)", value: "asia-northeast2" },
+    { name: "asia-northeast3 (Seoul)", value: "asia-northeast3" },
+    { name: "asia-south1 (Mumbai)", value: "asia-south1" },
+    { name: "asia-south2 (Delhi)", value: "asia-south2" },
+    { name: "asia-southeast1 (Singapore)", value: "asia-southeast1" },
+    { name: "asia-southeast2 (Jakarta)", value: "asia-southeast2" },
+    { name: "australia-southeast1 (Sydney)", value: "australia-southeast1" },
+    { name: "australia-southeast2 (Melbourne)", value: "australia-southeast2" },
+    { name: "europe-central2 (Warsaw)", value: "europe-central2" },
+    { name: "europe-north1 (Finland)", value: "europe-north1" },
+    { name: "europe-west1 (Belgium)", value: "europe-west1", recommended: true },
+    { name: "europe-west2 (London)", value: "europe-west2" },
+    { name: "europe-west3 (Frankfurt)", value: "europe-west3" },
+    { name: "europe-west4 (Netherlands)", value: "europe-west4" },
+    { name: "europe-west6 (Zurich)", value: "europe-west6" },
+    { name: "northamerica-northeast1 (Montreal)", value: "northamerica-northeast1" },
+    { name: "northamerica-northeast2 (Toronto)", value: "northamerica-northeast2" },
+    { name: "southamerica-east1 (São Paulo)", value: "southamerica-east1" },
+    { name: "southamerica-west1 (Santiago)", value: "southamerica-west1" },
 ];
 exports.I18N_ROOT = "/";
 function GET_DEFAULT_BUILD_TARGETS() {

package/lib/frameworks/index.js

@@ -62,14 +62,14 @@ async function discover(dir, warn = true) {
 }
 exports.discover = discover;
 const BUILD_MEMO = new Map();
-function memoizeBuild(dir, build, deps, target) {
+function memoizeBuild(dir, build, deps, target, context) {
     const key = [dir, ...deps];
     for (const existingKey of BUILD_MEMO.keys()) {
         if ((0, util_1.isDeepStrictEqual)(existingKey, key)) {
             return BUILD_MEMO.get(existingKey);
         }
     }
-    const value = build(dir, target);
+    const value = build(dir, target, context);
     BUILD_MEMO.set(key, value);
     return value;
 }
@@ -119,7 +119,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             throw new error_1.FirebaseError(`Hosting config for site ${site} places server-side content in region ${ssrRegion} which is not known. Valid regions are ${validRegions}`);
         }
         const getProjectPath = (...args) => (0, path_1.join)(projectRoot, source, ...args);
-        const functionId = `ssr${site.toLowerCase().replace(/-/g, "")}`;
+        const functionId = `ssr${site.toLowerCase().replace(/-/g, "").substring(0, 20)}`;
         const usesFirebaseAdminSdk = !!(0, utils_1.findDependency)("firebase-admin", { cwd: getProjectPath() });
         const usesFirebaseJsSdk = !!(0, utils_1.findDependency)("@firebase/app", { cwd: getProjectPath() });
         if (usesFirebaseAdminSdk) {
@@ -190,13 +190,18 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             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 { build, ɵcodegenPublicDirectory, ɵcodegenFunctionsDirectory: codegenProdModeFunctionsDirectory, getDevModeHandle, name, support, docsUrl, 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, "   ")}\n`);
+        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);
         const validBuildTargets = await getValidBuildTargets(purpose, getProjectPath());
         const frameworksBuildTarget = (0, utils_1.getFrameworksBuildTarget)(purpose, validBuildTargets);
         const useDevModeHandle = purpose !== "deploy" &&
             (await shouldUseDevModeHandle(frameworksBuildTarget, getProjectPath()));
+        const frameworkContext = {
+            projectId: project,
+            site: options.site,
+            hostingChannel: context === null || context === void 0 ? void 0 : context.hostingChannel,
+        };
         let codegenFunctionsDirectory;
         let baseUrl = "";
         const rewrites = [];
@@ -213,7 +218,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             }
         }
         else {
-            const buildResult = await memoizeBuild(getProjectPath(), build, [firebaseDefaults, frameworksBuildTarget], frameworksBuildTarget);
+            const buildResult = await memoizeBuild(getProjectPath(), build, [firebaseDefaults, frameworksBuildTarget], frameworksBuildTarget, frameworkContext);
             const { wantsBackend = false, trailingSlash, i18n = false } = buildResult || {};
             if (buildResult) {
                 baseUrl = (_d = buildResult.baseUrl) !== null && _d !== void 0 ? _d : baseUrl;
@@ -282,7 +287,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             else {
                 await (0, fs_extra_1.mkdirp)(functionsDist);
             }
-            const { packageJson, bootstrapScript, frameworksEntry = framework, dotEnv = {}, rewriteSource, } = await codegenFunctionsDirectory(getProjectPath(), functionsDist, frameworksBuildTarget);
+            const { packageJson, bootstrapScript, frameworksEntry = framework, dotEnv = {}, rewriteSource, } = await codegenFunctionsDirectory(getProjectPath(), functionsDist, frameworksBuildTarget, frameworkContext);
             const rewrite = {
                 source: rewriteSource || path_1.posix.join(baseUrl, "**"),
                 function: {