firebase-tools 13.11.3 → 13.12.0

package/lib/auth.js

@@ -3,14 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("colorette");
 const FormData = require("form-data");
-const fs = require("fs");
 const http = require("http");
 const jwt = require("jsonwebtoken");
 const opn = require("open");
-const path = require("path");
 const portfinder = require("portfinder");
 const url = require("url");
-const util = require("util");
 const apiv2 = require("./apiv2");
 const configstore_1 = require("./configstore");
 const error_1 = require("./error");
@@ -23,6 +20,7 @@ const uuid_1 = require("uuid");
 const crypto_1 = require("crypto");
 const track_1 = require("./track");
 const api_1 = require("./api");
+const templates_1 = require("./templates");
 portfinder.setBasePort(9005);
 function getGlobalDefaultAccount() {
     const user = configstore_1.configstore.get("user");
@@ -261,13 +259,12 @@ async function getGithubTokensFromAuthorizationCode(code, callbackUrl) {
     });
     return res.body.access_token;
 }
-async function respondWithFile(req, res, statusCode, filename) {
-    const response = await util.promisify(fs.readFile)(path.join(__dirname, filename));
+function respondHtml(req, res, statusCode, html) {
     res.writeHead(statusCode, {
-        "Content-Length": response.length,
+        "Content-Length": html.length,
         "Content-Type": "text/html",
     });
-    res.end(response);
+    res.end(html);
     req.socket.destroy();
 }
 function urlsafeBase64(base64string) {
@@ -319,8 +316,8 @@ async function loginRemotely() {
 async function loginWithLocalhostGoogle(port, userHint) {
     const callbackUrl = getCallbackUrl(port);
     const authUrl = getLoginUrl(callbackUrl, userHint);
-    const successTemplate = "../templates/loginSuccess.html";
-    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getTokensFromAuthorizationCode);
+    const successHtml = await (0, templates_1.readTemplate)("loginSuccess.html");
+    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successHtml, getTokensFromAuthorizationCode);
     void (0, track_1.trackGA4)("login", { method: "google_localhost" });
     return {
         user: jwt.decode(tokens.id_token, { json: true }),
@@ -331,30 +328,32 @@ async function loginWithLocalhostGoogle(port, userHint) {
 async function loginWithLocalhostGitHub(port) {
     const callbackUrl = getCallbackUrl(port);
     const authUrl = getGithubLoginUrl(callbackUrl);
-    const successTemplate = "../templates/loginSuccessGithub.html";
-    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getGithubTokensFromAuthorizationCode);
+    const successHtml = await (0, templates_1.readTemplate)("loginSuccessGithub.html");
+    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successHtml, getGithubTokensFromAuthorizationCode);
     void (0, track_1.trackGA4)("login", { method: "github_localhost" });
     return tokens;
 }
-async function loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getTokens) {
+async function loginWithLocalhost(port, callbackUrl, authUrl, successHtml, getTokens) {
     return new Promise((resolve, reject) => {
         const server = http.createServer(async (req, res) => {
             const query = url.parse(`${req.url}`, true).query || {};
             const queryState = query.state;
             const queryCode = query.code;
             if (queryState !== _nonce || typeof queryCode !== "string") {
-                await respondWithFile(req, res, 400, "../templates/loginFailure.html");
+                const html = await (0, templates_1.readTemplate)("loginFailure.html");
+                respondHtml(req, res, 400, html);
                 reject(new error_1.FirebaseError("Unexpected error while logging in"));
                 server.close();
                 return;
             }
             try {
                 const tokens = await getTokens(queryCode, callbackUrl);
-                await respondWithFile(req, res, 200, successTemplate);
+                respondHtml(req, res, 200, successHtml);
                 resolve(tokens);
             }
             catch (err) {
-                await respondWithFile(req, res, 400, "../templates/loginFailure.html");
+                const html = await (0, templates_1.readTemplate)("loginFailure.html");
+                respondHtml(req, res, 400, html);
                 reject(err);
             }
             server.close();

package/lib/commands/dataconnect-sdk-generate.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const path = require("path");
+const clc = require("colorette");
 const command_1 = require("../command");
 const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
 const projectUtils_1 = require("../projectUtils");
@@ -19,7 +20,7 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             const cwd = options.cwd || process.cwd();
             configDir = path.resolve(path.join(cwd), configDir);
         }
-        const serviceInfo = await (0, load_1.load)(projectId, service.location, configDir);
+        const serviceInfo = await (0, load_1.load)(projectId, configDir);
         const hasGeneratables = serviceInfo.connectorInfo.some((c) => {
             var _a, _b, _c;
             return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||
@@ -28,13 +29,13 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
         });
         if (!hasGeneratables) {
             logger_1.logger.warn("No generated SDKs have been declared in connector.yaml files.");
-            logger_1.logger.warn("See https://firebase.google.com/docs/data-connect/quickstart#configure-sdk-outputs for examples of how to configure generated SDKs.");
+            logger_1.logger.warn(`Run ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
+            logger_1.logger.warn(`See https://firebase.google.com/docs/data-connect/gp/web-sdk for more details of how to configure generated SDKs.`);
             return;
         }
         for (const conn of serviceInfo.connectorInfo) {
             const output = await dataconnectEmulator_1.DataConnectEmulator.generate({
                 configDir,
-                locationId: service.location,
                 connectorId: conn.connectorYaml.connectorId,
             });
             logger_1.logger.info(output);

package/lib/commands/ext-dev-init.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const fs = require("fs");
-const path = require("path");
 const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
@@ -12,19 +10,18 @@ const error_1 = require("../error");
 const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const npmDependencies = require("../init/features/functions/npm-dependencies");
+const templates_1 = require("../templates");
 marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-const TEMPLATE_ROOT = path.resolve(__dirname, "../../templates/extensions/");
-const FUNCTIONS_ROOT = path.resolve(__dirname, "../../templates/init/functions/");
 function readCommonTemplates() {
     return {
-        integrationTestFirebaseJsonTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "integration-test.json"), "utf8"),
-        integrationTestEnvTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "integration-test.env"), "utf8"),
-        extSpecTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "extension.yaml"), "utf8"),
-        preinstallTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "PREINSTALL.md"), "utf8"),
-        postinstallTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "POSTINSTALL.md"), "utf8"),
-        changelogTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "CL-template.md"), "utf8"),
+        integrationTestFirebaseJsonTemplate: (0, templates_1.readTemplateSync)("extensions/integration-test.json"),
+        integrationTestEnvTemplate: (0, templates_1.readTemplateSync)("extensions/integration-test.env"),
+        extSpecTemplate: (0, templates_1.readTemplateSync)("extensions/extension.yaml"),
+        preinstallTemplate: (0, templates_1.readTemplateSync)("extensions/PREINSTALL.md"),
+        postinstallTemplate: (0, templates_1.readTemplateSync)("extensions/POSTINSTALL.md"),
+        changelogTemplate: (0, templates_1.readTemplateSync)("extensions/CL-template.md"),
     };
 }
 exports.command = new command_1.Command("ext:dev:init")
