firebase-tools 14.2.0 → 14.2.1

package/lib/dataconnect/build.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBuildErrors = exports.build = void 0;
 const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
 const error_1 = require("../error");
-const experiments = require("../experiments");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
 const graphqlError_1 = require("./graphqlError");
@@ -12,14 +11,7 @@ async function build(options, configDir, dryRun) {
     var _a, _b;
     const account = (0, auth_1.getProjectDefaultAccount)(options.projectRoot);
     const args = { configDir, account };
-    if (experiments.isEnabled("fdcconnectorevolution") && options.projectId) {
-        const flags = process.env["DATA_CONNECT_PREVIEW"];
-        if (flags) {
-            process.env["DATA_CONNECT_PREVIEW"] = flags + ",conn_evolution";
-        }
-        else {
-            process.env["DATA_CONNECT_PREVIEW"] = "conn_evolution";
-        }
+    if (options.projectId) {
         args.projectId = options.projectId;
     }
     const buildResult = await dataconnectEmulator_1.DataConnectEmulator.build(args);

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "2.2.0",
-            expectedSize: 26538752,
-            expectedChecksum: "15304de22f04e51db155b1c76229e3f3",
+            version: "2.3.1",
+            expectedSize: 27271936,
+            expectedChecksum: "5ffcfe584c5af818477a00eb6450dd66",
         }
         : process.platform === "win32"
             ? {
-                version: "2.2.0",
-                expectedSize: 26982912,
-                expectedChecksum: "a7677c4dfe78275eab7320b1ff777e9e",
+                version: "2.3.1",
+                expectedSize: 27729408,
+                expectedChecksum: "b71f1686724e8e051810b3a2e14c6d08",
             }
             : {
-                version: "2.2.0",
-                expectedSize: 26452120,
-                expectedChecksum: "ef332cc135bc05e43121020e5c1fef09",
+                version: "2.3.1",
+                expectedSize: 27185304,
+                expectedChecksum: "54c40731f4563073404591ef1ffcdc20",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/env.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCredentialsEnvironment = exports.setEnvVarsForEmulators = void 0;
+exports.maybeUsePortForwarding = exports.getCredentialsEnvironment = exports.setEnvVarsForEmulators = void 0;
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
 const defaultCredentials_1 = require("../defaultCredentials");
 function setEnvVarsForEmulators(env, emulators) {
+    maybeUsePortForwarding(emulators);
     for (const emu of emulators) {
         const host = (0, functionsEmulatorShared_1.formatHost)(emu);
         switch (emu.name) {
@@ -59,3 +60,29 @@ async function getCredentialsEnvironment(account, logger, logLabel, silent = fal
     return credentialEnv;
 }
 exports.getCredentialsEnvironment = getCredentialsEnvironment;
+function maybeUsePortForwarding(emulatorInfos) {
+    var _a;
+    const portForwardingHost = process.env.WEB_HOST;
+    if (portForwardingHost) {
+        for (const info of emulatorInfos) {
+            if (info.host.includes(portForwardingHost)) {
+                continue;
+            }
+            const url = `${info.port}-${portForwardingHost}`;
+            info.host = url;
+            info.listen = (_a = info.listen) === null || _a === void 0 ? void 0 : _a.map((l) => {
+                l.address = url;
+                l.port = 443;
+                return l;
+            });
+            info.port = 443;
+            const fsInfo = info;
+            if (fsInfo.webSocketPort) {
+                fsInfo.webSocketHost = `${fsInfo.webSocketPort}-${portForwardingHost}`;
+                fsInfo.webSocketPort = 443;
+            }
+        }
+    }
+    return emulatorInfos;
+}
+exports.maybeUsePortForwarding = maybeUsePortForwarding;

package/lib/emulator/functionsEmulator.js

@@ -912,6 +912,7 @@ class FunctionsEmulator {
         if (this.args.remoteEmulators) {
             emulatorInfos = emulatorInfos.concat(Object.values(this.args.remoteEmulators));
         }
+        (0, env_1.maybeUsePortForwarding)(emulatorInfos);
         (0, env_1.setEnvVarsForEmulators)(envs, emulatorInfos);
         if (this.debugMode) {
             envs["FUNCTION_DEBUG_MODE"] = "true";
@@ -1082,10 +1083,9 @@ class FunctionsEmulator {
         return;
     }
     getEmulatorInfo(emulator) {
-        if (this.args.remoteEmulators) {
-            if (this.args.remoteEmulators[emulator]) {
-                return this.args.remoteEmulators[emulator];
-            }
+        var _a;
+        if ((_a = this.args.remoteEmulators) === null || _a === void 0 ? void 0 : _a[emulator]) {
+            return this.args.remoteEmulators[emulator];
         }
         return registry_1.EmulatorRegistry.getInfo(emulator);
     }

package/lib/emulator/ui.js

@@ -12,6 +12,7 @@ const constants_1 = require("./constants");
 const track_1 = require("../track");
 const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
 const experiments_1 = require("../experiments");
+const env_1 = require("./env");
 class EmulatorUI extends ExpressBasedEmulator_1.ExpressBasedEmulator {
     constructor(args) {
         super({
@@ -35,13 +36,9 @@ class EmulatorUI extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         const downloadDetails = downloadableEmulators.getDownloadDetails(types_1.Emulators.UI);
         const webDir = path.join(downloadDetails.unzipDir, "client");
         app.get("/api/config", this.jsonHandler(() => {
-            const json = Object.assign({ projectId, experiments: [] }, hub.getRunningEmulatorsMapping());
-            if (emulatorGaSession) {
-                json.analytics = emulatorGaSession;
-            }
-            if (enabledExperiments) {
-                json.experiments = enabledExperiments;
-            }
+            const emulatorInfos = hub.getRunningEmulatorsMapping();
+            (0, env_1.maybeUsePortForwarding)(Object.values(emulatorInfos));
+            const json = Object.assign({ projectId, experiments: enabledExperiments !== null && enabledExperiments !== void 0 ? enabledExperiments : [], analytics: emulatorGaSession }, emulatorInfos);
             return Promise.resolve(json);
         }));
         app.use(express.static(webDir));

package/lib/experiments.js

@@ -100,12 +100,6 @@ exports.ALL_EXPERIMENTS = experiments({
         default: false,
         public: true,
     },
-    fdcconnectorevolution: {
-        shortDescription: "Enable Data Connect connector evolution warnings.",
-        fullDescription: "Enable Data Connect connector evolution warnings.",
-        default: true,
-        public: false,
-    },
 });
 function isValidExperiment(name) {
     return Object.keys(exports.ALL_EXPERIMENTS).includes(name);

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

@@ -15,32 +15,43 @@ const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
 const UNKNOWN_VERSION_TOO_HIGH = "2.0.0";
+const MIN_VERSION = "0.6.0";
 const LATEST_TEMPLATE = "1.0.0";
-async function getGenkitVersion() {
-    let genkitVersion;
-    let templateVersion = LATEST_TEMPLATE;
-    let useInit = false;
-    let stopInstall = false;
-    if (process.env.GENKIT_DEV_VERSION && typeof process.env.GENKIT_DEV_VERSION === "string") {
-        semver.parse(process.env.GENKIT_DEV_VERSION);
-        genkitVersion = process.env.GENKIT_DEV_VERSION;
-    }
-    else {
-        try {
-            genkitVersion = await (0, spawn_1.spawnWithOutput)("npm", ["view", "genkit", "version"]);
+async function getPackageVersion(packageName, envVariable) {
+    const envVal = process.env[envVariable];
+    if (envVal && typeof envVal === "string") {
+        if (semver.parse(envVal)) {
+            return envVal;
         }
-        catch (err) {
-            throw new error_1.FirebaseError("Unable to determine which genkit version to install.\n" +
-                `npm Error: ${(0, error_1.getErrMsg)(err)}\n\n` +
-                "For a possible workaround run\n  npm view genkit version\n" +
-                "and then set an environment variable:\n" +
-                "  export GENKIT_DEV_VERSION=<output from previous command>\n" +
-                "and run `firebase init genkit` again");
+        else {
+            throw new error_1.FirebaseError(`Invalid version string '${envVal}' specified in ${envVariable}`);
+        }
+    }
+    try {
+        const output = await (0, spawn_1.spawnWithOutput)("npm", ["view", packageName, "version"]);
+        if (!output) {
+            throw new error_1.FirebaseError(`Unable to determine ${packageName} version to install`);
         }
+        return output;
     }
-    if (!genkitVersion) {
-        throw new error_1.FirebaseError("Unable to determine genkit version to install");
+    catch (err) {
+        throw new error_1.FirebaseError(`Unable to determine which version of ${packageName} to install.\n` +
+            `npm Error: ${(0, error_1.getErrMsg)(err)}\n\n` +
+            "For a possible workaround run\n  npm view " +
+            packageName +
+            " version\n" +
+            "and then set an environment variable:\n" +
+            `  export ${envVariable}=<output from previous command>\n` +
+            "and run `firebase init genkit` again");
     }
+}
+async function getGenkitInfo() {
+    let templateVersion = LATEST_TEMPLATE;
+    let stopInstall = false;
+    const genkitVersion = await getPackageVersion("genkit", "GENKIT_DEV_VERSION");
+    const cliVersion = await getPackageVersion("genkit-cli", "GENKIT_CLI_DEV_VERSION");
+    const vertexVersion = await getPackageVersion("@genkit-ai/vertexai", "GENKIT_VERTEX_VERSION");
+    const googleAiVersion = await getPackageVersion("@genkit-ai/googleai", "GENKIT_GOOGLEAI_VERSION");
     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` +
@@ -56,24 +67,32 @@ async function getGenkitVersion() {
     else if (semver.gte(genkitVersion, "1.0.0-rc.1")) {
         templateVersion = "1.0.0";
     }
-    else if (semver.gte(genkitVersion, "0.6.0")) {
+    else if (semver.gte(genkitVersion, MIN_VERSION)) {
         templateVersion = "0.9.0";
     }
     else {
-        templateVersion = "";
-        useInit = true;
-    }
-    return { genkitVersion, templateVersion, useInit, stopInstall };
+        throw new error_1.FirebaseError(`The requested version of Genkit (${genkitVersion}) is no ` +
+            `longer supported. Please specify a newer version.`);
+    }
+    return {
+        genkitVersion,
+        cliVersion,
+        vertexVersion,
+        googleAiVersion,
+        templateVersion,
+        stopInstall,
+    };
 }
-function showStartMessage(config, command) {
+function showStartMessage(setup, command) {
+    logger_1.logger.info();
     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(clc.bold(clc.green(`    gcloud auth application-default login --project ${setup.projectId || "your-project-id"}\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();
+    const genkitInfo = await getGenkitInfo();
     if (genkitInfo.stopInstall) {
         (0, utils_1.logLabeledWarning)("genkit", "Stopped Genkit initialization");
         return;
@@ -108,31 +127,16 @@ async function doSetup(setup, config, options) {
         },
     ])).choice;
     try {
-        (0, utils_1.logLabeledBullet)("genkit", `Installing Genkit CLI version ${genkitInfo.genkitVersion}`);
+        (0, utils_1.logLabeledBullet)("genkit", `Installing Genkit CLI version ${genkitInfo.cliVersion}`);
         if (installType === "globally") {
-            if (genkitInfo.useInit) {
-                await (0, spawn_1.wrapSpawn)("npm", ["install", "-g", `genkit@${genkitInfo.genkitVersion}`], projectDir);
-                await (0, spawn_1.wrapSpawn)("genkit", ["init", "-p", "firebase"], projectDir);
-                logger_1.logger.info("Start the Genkit developer experience by running:");
-                logger_1.logger.info(`    cd ${setup.functions.source} && genkit start`);
-            }
-            else {
-                await (0, spawn_1.wrapSpawn)("npm", ["install", "-g", `genkit-cli@${genkitInfo.genkitVersion}`], projectDir);
-                await genkitSetup(options, genkitInfo, projectDir);
-                showStartMessage(config, `cd ${setup.functions.source} && npm run genkit:start`);
-            }
+            await (0, spawn_1.wrapSpawn)("npm", ["install", "-g", `genkit-cli@${genkitInfo.cliVersion}`], projectDir);
+            await genkitSetup(options, genkitInfo, projectDir);
+            showStartMessage(setup, `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);
-                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);
-                showStartMessage(config, `cd ${setup.functions.source} && npm run genkit:start`);
-            }
+            await (0, spawn_1.wrapSpawn)("npm", ["install", `genkit-cli@${genkitInfo.cliVersion}`, "--save-dev"], projectDir);
+            await genkitSetup(options, genkitInfo, projectDir);
+            showStartMessage(setup, `cd ${setup.functions.source} && npm run genkit:start`);
         }
     }
     catch (err) {
@@ -151,17 +155,17 @@ async function ensureVertexApiEnabled(options) {
     return await (0, ensureApiEnabled_1.ensure)(projectId, VERTEX_AI_URL, "aiplatform", silently);
 }
 exports.ensureVertexApiEnabled = ensureVertexApiEnabled;
-function getModelOptions(genkitVersion) {
+function getModelOptions(genkitInfo) {
     const modelOptions = {
         vertexai: {
             label: "Google Cloud Vertex AI",
             plugin: "@genkit-ai/vertexai",
-            package: `@genkit-ai/vertexai@${genkitVersion}`,
+            package: `@genkit-ai/vertexai@${genkitInfo.vertexVersion}`,
         },
         googleai: {
             label: "Google AI",
             plugin: "@genkit-ai/googleai",
-            package: `@genkit-ai/googleai@${genkitVersion}`,
+            package: `@genkit-ai/googleai@${genkitInfo.googleAiVersion}`,
         },
         none: { label: "None", plugin: undefined, package: undefined },
     };
@@ -208,7 +212,7 @@ function getBasePackages(genkitVersion) {
 const externalDevPackages = ["typescript", "tsx"];
 async function genkitSetup(options, genkitInfo, projectDir) {
     var _a, _b;
-    const modelOptions = getModelOptions(genkitInfo.genkitVersion);
+    const modelOptions = getModelOptions(genkitInfo);
     const supportedModels = Object.keys(modelOptions);
     const answer = await inquirer.prompt([
         {

package/package.json

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