firebase-tools 13.25.0 → 13.27.0

package/lib/init/features/project.js

@@ -12,13 +12,13 @@ const OPTION_NO_PROJECT = "Don't set up a default project";
 const OPTION_USE_PROJECT = "Use an existing project";
 const OPTION_NEW_PROJECT = "Create a new project";
 const OPTION_ADD_FIREBASE = "Add Firebase to an existing Google Cloud Platform project";
-function toProjectInfo(projectMetaData) {
+function toInitProjectInfo(projectMetaData) {
     const { projectId, displayName, resources } = projectMetaData;
     return {
         id: projectId,
         label: `${projectId}` + (displayName ? ` (${displayName})` : ""),
-        instance: _.get(resources, "realtimeDatabaseInstance"),
-        location: _.get(resources, "locationId"),
+        instance: resources === null || resources === void 0 ? void 0 : resources.realtimeDatabaseInstance,
+        location: resources === null || resources === void 0 ? void 0 : resources.locationId,
     };
 }
 async function promptAndCreateNewProject() {
@@ -65,18 +65,19 @@ async function projectChoicePrompt(options) {
     }
 }
 async function doSetup(setup, config, options) {
+    var _a, _b, _c;
     setup.project = {};
     logger_1.logger.info();
     logger_1.logger.info(`First, let's associate this project directory with a Firebase project.`);
     logger_1.logger.info(`You can create multiple project aliases by running ${clc.bold("firebase use --add")}, `);
     logger_1.logger.info(`but for now we'll just set up a default project.`);
     logger_1.logger.info();
-    const projectFromRcFile = _.get(setup.rcfile, "projects.default");
+    const projectFromRcFile = (_b = (_a = setup.rcfile) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b.default;
     if (projectFromRcFile && !options.project) {
         utils.logBullet(`.firebaserc already has a default project, using ${projectFromRcFile}.`);
         const rcProject = await (0, projects_1.getFirebaseProject)(projectFromRcFile);
         setup.projectId = rcProject.projectId;
-        setup.projectLocation = _.get(rcProject, "resources.locationId");
+        setup.projectLocation = (_c = rcProject === null || rcProject === void 0 ? void 0 : rcProject.resources) === null || _c === void 0 ? void 0 : _c.locationId;
         return;
     }
     let projectMetaData;
@@ -90,7 +91,7 @@ async function doSetup(setup, config, options) {
             return;
         }
     }
-    const projectInfo = toProjectInfo(projectMetaData);
+    const projectInfo = toInitProjectInfo(projectMetaData);
     utils.logBullet(`Using project ${projectInfo.label}`);
     _.set(setup.rcfile, "projects.default", projectInfo.id);
     setup.projectId = projectInfo.id;

package/lib/logger.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = exports.vsceLogEmitter = void 0;
 const winston = require("winston");
-const utils_1 = require("./utils");
+const vsCodeUtils_1 = require("./vsCodeUtils");
 const events_1 = require("events");
 exports.vsceLogEmitter = new events_1.EventEmitter();
 function expandErrors(logger) {
@@ -29,7 +29,7 @@ function annotateDebugLines(logger) {
     return logger;
 }
 function maybeUseVSCodeLogger(logger) {
-    if (!(0, utils_1.isVSCodeExtension)()) {
+    if (!(0, vsCodeUtils_1.isVSCodeExtension)()) {
         return logger;
     }
     const oldLogFunc = logger.log.bind(logger);

package/lib/management/projects.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirebaseProject = exports.listFirebaseProjects = exports.getAvailableCloudProjectPage = exports.getFirebaseProjectPage = exports.addFirebaseToCloudProject = exports.createCloudProject = exports.promptAvailableProjectId = exports.getOrPromptProject = exports.addFirebaseToCloudProjectAndLog = exports.createFirebaseProjectAndLog = exports.PROJECTS_CREATE_QUESTIONS = exports.ProjectParentResourceType = void 0;
+exports.getProject = exports.getFirebaseProject = exports.listFirebaseProjects = exports.getAvailableCloudProjectPage = exports.getFirebaseProjectPage = exports.addFirebaseToCloudProject = exports.createCloudProject = exports.promptAvailableProjectId = exports.getOrPromptProject = exports.addFirebaseToCloudProjectAndLog = exports.createFirebaseProjectAndLog = exports.PROJECTS_CREATE_QUESTIONS = exports.ProjectParentResourceType = void 0;
 const clc = require("colorette");
 const ora = require("ora");
 const apiv2_1 = require("../apiv2");
@@ -39,6 +39,10 @@ const firebaseAPIClient = new apiv2_1.Client({
     auth: true,
     apiVersion: "v1beta1",
 });
+const resourceManagerClient = new apiv2_1.Client({
+    urlPrefix: api.resourceManagerOrigin(),
+    apiVersion: "v1",
+});
 async function createFirebaseProjectAndLog(projectId, options) {
     const spinner = ora("Creating Google Cloud Platform project").start();
     try {
@@ -78,7 +82,9 @@ function logNewFirebaseProjectInfo(projectInfo) {
     logger_1.logger.info("");
     logger_1.logger.info("Project information:");
     logger_1.logger.info(`   - Project ID: ${clc.bold(projectInfo.projectId)}`);
-    logger_1.logger.info(`   - Project Name: ${clc.bold(projectInfo.displayName)}`);
+    if (projectInfo.displayName) {
+        logger_1.logger.info(`   - Project Name: ${clc.bold(projectInfo.displayName)}`);
+    }
     logger_1.logger.info("");
     logger_1.logger.info("Firebase console is available at");
     logger_1.logger.info(`https://console.firebase.google.com/project/${clc.bold(projectInfo.projectId)}/overview`);
@@ -171,13 +177,12 @@ async function promptAvailableProjectId() {
 exports.promptAvailableProjectId = promptAvailableProjectId;
 async function createCloudProject(projectId, options) {
     try {
-        const client = new apiv2_1.Client({ urlPrefix: api.resourceManagerOrigin(), apiVersion: "v1" });
         const data = {
             projectId,
             name: options.displayName || projectId,
             parent: options.parentResource,
         };
-        const response = await client.request({
+        const response = await resourceManagerClient.request({
             method: "POST",
             path: "/projects",
             body: data,
@@ -300,6 +305,16 @@ async function getFirebaseProject(projectId) {
         return res.body;
     }
     catch (err) {
+        if ((0, error_1.getErrStatus)(err) === 404) {
+            try {
+                logger_1.logger.debug(`Couldn't get project info from firedata for ${projectId}, trying resource manager. Original error: ${err}`);
+                const info = await getProject(projectId);
+                return info;
+            }
+            catch (err) {
+                logger_1.logger.debug(`Unable to get project info from resourcemanager for ${projectId}: ${err}`);
+            }
+        }
         let message = err.message;
         if (err.original) {
             message += ` (original: ${err.original.message})`;
@@ -310,3 +325,8 @@ async function getFirebaseProject(projectId) {
     }
 }
 exports.getFirebaseProject = getFirebaseProject;
+async function getProject(projectId) {
+    const response = await resourceManagerClient.get(`/projects/${projectId}`);
+    return response.body;
+}
+exports.getProject = getProject;

package/lib/projectUtils.js

@@ -43,7 +43,7 @@ async function needProjectNumber(options) {
         return options.projectNumber;
     }
     const projectId = needProjectId(options);
-    const metadata = await (0, projects_1.getFirebaseProject)(projectId);
+    const metadata = await (0, projects_1.getProject)(projectId);
     options.projectNumber = metadata.projectNumber;
     return options.projectNumber;
 }

package/lib/requireDatabaseInstance.js

@@ -15,7 +15,7 @@ async function requireDatabaseInstance(options) {
     }
     catch (err) {
         throw new error_1.FirebaseError(`Failed to get details for project: ${options.project}.`, {
-            original: err,
+            original: (0, error_1.getError)(err),
         });
     }
     if (instance === "") {

package/lib/requirePermissions.js

@@ -23,7 +23,7 @@ async function requirePermissions(options, permissions = []) {
         }
     }
     catch (err) {
-        logger_1.logger.debug(`[iam] error while checking permissions, command may fail: ${err}`);
+        logger_1.logger.debug(`[iam] error while checking permissions, command may fail: ${(0, error_1.getErrMsg)(err)}`);
         return;
     }
 }

package/lib/rulesDeploy.js

@@ -113,7 +113,7 @@ class RulesDeploy {
             }
         }
         catch (err) {
-            if (err.status !== QUOTA_EXCEEDED_STATUS_CODE) {
+            if ((0, error_1.getErrStatus)(err) !== QUOTA_EXCEEDED_STATUS_CODE) {
                 throw err;
             }
             utils.logLabeledBullet(RulesetType[this.type], "quota exceeded error while uploading rules");

package/lib/templates.js

@@ -4,10 +4,10 @@ exports.readTemplate = exports.readTemplateSync = exports.absoluteTemplateFilePa
 const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
-const utils_1 = require("./utils");
+const vsCodeUtils_1 = require("./vsCodeUtils");
 const TEMPLATE_ENCODING = "utf8";
 function absoluteTemplateFilePath(relPath) {
-    if ((0, utils_1.isVSCodeExtension)()) {
+    if ((0, vsCodeUtils_1.isVSCodeExtension)()) {
         return (0, path_1.resolve)(__dirname, "templates", relPath);
     }
     return (0, path_1.resolve)(__dirname, "../templates", relPath);

package/lib/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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 = exports.openInBrowser = 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.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.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");
@@ -24,6 +24,7 @@ const error_1 = require("./error");
 const logger_1 = require("./logger");
 const prompt_1 = require("./prompt");
 const templates_1 = require("./templates");
+const vsCodeUtils_1 = require("./vsCodeUtils");
 exports.IS_WINDOWS = process.platform === "win32";
 const SUCCESS_CHAR = exports.IS_WINDOWS ? "+" : "✔";
 const WARNING_CHAR = exports.IS_WINDOWS ? "!" : "⚠";
@@ -51,7 +52,7 @@ function setVSCodeEnvVars(envVar, value) {
 }
 exports.setVSCodeEnvVars = setVSCodeEnvVars;
 function envOverride(envname, value, coerce) {
-    const currentEnvValue = isVSCodeExtension() && exports.vscodeEnvVars[envname] ? exports.vscodeEnvVars[envname] : process.env[envname];
+    const currentEnvValue = (0, vsCodeUtils_1.isVSCodeExtension)() && exports.vscodeEnvVars[envname] ? exports.vscodeEnvVars[envname] : process.env[envname];
     if (currentEnvValue && currentEnvValue.length) {
         exports.envOverrides.push(envname);
         if (coerce) {
@@ -385,10 +386,6 @@ 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;
 }
@@ -563,7 +560,7 @@ function wrappedSafeLoad(source) {
         return yaml.parse(source);
     }
     catch (err) {
-        throw new error_1.FirebaseError(`YAML Error: ${err.message}`, { original: err });
+        throw new error_1.FirebaseError(`YAML Error: ${(0, error_1.getErrMsg)(err)}`, { original: (0, error_1.getError)(err) });
     }
 }
 exports.wrappedSafeLoad = wrappedSafeLoad;
@@ -600,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/lib/vsCodeUtils.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVSCodeExtension = void 0;
+const process_1 = require("process");
+function isVSCodeExtension() {
+    return !!process_1.env.VSCODE_CWD;
+}
+exports.isVSCodeExtension = isVSCodeExtension;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.25.0",
+  "version": "13.27.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -72,7 +72,7 @@
     "cjson": "^0.3.1",
     "cli-table": "0.3.11",
     "colorette": "^2.0.19",
-    "commander": "^4.0.1",
+    "commander": "^5.1.0",
     "configstore": "^5.0.1",
     "cors": "^2.8.5",
     "cross-env": "^5.1.3",

package/schema/firebase-config.json

@@ -366,6 +366,9 @@
                         "port": {
                             "type": "number"
                         },
+                        "rootDirectory": {
+                            "type": "string"
+                        },
                         "startCommandOverride": {
                             "type": "string"
                         }
@@ -399,6 +402,9 @@
                 "dataconnect": {
                     "additionalProperties": false,
                     "properties": {
+                        "dataDir": {
+                            "type": "string"
+                        },
                         "host": {
                             "type": "string"
                         },

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;