@@ -34,6 +31,7 @@ exports.command = new command_1.Command("ext:dev:init")
     const cwd = options.cwd || process.cwd();
     const config = new config_1.Config({}, { projectDir: cwd, cwd: cwd });
     try {
+        let welcome;
         const lang = await (0, prompt_1.promptOnce)({
             type: "list",
             name: "language",
@@ -53,10 +51,12 @@ exports.command = new command_1.Command("ext:dev:init")
         switch (lang) {
             case "javascript": {
                 await javascriptSelected(config);
+                welcome = (0, templates_1.readTemplateSync)("extensions/javascript/WELCOME.md");
                 break;
             }
             case "typescript": {
                 await typescriptSelected(config);
+                welcome = (0, templates_1.readTemplateSync)("extensions/typescript/WELCOME.md");
                 break;
             }
             default: {
@@ -64,7 +64,6 @@ exports.command = new command_1.Command("ext:dev:init")
             }
         }
         await npmDependencies.askInstallDependencies({ source: "functions" }, config);
-        const welcome = fs.readFileSync(path.join(TEMPLATE_ROOT, lang, "WELCOME.md"), "utf8");
         return logger_1.logger.info("\n" + (0, marked_1.marked)(welcome));
     }
     catch (err) {
@@ -77,15 +76,15 @@ exports.command = new command_1.Command("ext:dev:init")
     }
 });
 async function typescriptSelected(config) {
-    const packageLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "package.lint.json"), "utf8");
-    const packageNoLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "package.nolint.json"), "utf8");
-    const tsconfigTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "tsconfig.json"), "utf8");
-    const tsconfigDevTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "tsconfig.dev.json"), "utf8");
-    const indexTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "index.ts"), "utf8");
-    const integrationTestTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "integration-test.ts"), "utf8");
-    const gitignoreTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "_gitignore"), "utf8");
-    const mocharcTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "_mocharc"), "utf8");
-    const eslintTemplate = fs.readFileSync(path.join(FUNCTIONS_ROOT, "typescript", "_eslintrc"), "utf8");
+    const packageLintingTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/package.lint.json");
+    const packageNoLintingTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/package.nolint.json");
+    const tsconfigTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/tsconfig.json");
+    const tsconfigDevTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/tsconfig.dev.json");
+    const indexTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/index.ts");
+    const integrationTestTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/integration-test.ts");
+    const gitignoreTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/_gitignore");
+    const mocharcTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/_mocharc");
+    const eslintTemplate = (0, templates_1.readTemplateSync)("init/functions/typescript/_eslintrc");
     const lint = await (0, prompt_1.promptOnce)({
         name: "lint",
         type: "confirm",
@@ -116,12 +115,12 @@ async function typescriptSelected(config) {
     await config.askWriteProjectFile("functions/.gitignore", gitignoreTemplate);
 }
 async function javascriptSelected(config) {
-    const indexTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "index.js"), "utf8");
-    const integrationTestTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "integration-test.js"), "utf8");
-    const packageLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "package.lint.json"), "utf8");
-    const packageNoLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "package.nolint.json"), "utf8");
-    const gitignoreTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "_gitignore"), "utf8");
-    const eslintTemplate = fs.readFileSync(path.join(FUNCTIONS_ROOT, "javascript", "_eslintrc"), "utf8");
+    const indexTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/index.js");
+    const integrationTestTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/integration-test.js");
+    const packageLintingTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/package.lint.json");
+    const packageNoLintingTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/package.nolint.json");
+    const gitignoreTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/_gitignore");
+    const eslintTemplate = (0, templates_1.readTemplateSync)("init/functions/javascript/_eslintrc");
     const lint = await (0, prompt_1.promptOnce)({
         name: "lint",
         type: "confirm",

package/lib/commands/index.js

@@ -200,17 +200,15 @@ function load(client) {
     client.setup.emulators.pubsub = loadCommand("setup-emulators-pubsub");
     client.setup.emulators.storage = loadCommand("setup-emulators-storage");
     client.setup.emulators.ui = loadCommand("setup-emulators-ui");
-    if (experiments.isEnabled("dataconnect")) {
-        client.dataconnect = {};
-        client.setup.emulators.dataconnect = loadCommand("setup-emulators-dataconnect");
-        client.dataconnect.services = {};
-        client.dataconnect.services.list = loadCommand("dataconnect-services-list");
-        client.dataconnect.sql = {};
-        client.dataconnect.sql.diff = loadCommand("dataconnect-sql-diff");
-        client.dataconnect.sql.migrate = loadCommand("dataconnect-sql-migrate");
-        client.dataconnect.sdk = {};
-        client.dataconnect.sdk.generate = loadCommand("dataconnect-sdk-generate");
-    }
+    client.dataconnect = {};
+    client.setup.emulators.dataconnect = loadCommand("setup-emulators-dataconnect");
+    client.dataconnect.services = {};
+    client.dataconnect.services.list = loadCommand("dataconnect-services-list");
+    client.dataconnect.sql = {};
+    client.dataconnect.sql.diff = loadCommand("dataconnect-sql-diff");
+    client.dataconnect.sql.migrate = loadCommand("dataconnect-sql-migrate");
+    client.dataconnect.sdk = {};
+    client.dataconnect.sdk.generate = loadCommand("dataconnect-sdk-generate");
     client.target = loadCommand("target");
     client.target.apply = loadCommand("target-apply");
     client.target.clear = loadCommand("target-clear");

package/lib/commands/init.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initAction = exports.command = void 0;
 const clc = require("colorette");
-const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const command_1 = require("../command");
@@ -15,10 +14,10 @@ const requireAuth_1 = require("../requireAuth");
 const fsutils = require("../fsutils");
 const utils = require("../utils");
 const experiments_1 = require("../experiments");
+const templates_1 = require("../templates");
 const homeDir = os.homedir();
-const TEMPLATE_ROOT = path.resolve(__dirname, "../../templates/");
-const BANNER_TEXT = fs.readFileSync(path.join(TEMPLATE_ROOT, "banner.txt"), "utf8");
-const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+const BANNER_TEXT = (0, templates_1.readTemplateSync)("banner.txt");
+const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("_gitignore");
 function isOutside(from, to) {
     return !!/^\.\./.exec(path.relative(from, to));
 }
@@ -76,13 +75,16 @@ if ((0, experiments_1.isEnabled)("genkit")) {
         checked: false,
     });
 }
-if ((0, experiments_1.isEnabled)("dataconnect")) {
-    choices.push({
-        value: "dataconnect",
-        name: "Data Connect: Set up a Firebase Data Connect service.",
-        checked: false,
-    });
-}
+choices.push({
+    value: "dataconnect",
+    name: "Data Connect: Set up a Firebase Data Connect service",
+    checked: false,
+});
+choices.push({
+    value: "dataconnect:sdk",
+    name: "Data Connect: Set up a generated SDK for your Firebase Data Connect service",
+    checked: false,
+});
 const featureNames = choices.map((choice) => choice.value);
 const DESCRIPTION = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
 

package/lib/config.js

@@ -18,7 +18,7 @@ const loadCJSON_1 = require("./loadCJSON");
 const parseBoltRules = require("./parseBoltRules");
 class Config {
     constructor(src, options = {}) {
-        var _a;
+        var _a, _b;
         this.data = {};
         this.defaults = {};
         this.notes = {};
@@ -54,6 +54,11 @@ class Config {
                 }
             }
         }
+        if (((_b = this._src.dataconnect) === null || _b === void 0 ? void 0 : _b.location) ||
+            (Array.isArray(this._src.dataconnect) && this._src.dataconnect.some((c) => c === null || c === void 0 ? void 0 : c.location))) {
+            utils.logLabeledWarning("dataconnect", "'location' has been moved from 'firebase.json' to 'dataconnect.yaml'. " +
+                "Please remove 'dataconnect.location' from 'firebase.json' and add it as top level field to 'dataconnect.yaml' instead ");
+        }
     }
     materialize(target) {
         const val = _.get(this._src, target);

package/lib/crashlytics/buildToolsJarHelper.js

@@ -12,7 +12,7 @@ const rimraf = require("rimraf");
 const utils = require("../utils");
 const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
     path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
-const JAR_VERSION = "3.0.0";
+const JAR_VERSION = "3.0.2";
 const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
 async function fetchBuildtoolsJar() {
     if (process.env.CRASHLYTICS_LOCAL_JAR) {

package/lib/dataconnect/client.js

@@ -132,7 +132,7 @@ async function listConnectors(serviceName) {
                 pageToken,
             },
         });
-        connectors.push(...res.body.connectors);
+        connectors.push(...(res.body.connectors || []));
         if (res.body.nextPageToken) {
             await getNextPage(res.body.nextPageToken);
         }

package/lib/dataconnect/fileUtils.js

@@ -11,12 +11,11 @@ function readFirebaseJson(config) {
         return [];
     }
     const validator = (cfg) => {
-        if (!cfg["source"] && !cfg["location"]) {
-            throw new error_1.FirebaseError("Invalid firebase.json: DataConnect requires `source` and `location`");
+        if (!cfg["source"]) {
+            throw new error_1.FirebaseError("Invalid firebase.json: DataConnect requires `source`");
         }
         return {
             source: cfg["source"],
-            location: cfg["location"],
         };
     };
     const configs = config.get("dataconnect");
@@ -27,7 +26,7 @@ function readFirebaseJson(config) {
         return configs.map(validator);
     }
     else {
-        throw new error_1.FirebaseError("Invalid firebase.json: dataconnect should be of the form { source: string, location: string }");
+        throw new error_1.FirebaseError("Invalid firebase.json: dataconnect should be of the form { source: string }");
     }
 }
 exports.readFirebaseJson = readFirebaseJson;
@@ -38,6 +37,9 @@ async function readDataConnectYaml(sourceDirectory) {
 }
 exports.readDataConnectYaml = readDataConnectYaml;
 function validateDataConnectYaml(unvalidated) {
+    if (!unvalidated["location"]) {
+        throw new error_1.FirebaseError("Missing required field 'location' in dataconnect.yaml");
+    }
     return unvalidated;
 }
 async function readConnectorYaml(sourceDirectory) {
@@ -74,13 +76,13 @@ async function pickService(projectId, config, serviceId) {
         throw new error_1.FirebaseError("No Data Connect services found in firebase.json.");
     }
     else if (serviceCfgs.length === 1) {
-        serviceInfo = await (0, load_1.load)(projectId, serviceCfgs[0].location, serviceCfgs[0].source);
+        serviceInfo = await (0, load_1.load)(projectId, serviceCfgs[0].source);
     }
     else {
         if (!serviceId) {
             throw new error_1.FirebaseError("Multiple Data Connect services found in firebase.json. Please specify a service ID to use.");
         }
-        const infos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, c.location, c.source)));
+        const infos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, c.source)));
         const maybe = infos.find((i) => i.dataConnectYaml.serviceId === serviceId);
         if (!maybe) {
             throw new error_1.FirebaseError(`No service named ${serviceId} declared in firebase.json.`);

package/lib/dataconnect/load.js

@@ -4,9 +4,9 @@ exports.load = void 0;
 const path = require("path");
 const fileUtils = require("./fileUtils");
 const types_1 = require("./types");
-async function load(projectId, locationId, sourceDirectory) {
+async function load(projectId, sourceDirectory) {
     const dataConnectYaml = await fileUtils.readDataConnectYaml(sourceDirectory);
-    const serviceName = `projects/${projectId}/locations/${locationId}/services/${dataConnectYaml.serviceId}`;
+    const serviceName = `projects/${projectId}/locations/${dataConnectYaml.location}/services/${dataConnectYaml.serviceId}`;
     const schemaDir = path.join(sourceDirectory, dataConnectYaml.schema.source);
     const schemaGQLs = await fileUtils.readGQLFiles(schemaDir);
     const connectorInfo = await Promise.all(dataConnectYaml.connectorDirs.map(async (dir) => {
@@ -14,6 +14,7 @@ async function load(projectId, locationId, sourceDirectory) {
         const connectorYaml = await fileUtils.readConnectorYaml(connectorDir);
         const connectorGqls = await fileUtils.readGQLFiles(connectorDir);
         return {
+            directory: connectorDir,
             connectorYaml,
             connector: {
                 name: `${serviceName}/connectors/${connectorYaml.connectorId}`,
@@ -28,7 +29,7 @@ async function load(projectId, locationId, sourceDirectory) {
         sourceDirectory,
         schema: {
             name: `${serviceName}/schemas/${types_1.SCHEMA_ID}`,
-            primaryDatasource: (0, types_1.toDatasource)(projectId, locationId, dataConnectYaml.schema.datasource),
+            primaryDatasource: (0, types_1.toDatasource)(projectId, dataConnectYaml.location, dataConnectYaml.schema.datasource),
             source: {
                 files: schemaGQLs,
             },

package/lib/deploy/dataconnect/prepare.js

@@ -18,7 +18,7 @@ async function default_1(context, options) {
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(options.config);
     utils.logLabeledBullet("dataconnect", `Preparing to deploy`);
     const filters = (0, filters_1.getResourceFilters)(options);
-    const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, c.location, path.join(options.cwd || process.cwd(), c.source))));
+    const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, path.join(options.cwd || process.cwd(), c.source))));
     for (const si of serviceInfos) {
         si.deploymentMetadata = await (0, build_1.build)(options, si.sourceDirectory);
     }

package/lib/emulator/controller.js

@@ -535,13 +535,9 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             projectId,
             auto_download: true,
             configDir,
-            locationId: config[0].location,
             rc: options.rc,
         });
         await startEmulator(dataConnectEmulator);
-        if (!utils.isVSCodeExtension()) {
-            await dataConnectEmulator.connectToPostgres();
-        }
     }
     if (listenForEmulator.storage) {
         const storageAddr = legacyGetFirstAddr(types_1.Emulators.STORAGE);