firebase-tools 13.26.0 → 13.28.0

package/lib/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBillingError = exports.getError = exports.getErrStatus = exports.getErrMsg = exports.FirebaseError = void 0;
+exports.isBillingError = exports.getError = exports.getErrStatus = exports.isObject = exports.getErrStack = exports.getErrMsg = exports.FirebaseError = void 0;
 const lodash_1 = require("lodash");
 const DEFAULT_CHILDREN = [];
 const DEFAULT_EXIT = 1;
@@ -31,9 +31,17 @@ function getErrMsg(err, defaultMsg) {
     return JSON.stringify(err);
 }
 exports.getErrMsg = getErrMsg;
+function getErrStack(err) {
+    if (err instanceof Error) {
+        return err.stack || err.message;
+    }
+    return getErrMsg(err);
+}
+exports.getErrStack = getErrStack;
 function isObject(value) {
     return typeof value === "object" && value !== null;
 }
+exports.isObject = isObject;
 function getErrStatus(err, defaultStatus) {
     if (isObject(err) && err.status && typeof err.status === "number") {
         return err.status;

package/lib/experiments.js

@@ -106,12 +106,6 @@ exports.ALL_EXPERIMENTS = experiments({
         default: true,
         public: false,
     },
-    fdccompatiblemode: {
-        shortDescription: "Enable Data Connect schema migrations in Compatible Mode",
-        fullDescription: "Enable Data Connect schema migrations in Compatible Mode",
-        default: true,
-        public: false,
-    },
 });
 function isValidExperiment(name) {
     return Object.keys(exports.ALL_EXPERIMENTS).includes(name);

package/lib/extensions/localHelper.js

@@ -38,9 +38,9 @@ function fixLifecycleEvents(lifecycleEvents) {
         stageUnspecified: "STAGE_UNSPECIFIED",
     };
     const arrayLifecycle = [];
-    if ((0, types_1.isObject)(lifecycleEvents)) {
+    if ((0, error_1.isObject)(lifecycleEvents)) {
         for (const [key, val] of Object.entries(lifecycleEvents)) {
-            if ((0, types_1.isObject)(val) &&
+            if ((0, error_1.isObject)(val) &&
                 typeof val.function === "string" &&
                 typeof val.processingMessage === "string") {
                 arrayLifecycle.push({

package/lib/extensions/runtimes/node.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeSDK = exports.TYPESCRIPT_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.SDK_GENERATION_VERSION = void 0;
 const path = require("path");
-const child_process_1 = require("child_process");
 const marked_terminal_1 = require("marked-terminal");
 const marked_1 = require("marked");
+const error_1 = require("../../error");
 const types_1 = require("../types");
 const prompt_1 = require("../../prompt");
 const secretsUtils = require("../secretsUtils");
@@ -12,7 +12,8 @@ const utils_1 = require("../../utils");
 const common_1 = require("./common");
 const askUserForEventsConfig_1 = require("../askUserForEventsConfig");
 const extensionsHelper_1 = require("../extensionsHelper");
-const error_1 = require("../../error");
+const error_2 = require("../../error");
+const spawn_1 = require("../../init/spawn");
 marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 exports.SDK_GENERATION_VERSION = "1.0.0";
 exports.FIREBASE_FUNCTIONS_VERSION = ">=5.1.0";
@@ -91,8 +92,8 @@ function addPeerDependency(pkgJson, dependency, version) {
     if (!pkgJson.peerDependencies) {
         pkgJson.peerDependencies = {};
     }
-    if (!(0, types_1.isObject)(pkgJson.peerDependencies)) {
-        throw new error_1.FirebaseError("Internal error generating peer dependencies.");
+    if (!(0, error_1.isObject)(pkgJson.peerDependencies)) {
+        throw new error_2.FirebaseError("Internal error generating peer dependencies.");
     }
     pkgJson.peerDependencies[dependency] = version;
 }
@@ -118,7 +119,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
         }
     }
     if (!dirPath) {
-        throw new error_1.FirebaseError("Invalid extension definition. Must have either extensionRef or localPath");
+        throw new error_2.FirebaseError("Invalid extension definition. Must have either extensionRef or localPath");
     }
     const packageName = makePackageName(extensionRef, spec.name);
     const pkgJson = {
@@ -292,7 +293,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
                 sdkLines.push(`  ${sysParam.param}${opt}: string;`);
                 break;
             default:
-                throw new error_1.FirebaseError(`Error: Unknown systemParam type: ${sysParam.type || "undefined"}.`);
+                throw new error_2.FirebaseError(`Error: Unknown systemParam type: ${sysParam.type || "undefined"}.`);
         }
         sdkLines.push("");
     }
@@ -347,19 +348,19 @@ async function writeSDK(extensionRef, localPath, spec, options) {
     await (0, common_1.writeFile)(`${dirPath}/tsconfig.json`, JSON.stringify(tsconfigJson, null, 2), options);
     (0, utils_1.logLabeledBullet)("extensions", `running 'npm --prefix ${shortDirPath} install'`);
     try {
-        (0, child_process_1.execFileSync)("npm", ["--prefix", dirPath, "install"]);
+        await (0, spawn_1.spawnWithOutput)("npm", ["--prefix", dirPath, "install"]);
     }
     catch (err) {
-        const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
-        throw new error_1.FirebaseError(`Error during npm install in ${shortDirPath}: ${errMsg}`);
+        const errMsg = (0, error_2.getErrMsg)(err, "unknown error");
+        throw new error_2.FirebaseError(`Error during npm install in ${shortDirPath}: ${errMsg}`);
     }
     (0, utils_1.logLabeledBullet)("extensions", `running 'npm --prefix ${shortDirPath} run build'`);
     try {
-        (0, child_process_1.execFileSync)("npm", ["--prefix", dirPath, "run", "build"]);
+        await (0, spawn_1.spawnWithOutput)("npm", ["--prefix", dirPath, "run", "build"]);
     }
     catch (err) {
-        const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
-        throw new error_1.FirebaseError(`Error during npm run build in ${shortDirPath}: ${errMsg}`);
+        const errMsg = (0, error_2.getErrMsg)(err, "unknown error");
+        throw new error_2.FirebaseError(`Error during npm run build in ${shortDirPath}: ${errMsg}`);
     }
     const codebaseDir = (0, common_1.getCodebaseDir)(options);
     const shortCodebaseDir = codebaseDir.replace(process.cwd(), ".");
@@ -372,11 +373,11 @@ async function writeSDK(extensionRef, localPath, spec, options) {
     })) {
         (0, utils_1.logLabeledBullet)("extensions", `running 'npm --prefix ${shortCodebaseDir} install --save ${shortDirPath}'`);
         try {
-            (0, child_process_1.execFileSync)("npm", ["--prefix", codebaseDir, "install", "--save", dirPath]);
+            await (0, spawn_1.spawnWithOutput)("npm", ["--prefix", codebaseDir, "install", "--save", dirPath]);
         }
         catch (err) {
-            const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
-            throw new error_1.FirebaseError(`Error during npm install in ${codebaseDir}: ${errMsg}`);
+            const errMsg = (0, error_2.getErrMsg)(err, "unknown error");
+            throw new error_2.FirebaseError(`Error during npm install in ${codebaseDir}: ${errMsg}`);
         }
     }
     else {

package/lib/extensions/types.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExtensionSpec = exports.isResource = exports.isParam = exports.isObject = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.isExtensionInstance = exports.Visibility = exports.RegistryLaunchStage = void 0;
+exports.isExtensionSpec = exports.isResource = exports.isParam = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.isExtensionInstance = exports.Visibility = exports.RegistryLaunchStage = void 0;
+const error_1 = require("../error");
 var RegistryLaunchStage;
 (function (RegistryLaunchStage) {
     RegistryLaunchStage["EXPERIMENTAL"] = "EXPERIMENTAL";
@@ -23,7 +24,7 @@ const extensionInstanceState = [
     "PAUSED",
 ];
 const isExtensionInstance = (value) => {
-    if (!isObject(value) || typeof value.name !== "string") {
+    if (!(0, error_1.isObject)(value) || typeof value.name !== "string") {
         return false;
     }
     return true;
@@ -40,20 +41,16 @@ var ParamType;
     ParamType["SELECT_RESOURCE"] = "SELECT_RESOURCE";
     ParamType["SECRET"] = "SECRET";
 })(ParamType = exports.ParamType || (exports.ParamType = {}));
-function isObject(value) {
-    return typeof value === "object" && value !== null;
-}
-exports.isObject = isObject;
 const isParam = (param) => {
-    return (isObject(param) && typeof param["param"] === "string" && typeof param["label"] === "string");
+    return ((0, error_1.isObject)(param) && typeof param["param"] === "string" && typeof param["label"] === "string");
 };
 exports.isParam = isParam;
 const isResource = (res) => {
-    return isObject(res) && typeof res["name"] === "string";
+    return (0, error_1.isObject)(res) && typeof res["name"] === "string";
 };
 exports.isResource = isResource;
 const isExtensionSpec = (spec) => {
-    if (!isObject(spec) || typeof spec.name !== "string" || typeof spec.version !== "string") {
+    if (!(0, error_1.isObject)(spec) || typeof spec.name !== "string" || typeof spec.version !== "string") {
         return false;
     }
     if (spec.resources && Array.isArray(spec.resources)) {

package/lib/gcp/cloudfunctionsv2.js

@@ -381,6 +381,7 @@ function endpointFromFunction(gcfFunction) {
             endpoint.runServiceId = utils.last(serviceName.split("/"));
         }
     }
+    proto.renameIfPresent(endpoint, gcfFunction, "uri", "url");
     endpoint.codebase = ((_e = gcfFunction.labels) === null || _e === void 0 ? void 0 : _e[constants_1.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
     if ((_f = gcfFunction.labels) === null || _f === void 0 ? void 0 : _f[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];

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

@@ -8,7 +8,6 @@ const provisionCloudSql_1 = require("../../../dataconnect/provisionCloudSql");
 const freeTrial_1 = require("../../../dataconnect/freeTrial");
 const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
 const ensureApis_1 = require("../../../dataconnect/ensureApis");
-const experiments = require("../../../experiments");
 const client_1 = require("../../../dataconnect/client");
 const types_1 = require("../../../dataconnect/types");
 const names_1 = require("../../../dataconnect/names");
@@ -19,7 +18,6 @@ const cloudbilling_1 = require("../../../gcp/cloudbilling");
 const sdk = require("./sdk");
 const fileUtils_1 = require("../../../dataconnect/fileUtils");
 const DATACONNECT_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect.yaml");
-const DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect-fdccompatiblemode.yaml");
 const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/connector.yaml");
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
@@ -50,6 +48,9 @@ async function doSetup(setup, config) {
         isBillingEnabled ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
     }
     const info = await askQuestions(setup, isBillingEnabled);
+    const dir = config.get("dataconnect.source", "dataconnect");
+    const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
+    config.set("emulators.dataconnect.dataDir", dataDir);
     await actuate(setup, config, info);
     const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
     if (cwdPlatformGuess !== types_1.Platform.NONE) {
@@ -156,9 +157,7 @@ function subDataconnectYamlValues(replacementValues) {
         connectorDirs: "__connectorDirs__",
         locationId: "__location__",
     };
-    let replaced = experiments.isEnabled("fdccompatiblemode")
-        ? DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE
-        : DATACONNECT_YAML_TEMPLATE;
+    let replaced = DATACONNECT_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
         replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }

package/lib/init/features/emulators.js

@@ -7,6 +7,7 @@ const prompt_1 = require("../../prompt");
 const types_1 = require("../../emulator/types");
 const constants_1 = require("../../emulator/constants");
 const downloadableEmulators_1 = require("../../emulator/downloadableEmulators");
+const initEmulators_1 = require("../../emulator/initEmulators");
 async function doSetup(setup, config) {
     var _a, _b, _c;
     const choices = types_1.ALL_SERVICE_EMULATORS.map((e) => {
@@ -46,6 +47,13 @@ async function doSetup(setup, config) {
                 },
             ]);
         }
+        const additionalInitFn = initEmulators_1.AdditionalInitFns[selected];
+        if (additionalInitFn) {
+            const additionalOptions = await additionalInitFn(config);
+            if (additionalOptions) {
+                setup.config.emulators[selected] = Object.assign(Object.assign({}, setup.config.emulators[selected]), additionalOptions);
+            }
+        }
     }
     if (selections.emulators.length) {
         const uiDesc = constants_1.Constants.description(types_1.Emulators.UI);

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

@@ -6,7 +6,6 @@ const inquirer = require("inquirer");
 const path = require("path");
 const semver = require("semver");
 const clc = require("colorette");
-const child_process_1 = require("child_process");
 const functions_1 = require("../functions");
 const prompt_1 = require("../../../prompt");
 const spawn_1 = require("../../spawn");
@@ -15,7 +14,6 @@ const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
 const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
-const types_1 = require("../../../extensions/types");
 async function getGenkitVersion() {
     let genkitVersion;
     let templateVersion = "0.9.0";
@@ -26,7 +24,17 @@ async function getGenkitVersion() {
         genkitVersion = process.env.GENKIT_DEV_VERSION;
     }
     else {
-        genkitVersion = (0, child_process_1.execFileSync)("npm", ["view", "genkit", "version"]).toString();
+        try {
+            genkitVersion = await (0, spawn_1.spawnWithOutput)("npm", ["view", "genkit", "version"]);
+        }
+        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");
+        }
     }
     if (!genkitVersion) {
         throw new error_1.FirebaseError("Unable to determine genkit version to install");
@@ -236,7 +244,7 @@ async function genkitSetup(options, genkitInfo, projectDir) {
 }
 exports.genkitSetup = genkitSetup;
 const isTsConfig = (value) => {
-    if (!(0, types_1.isObject)(value) || (value.compilerOptions && !(0, types_1.isObject)(value.compilerOptions))) {
+    if (!(0, error_1.isObject)(value) || (value.compilerOptions && !(0, error_1.isObject)(value.compilerOptions))) {
         return false;
     }
     return true;
@@ -339,7 +347,7 @@ function generateSampleFile(modelPlugin, configPlugins, projectDir, templateVers
     }
 }
 const isPackageJson = (value) => {
-    if (!(0, types_1.isObject)(value) || (value.scripts && !(0, types_1.isObject)(value.scripts))) {
+    if (!(0, error_1.isObject)(value) || (value.scripts && !(0, error_1.isObject)(value.scripts))) {
         return false;
     }
     return true;

package/lib/init/spawn.js

@@ -1,27 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.spawnWithCommandString = exports.wrapSpawn = void 0;
+exports.spawnWithCommandString = exports.spawnWithOutput = exports.wrapSpawn = void 0;
 const spawn = require("cross-spawn");
 const logger_1 = require("../logger");
-function wrapSpawn(cmd, args, projectDir, environmentVariables) {
+const error_1 = require("../error");
+function wrapSpawn(cmd, args, projectDir) {
     return new Promise((resolve, reject) => {
         const installer = spawn(cmd, args, {
             cwd: projectDir,
             stdio: "inherit",
-            env: Object.assign(Object.assign({}, process.env), environmentVariables),
+            env: Object.assign({}, process.env),
         });
         installer.on("error", (err) => {
-            logger_1.logger.debug(err.stack);
+            logger_1.logger.debug((0, error_1.getErrStack)(err));
         });
         installer.on("close", (code) => {
             if (code === 0) {
                 return resolve();
             }
-            return reject();
+            return reject(new Error(`Error: spawn(${cmd}, [${args.join(", ")}]) \n exited with code: ${code || "null"}`));
         });
     });
 }
 exports.wrapSpawn = wrapSpawn;
+function spawnWithOutput(cmd, args) {
+    return new Promise((resolve, reject) => {
+        var _a, _b;
+        const child = spawn(cmd, args);
+        let output = "";
+        (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
+            if ((0, error_1.isObject)(data) && data.toString) {
+                output += data.toString();
+            }
+            else {
+                output += JSON.stringify(data);
+            }
+        });
+        (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => {
+            logger_1.logger.debug(`Error: spawn(${cmd}, ${args.join(", ")})\n  Stderr:\n${JSON.stringify(data)}\n`);
+        });
+        child.on("error", (err) => {
+            logger_1.logger.debug((0, error_1.getErrStack)(err));
+        });
+        child.on("close", (code) => {
+            if (code === 0) {
+                resolve(output);
+            }
+            else {
+                reject(new Error(`Error: spawn(${cmd}, [${args.join(", ")}]) \n exited with code: ${code || "null"}`));
+            }
+        });
+    });
+}
+exports.spawnWithOutput = spawnWithOutput;
 function spawnWithCommandString(cmd, projectDir, environmentVariables) {
     return new Promise((resolve, reject) => {
         const installer = spawn(cmd, {
@@ -31,13 +62,13 @@ function spawnWithCommandString(cmd, projectDir, environmentVariables) {
             env: Object.assign(Object.assign({}, process.env), environmentVariables),
         });
         installer.on("error", (err) => {
-            logger_1.logger.log("DEBUG", err.stack);
+            logger_1.logger.log("DEBUG", (0, error_1.getErrStack)(err));
         });
         installer.on("close", (code) => {
             if (code === 0) {
                 return resolve();
             }
-            return reject();
+            return reject(new Error(`Error: spawn(${cmd}) \n exited with code: ${code || "null"}`));
         });
     });
 }

package/lib/requireAuth.js

@@ -25,6 +25,7 @@ async function autoAuth(options, authScopes) {
     const client = getAuthClient({ scopes: authScopes, projectId: options.project });
     const token = await client.getAccessToken();
     token !== null ? apiv2.setAccessToken(token) : false;
+    logger_1.logger.debug(`Running auto auth`);
     let clientEmail;
     try {
         const credentials = await client.getCredentials();
@@ -72,7 +73,7 @@ async function requireAuth(options) {
         utils.logWarning("Authenticating with `FIREBASE_TOKEN` is deprecated and will be removed in a future major version of `firebase-tools`. " +
             "Instead, use a service account key with `GOOGLE_APPLICATION_CREDENTIALS`: https://cloud.google.com/docs/authentication/getting-started");
     }
-    else if (user) {
+    else if (user && (!(0, auth_1.isExpired)(tokens) || (tokens === null || tokens === void 0 ? void 0 : tokens.refresh_token))) {
         logger_1.logger.debug(`> authorizing via signed-in user (${user.email})`);
     }
     else {

package/lib/utils.js

@@ -1,7 +1,7 @@
 "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.sleep = 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.setVSCodeEnvVars = exports.getInheritedOption = exports.consoleUrl = exports.vscodeEnvVars = exports.envOverrides = exports.IS_WINDOWS = void 0;
-exports.readSecretValue = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = exports.openInBrowserPopup = void 0;
+exports.updateOrCreateGitignore = exports.readSecretValue = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = exports.openInBrowserPopup = void 0;
 const fs = require("fs-extra");
 const tty = require("tty");
 const path = require("node:path");
@@ -597,3 +597,18 @@ function readSecretValue(prompt, dataFile) {
     }
 }
 exports.readSecretValue = readSecretValue;
+function updateOrCreateGitignore(dirPath, entries) {
+    const gitignorePath = path.join(dirPath, ".gitignore");
+    if (!fs.existsSync(gitignorePath)) {
+        fs.writeFileSync(gitignorePath, entries.join("\n"));
+        return;
+    }
+    let content = fs.readFileSync(gitignorePath, "utf-8");
+    for (const entry of entries) {
+        if (!content.includes(entry)) {
+            content += `\n${entry}\n`;
+        }
+    }
+    fs.writeFileSync(gitignorePath, content);
+}
+exports.updateOrCreateGitignore = updateOrCreateGitignore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.26.0",
+  "version": "13.28.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -91,6 +91,7 @@
     "google-auth-library": "^9.11.0",
     "inquirer": "^8.2.6",
     "inquirer-autocomplete-prompt": "^2.0.1",
+    "js-yaml": "^3.14.1",
     "jsonwebtoken": "^9.0.0",
     "leven": "^3.1.0",
     "libsodium-wrappers": "^0.7.10",
@@ -114,7 +115,7 @@
     "sql-formatter": "^15.3.0",
     "stream-chain": "^2.2.4",
     "stream-json": "^1.7.3",
-    "superstatic": "^9.0.3",
+    "superstatic": "^9.1.0",
     "tar": "^6.1.11",
     "tcp-port-used": "^1.0.2",
     "tmp": "^0.2.3",

package/schema/firebase-config.json

@@ -369,6 +369,9 @@
                         "rootDirectory": {
                             "type": "string"
                         },
+                        "startCommand": {
+                            "type": "string"
+                        },
                         "startCommandOverride": {
                             "type": "string"
                         }
@@ -402,6 +405,9 @@
                 "dataconnect": {
                     "additionalProperties": false,
                     "properties": {
+                        "dataDir": {
+                            "type": "string"
+                        },
                         "host": {
                             "type": "string"
                         },

package/templates/init/dataconnect/dataconnect.yaml

@@ -8,4 +8,5 @@ schema:
       database: __cloudSqlDatabase__
       cloudSql:
         instanceId: __cloudSqlInstanceId__
+      # schemaValidation: "COMPATIBLE"
 connectorDirs: __connectorDirs__

package/lib/emulator/apphosting/utils.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.discoverPackageManager = exports.logger = void 0;
-const fs_extra_1 = require("fs-extra");
-const path_1 = require("path");
-const emulatorLogger_1 = require("../emulatorLogger");
-const types_1 = require("../types");
-exports.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
-async function discoverPackageManager(rootdir) {
-    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "pnpm-lock.yaml"))) {
-        return "pnpm";
-    }
-    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "yarn.lock"))) {
-        return "yarn";
-    }
-    return "npm";
-}
-exports.discoverPackageManager = discoverPackageManager;

package/templates/init/dataconnect/dataconnect-fdccompatiblemode.yaml

@@ -1,12 +0,0 @@
-specVersion: "v1beta"
-serviceId: __serviceId__
-location: __location__
-schema:
-  source: "./schema"
-  datasource:
-    postgresql:
-      database: __cloudSqlDatabase__
-      cloudSql:
-        instanceId: __cloudSqlInstanceId__
-      # schemaValidation: "COMPATIBLE"
-connectorDirs: __connectorDirs__