firebase-tools 12.5.2 → 12.5.4

package/lib/command.js

@@ -83,10 +83,12 @@ class Command {
             runner(...args)
                 .then(async (result) => {
                 if ((0, utils_1.getInheritedOption)(options, "json")) {
-                    console.log(JSON.stringify({
-                        status: "success",
-                        result: result,
-                    }, null, 2));
+                    await new Promise((resolve) => {
+                        process.stdout.write(JSON.stringify({
+                            status: "success",
+                            result: result,
+                        }, null, 2), resolve);
+                    });
                 }
                 const duration = Math.floor((process.uptime() - start) * 1000);
                 const trackSuccess = (0, track_1.trackGA4)("command_execution", {
@@ -111,10 +113,12 @@ class Command {
             })
                 .catch(async (err) => {
                 if ((0, utils_1.getInheritedOption)(options, "json")) {
-                    console.log(JSON.stringify({
-                        status: "error",
-                        error: err.message,
-                    }, null, 2));
+                    await new Promise((resolve) => {
+                        process.stdout.write(JSON.stringify({
+                            status: "error",
+                            error: err.message,
+                        }, null, 2), resolve);
+                    });
                 }
                 const duration = Math.floor((process.uptime() - start) * 1000);
                 await (0, utils_1.withTimeout)(5000, Promise.all([

package/lib/deploy/extensions/prepare.js

@@ -38,6 +38,8 @@ async function prepare(context, options, payload) {
         if (!(await prompt.confirm({
             message: `Do you wish to continue deploying these extension instances?`,
             default: false,
+            nonInteractive: options.nonInteractive,
+            force: options.force,
         }))) {
             throw new error_1.FirebaseError("Deployment cancelled");
         }
@@ -58,6 +60,8 @@ async function prepare(context, options, payload) {
         if (!(await prompt.confirm({
             message: `Do you wish to continue deploying these extension instances?`,
             default: true,
+            nonInteractive: options.nonInteractive,
+            force: options.force,
         }))) {
             throw new error_1.FirebaseError("Deployment cancelled");
         }
@@ -82,6 +86,8 @@ async function prepare(context, options, payload) {
                 .map((i) => i.instanceId)
                 .join(", ")}?`,
             default: false,
+            nonInteractive: options.nonInteractive,
+            force: options.force,
         }))) {
             payload.instancesToDelete = [];
         }

package/lib/emulator/downloadableEmulators.js

@@ -23,9 +23,9 @@ const EMULATOR_UPDATE_DETAILS = {
         expectedChecksum: "2fd771101c0e1f7898c04c9204f2ce63",
     },
     firestore: {
-        version: "1.18.1",
-        expectedSize: 64866257,
-        expectedChecksum: "743211a3e33217fe71dc20aff1fa26a5",
+        version: "1.18.2",
+        expectedSize: 63929486,
+        expectedChecksum: "7b066cd684baf9bcd4a56a258be344a5",
     },
     storage: {
         version: "1.1.3",
@@ -333,7 +333,7 @@ async function stop(targetName) {
     const emulator = get(targetName);
     return new Promise((resolve, reject) => {
         const logger = emulatorLogger_1.EmulatorLogger.forEmulator(emulator.name);
-        if (emulator.instance) {
+        if (emulator.instance && emulator.instance.kill(0)) {
             const killTimeout = setTimeout(() => {
                 const pid = emulator.instance ? emulator.instance.pid : -1;
                 const errorMsg = constants_1.Constants.description(emulator.name) + ": Unable to terminate process (PID=" + pid + ")";

package/lib/emulator/portUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveHostAndAssignPorts = exports.waitForPortClosed = exports.checkListenable = void 0;
+exports.resolveHostAndAssignPorts = exports.waitForPortUsed = exports.checkListenable = void 0;
 const clc = require("colorette");
 const tcpport = require("tcp-port-used");
 const node_net_1 = require("node:net");
@@ -131,7 +131,7 @@ async function checkListenable(arg1, port) {
     });
 }
 exports.checkListenable = checkListenable;
-async function waitForPortClosed(port, host) {
+async function waitForPortUsed(port, host) {
     const interval = 250;
     const timeout = 60000;
     try {
@@ -141,7 +141,7 @@ async function waitForPortClosed(port, host) {
         throw new error_1.FirebaseError(`TIMEOUT: Port ${port} on ${host} was not active within ${timeout}ms`);
     }
 }
-exports.waitForPortClosed = waitForPortClosed;
+exports.waitForPortUsed = waitForPortUsed;
 const EMULATOR_CAN_LISTEN_ON_PRIMARY_ONLY = {
     database: true,
     firestore: true,

package/lib/emulator/registry.js

@@ -18,7 +18,7 @@ class EmulatorRegistry {
         await instance.start();
         if (instance.getName() !== types_1.Emulators.EXTENSIONS) {
             const info = instance.getInfo();
-            await portUtils.waitForPortClosed(info.port, (0, utils_1.connectableHostname)(info.host));
+            await portUtils.waitForPortUsed(info.port, (0, utils_1.connectableHostname)(info.host));
         }
     }
     static async stop(name) {
@@ -27,8 +27,13 @@ class EmulatorRegistry {
         if (!instance) {
             return;
         }
-        await instance.stop();
-        this.clear(instance.getName());
+        try {
+            await instance.stop();
+            this.clear(instance.getName());
+        }
+        catch (e) {
+            emulatorLogger_1.EmulatorLogger.forEmulator(name).logLabeled("WARN", name, `Error stopping ${constants_1.Constants.description(name)}`);
+        }
     }
     static async stopAll() {
         const stopPriority = {
@@ -49,12 +54,7 @@ class EmulatorRegistry {
             return stopPriority[a] - stopPriority[b];
         });
         for (const name of emulatorsToStop) {
-            try {
-                await this.stop(name);
-            }
-            catch (e) {
-                emulatorLogger_1.EmulatorLogger.forEmulator(name).logLabeled("WARN", name, `Error stopping ${constants_1.Constants.description(name)}`);
-            }
+            await this.stop(name);
         }
     }
     static isRunning(emulator) {

package/lib/extensions/change-log.js

@@ -16,7 +16,7 @@ marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const EXTENSIONS_CHANGELOG = "CHANGELOG.md";
-const VERSION_LINE_REGEX = /##.*(\d+\.\d+\.\d+(?:-((\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?).*/;
+const VERSION_LINE_REGEX = /##.+?(\d+\.\d+\.\d+(?:-((\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?).*/;
 async function getReleaseNotesForUpdate(args) {
     const releaseNotes = {};
     const filter = `id<="${args.toVersion}" AND id>"${args.fromVersion}"`;

package/package.json

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

package/standalone/firepit.js

@@ -184,7 +184,6 @@ let runtimeBinsPath = path.join(homePath, ".cache", "firebase", "runtime");
 const npmArgs = [
   `--script-shell=${runtimeBinsPath}/shell${isWindows ? ".bat" : ""}`,
   `--globalconfig=${path.join(runtimeBinsPath, "npmrc")}`,
-  `--userconfig=${path.join(runtimeBinsPath, "npmrc")}`,
   `--scripts-prepend-node-path=auto`
 ];
 

package/standalone/package.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^2.4.2",
-    "npm": "^9.8.0",
+    "npm": "^8.19.0",
     "shelljs": "^0.8.3",
     "shx": "^0.3.2",
     "user-home": "^2.0.0"