firebase-tools 13.7.2 → 13.7.4

package/lib/emulator/downloadableEmulators.js

@@ -23,9 +23,9 @@ const EMULATOR_UPDATE_DETAILS = {
         expectedChecksum: "2fd771101c0e1f7898c04c9204f2ce63",
     },
     firestore: {
-        version: "1.19.4",
-        expectedSize: 65913000,
-        expectedChecksum: "a861bfa9d12ef69645b41e2f3bd8db8d",
+        version: "1.19.5",
+        expectedSize: 66204670,
+        expectedChecksum: "6d9fb826605701668af722f25048ad95",
     },
     storage: {
         version: "1.1.3",
@@ -147,6 +147,7 @@ const Commands = {
             "single_project_mode",
         ],
         joinArgs: false,
+        shell: false,
     },
     firestore: {
         binary: "java",
@@ -168,6 +169,7 @@ const Commands = {
             "single_project_mode",
         ],
         joinArgs: false,
+        shell: false,
     },
     storage: {
         binary: "java",
@@ -179,18 +181,21 @@ const Commands = {
         ],
         optionalArgs: [],
         joinArgs: false,
+        shell: false,
     },
     pubsub: {
         binary: getExecPath(types_1.Emulators.PUBSUB),
         args: [],
         optionalArgs: ["port", "host"],
         joinArgs: true,
+        shell: true,
     },
     ui: {
         binary: "node",
         args: [getExecPath(types_1.Emulators.UI)],
         optionalArgs: [],
         joinArgs: false,
+        shell: false,
     },
 };
 function getExecPath(name) {
@@ -237,6 +242,7 @@ function _getCommand(emulator, args) {
         args: cmdLineArgs,
         optionalArgs: baseCmd.optionalArgs,
         joinArgs: baseCmd.joinArgs,
+        shell: baseCmd.shell,
     };
 }
 exports._getCommand = _getCommand;
