firebase-tools 14.21.0 → 14.23.0

package/lib/emulator/downloadableEmulatorInfo.json

@@ -44,38 +44,38 @@
         }
     },
     "pubsub": {
-        "version": "0.8.14",
-        "expectedSize": 66786933,
-        "expectedChecksum": "a9025b3e53fdeafd2969ccb3ba1e1d38",
-        "expectedChecksumSHA256": "4fbeefd8ecb32b10e5ab522e5d8748e0c2b13891c471c0c327c04632dcc75a8d",
-        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.14.zip",
-        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.14.zip",
-        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.14/pubsub-emulator/bin/cloud-pubsub-emulator"
+        "version": "0.8.17",
+        "expectedSize": 65162324,
+        "expectedChecksum": "a88ec6424e49af459b5c8a3657d69c06",
+        "expectedChecksumSHA256": "72a49d14ee6cd4c1a0fee4a46f520fe4d7465396a155c61abc0103905047edd3",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.17.zip",
+        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.17.zip",
+        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.17/pubsub-emulator/bin/cloud-pubsub-emulator"
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.15.1",
-            "expectedSize": 29946720,
-            "expectedChecksum": "cc8d5dd053cc71adad0f640ac2627018",
-            "expectedChecksumSHA256": "a3749396507678bc546987ef047a9d0c25145064503a9adc777229f1bc9b8c6f",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.15.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.1"
+            "version": "2.16.0",
+            "expectedSize": 29963104,
+            "expectedChecksum": "ee4d81abfba3576c7c6c8082313acfd0",
+            "expectedChecksumSHA256": "8aed1dc6cc8c35ab23fdf10e519e9cf3d93c8a0ccb0ff7d5af3ddc41a4847e3e",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.16.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.16.0"
         },
         "win32": {
-            "version": "2.15.1",
-            "expectedSize": 30440960,
-            "expectedChecksum": "57390c392101a13952ff2aea74b62787",
-            "expectedChecksumSHA256": "905a9ab2200189dc31f23b5454d21803b0c672442f0ee4bb7db8286d159a86e0",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.15.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.1.exe"
+            "version": "2.16.0",
+            "expectedSize": 30456320,
+            "expectedChecksum": "546019a713be28620a3b43d49fc9d4b0",
+            "expectedChecksumSHA256": "ec1de720e173f0a613fbbb51767c0288121aa2f80e45e6bad0f3d2aff12689ec",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.16.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.16.0.exe"
         },
         "linux": {
-            "version": "2.15.1",
-            "expectedSize": 29868216,
-            "expectedChecksum": "cc6ef676d8c5c3a3f74c0bf037083cf0",
-            "expectedChecksumSHA256": "1dfe085c467637ebf6a71cc6c8e8bc11fac85202056b960633607627bd647a6d",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.15.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.1"
+            "version": "2.16.0",
+            "expectedSize": 29888696,
+            "expectedChecksum": "5ab8da956043a48b43199f07b94ac48c",
+            "expectedChecksumSHA256": "1a420f3d2672627eae2d9b0b6747b833517cfc08f7e80ae3a79389788691b67a",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.16.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.16.0"
         }
     }
 }

package/lib/emulator/functionsEmulatorRuntime.js

