firebase-tools 14.21.0 → 14.22.0

package/lib/commands/deploy.js

@@ -15,6 +15,7 @@ const error_1 = require("../error");
 const colorette_1 = require("colorette");
 const interactive_1 = require("../hosting/interactive");
 const utils_1 = require("../utils");
+const api_1 = require("../hosting/api");
 exports.VALID_DEPLOY_TARGETS = [
     "database",
     "storage",
@@ -107,7 +108,7 @@ exports.command = new command_1.Command("deploy")
         await (0, requireDatabaseInstance_1.requireDatabaseInstance)(options);
     }
     if (options.filteredTargets.includes("hosting")) {
-        let createSite = false;
+        let shouldCreateSite = false;
         try {
             await (0, requireHostingSite_1.requireHostingSite)(options);
         }
@@ -119,17 +120,18 @@ exports.command = new command_1.Command("deploy")
                 throw err;
             }
             else if (err === getDefaultHostingSite_1.errNoDefaultSite) {
-                createSite = true;
+                shouldCreateSite = true;
             }
         }
-        if (!createSite) {
+        if (!shouldCreateSite) {
             return;
         }
         if (options.nonInteractive) {
             throw new error_1.FirebaseError(`Unable to deploy to Hosting as there is no Hosting site. Use ${(0, colorette_1.bold)("firebase hosting:sites:create")} to create a site.`);
         }
         (0, utils_1.logBullet)("No Hosting site detected.");
-        await (0, interactive_1.interactiveCreateHostingSite)("", "", options);
+        const siteId = await (0, interactive_1.pickHostingSiteName)("", options);
+        await (0, api_1.createSite)(options.project, siteId);
     }
 })
     .before(checkValidTargetFilters_1.checkValidTargetFilters)

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

@@ -8,6 +8,7 @@ const utils_1 = require("../utils");
 const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const requirePermissions_1 = require("../requirePermissions");
+const api_1 = require("../hosting/api");
 const error_1 = require("../error");
 const LOG_TAG = "hosting:sites";
 exports.command = new command_1.Command("hosting:sites:create [siteId]")
@@ -18,10 +19,10 @@ exports.command = new command_1.Command("hosting:sites:create [siteId]")
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const appId = options.app;
     if (options.nonInteractive && !siteId) {
-        throw new error_1.FirebaseError(`${(0, colorette_1.bold)(siteId)} is required in a non-interactive environment`);
+        throw new error_1.FirebaseError(`${(0, colorette_1.bold)("siteId")} is required in a non-interactive environment`);
     }
-    const site = await (0, interactive_1.interactiveCreateHostingSite)(siteId, appId, options);
-    siteId = (0, utils_1.last)(site.name.split("/"));
+    siteId = await (0, interactive_1.pickHostingSiteName)(siteId !== null && siteId !== void 0 ? siteId : "", options);
+    const site = await (0, api_1.createSite)(projectId, siteId, appId);
     logger_1.logger.info();
     (0, utils_1.logLabeledSuccess)(LOG_TAG, `Site ${(0, colorette_1.bold)(siteId)} has been created in project ${(0, colorette_1.bold)(projectId)}.`);
     if (appId) {

package/lib/deploy/functions/params.js

@@ -168,18 +168,9 @@ async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive, i
         paramValues[param.name] = userEnvs[param.name];
     }
     const [needSecret, needPrompt] = (0, functional_1.partition)(outstanding, (param) => param.type === "secret");
-    if (nonInteractive && needSecret.length > 0) {
-        const secretNames = needSecret.map((p) => p.name).join(", ");
-        const commands = needSecret
-            .map((p) => `\tfirebase functions:secrets:set ${p.name}${p.format === "json" ? " --format=json --data-file <file.json>" : ""}`)
-            .join("\n");
-        throw new error_1.FirebaseError(`In non-interactive mode but have no value for the following secrets: ${secretNames}\n\n` +
-            "Set these secrets before deploying:\n" +
-            commands);
-    }
     if (!isEmulator) {
         for (const param of needSecret) {
-            await handleSecret(param, firebaseConfig.projectId);
+            await handleSecret(param, firebaseConfig.projectId, nonInteractive);
         }
     }
     if (nonInteractive && needPrompt.length > 0) {
@@ -230,9 +221,14 @@ function populateDefaultParams(config) {
     }
     return defaultParams;
 }
