firebase-tools 13.29.3 → 13.31.0

package/lib/emulator/dataconnectToolkitController.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataConnectToolkitController = void 0;
+const types_1 = require("./types");
 const error_1 = require("../error");
 const portUtils = require("./portUtils");
 const utils_1 = require("../utils");
 const dataconnectEmulator_1 = require("./dataconnectEmulator");
+const downloadableEmulators_1 = require("./downloadableEmulators");
 const name = "Data Connect Toolkit";
 class DataConnectToolkitController {
     static async start(args) {
@@ -29,6 +31,9 @@ class DataConnectToolkitController {
             throw new error_1.FirebaseError(`Data Connect Toolkit failed to stop with error: ${e}`);
         }
     }
+    static getVersion() {
+        return (0, downloadableEmulators_1.getDownloadDetails)(types_1.Emulators.DATACONNECT).version;
+    }
     static getInfo() {
         return this.instance.getInfo();
     }

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.7.7",
-            expectedSize: 25359104,
-            expectedChecksum: "c5481addc04e14d10538add7aabda183",
+            version: "1.8.0",
+            expectedSize: 25469696,
+            expectedChecksum: "d20a4240b4290a262caff3d0d3a85a4f",
         }
         : process.platform === "win32"
             ? {
-                version: "1.7.7",
-                expectedSize: 25788416,
-                expectedChecksum: "9f7e5b9bcbca47de509fbc26cc1e0fa8",
+                version: "1.8.0",
+                expectedSize: 25903616,
+                expectedChecksum: "dda0350259449493ecc5cc24187ce752",
             }
             : {
-                version: "1.7.7",
-                expectedSize: 25268376,
-                expectedChecksum: "fb239ecf5dcbf87b762d12a3e9dee012",
+                version: "1.8.0",
+                expectedSize: 25383064,
+                expectedChecksum: "54a19e336f4118854c4c2d4eeeccb506",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/extensionsEmulator.js

@@ -6,7 +6,7 @@ const spawn = require("cross-spawn");
 const fs = require("fs-extra");
 const os = require("os");
 const path = require("path");
-const Table = require("cli-table");
+const Table = require("cli-table3");
 const planner = require("../deploy/extensions/planner");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const error_1 = require("../error");
@@ -221,7 +221,7 @@ class ExtensionsEmulator {
                 const enablementUri = await (0, shortenUrl_1.shortenUrl)((0, ensureApiEnabled_1.enableApiURI)(this.args.projectId, apiToWarn.apiName));
                 table.push([
                     apiToWarn.apiName,
-                    apiToWarn.instanceIds,
+                    apiToWarn.instanceIds.join(", "),
                     apiToWarn.enabled ? "Yes" : "No",
                     apiToWarn.enabled ? "" : clc.bold(clc.underline(enablementUri)),
                 ]);

package/lib/experiments.js

@@ -106,6 +106,12 @@ exports.ALL_EXPERIMENTS = experiments({
         default: true,
         public: false,
     },
+    appsinit: {
+        shortDescription: "Adds experimental `apps:init` command.",
+        fullDescription: "Adds experimental `apps:init` command. When run from an app directory, this command detects the app's platform and configures required files.",
+        default: false,
+        public: true,
+    },
     fdcconnectorevolution: {
         shortDescription: "Enable Data Connect connector evolution warnings.",
         fullDescription: "Enable Data Connect connector evolution warnings.",

package/lib/extensions/change-log.js

@@ -1,17 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseChangelog = exports.getLocalChangelog = exports.breakingChangesInUpdate = exports.displayReleaseNotes = exports.getReleaseNotesForUpdate = void 0;
-const clc = require("colorette");
+exports.parseChangelog = exports.getLocalChangelog = exports.breakingChangesInUpdate = exports.getReleaseNotesForUpdate = void 0;
 const marked_1 = require("marked");
 const path = require("path");
 const semver = require("semver");
 const marked_terminal_1 = require("marked-terminal");
-const Table = require("cli-table");
 const extensionsApi_1 = require("./extensionsApi");
 const localHelper_1 = require("./localHelper");
-const logger_1 = require("../logger");
 const refs = require("./refs");
-const utils_1 = require("../utils");
 marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const EXTENSIONS_CHANGELOG = "CHANGELOG.md";
 const VERSION_LINE_REGEX = /##.+?(\d+\.\d+\.\d+(?:-((\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?).*/;
@@ -31,26 +27,6 @@ async function getReleaseNotesForUpdate(args) {
     return releaseNotes;
 }
 exports.getReleaseNotesForUpdate = getReleaseNotesForUpdate;
-function displayReleaseNotes(releaseNotes, fromVersion) {
-    const versions = [fromVersion].concat(Object.keys(releaseNotes));
-    const breakingVersions = breakingChangesInUpdate(versions);
-    const table = new Table({ head: ["Version", "What's New"], style: { head: ["yellow", "bold"] } });
-    for (const [version, note] of Object.entries(releaseNotes)) {
-        if (breakingVersions.includes(version)) {
-            table.push([clc.yellow(clc.bold(version)), (0, marked_1.marked)(note)]);
-        }
-        else {
-            table.push([version, (0, marked_1.marked)(note)]);
-        }
-    }
-    logger_1.logger.info(clc.bold("What's new with this update:"));
-    if (breakingVersions.length) {
-        (0, utils_1.logLabeledWarning)("warning", "This is a major version update, which means it may contain breaking changes." +
-            " Read the release notes carefully before continuing with this update.");
-    }
-    logger_1.logger.info(table.toString());
-}
-exports.displayReleaseNotes = displayReleaseNotes;
 function breakingChangesInUpdate(versionsInUpdate) {
     const breakingVersions = [];
     const semvers = versionsInUpdate.map((v) => semver.parse(v)).sort(semver.compare);

package/lib/extensions/listExtensions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listExtensions = void 0;
 const clc = require("colorette");
-const Table = require("cli-table");
+const Table = require("cli-table3");
 const extensionsApi_1 = require("./extensionsApi");
 const logger_1 = require("../logger");
 const utils_1 = require("../utils");

package/lib/extensions/provisioningHelper.js

@@ -97,7 +97,7 @@ async function isStorageProvisioned(projectId) {
     return !!((_b = (_a = resp.body) === null || _a === void 0 ? void 0 : _a.buckets) === null || _b === void 0 ? void 0 : _b.find((bucket) => {
         const bucketResourceName = bucket.name;
         const bucketResourceNameTokens = bucketResourceName.split("/");
-        const pattern = "^" + projectId + "(.[[a-z0-9]+)*.appspot.com$";
+        const pattern = "^" + projectId + "(.[[a-z0-9]+)*.(appspot.com|firebasestorage.app)$";
         return new RegExp(pattern).test(bucketResourceNameTokens[bucketResourceNameTokens.length - 1]);
     }));
 }

package/lib/firestore/pretty-print.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrettyPrint = void 0;
 const clc = require("colorette");
-const Table = require("cli-table");
+const Table = require("cli-table3");
 const sort = require("./api-sort");
 const types = require("./api-types");
 const logger_1 = require("../logger");

package/lib/frameworks/angular/index.js

@@ -15,7 +15,7 @@ exports.support = "preview";
 exports.type = 3;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/angular";
 const DEFAULT_BUILD_SCRIPT = ["ng build"];
-exports.supportedRange = "16 - 18";
+exports.supportedRange = "16 - 19";
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
@@ -182,17 +182,22 @@ exports.handle = function(req,res) {
     }
     else if (serverOutputPath) {
         bootstrapScript = `
-    const app = new Promise((resolve) => {
+    const app = new Promise((resolve, reject) => {
       setTimeout(() => {
         const port = process.env.PORT;
         const socket = 'express.sock';
         process.env.PORT = socket;
-        
+
         ${(serverEntry === null || serverEntry === void 0 ? void 0 : serverEntry.endsWith(".mjs"))
             ? `import(\`./${serverOutputPath}/${serverEntry}\`)`
-            : `Promise.resolve(require('./${serverOutputPath}/${serverEntry}'))`}.then(({ app }) => {
-          process.env.PORT = port;
-          resolve(app());
+            : `Promise.resolve(require('./${serverOutputPath}/${serverEntry}'))`}.then(({ default: defHandler, reqHandler, app }) => {
+          const handler = app?.() ?? reqHandler ?? defHandler;
+          if (!handler) {
+            reject(\`The file at "./${serverOutputPath}/${serverEntry}" did not export a valid request handler. Expected exports: 'app', 'default', or 'reqHandler'.\`);
+          } else {
+            process.env.PORT = port;
+            resolve(handler);
+          }
         });
       }, 0);
     });

package/lib/frameworks/utils.js

@@ -123,7 +123,9 @@ function simpleProxy(hostOrRequestHandler) {
             });
         }
         else {
-            const proxiedRes = proxyResponse(originalReq, originalRes, next);
+            const proxiedRes = proxyResponse(originalReq, originalRes, () => {
+                void hostOrRequestHandler(originalReq, originalRes, next);
+            });
             await hostOrRequestHandler(originalReq, proxiedRes, next);
         }
     };

package/lib/functions/secrets.js

@@ -16,7 +16,7 @@ const functional_1 = require("../functional");
 const secretManager_2 = require("../gcp/secretManager");
 const secretManager_3 = require("../gcp/secretManager");
 const projectUtils_1 = require("../projectUtils");
-const Table = require("cli-table");
+const Table = require("cli-table3");
 const gcfV1PollerOptions = {
     apiOrigin: (0, api_1.functionsOrigin)(),
     apiVersion: "v1",

package/lib/gcp/cloudfunctionsv2.js

@@ -259,6 +259,9 @@ function functionFromEndpoint(endpoint) {
     }
     else if (backend.isCallableTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
+        if (endpoint.callableTrigger.genkitAction) {
+            gcfFunction.labels["genkit-action"] = "true";
+        }
     }
     else if (backend.isBlockingTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.BLOCKING_LABEL]: constants_1.BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType] });

package/lib/gcp/cloudsql/interactive.js

@@ -5,7 +5,7 @@ const ora = require("ora");
 const clc = require("colorette");
 const logger_1 = require("../../logger");
 const prompt_1 = require("../../prompt");
-const Table = require("cli-table");
+const Table = require("cli-table3");
 const destructiveSqlKeywords = ["DROP", "DELETE"];
 function checkIsDestructiveSql(query) {
     const upperCaseQuery = query.toUpperCase();

package/lib/init/features/dataconnect/sdk.js

@@ -75,13 +75,30 @@ async function askQuestions(setup, config) {
         choices: connectorChoices,
     });
     const connectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
-    const newConnectorYaml = generateSdkYaml(targetPlatform, connectorYaml, connectorInfo.directory, appDir);
+    const newConnectorYaml = await generateSdkYaml(targetPlatform, connectorYaml, connectorInfo.directory, appDir);
+    if (targetPlatform === types_1.Platform.WEB) {
+        const unusedFrameworks = fileUtils_1.SUPPORTED_FRAMEWORKS.filter((framework) => { var _a; return (_a = newConnectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk[framework]; });
+        if (unusedFrameworks.length > 0) {
+            const additionalFrameworks = await (0, prompt_1.prompt)(setup, [
+                {
+                    type: "checkbox",
+                    name: "features",
+                    message: "Which framework would you like to generate SDKs for? " +
+                        "Press Space to select features, then Enter to confirm your choices.",
+                    choices: unusedFrameworks,
+                },
+            ]);
+            for (const framework of additionalFrameworks.features) {
+                newConnectorYaml.generate.javascriptSdk[framework] = true;
+            }
+        }
+    }
     const connectorYamlContents = yaml.stringify(newConnectorYaml);
     connectorInfo.connectorYaml = newConnectorYaml;
     const displayIOSWarning = targetPlatform === types_1.Platform.IOS;
     return { connectorYamlContents, connectorInfo, displayIOSWarning };
 }
-function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appDir) {
+async function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appDir) {
     if (!connectorYaml.generate) {
         connectorYaml.generate = {};
     }
@@ -94,11 +111,19 @@ function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appDir) {
     }
     if (targetPlatform === types_1.Platform.WEB) {
         const pkg = `${connectorYaml.connectorId}-connector`;
+        const packageJsonDir = path.relative(connectorDir, appDir);
         const javascriptSdk = {
             outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/js/${pkg}`)),
             package: `@firebasegen/${pkg}`,
-            packageJsonDir: path.relative(connectorDir, appDir),
+            packageJsonDir,
         };
+        const packageJson = await (0, fileUtils_1.resolvePackageJson)(appDir);
+        if (packageJson) {
+            const frameworksUsed = (0, fileUtils_1.getFrameworksFromPackageJson)(packageJson);
+            for (const framework of frameworksUsed) {
+                javascriptSdk[framework] = true;
+            }
+        }
         connectorYaml.generate.javascriptSdk = javascriptSdk;
     }
     if (targetPlatform === types_1.Platform.FLUTTER) {

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

@@ -14,9 +14,11 @@ const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
 const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
+const UNKNOWN_VERSION_TOO_HIGH = "2.0.0";
+const LATEST_TEMPLATE = "1.0.0";
 async function getGenkitVersion() {
     let genkitVersion;
-    let templateVersion = "0.9.0";
+    let templateVersion = LATEST_TEMPLATE;
     let useInit = false;
     let stopInstall = false;
     if (process.env.GENKIT_DEV_VERSION && typeof process.env.GENKIT_DEV_VERSION === "string") {
@@ -39,7 +41,7 @@ async function getGenkitVersion() {
     if (!genkitVersion) {
         throw new error_1.FirebaseError("Unable to determine genkit version to install");
     }
-    if (semver.gte(genkitVersion, "1.0.0")) {
+    if (semver.gte(genkitVersion, UNKNOWN_VERSION_TOO_HIGH)) {
         const continueInstall = await (0, prompt_1.confirm)({
             message: clc.yellow(`WARNING: The latest version of Genkit (${genkitVersion}) isn't supported by this\n` +
                 "version of firebase-tools. You can proceed, but the provided sample code may\n" +
@@ -51,7 +53,11 @@ async function getGenkitVersion() {
             stopInstall = true;
         }
     }
+    else if (semver.gte(genkitVersion, "1.0.0-rc.1")) {
+        templateVersion = "1.0.0";
+    }
     else if (semver.gte(genkitVersion, "0.6.0")) {
+        templateVersion = "0.9.0";
     }
     else {
         templateVersion = "";
@@ -59,6 +65,12 @@ async function getGenkitVersion() {
     }
     return { genkitVersion, templateVersion, useInit, stopInstall };
 }
+function showStartMessage(config, command) {
+    logger_1.logger.info("\nLogin to Google Cloud using:");
+    logger_1.logger.info(clc.bold(clc.green(`    gcloud auth application-default login --project ${config.options.project}\n`)));
+    logger_1.logger.info("Then start the Genkit developer experience by running:");
+    logger_1.logger.info(clc.bold(clc.green(`    ${command}`)));
+}
 async function doSetup(setup, config, options) {
     var _a;
     const genkitInfo = await getGenkitVersion();
@@ -107,23 +119,19 @@ async function doSetup(setup, config, options) {
             else {
                 await (0, spawn_1.wrapSpawn)("npm", ["install", "-g", `genkit-cli@${genkitInfo.genkitVersion}`], projectDir);
                 await genkitSetup(options, genkitInfo, projectDir);
-                logger_1.logger.info("Start the Genkit developer experience by running:");
-                logger_1.logger.info(`    cd ${setup.functions.source} && npm run genkit:start`);
+                showStartMessage(config, `cd ${setup.functions.source} && npm run genkit:start`);
             }
         }
         else {
             if (genkitInfo.useInit) {
                 await (0, spawn_1.wrapSpawn)("npm", ["install", `genkit@${genkitInfo.genkitVersion}`, "--save-dev"], projectDir);
                 await (0, spawn_1.wrapSpawn)("npx", ["genkit", "init", "-p", "firebase"], projectDir);
-                logger_1.logger.info("Start the Genkit developer experience by running:");
-                logger_1.logger.info(`    cd ${setup.functions.source} && npx genkit start`);
+                showStartMessage(config, `cd ${setup.functions.source} && npx genkit start`);
             }
             else {
                 await (0, spawn_1.wrapSpawn)("npm", ["install", `genkit-cli@${genkitInfo.genkitVersion}`, "--save-dev"], projectDir);
                 await genkitSetup(options, genkitInfo, projectDir);
-                logger_1.logger.info("Start the Genkit developer experience by running:");
-                logger_1.logger.info();
-                logger_1.logger.info(clc.bold(clc.green(`    cd ${setup.functions.source} && npm run genkit:start`)));
+                showStartMessage(config, `cd ${setup.functions.source} && npm run genkit:start`);
             }
         }
     }