@@ -240,6 +240,10 @@ function initializeNetworkFiltering() {
 }
 async function initializeFirebaseFunctionsStubs() {
     const firebaseFunctionsResolution = await assertResolveDeveloperNodeModule("firebase-functions");
+    if ((0, functionsEmulatorUtils_1.compareVersionStrings)(firebaseFunctionsResolution.version, "7.0.0") >= 0) {
+        logDebug("Detected firebase-functions v7+, skipping legacy stubs.");
+        return;
+    }
     const firebaseFunctionsRoot = (0, functionsEmulatorShared_1.findModuleRoot)("firebase-functions", firebaseFunctionsResolution.resolution);
     const httpsProviderResolution = path.join(firebaseFunctionsRoot, "lib/providers/https");
     const httpsProviderV1Resolution = path.join(firebaseFunctionsRoot, "lib/v1/providers/https");
@@ -451,6 +455,10 @@ function warnAboutStorageProd() {
 }
 async function initializeFunctionsConfigHelper() {
     const functionsResolution = await assertResolveDeveloperNodeModule("firebase-functions");
+    if ((0, functionsEmulatorUtils_1.compareVersionStrings)(functionsResolution.version, "7.0.0") >= 0) {
+        logDebug("Detected firebase-functions v7+, skipping config helper.");
+        return;
+    }
     const localFunctionsModule = require(functionsResolution.resolution);
     logDebug("Checked functions.config()", {
         config: localFunctionsModule.config(),

package/lib/emulator/taskQueue.js

@@ -4,6 +4,7 @@ exports.TaskQueue = exports.TaskStatus = exports.Queue = void 0;
 const abort_controller_1 = require("abort-controller");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_1 = require("./types");
+const error_1 = require("../error");
 const node_fetch_1 = require("node-fetch");
 class Node {
     constructor(data) {
@@ -198,6 +199,10 @@ class TaskQueue {
             }
             const controller = new abort_controller_1.default();
             const signal = controller.signal;
+            signal.reason = "";
+            signal.throwIfAborted = () => {
+                throw new error_1.FirebaseError("Aborted");
+            };
             const request = (0, node_fetch_1.default)(emulatedTask.task.httpRequest.url, {
                 method: "POST",
                 headers: headers,

package/lib/experiments.js

@@ -118,12 +118,6 @@ exports.ALL_EXPERIMENTS = experiments({
         shortDescription: "Adds experimental App Testing feature",
         public: true,
     },
-    ailogic: {
-        shortDescription: "Enable Firebase AI Logic feature for existing apps",
-        fullDescription: "Enables the AI Logic initialization feature that provisions AI Logic for existing Firebase apps.",
-        public: true,
-        default: false,
-    },
 });
 function isValidExperiment(name) {
     return Object.keys(exports.ALL_EXPERIMENTS).includes(name);

package/lib/firestore/api.js

@@ -22,16 +22,34 @@ class FirestoreApi {
         this.printer = new pretty_print_1.PrettyPrint();
     }
     static processIndex(index) {
-        var _a, _b, _c;
-        const fields = index.fields;
+        var _a;
+        let fields = index.fields;
+        const suffixOrder = FirestoreApi.lastIndexFieldOrder(fields);
+        const nameSuffix = { fieldPath: "__name__", order: suffixOrder };
         const lastField = (_a = index.fields) === null || _a === void 0 ? void 0 : _a[index.fields.length - 1];
+        if (lastField.vectorConfig) {
+            const vectorField = lastField;
+            fields = fields.slice(0, -1);
+            if (fields.length === 0 || (fields === null || fields === void 0 ? void 0 : fields[fields.length - 1].fieldPath) !== "__name__") {
+                fields.push(nameSuffix);
+            }
+            fields.push(vectorField);
+            return Object.assign(Object.assign({}, index), { fields });
+        }
         if ((lastField === null || lastField === void 0 ? void 0 : lastField.fieldPath) !== "__name__") {
-            const defaultDirection = (_c = (_b = index.fields) === null || _b === void 0 ? void 0 : _b[index.fields.length - 1]) === null || _c === void 0 ? void 0 : _c.order;
-            const nameSuffix = { fieldPath: "__name__", order: defaultDirection };
             fields.push(nameSuffix);
         }
         return Object.assign(Object.assign({}, index), { fields });
     }
+    static lastIndexFieldOrder(fields) {
+        let lastIndexFieldOrder = types.Order.ASCENDING;
+        for (const field of fields) {
+            if (field.order) {
+                lastIndexFieldOrder = field.order;
+            }
+        }
+        return lastIndexFieldOrder;
+    }
     async deploy(options, indexes, fieldOverrides, databaseId = "(default)") {
         var _a;
         const spec = this.upgradeOldSpec({

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/github.js

@@ -29,11 +29,11 @@ const HOSTING_GITHUB_ACTION_NAME = "FirebaseExtended/action-hosting-deploy@v0";
 const SERVICE_ACCOUNT_MAX_KEY_NUMBER = 10;
 const githubApiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.githubApiOrigin)(), auth: false });
 async function initGitHub(setup) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (!setup.projectId) {
         return (0, utils_1.reject)("Could not determine Project ID, can't set up GitHub workflow.", { exit: 1 });
     }
-    if (!setup.config.hosting) {
+    if (!setup.config.hosting && !((_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.hosting)) {
         return (0, utils_1.reject)(`Didn't find a Hosting config in firebase.json. Run ${(0, colorette_1.bold)("firebase init hosting")} instead.`);
     }
     logger_1.logger.info();
@@ -67,10 +67,10 @@ async function initGitHub(setup) {
     (0, utils_1.logSuccess)(`Uploaded service account JSON to GitHub as secret ${(0, colorette_1.bold)(githubSecretName)}.`);
     (0, utils_1.logBullet)(`You can manage your secrets at https://github.com/${repo}/settings/secrets.`);
     logger_1.logger.info();
-    if (!Array.isArray(setup.config.hosting) && setup.config.hosting.predeploy) {
+    if (!Array.isArray(setup.config.hosting) && ((_b = setup.config.hosting) === null || _b === void 0 ? void 0 : _b.predeploy)) {
         (0, utils_1.logBullet)(`You have a predeploy script configured in firebase.json.`);
     }
-    const { script } = await promptForBuildScript((_a = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _a === void 0 ? void 0 : _a.useWebFrameworks);
+    const { script } = await promptForBuildScript((_c = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _c === void 0 ? void 0 : _c.useWebFrameworks);
     const ymlDeployDoc = loadYMLDeploy();
     let shouldWriteYMLHostingFile = true;
     let shouldWriteYMLDeployFile = false;
@@ -81,7 +81,7 @@ async function initGitHub(setup) {
         shouldWriteYMLHostingFile = overwrite;
     }
     if (shouldWriteYMLHostingFile) {
-        writeChannelActionYMLFile(YML_FULL_PATH_PULL_REQUEST, githubSecretName, setup.projectId, script, (_b = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _b === void 0 ? void 0 : _b.useWebFrameworks, (_c = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _c === void 0 ? void 0 : _c.source);
+        writeChannelActionYMLFile(YML_FULL_PATH_PULL_REQUEST, githubSecretName, setup.projectId, script, (_d = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _d === void 0 ? void 0 : _d.useWebFrameworks, (_e = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _e === void 0 ? void 0 : _e.source);
         logger_1.logger.info();
         (0, utils_1.logSuccess)(`Created workflow file ${(0, colorette_1.bold)(YML_FULL_PATH_PULL_REQUEST)}`);
     }
@@ -101,7 +101,7 @@ async function initGitHub(setup) {
             shouldWriteYMLDeployFile = true;
         }
         if (shouldWriteYMLDeployFile) {
-            writeDeployToProdActionYMLFile(YML_FULL_PATH_MERGE, branch, githubSecretName, setup.projectId, script, (_d = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _d === void 0 ? void 0 : _d.useWebFrameworks, (_e = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _e === void 0 ? void 0 : _e.source);
+            writeDeployToProdActionYMLFile(YML_FULL_PATH_MERGE, branch, githubSecretName, setup.projectId, script, (_f = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _f === void 0 ? void 0 : _f.useWebFrameworks, (_g = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _g === void 0 ? void 0 : _g.source);
             logger_1.logger.info();
             (0, utils_1.logSuccess)(`Created workflow file ${(0, colorette_1.bold)(YML_FULL_PATH_MERGE)}`);
         }

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,95 +36,72 @@ 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?`,
+        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)({
+    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.source !== ".")
-            delete setup.hosting.useDiscoveredFramework;
-        discoveredFramework = await (0, frameworks_1.discover)((0, path_1.join)(config.projectDir, setup.hosting.source));
+        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;
-            (_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?`,
+            (_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;
         }
-        if (setup.hosting.useDiscoveredFramework && discoveredFramework) {
-            setup.hosting.webFramework = discoveredFramework.framework;
-        }
-        else {
-            const choices = [];
-            for (const value in frameworks_1.WebFrameworks) {
-                if (frameworks_1.WebFrameworks[value]) {
-                    const { name, init } = frameworks_1.WebFrameworks[value];
-                    if (init)
-                        choices.push({ name, value });
-                }
+        const choices = [];
+        for (const value in frameworks_1.WebFrameworks) {
+            if (frameworks_1.WebFrameworks[value]) {
+                const { name, init } = frameworks_1.WebFrameworks[value];
+                if (init)
+                    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 ||
-                    (await (0, prompt_1.select)({
-                        message: "Please choose the framework:",
-                        default: defaultChoice,
-                        choices,
-                    }));
-            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 ||
+        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: "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,