-async function handleSecret(secretParam, projectId) {
+async function handleSecret(secretParam, projectId, nonInteractive) {
     const metadata = await secretManager.getSecretMetadata(projectId, secretParam.name, "latest");
     if (!metadata.secret) {
+        if (nonInteractive) {
+            throw new error_1.FirebaseError(`In non-interactive mode but have no value for the secret: ${secretParam.name}\n\n` +
+                "Set this secret before deploying:\n" +
+                `\tfirebase functions:secrets:set ${secretParam.name}${secretParam.format === "json" ? " --format=json --data-file <file.json>" : ""}`);
+        }
         const promptMessage = `This secret will be stored in Cloud Secret Manager (https://cloud.google.com/secret-manager/pricing) as ${secretParam.name}. Enter ${secretParam.format === "json" ? "a JSON value" : "a value"} for ${secretParam.label || secretParam.name}:`;
         const secretValue = await (0, prompt_1.password)({
             message: promptMessage,

package/lib/frameworks/angular/index.js

@@ -26,7 +26,7 @@ async function discover(dir) {
 }
 exports.discover = discover;
 function init(setup, config) {
-    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@"${exports.supportedRange}" 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.featureInfo.hosting.source} --skip-git`, {
         stdio: "inherit",
         cwd: config.projectDir,
     });

package/lib/frameworks/flutter/index.js

@@ -34,7 +34,7 @@ function init(setup, config) {
         `--project-name=${projectName}`,
         "--overwrite",
         "--platforms=web",
-        setup.hosting.source,
+        setup.featureInfo.hosting.source,
     ], { stdio: "inherit", cwd: config.projectDir });
     if (result.status !== 0)
         throw new error_1.FirebaseError("We were not able to create your flutter app, create the application yourself https://docs.flutter.dev/get-started/test-drive?tab=terminal before trying again.");

package/lib/frameworks/next/index.js

@@ -214,7 +214,7 @@ async function init(setup, config) {
         ],
     });
     (0, child_process_1.execSync)(`npx --yes create-next-app@"${exports.supportedRange}" -e hello-world ` +
-        `${setup.hosting.source} --use-npm --${language}`, { stdio: "inherit", cwd: config.projectDir });
+        `${setup.featureInfo.hosting.source} --use-npm --${language}`, { stdio: "inherit", cwd: config.projectDir });
 }
 exports.init = init;
 async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {

package/lib/frameworks/nuxt/index.js

@@ -93,7 +93,7 @@ async function getConfig(cwd) {
 }
 exports.getConfig = getConfig;
 function init(setup, config) {
-    (0, child_process_1.execSync)(`npx --yes nuxi@"${exports.supportedRange}" init ${setup.hosting.source}`, {
+    (0, child_process_1.execSync)(`npx --yes nuxi@"${exports.supportedRange}" init ${setup.featureInfo.hosting.source}`, {
         stdio: "inherit",
         cwd: config.projectDir,
     });

package/lib/frameworks/vite/index.js

@@ -25,11 +25,14 @@ async function init(setup, config, baseTemplate = "vanilla") {
             { name: "TypeScript", value: `${baseTemplate}-ts` },
         ],
     });
-    (0, child_process_1.execSync)(`npm create vite@"${exports.supportedRange}" ${setup.hosting.source} --yes -- --template ${template}`, {
+    (0, child_process_1.execSync)(`npm create vite@"${exports.supportedRange}" ${setup.featureInfo.hosting.source} --yes -- --template ${template}`, {
         stdio: "inherit",
         cwd: config.projectDir,
     });
-    (0, child_process_1.execSync)(`npm install`, { stdio: "inherit", cwd: (0, path_1.join)(config.projectDir, setup.hosting.source) });
+    (0, child_process_1.execSync)(`npm install`, {
+        stdio: "inherit",
+        cwd: (0, path_1.join)(config.projectDir, setup.featureInfo.hosting.source),
+    });
 }
 exports.init = init;
 const viteDiscoverWithNpmDependency = (dep) => async (dir) => await discover(dir, undefined, dep);

package/lib/hosting/interactive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.interactiveCreateHostingSite = void 0;
+exports.pickHostingSiteName = void 0;
 const error_1 = require("../error");
 const utils_1 = require("../utils");
 const projectUtils_1 = require("../projectUtils");
@@ -9,11 +9,11 @@ const prompt_1 = require("../prompt");
 const nameSuggestion = new RegExp("try something like `(.+)`");
 const prompt = "Please provide an unique, URL-friendly id for your site. Your site's URL will be <site-id>.web.app. " +
     'We recommend using letters, numbers, and hyphens (e.g. "{project-id}-{random-hash}"):';
-async function interactiveCreateHostingSite(siteId, appId, options) {
+async function pickHostingSiteName(siteId, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     let id = siteId;
-    let newSite;
+    let nameConfirmed = false;
     let suggestion;
     if (!id) {
         const attempt = await trySiteID(projectNumber, projectId);
@@ -24,7 +24,7 @@ async function interactiveCreateHostingSite(siteId, appId, options) {
             suggestion = attempt.suggestion;
         }
     }
-    while (!newSite) {
+    while (!nameConfirmed) {
         if (!id || suggestion) {
             id = await (0, prompt_1.input)({
                 message: prompt,
@@ -32,24 +32,16 @@ async function interactiveCreateHostingSite(siteId, appId, options) {
                 default: suggestion,
             });
         }
-        try {
-            newSite = await (0, api_1.createSite)(projectNumber, id, appId);
-        }
-        catch (err) {
-            if (!(err instanceof error_1.FirebaseError)) {
-                throw err;
-            }
-            if (options.nonInteractive) {
-                throw err;
-            }
+        const attempt = await trySiteID(projectNumber, id, options.nonInteractive);
+        nameConfirmed = attempt.available;
+        suggestion = attempt.suggestion;
+        if (!nameConfirmed)
             id = "";
-            suggestion = getSuggestionFromError(err);
-        }
     }
-    return newSite;
+    return id;
 }
-exports.interactiveCreateHostingSite = interactiveCreateHostingSite;
-async function trySiteID(projectNumber, id) {
+exports.pickHostingSiteName = pickHostingSiteName;
+async function trySiteID(projectNumber, id, nonInteractive = false) {
     try {
         await (0, api_1.createSite)(projectNumber, id, "", true);
         return { available: true };
@@ -58,6 +50,9 @@ async function trySiteID(projectNumber, id) {
         if (!(err instanceof error_1.FirebaseError)) {
             throw err;
         }
+        if (nonInteractive) {
+            throw err;
+        }
         const suggestion = getSuggestionFromError(err);
         return { available: false, suggestion };
     }

package/lib/init/features/hosting/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.actuate = exports.askQuestions = void 0;
 const clc = require("colorette");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
@@ -15,13 +15,16 @@ const getDefaultHostingSite_1 = require("../../../getDefaultHostingSite");
 const utils_1 = require("../../../utils");
 const interactive_1 = require("../../../hosting/interactive");
 const templates_1 = require("../../../templates");
+const error_1 = require("../../../error");
+const api_1 = require("../../../hosting/api");
 const INDEX_TEMPLATE = (0, templates_1.readTemplateSync)("init/hosting/index.html");
 const MISSING_TEMPLATE = (0, templates_1.readTemplateSync)("init/hosting/404.html");
 const DEFAULT_IGNORES = ["firebase.json", "**/.*", "**/node_modules/**"];
-async function doSetup(setup, config, options) {
-    var _a, _b, _c, _d;
-    var _e, _f, _g;
-    setup.hosting = {};
+async function askQuestions(setup, config, options) {
+    var _a, _b, _c, _d, _e, _f;
+    var _g, _h, _j, _k, _l;
+    setup.featureInfo = setup.featureInfo || {};
+    setup.featureInfo.hosting = {};
     if (setup.projectId) {
         let hasHostingSite = true;
         try {
@@ -33,61 +36,50 @@ async function doSetup(setup, config, options) {
             }
             hasHostingSite = false;
         }
-        if (!hasHostingSite) {
-            const confirmCreate = await (0, prompt_1.confirm)({
+        if (!hasHostingSite &&
+            (await (0, prompt_1.confirm)({
                 message: "A Firebase Hosting site is required to deploy. Would you like to create one now?",
                 default: true,
-            });
-            if (confirmCreate) {
-                const createOptions = {
-                    projectId: setup.projectId,
-                    nonInteractive: options.nonInteractive,
-                };
-                const newSite = await (0, interactive_1.interactiveCreateHostingSite)("", "", createOptions);
-                logger_1.logger.info();
-                (0, utils_1.logSuccess)(`Firebase Hosting site ${(0, utils_1.last)(newSite.name.split("/"))} created!`);
-                logger_1.logger.info();
-            }
+            }))) {
+            const createOptions = {
+                projectId: setup.projectId,
+                nonInteractive: options.nonInteractive,
+            };
+            setup.featureInfo.hosting.newSiteId = await (0, interactive_1.pickHostingSiteName)("", createOptions);
         }
     }
-    let discoveredFramework = experiments.isEnabled("webframeworks")
-        ? await (0, frameworks_1.discover)(config.projectDir, false)
-        : undefined;
     if (experiments.isEnabled("webframeworks")) {
-        if (discoveredFramework) {
-            const name = frameworks_1.WebFrameworks[discoveredFramework.framework].name;
-            (_a = (_e = setup.hosting).useDiscoveredFramework) !== null && _a !== void 0 ? _a : (_e.useDiscoveredFramework = await (0, prompt_1.confirm)({
-                message: `Detected an existing ${name} codebase in the current directory, should we use this?`,
+        let discoveredFramework = experiments.isEnabled("webframeworks")
+            ? await (0, frameworks_1.discover)(config.projectDir, false)
+            : undefined;
+        if (discoveredFramework &&
+            (await (0, prompt_1.confirm)({
+                message: `Detected an existing ${frameworks_1.WebFrameworks[discoveredFramework.framework].name} codebase in the current directory, do you want to use this?`,
                 default: true,
-            }));
-        }
-        if (setup.hosting.useDiscoveredFramework) {
-            setup.hosting.source = ".";
-            setup.hosting.useWebFrameworks = true;
+            }))) {
+            setup.featureInfo.hosting.source = ".";
+            setup.featureInfo.hosting.useWebFrameworks = true;
+            setup.featureInfo.hosting.useDiscoveredFramework = true;
+            setup.featureInfo.hosting.webFramework = discoveredFramework.framework;
         }
         else {
-            setup.hosting.useWebFrameworks = await (0, prompt_1.confirm)(`Do you want to use a web framework? (${clc.bold("experimental")})`);
+            setup.featureInfo.hosting.useWebFrameworks = await (0, prompt_1.confirm)(`Do you want to use a web framework? (${clc.bold("experimental")})`);
         }
-    }
-    if (setup.hosting.useWebFrameworks) {
-        (_b = (_f = setup.hosting).source) !== null && _b !== void 0 ? _b : (_f.source = await (0, prompt_1.input)({
-            message: "What folder would you like to use for your web application's root directory?",
-            default: "hosting",
-        }));
-        if (setup.hosting.source !== ".")
-            delete setup.hosting.useDiscoveredFramework;
-        discoveredFramework = await (0, frameworks_1.discover)((0, path_1.join)(config.projectDir, setup.hosting.source));
-        if (discoveredFramework) {
-            const name = frameworks_1.WebFrameworks[discoveredFramework.framework].name;
-            (_c = (_g = setup.hosting).useDiscoveredFramework) !== null && _c !== void 0 ? _c : (_g.useDiscoveredFramework = await (0, prompt_1.confirm)({
-                message: `Detected an existing ${name} codebase in ${setup.hosting.source}, should we use this?`,
-                default: true,
+        if (setup.featureInfo.hosting.useWebFrameworks) {
+            (_a = (_g = setup.featureInfo.hosting).source) !== null && _a !== void 0 ? _a : (_g.source = await (0, prompt_1.input)({
+                message: "What folder would you like to use for your web application's root directory?",
+                default: "hosting",
             }));
-        }
-        if (setup.hosting.useDiscoveredFramework && discoveredFramework) {
-            setup.hosting.webFramework = discoveredFramework.framework;
-        }
-        else {
+            discoveredFramework = await (0, frameworks_1.discover)((0, path_1.join)(config.projectDir, setup.featureInfo.hosting.source));
+            if (discoveredFramework) {
+                const name = frameworks_1.WebFrameworks[discoveredFramework.framework].name;
+                (_b = (_h = setup.featureInfo.hosting).useDiscoveredFramework) !== null && _b !== void 0 ? _b : (_h.useDiscoveredFramework = await (0, prompt_1.confirm)({
+                    message: `Detected an existing ${name} codebase in ${setup.featureInfo.hosting.source}, should we use this?`,
+                    default: true,
+                }));
+                if (setup.featureInfo.hosting.useDiscoveredFramework)
+                    setup.featureInfo.hosting.webFramework = discoveredFramework.framework;
+            }
             const choices = [];
             for (const value in frameworks_1.WebFrameworks) {
                 if (frameworks_1.WebFrameworks[value]) {
@@ -96,32 +88,20 @@ async function doSetup(setup, config, options) {
                         choices.push({ name, value });
                 }
             }
-            const defaultChoice = (_d = choices.find(({ value }) => value === (discoveredFramework === null || discoveredFramework === void 0 ? void 0 : discoveredFramework.framework))) === null || _d === void 0 ? void 0 : _d.value;
-            setup.hosting.whichFramework =
-                setup.hosting.whichFramework ||
+            const defaultChoice = (_c = choices.find(({ value }) => value === (discoveredFramework === null || discoveredFramework === void 0 ? void 0 : discoveredFramework.framework))) === null || _c === void 0 ? void 0 : _c.value;
+            (_d = (_j = setup.featureInfo.hosting).webFramework) !== null && _d !== void 0 ? _d : (_j.webFramework = await (0, prompt_1.select)({
+                message: "Please choose the framework:",
+                default: defaultChoice,
+                choices,
+            }));
+            setup.featureInfo.hosting.region =
+                setup.featureInfo.hosting.region ||
                     (await (0, prompt_1.select)({
-                        message: "Please choose the framework:",
-                        default: defaultChoice,
-                        choices,
+                        message: "In which region would you like to host server-side content, if applicable?",
+                        default: constants_1.DEFAULT_REGION,
+                        choices: constants_1.ALLOWED_SSR_REGIONS.filter((region) => region.recommended),
                     }));
-            if (discoveredFramework)
-                (0, node_fs_1.rmSync)(setup.hosting.source, { recursive: true });
-            await frameworks_1.WebFrameworks[setup.hosting.whichFramework].init(setup, config);
         }
-        setup.hosting.region =
-            setup.hosting.region ||
-                (await (0, prompt_1.select)({
-                    message: "In which region would you like to host server-side content, if applicable?",
-                    default: constants_1.DEFAULT_REGION,
-                    choices: constants_1.ALLOWED_SSR_REGIONS.filter((region) => region.recommended),
-                }));
-        setup.config.hosting = {
-            source: setup.hosting.source,
-            ignore: DEFAULT_IGNORES,
-            frameworksBackend: {
-                region: setup.hosting.region,
-            },
-        };
     }
     else {
         logger_1.logger.info();
@@ -129,35 +109,58 @@ async function doSetup(setup, config, options) {
         logger_1.logger.info(`will contain Hosting assets to be uploaded with ${clc.bold("firebase deploy")}. If you`);
         logger_1.logger.info("have a build process for your assets, use your build's output directory.");
         logger_1.logger.info();
-        setup.hosting.public =
-            setup.hosting.public ||
-                (await (0, prompt_1.input)({
-                    message: "What do you want to use as your public directory?",
-                    default: "public",
-                }));
-        setup.hosting.spa =
-            setup.hosting.spa ||
-                (await (0, prompt_1.confirm)("Configure as a single-page app (rewrite all urls to /index.html)?"));
+        (_e = (_k = setup.featureInfo.hosting).public) !== null && _e !== void 0 ? _e : (_k.public = await (0, prompt_1.input)({
+            message: "What do you want to use as your public directory?",
+            default: "public",
+        }));
+        (_f = (_l = setup.featureInfo.hosting).spa) !== null && _f !== void 0 ? _f : (_l.spa = await (0, prompt_1.confirm)("Configure as a single-page app (rewrite all urls to /index.html)?"));
+    }
+    if (await (0, prompt_1.confirm)("Set up automatic builds and deploys with GitHub?")) {
+        return (0, github_1.initGitHub)(setup);
+    }
+}
+exports.askQuestions = askQuestions;
+async function actuate(setup, config, options) {
+    var _a;
+    const hostingInfo = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.hosting;
+    if (!hostingInfo) {
+        throw new error_1.FirebaseError("Could not find hosting info in setup.featureInfo.hosting. This should not happen.", { exit: 2 });
+    }
+    if (hostingInfo.newSiteId && setup.projectId) {
+        await (0, api_1.createSite)(setup.projectId, hostingInfo.newSiteId);
+        logger_1.logger.info();
+        (0, utils_1.logSuccess)(`Firebase Hosting site ${hostingInfo.newSiteId} created!`);
+        logger_1.logger.info();
+    }
+    if (hostingInfo.webFramework) {
+        if (!hostingInfo.useDiscoveredFramework) {
+            if (hostingInfo.source && (0, node_fs_1.existsSync)(hostingInfo.source)) {
+                (0, node_fs_1.rmSync)(hostingInfo.source, { recursive: true });
+            }
+            await frameworks_1.WebFrameworks[hostingInfo.webFramework].init(setup, config);
+        }
         setup.config.hosting = {
-            public: setup.hosting.public,
+            source: hostingInfo.source,
             ignore: DEFAULT_IGNORES,
+            frameworksBackend: {
+                region: hostingInfo.region,
+            },
         };
     }
-    setup.hosting.github =
-        setup.hosting.github || (await (0, prompt_1.confirm)("Set up automatic builds and deploys with GitHub?"));
-    if (!setup.hosting.useWebFrameworks) {
-        if (setup.hosting.spa) {
+    else {
+        setup.config.hosting = {
+            public: hostingInfo.public,
+            ignore: DEFAULT_IGNORES,
+        };
+        if (hostingInfo.spa) {
             setup.config.hosting.rewrites = [{ source: "**", destination: "/index.html" }];
         }
         else {
-            await config.askWriteProjectFile(`${setup.hosting.public}/404.html`, MISSING_TEMPLATE);
+            await config.askWriteProjectFile(`${hostingInfo.public}/404.html`, MISSING_TEMPLATE, !!options.force);
         }
         const c = new apiv2_1.Client({ urlPrefix: "https://www.gstatic.com", auth: false });
         const response = await c.get("/firebasejs/releases.json");
-        await config.askWriteProjectFile(`${setup.hosting.public}/index.html`, INDEX_TEMPLATE.replace(/{{VERSION}}/g, response.body.current.version));
-    }
-    if (setup.hosting.github) {
-        return (0, github_1.initGitHub)(setup);
+        await config.askWriteProjectFile(`${hostingInfo.public}/index.html`, INDEX_TEMPLATE.replace(/{{VERSION}}/g, response.body.current.version), !!options.force);
     }
 }
-exports.doSetup = doSetup;
+exports.actuate = actuate;

package/lib/init/features/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aiLogicActuate = exports.aiLogicAskQuestions = exports.aitools = exports.apptestingAcutate = exports.apptestingAskQuestions = exports.genkit = exports.apphosting = exports.dataconnectSdkActuate = exports.dataconnectSdkAskQuestions = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storageActuate = exports.storageAskQuestions = exports.hosting = exports.functions = exports.firestoreActuate = exports.firestoreAskQuestions = exports.databaseActuate = exports.databaseAskQuestions = exports.account = void 0;
+exports.aiLogicActuate = exports.aiLogicAskQuestions = exports.aitools = exports.apptestingAcutate = exports.apptestingAskQuestions = exports.genkit = exports.apphosting = exports.dataconnectSdkActuate = exports.dataconnectSdkAskQuestions = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storageActuate = exports.storageAskQuestions = exports.hostingActuate = exports.hostingAskQuestions = exports.functions = exports.firestoreActuate = exports.firestoreAskQuestions = exports.databaseActuate = exports.databaseAskQuestions = exports.account = void 0;
 var account_1 = require("./account");
 Object.defineProperty(exports, "account", { enumerable: true, get: function () { return account_1.doSetup; } });
 var database_1 = require("./database");
@@ -12,7 +12,8 @@ Object.defineProperty(exports, "firestoreActuate", { enumerable: true, get: func
 var functions_1 = require("./functions");
 Object.defineProperty(exports, "functions", { enumerable: true, get: function () { return functions_1.doSetup; } });
 var hosting_1 = require("./hosting");
-Object.defineProperty(exports, "hosting", { enumerable: true, get: function () { return hosting_1.doSetup; } });
+Object.defineProperty(exports, "hostingAskQuestions", { enumerable: true, get: function () { return hosting_1.askQuestions; } });
+Object.defineProperty(exports, "hostingActuate", { enumerable: true, get: function () { return hosting_1.actuate; } });
 var storage_1 = require("./storage");
 Object.defineProperty(exports, "storageAskQuestions", { enumerable: true, get: function () { return storage_1.askQuestions; } });
 Object.defineProperty(exports, "storageActuate", { enumerable: true, get: function () { return storage_1.actuate; } });

package/lib/init/index.js

@@ -30,7 +30,11 @@ const featuresList = [
         actuate: features.dataconnectSdkActuate,
     },
     { name: "functions", doSetup: features.functions },
-    { name: "hosting", doSetup: features.hosting },
+    {
+        name: "hosting",
+        askQuestions: features.hostingAskQuestions,
+        actuate: features.hostingActuate,
+    },
     {
         name: "storage",
         askQuestions: features.storageAskQuestions,

package/lib/mcp/resources/guides/init_backend.js

@@ -7,7 +7,7 @@ exports.init_backend = (0, resource_1.resource)({
     name: "backend_init_guide",
     title: "Firebase Backend Init Guide",
     description: "guides the coding agent through configuring Firebase backend services in the current project",
-}, async (uri) => {
+}, async (uri, ctx) => {
     return {
         contents: [
             {
@@ -24,31 +24,8 @@ The user will likely need to setup Firestore, Authentication, and Hosting. Read
  3. [Firestore Rules](firebase://guides/init/firestore_rules): read this to setup the \`firestore.rules\` file for securing your database
  4. [Hosting](firebase://guides/init/hosting): read this if the user would like to deploy to Firebase Hosting
 
-**firebase.json**
-The firebase.json file is used to deploy Firebase products with the firebase deploy command.
-
-Here is an example firebase.json file with Firebase Hosting, Firestore, and Cloud Functions. Note that you do not need entries for services that the user isn't using. Do not remove sections from the user's firebase.json unless the user gives explicit permission. For more information, refer to [firebase.json file documentation](https://firebase.google.com/docs/cli/#the_firebasejson_file)
-\`\`\`json
-{
-  "hosting": {
-    "public": "public",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ]
-  },
-  "firestore": {
-      "rules": "firestore.rules",
-      "indexes": "firestore.indexes.json"
-  },
-  "functions": {
-    "predeploy": [
-      "npm --prefix "$RESOURCE_DIR" run lint",
-      "npm --prefix "$RESOURCE_DIR" run build"
-    ]
-  }
-}
+Once you are done setting up, ask the user if they would like to deploy.
+If they say yes, run the command '${ctx.firebaseCliCommand} deploy --non-interactive' to do so.
 \`\`\`
 `.trim(),
             },

package/lib/mcp/resources/guides/init_hosting.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init_hosting = void 0;
+const getDefaultHostingSite_1 = require("../../../getDefaultHostingSite");
 const resource_1 = require("../../resource");
 exports.init_hosting = (0, resource_1.resource)({
     uri: "firebase://guides/init/hosting",
     name: "hosting_init_guide",
     title: "Firebase Hosting Deployment Guide",
     description: "guides the coding agent through deploying to Firebase Hosting in the current project",
-}, async (uri) => {
+}, async (uri, ctx) => {
+    const defaultHostingSite = await (0, getDefaultHostingSite_1.getDefaultHostingSite)(ctx);
     return {
         contents: [
             {
@@ -15,18 +17,21 @@ exports.init_hosting = (0, resource_1.resource)({
                 type: "text",
                 text: `
 ### Configure Firebase Hosting
+Default hosting site for ${ctx.projectId}: ${defaultHostingSite || "Does not exist"}
+If there is not a default hosting site configured, ask the user what the site ID should be, and suggest ${ctx.projectId} as a good choice.
+Next, use the 'firebase_init' tool to set up hosting. Below is an example of what the arguments to do so look like;
+however, you should change the values to match the user's choices and project structure:
+{
+  features: {
+    hosting: {
+      site_id: ${ctx.projectId},
+      public_directory: public,
+    }
+  }
+}
 
 **Security Warning:**
 - Files included in the public folder of a hosting site are publicly accessible. Do not include sensitive API keys for services other than Firebase in these files.
-
-**When to Deploy:**
-- Introduce Firebase Hosting when developers are ready to deploy their application to production. 
-- Alternative: Developers can deploy later using the \`/firebase:deploy\` command.
-
-**Deployment Process:**
-- Request developer's permission before implementing Firebase Hosting
-- Request developer's permission before deploying Firebase Hosting app to production. 
-- Configure Firebase Hosting and deploy the application to production
 `.trim(),
             },
         ],

package/lib/mcp/tools/core/init.js

@@ -115,6 +115,25 @@ exports.init = (0, tool_1.tool)("core", {
             })
                 .optional()
                 .describe("Enable Firebase AI Logic feature for existing app"),
+            hosting: zod_1.z
+                .object({
+                site_id: zod_1.z
+                    .string()
+                    .optional()
+                    .describe("The ID of the hosting site to configure. If omitted and there is a default hosting site, that will be used."),
+                public_directory: zod_1.z
+                    .string()
+                    .optional()
+                    .default("public")
+                    .describe("The directory containing public files that will be served. If using a build tool, this likely should be the output directory of that tool."),
+                single_page_app: zod_1.z
+                    .boolean()
+                    .optional()
+                    .default(false)
+                    .describe("Configure as a single-page app."),
+            })
+                .optional()
+                .describe("Provide this object to initialize Firebase Hosting in this project directory."),
         }),
     }),
     annotations: {
@@ -185,6 +204,14 @@ exports.init = (0, tool_1.tool)("core", {
             displayName: appData.displayName,
         };
     }
+    if (features.hosting) {
+        featuresList.push("hosting");
+        featureInfo.hosting = {
+            newSiteId: features.hosting.site_id,
+            public: features.hosting.public_directory,
+            spa: features.hosting.single_page_app,
+        };
+    }
     const setup = {
         config: config === null || config === void 0 ? void 0 : config.src,
         rcfile: rc === null || rc === void 0 ? void 0 : rc.data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "14.21.0",
+  "version": "14.22.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {