firebase-tools 12.4.7 → 12.4.8

package/lib/emulator/functionsEmulatorRuntime.js

@@ -642,22 +642,23 @@ async function main() {
     }
     const app = express();
     app.enable("trust proxy");
+    const bodyParserLimit = "32mb";
     app.use(bodyParser.json({
-        limit: "10mb",
+        limit: bodyParserLimit,
         verify: rawBodySaver,
     }));
     app.use(bodyParser.text({
-        limit: "10mb",
+        limit: bodyParserLimit,
         verify: rawBodySaver,
     }));
     app.use(bodyParser.urlencoded({
         extended: true,
-        limit: "10mb",
+        limit: bodyParserLimit,
         verify: rawBodySaver,
     }));
     app.use(bodyParser.raw({
         type: "*/*",
-        limit: "10mb",
+        limit: bodyParserLimit,
         verify: rawBodySaver,
     }));
     app.get("/__/health", (req, res) => {

package/lib/frameworks/astro/index.js

@@ -10,14 +10,10 @@ const utils_2 = require("./utils");
 exports.name = "Astro";
 exports.support = "experimental";
 exports.type = 2;
-function getAstroVersion(cwd) {
-    var _a;
-    return (_a = (0, utils_1.findDependency)("astro", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
-}
 async function discover(dir) {
     if (!(0, fs_extra_1.existsSync)((0, path_1.join)(dir, "package.json")))
         return;
-    if (!getAstroVersion(dir))
+    if (!(0, utils_2.getAstroVersion)(dir))
         return;
     const { output, publicDir: publicDirectory } = await (0, utils_2.getConfig)(dir);
     return {

package/lib/frameworks/astro/utils.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfig = exports.getBootstrapScript = void 0;
+exports.getAstroVersion = exports.getConfig = exports.getBootstrapScript = void 0;
 const path_1 = require("path");
+const utils_1 = require("../utils");
+const semver_1 = require("semver");
 const { dynamicImport } = require(true && "../../dynamicImport");
 function getBootstrapScript() {
     return `const entry = import('./entry.mjs');\nexport const handle = async (req, res) => (await entry).handler(req, res)`;
@@ -9,9 +11,20 @@ function getBootstrapScript() {
 exports.getBootstrapScript = getBootstrapScript;
 async function getConfig(cwd) {
     const astroDirectory = (0, path_1.dirname)(require.resolve("astro/package.json", { paths: [cwd] }));
-    const { openConfig } = await dynamicImport((0, path_1.join)(astroDirectory, "dist", "core", "config", "config.js"));
-    const logging = undefined;
-    const { astroConfig: config } = await openConfig({ cmd: "build", cwd, logging });
+    const version = getAstroVersion(cwd);
+    let config;
+    const configPath = (0, path_1.join)(astroDirectory, "dist", "core", "config", "config.js");
+    if ((0, semver_1.gte)(version, "2.9.7")) {
+        const { resolveConfig } = await dynamicImport(configPath);
+        const { astroConfig } = await resolveConfig({ root: cwd }, "build");
+        config = astroConfig;
+    }
+    else {
+        const { openConfig } = await dynamicImport(configPath);
+        const logging = undefined;
+        const { astroConfig } = await openConfig({ cmd: "build", cwd, logging });
+        config = astroConfig;
+    }
     return {
         outDir: (0, path_1.relative)(cwd, config.outDir.pathname),
         publicDir: (0, path_1.relative)(cwd, config.publicDir.pathname),
@@ -20,3 +33,8 @@ async function getConfig(cwd) {
     };
 }
 exports.getConfig = getConfig;
+function getAstroVersion(cwd) {
+    var _a;
+    return (_a = (0, utils_1.findDependency)("astro", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
+}
+exports.getAstroVersion = getAstroVersion;

package/lib/frameworks/next/index.js

@@ -29,6 +29,7 @@ exports.name = "Next.js";
 exports.support = "preview";
 exports.type = 2;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/nextjs";
+const BUNDLE_NEXT_CONFIG_TIMEOUT = 60000;
 const DEFAULT_NUMBER_OF_REASONS_TO_LIST = 5;
 function getReactVersion(cwd) {
     var _a;
@@ -297,7 +298,6 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
     }));
 }
 exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
-const BUNDLE_NEXT_CONFIG_TIMEOUT = 10000;
 async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
     const { distDir } = await getConfig(sourceDir);
     const packageJson = await (0, utils_1.readJSON)((0, path_1.join)(sourceDir, "package.json"));

package/lib/gcp/frameworks.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBuild = exports.createStack = exports.API_VERSION = void 0;
+exports.createBuild = exports.getStack = exports.createStack = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
-exports.API_VERSION = "v2";
+exports.API_VERSION = "v1alpha";
 const client = new apiv2_1.Client({
     urlPrefix: api_1.frameworksOrigin,
     auth: true,
@@ -15,6 +15,12 @@ async function createStack(projectId, location, stackInput) {
     return res.body;
 }
 exports.createStack = createStack;
+async function getStack(projectId, location, stackId) {
+    const name = `projects/${projectId}/locations/${location}/stacks/${stackId}`;
+    const res = await client.get(name);
+    return res.body;
+}
+exports.getStack = getStack;
 async function createBuild(projectId, location, stackId, buildInput) {
     const buildId = buildInput.name;
     const res = await client.post(`projects/${projectId}/locations/${location}/stacks/${stackId}/builds`, buildInput, { queryParams: { buildId } });

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStack = exports.doSetup = void 0;
+exports.createStack = exports.getOrCreateStack = exports.doSetup = void 0;
 const clc = require("colorette");
 const utils = require("../../../utils");
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const constants_1 = require("./constants");
-const repo_1 = require("./repo");
+const repo = require("./repo");
 const poller = require("../../../operation-poller");
 const api_1 = require("../../../api");
 const gcp = require("../../../gcp/frameworks");
 const frameworks_1 = require("../../../gcp/frameworks");
+const error_1 = require("../../../error");
 const frameworksPollerOptions = {
     apiOrigin: api_1.frameworksOrigin,
     apiVersion: frameworks_1.API_VERSION,
@@ -26,7 +27,7 @@ async function doSetup(setup) {
         name: "serviceName",
         type: "input",
         default: "acme-inc-web",
-        message: "Create a name for your service [6-32 characters]",
+        message: "Create a name for your service [1-30 characters]",
     }, setup.frameworks);
     await (0, prompt_1.promptOnce)({
         name: "region",
@@ -45,19 +46,62 @@ async function doSetup(setup) {
         message: "How do you want to deploy",
         choices: constants_1.ALLOWED_DEPLOY_METHODS,
     }, setup.frameworks);
-    if (setup.frameworks.deployMethod === "github") {
-        const cloudBuildConnRepo = await (0, repo_1.linkGitHubRepository)(projectId, setup.frameworks.region, setup.frameworks.serviceName);
-        toStack(cloudBuildConnRepo, setup.frameworks.serviceName);
-    }
+    await getOrCreateStack(projectId, setup);
 }
 exports.doSetup = doSetup;
 function toStack(cloudBuildConnRepo, stackId) {
     return {
         name: stackId,
-        codebase: { repository: cloudBuildConnRepo.name, rootDirectory: "/" },
         labels: {},
     };
 }
+async function getOrCreateStack(projectId, setup) {
+    const location = setup.frameworks.region;
+    const deployMethod = setup.frameworks.deployMethod;
+    try {
+        return await getExistingStack(projectId, setup, location);
+    }
+    catch (err) {
+        if (err.status === 404) {
+            logger_1.logger.info("Creating new stack.");
+            if (deployMethod === "github") {
+                const cloudBuildConnRepo = await repo.linkGitHubRepository(projectId, location, setup.frameworks.serviceName);
+                const stackDetails = toStack(cloudBuildConnRepo, setup.frameworks.serviceName);
+                return await createStack(projectId, location, stackDetails);
+            }
+        }
+        else {
+            throw new error_1.FirebaseError(`Failed to get or create a stack using the given initialization details: ${err}`);
+        }
+    }
+    return undefined;
+}
+exports.getOrCreateStack = getOrCreateStack;
+async function getExistingStack(projectId, setup, location) {
+    let stack = await gcp.getStack(projectId, location, setup.frameworks.serviceName);
+    while (stack) {
+        setup.frameworks.serviceName = undefined;
+        await (0, prompt_1.promptOnce)({
+            name: "existingStack",
+            type: "confirm",
+            default: true,
+            message: "A stack already exists for the given serviceName, do you want to use existing stack? (yes/no)",
+        }, setup.frameworks);
+        if (setup.frameworks.existingStack) {
+            logger_1.logger.info("Using the existing stack.");
+            return stack;
+        }
+        await (0, prompt_1.promptOnce)({
+            name: "serviceName",
+            type: "input",
+            default: "acme-inc-web",
+            message: "Please enter a new service name [1-30 characters]",
+        }, setup.frameworks);
+        stack = await gcp.getStack(projectId, location, setup.frameworks.serviceName);
+        setup.frameworks.existingStack = undefined;
+    }
+    return stack;
+}
 async function createStack(projectId, location, stackInput) {
     const op = await gcp.createStack(projectId, location, stackInput);
     const stack = await poller.pollOperation(Object.assign(Object.assign({}, frameworksPollerOptions), { pollerName: `create-${projectId}-${location}-${stackInput.name}`, operationResourceName: op.name }));

package/lib/init/features/frameworks/repo.js

@@ -32,7 +32,7 @@ async function linkGitHubRepository(projectId, location, stackId) {
         await utils.openInBrowser("https://github.com/apps/google-cloud-build/installations/new");
         await (0, prompt_1.promptOnce)({
             type: "input",
-            message: "Press any key once you have finished configuring your installation's access settings.",
+            message: "Press ENTER once you have finished configuring your installation's access settings.",
         });
         remoteUri = await promptRepositoryURI(projectId, location, connectionId);
     }

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
 const _ = require("lodash");
 const url = require("url");
 const clc = require("colorette");
@@ -367,6 +367,10 @@ function isCloudEnvironment() {
     return !!process.env.CODESPACES || !!process.env.GOOGLE_CLOUD_WORKSTATIONS;
 }
 exports.isCloudEnvironment = isCloudEnvironment;
+function isVSCodeExtension() {
+    return !!process.env.VSCODE_CWD;
+}
+exports.isVSCodeExtension = isVSCodeExtension;
 function isRunningInWSL() {
     return !!process.env.WSL_DISTRO_NAME;
 }

package/package.json

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