firebase-tools 12.5.1 → 12.5.3

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/deploy/functions/backend.js

@@ -130,7 +130,7 @@ function of(...endpoints) {
     for (const endpoint of endpoints) {
         bkend.endpoints[endpoint.region] = bkend.endpoints[endpoint.region] || {};
         if (bkend.endpoints[endpoint.region][endpoint.id]) {
-            throw new Error("Trying to create a backend with the same endpiont twice");
+            throw new Error("Trying to create a backend with the same endpoint twice");
         }
         bkend.endpoints[endpoint.region][endpoint.id] = endpoint;
     }

package/lib/deploy/functions/release/fabricator.js

@@ -95,18 +95,17 @@ class Fabricator {
             deployResults.push(result);
         };
         const upserts = [];
-        const scraperV1 = new sourceTokenScraper_1.SourceTokenScraper();
-        const scraperV2 = new sourceTokenScraper_1.SourceTokenScraper();
+        const scraper = new sourceTokenScraper_1.SourceTokenScraper();
         for (const endpoint of changes.endpointsToCreate) {
             this.logOpStart("creating", endpoint);
-            upserts.push(handle("create", endpoint, () => this.createEndpoint(endpoint, scraperV1, scraperV2)));
+            upserts.push(handle("create", endpoint, () => this.createEndpoint(endpoint, scraper)));
         }
         for (const endpoint of changes.endpointsToSkip) {
             utils.logSuccess(this.getLogSuccessMessage("skip", endpoint));
         }
         for (const update of changes.endpointsToUpdate) {
             this.logOpStart("updating", update.endpoint);
-            upserts.push(handle("update", update.endpoint, () => this.updateEndpoint(update, scraperV1, scraperV2)));
+            upserts.push(handle("update", update.endpoint, () => this.updateEndpoint(update, scraper)));
         }
         await utils.allSettled(upserts);
         if (deployResults.find((r) => r.error)) {
@@ -127,31 +126,31 @@ class Fabricator {
         await utils.allSettled(deletes);
         return deployResults;
     }
-    async createEndpoint(endpoint, scraperV1, scraperV2) {
+    async createEndpoint(endpoint, scraper) {
         endpoint.labels = Object.assign(Object.assign({}, endpoint.labels), deploymentTool.labels());
         if (endpoint.platform === "gcfv1") {
-            await this.createV1Function(endpoint, scraperV1);
+            await this.createV1Function(endpoint, scraper);
         }
         else if (endpoint.platform === "gcfv2") {
-            await this.createV2Function(endpoint, scraperV2);
+            await this.createV2Function(endpoint);
         }
         else {
             (0, functional_1.assertExhaustive)(endpoint.platform);
         }
         await this.setTrigger(endpoint);
     }
-    async updateEndpoint(update, scraperV1, scraperV2) {
+    async updateEndpoint(update, scraper) {
         update.endpoint.labels = Object.assign(Object.assign({}, update.endpoint.labels), deploymentTool.labels());
         if (update.deleteAndRecreate) {
             await this.deleteEndpoint(update.deleteAndRecreate);
-            await this.createEndpoint(update.endpoint, scraperV1, scraperV2);
+            await this.createEndpoint(update.endpoint, scraper);
             return;
         }
         if (update.endpoint.platform === "gcfv1") {
-            await this.updateV1Function(update.endpoint, scraperV1);
+            await this.updateV1Function(update.endpoint, scraper);
         }
         else if (update.endpoint.platform === "gcfv2") {
-            await this.updateV2Function(update.endpoint, scraperV2);
+            await this.updateV2Function(update.endpoint);
         }
         else {
             (0, functional_1.assertExhaustive)(update.endpoint.platform);
@@ -222,7 +221,7 @@ class Fabricator {
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
     }
-    async createV2Function(endpoint, scraper) {
+    async createV2Function(endpoint) {
         var _a, _b, _c, _d, _e;
         const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
         if (!storageSource) {
@@ -276,9 +275,8 @@ class Fabricator {
         while (!resultFunction) {
             resultFunction = await this.functionExecutor
                 .run(async () => {
-                apiFunction.buildConfig.sourceToken = await scraper.getToken();
                 const op = await gcfV2.createFunction(apiFunction);
-                return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
+                return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
             })
                 .catch(async (err) => {
                 if (err.code === CLOUD_RUN_RESOURCE_EXHAUSTED_CODE) {
@@ -368,7 +366,7 @@ class Fabricator {
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
     }
-    async updateV2Function(endpoint, scraper) {
+    async updateV2Function(endpoint) {
         var _a, _b, _c, _d;
         const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
         if (!storageSource) {
@@ -381,9 +379,8 @@ class Fabricator {
         }
         const resultFunction = await this.functionExecutor
             .run(async () => {
-            apiFunction.buildConfig.sourceToken = await scraper.getToken();
             const op = await gcfV2.updateFunction(apiFunction);
-            return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
+            return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
         }, { retryCodes: [...executor_1.DEFAULT_RETRY_CODES, CLOUD_RUN_RESOURCE_EXHAUSTED_CODE] })
             .catch(rethrowAs(endpoint, "update"));
         endpoint.uri = (_c = resultFunction.serviceConfig) === null || _c === void 0 ? void 0 : _c.uri;

package/lib/deploy/functions/release/sourceTokenScraper.js

@@ -5,9 +5,8 @@ const error_1 = require("../../../error");
 const functional_1 = require("../../../functional");
 const logger_1 = require("../../../logger");
 class SourceTokenScraper {
-    constructor(validDurationMs = 1500000, fetchTimeoutMs = 180000) {
+    constructor(validDurationMs = 1500000) {
         this.tokenValidDurationMs = validDurationMs;
-        this.fetchTimeoutMs = fetchTimeoutMs;
         this.promise = new Promise((resolve) => (this.resolve = resolve));
         this.fetchState = "NONE";
     }
@@ -17,13 +16,7 @@ class SourceTokenScraper {
             return undefined;
         }
         else if (this.fetchState === "FETCHING") {
-            const timeout = new Promise((resolve) => {
-                setTimeout(() => {
-                    this.fetchState = "NONE";
-                    resolve(undefined);
-                }, this.fetchTimeoutMs);
-            });
-            return Promise.race([this.promise, timeout]);
+            return this.promise;
         }
         else if (this.fetchState === "VALID") {
             if (this.isTokenExpired()) {

package/lib/emulator/downloadableEmulators.js

@@ -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/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.1",
+  "version": "12.5.3",
   "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"