@@ -273,11 +279,15 @@ async function _runBinary(emulator, command, extraEnv) {
         const logger = emulatorLogger_1.EmulatorLogger.forEmulator(emulator.name);
         emulator.stdout = fs.createWriteStream(getLogFileName(emulator.name));
         try {
-            emulator.instance = childProcess.spawn(command.binary, command.args, {
+            const opts = {
                 env: Object.assign(Object.assign({}, process.env), extraEnv),
                 detached: true,
                 stdio: ["inherit", "pipe", "pipe"],
-            });
+            };
+            if (command.shell && utils.IS_WINDOWS) {
+                opts.shell = true;
+            }
+            emulator.instance = childProcess.spawn(command.binary, command.args, opts);
         }
         catch (e) {
             if (e.code === "EACCES") {

package/lib/extensions/emulator/specHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRuntime = exports.DEFAULT_RUNTIME = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readPostinstall = exports.readExtensionYaml = void 0;
-const yaml = require("js-yaml");
+const yaml = require("yaml");
 const path = require("path");
 const fs = require("fs-extra");
 const supported = require("../../deploy/functions/runtimes/supported");
@@ -17,10 +17,10 @@ const validFunctionTypes = [
 ];
 function wrappedSafeLoad(source) {
     try {
-        return yaml.safeLoad(source);
+        return yaml.parse(source);
     }
     catch (err) {
-        if (err instanceof yaml.YAMLException) {
+        if (err instanceof yaml.YAMLParseError) {
             throw new error_1.FirebaseError(`YAML Error: ${err.message}`, { original: err });
         }
         throw err;

package/lib/extensions/extensionsApi.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refNotFoundError = exports.getExtension = exports.listExtensionVersions = exports.listExtensions = exports.getExtensionVersion = exports.getSource = exports.createSource = exports.populateSpec = exports.updateInstanceFromRegistry = exports.updateInstance = exports.configureInstance = exports.listInstances = exports.getInstance = exports.deleteInstance = exports.createInstance = void 0;
-const yaml = require("js-yaml");
+const yaml = require("yaml");
 const clc = require("colorette");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
@@ -230,7 +230,7 @@ function populateSpec(spec) {
         for (const r of spec.resources) {
             try {
                 if (r.propertiesYaml) {
-                    r.properties = yaml.safeLoad(r.propertiesYaml);
+                    r.properties = yaml.parse(r.propertiesYaml);
                 }
             }
             catch (err) {

package/lib/extensions/localHelper.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isLocalExtension = exports.readFile = exports.findExtensionYaml = exports.getLocalExtensionSpec = exports.EXTENSIONS_SPEC_FILE = void 0;
 const fs = require("fs-extra");
 const path = require("path");
-const yaml = require("js-yaml");
+const yaml = require("yaml");
 const fsutils_1 = require("../fsutils");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -56,10 +56,10 @@ function isLocalExtension(extensionName) {
 exports.isLocalExtension = isLocalExtension;
 function parseYAML(source) {
     try {
-        return yaml.safeLoad(source);
+        return yaml.parse(source);
     }
     catch (err) {
-        if (err instanceof yaml.YAMLException) {
+        if (err instanceof yaml.YAMLParseError) {
             throw new error_1.FirebaseError(`YAML Error: ${err.message}`, { original: err });
         }
         throw new error_1.FirebaseError(err.message);

package/lib/frameworks/flutter/index.js

@@ -4,7 +4,7 @@ exports.ɵcodegenPublicDirectory = exports.build = exports.init = exports.discov
 const cross_spawn_1 = require("cross-spawn");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const js_yaml_1 = require("js-yaml");
+const yaml = require("yaml");
 const promises_1 = require("fs/promises");
 const error_1 = require("../../error");
 const utils_1 = require("./utils");
@@ -19,7 +19,7 @@ async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "web"))))
         return;
     const pubSpecBuffer = await (0, promises_1.readFile)((0, path_1.join)(dir, "pubspec.yaml"));
-    const pubSpec = (0, js_yaml_1.load)(pubSpecBuffer.toString());
+    const pubSpec = yaml.parse(pubSpecBuffer.toString());
     const usingFlutter = (_a = pubSpec.dependencies) === null || _a === void 0 ? void 0 : _a.flutter;
     if (!usingFlutter)
         return;

package/lib/frameworks/next/index.js

@@ -123,9 +123,9 @@ async function build(dir, target, context) {
         headers.push(...headersFromMetaFiles);
         if (appPathsManifest) {
             const unrenderedServerComponents = (0, utils_2.getNonStaticServerComponents)(appPathsManifest, appPathRoutesManifest, prerenderedRoutes, dynamicRoutes);
-            if (unrenderedServerComponents.has("/_not-found") &&
-                (await (0, utils_2.hasStaticAppNotFoundComponent)(dir, distDir))) {
-                unrenderedServerComponents.delete("/_not-found");
+            const notFoundPageKey = ["/_not-found", "/_not-found/page"].find((key) => unrenderedServerComponents.has(key));
+            if (notFoundPageKey && (await (0, utils_2.hasStaticAppNotFoundComponent)(dir, distDir))) {
+                unrenderedServerComponents.delete(notFoundPageKey);
             }
             for (const key of unrenderedServerComponents) {
                 reasonsForBackend.add(`non-static component ${key}`);

package/lib/frameworks/next/utils.js

@@ -231,6 +231,7 @@ async function getProductionDistDirFiles(sourceDir, distDir) {
         cwd: (0, path_1.join)(sourceDir, distDir),
         nodir: true,
         absolute: true,
+        realpath: utils_2.IS_WINDOWS,
     }, (err, matches) => {
         if (err)
             reject(err);

package/lib/functions/python.js

@@ -4,13 +4,14 @@ exports.runWithVirtualEnv = exports.virtualEnvCmd = exports.DEFAULT_VENV_DIR = v
 const path = require("path");
 const spawn = require("cross-spawn");
 const logger_1 = require("../logger");
+const utils_1 = require("../utils");
 exports.DEFAULT_VENV_DIR = "venv";
 function virtualEnvCmd(cwd, venvDir) {
-    const activateScriptPath = process.platform === "win32" ? ["Scripts", "activate.bat"] : ["bin", "activate"];
+    const activateScriptPath = utils_1.IS_WINDOWS ? ["Scripts", "activate.bat"] : ["bin", "activate"];
     const venvActivate = `"${path.join(cwd, venvDir, ...activateScriptPath)}"`;
     return {
-        command: process.platform === "win32" ? venvActivate : ".",
-        args: [process.platform === "win32" ? "" : venvActivate],
+        command: utils_1.IS_WINDOWS ? venvActivate : ".",
+        args: [utils_1.IS_WINDOWS ? "" : venvActivate],
     };
 }
 exports.virtualEnvCmd = virtualEnvCmd;

package/lib/gcp/apphosting.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextRolloutId = exports.ensureApiEnabled = exports.listLocations = exports.updateTraffic = exports.listRollouts = exports.createRollout = exports.createBuild = exports.listBuilds = exports.getBuild = exports.deleteBackend = exports.listBackends = exports.getBackend = exports.createBackend = exports.client = exports.API_VERSION = void 0;
+exports.getNextRolloutId = exports.ensureApiEnabled = exports.listLocations = exports.updateTraffic = exports.listRollouts = exports.createRollout = exports.createBuild = exports.listBuilds = exports.getBuild = exports.deleteBackend = exports.listBackends = exports.getBackend = exports.createBackend = exports.serviceAgentEmail = exports.client = exports.API_VERSION = void 0;
 const proto = require("../gcp/proto");
 const apiv2_1 = require("../apiv2");
 const projectUtils_1 = require("../projectUtils");
@@ -19,6 +19,11 @@ exports.client = new apiv2_1.Client({
 (0, metaprogramming_1.assertImplements)();
 (0, metaprogramming_1.assertImplements)();
 (0, metaprogramming_1.assertImplements)();
+const P4SA_DOMAIN = (0, api_1.apphostingP4SADomain)();
+function serviceAgentEmail(projectNumber) {
+    return `service-${projectNumber}@${P4SA_DOMAIN}`;
+}
+exports.serviceAgentEmail = serviceAgentEmail;
 async function createBackend(projectId, location, backendReqBoby, backendId) {
     const res = await exports.client.post(`projects/${projectId}/locations/${location}/backends`, Object.assign(Object.assign({}, backendReqBoby), { labels: Object.assign(Object.assign({}, backendReqBoby.labels), deploymentTool.labels()) }), { queryParams: { backendId } });
     return res.body;

package/lib/gcp/devConnect.js

@@ -84,7 +84,7 @@ async function getGitRepositoryLink(projectId, location, connectionId, gitReposi
 }
 exports.getGitRepositoryLink = getGitRepositoryLink;
 function serviceAgentEmail(projectNumber) {
-    return `service-${projectNumber}@${(0, api_1.developerConnectP4SAOrigin)()}`;
+    return `service-${projectNumber}@${(0, api_1.developerConnectP4SADomain)()}`;
 }
 exports.serviceAgentEmail = serviceAgentEmail;
 async function generateP4SA(projectNumber) {

package/lib/init/features/hosting/github.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRunningInGithubAction = exports.initGitHub = void 0;
 const colorette_1 = require("colorette");
 const fs = require("fs");
-const yaml = require("js-yaml");
-const js_yaml_1 = require("js-yaml");
+const yaml = require("yaml");
 const ora = require("ora");
 const path = require("path");
 const libsodium = require("libsodium-wrappers");
@@ -149,7 +148,7 @@ function loadYMLDeploy() {
     }
 }
 function loadYML(ymlPath) {
-    return (0, js_yaml_1.safeLoad)(fs.readFileSync(ymlPath, "utf8"));
+    return yaml.parse(fs.readFileSync(ymlPath, "utf8"));
 }
 function mkdirNotExists(dir) {
     if (!(0, fsutils_1.dirExistsSync)(dir)) {
@@ -189,7 +188,7 @@ function writeChannelActionYMLFile(ymlPath, secretName, projectId, script) {
     const ymlContents = `# This file was auto-generated by the Firebase CLI
 # https://github.com/firebase/firebase-tools
 
-${yaml.safeDump(workflowConfig)}`;
+${yaml.stringify(workflowConfig)}`;
     mkdirNotExists(GITHUB_DIR);
     mkdirNotExists(WORKFLOW_DIR);
     fs.writeFileSync(ymlPath, ymlContents, "utf8");
@@ -222,7 +221,7 @@ function writeDeployToProdActionYMLFile(ymlPath, branch, secretName, projectId,
     const ymlContents = `# This file was auto-generated by the Firebase CLI
 # https://github.com/firebase/firebase-tools
 
-${yaml.safeDump(workflowConfig)}`;
+${yaml.stringify(workflowConfig)}`;
     mkdirNotExists(GITHUB_DIR);
     mkdirNotExists(WORKFLOW_DIR);
     fs.writeFileSync(ymlPath, ymlContents, "utf8");

package/lib/utils.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHostnameFromUrl = exports.openInBrowserPopup = 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.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = 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.getInheritedOption = exports.consoleUrl = exports.envOverrides = exports.IS_WINDOWS = void 0;
+exports.readSecretValue = void 0;
 const fs = require("node:fs");
+const tty = require("tty");
 const path = require("node:path");
 const _ = require("lodash");
 const url = require("url");
@@ -19,6 +21,7 @@ const portfinder_1 = require("portfinder");
 const configstore_1 = require("./configstore");
 const error_1 = require("./error");
 const logger_1 = require("./logger");
+const prompt_1 = require("./prompt");
 exports.IS_WINDOWS = process.platform === "win32";
 const SUCCESS_CHAR = exports.IS_WINDOWS ? "+" : "✔";
 const WARNING_CHAR = exports.IS_WINDOWS ? "!" : "⚠";
@@ -524,3 +527,17 @@ function getHostnameFromUrl(url) {
     }
 }
 exports.getHostnameFromUrl = getHostnameFromUrl;
+function readSecretValue(prompt, dataFile) {
+    if ((!dataFile || dataFile === "-") && tty.isatty(0)) {
+        return (0, prompt_1.promptOnce)({
+            type: "password",
+            message: prompt,
+        });
+    }
+    let input = 0;
+    if (dataFile && dataFile !== "-") {
+        input = dataFile;
+    }
+    return Promise.resolve(fs.readFileSync(input, "utf-8"));
+}
+exports.readSecretValue = readSecretValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.7.2",
+  "version": "13.7.4",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -86,7 +86,6 @@
     "google-auth-library": "^7.11.0",
     "inquirer": "^8.2.6",
     "inquirer-autocomplete-prompt": "^2.0.1",
-    "js-yaml": "^3.13.1",
     "jsonwebtoken": "^9.0.0",
     "leven": "^3.1.0",
     "libsodium-wrappers": "^0.7.10",
@@ -119,6 +118,7 @@
     "uuid": "^8.3.2",
     "winston": "^3.0.0",
     "winston-transport": "^4.4.0",
-    "ws": "^7.2.3"
+    "ws": "^7.2.3",
+    "yaml": "^2.4.1"
   }
 }

package/templates/init/functions/typescript/_eslintrc

@@ -19,6 +19,7 @@ module.exports = {
   },
   ignorePatterns: [
     "/lib/**/*", // Ignore built files.
+    "/generated/**/*", // Ignore generated files.
   ],
   plugins: [
     "@typescript-eslint",