firebase-tools 11.19.0 → 11.20.0

package/lib/commands/functions-delete.js

@@ -30,7 +30,7 @@ exports.command = new command_1.Command("functions:delete [filters...]")
     }
     const context = {
         projectId: (0, projectUtils_1.needProjectId)(options),
-        filters: filters.map((f) => ({ idChunks: f.split(".") })),
+        filters: filters.map((f) => ({ idChunks: f.split(/[-.]/) })),
     };
     const [config, existingBackend] = await Promise.all([
         functionsConfig.getFirebaseConfig(options),

package/lib/emulator/auth/operations.js

@@ -2066,7 +2066,7 @@ function generateBlockingFunctionJwt(state, event, url, timeoutMs, user, options
             photo_url: user.photoUrl,
             disabled: user.disabled,
             phone_number: user.phoneNumber,
-            custom_claims: user.customAttributes,
+            custom_claims: JSON.parse(user.customAttributes || "{}"),
         },
         sub: user.localId,
         sign_in_method: options.signInMethod,

package/lib/emulator/downloadableEmulators.js

@@ -35,9 +35,9 @@ const EMULATOR_UPDATE_DETAILS = {
     ui: experiments.isEnabled("emulatoruisnapshot")
         ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
         : {
-            version: "1.11.1",
-            expectedSize: 3061713,
-            expectedChecksum: "a4944414518be206280b495f526f18bf",
+            version: "1.11.2",
+            expectedSize: 3062873,
+            expectedChecksum: "fe7f668437d0e3c3b92677aaaade78bf",
         },
     pubsub: {
         version: "0.7.1",

package/lib/emulator/extensionsEmulator.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtensionsEmulator = void 0;
+const clc = require("colorette");
+const spawn = require("cross-spawn");
 const fs = require("fs-extra");
 const os = require("os");
 const path = require("path");
-const clc = require("colorette");
 const Table = require("cli-table");
-const spawn = require("cross-spawn");
 const planner = require("../deploy/extensions/planner");
+const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const error_1 = require("../error");
+const optionsHelper_1 = require("../extensions/emulator/optionsHelper");
 const refs_1 = require("../extensions/refs");
+const shortenUrl_1 = require("../shortenUrl");
+const constants_1 = require("./constants");
 const download_1 = require("./download");
-const optionsHelper_1 = require("../extensions/emulator/optionsHelper");
 const emulatorLogger_1 = require("./emulatorLogger");
-const types_1 = require("./types");
 const validation_1 = require("./extensions/validation");
-const ensureApiEnabled_1 = require("../ensureApiEnabled");
-const shortenUrl_1 = require("../shortenUrl");
-const constants_1 = require("./constants");
 const registry_1 = require("./registry");
+const types_1 = require("./types");
 class ExtensionsEmulator {
     constructor(args) {
         this.want = [];
@@ -112,15 +112,20 @@ class ExtensionsEmulator {
     }
     installAndBuildSourceCode(sourceCodePath) {
         this.logger.logLabeled("DEBUG", "Extensions", `Running "npm install" for ${sourceCodePath}`);
-        const npmInstall = spawn.sync("npm", ["--prefix", `/${sourceCodePath}/functions/`, "install"], {
+        const functionsDirectory = path.resolve(sourceCodePath, "functions");
+        const npmInstall = spawn.sync("npm", ["install"], {
             encoding: "utf8",
+            cwd: functionsDirectory,
         });
         if (npmInstall.error) {
             throw npmInstall.error;
         }
         this.logger.logLabeled("DEBUG", "Extensions", `Finished "npm install" for ${sourceCodePath}`);
         this.logger.logLabeled("DEBUG", "Extensions", `Running "npm run gcp-build" for ${sourceCodePath}`);
-        const npmRunGCPBuild = spawn.sync("npm", ["--prefix", `/${sourceCodePath}/functions/`, "run", "gcp-build"], { encoding: "utf8" });
+        const npmRunGCPBuild = spawn.sync("npm", ["run", "gcp-build"], {
+            encoding: "utf8",
+            cwd: functionsDirectory,
+        });
         if (npmRunGCPBuild.error) {
             throw npmRunGCPBuild.error;
         }

package/lib/emulator/functionsEmulator.js

@@ -381,7 +381,7 @@ class FunctionsEmulator {
             }
         }
         if (this.args.debugPort) {
-            emulatableBackend.secretEnv = Object.values(toSetup.reduce((acc, curr) => {
+            emulatableBackend.secretEnv = Object.values(triggerDefinitions.reduce((acc, curr) => {
                 for (const secret of curr.secretEnvironmentVariables || []) {
                     acc[secret.key] = secret;
                 }

package/lib/emulator/pubsubEmulator.js

@@ -9,6 +9,9 @@ const types_1 = require("../emulator/types");
 const constants_1 = require("./constants");
 const error_1 = require("../error");
 const registry_1 = require("./registry");
+const child_process_1 = require("child_process");
+const PUBSUB_KILL_COMMAND = "pubsub_pids=$(ps aux | grep '[p]ubsub-emulator' | awk '{print $2}');" +
+    " if [ ! -z '$pubsub_pids' ]; then kill -9 $pubsub_pids; fi;";
 class PubsubEmulator {
     constructor(args) {
         this.args = args;
@@ -32,7 +35,16 @@ class PubsubEmulator {
         return Promise.resolve();
     }
     async stop() {
-        await downloadableEmulators.stop(types_1.Emulators.PUBSUB);
+        try {
+            await downloadableEmulators.stop(types_1.Emulators.PUBSUB);
+        }
+        catch (e) {
+            this.logger.logLabeled("DEBUG", "pubsub", JSON.stringify(e));
+            if (process.platform !== "win32") {
+                const buffer = (0, child_process_1.execSync)(PUBSUB_KILL_COMMAND);
+                this.logger.logLabeled("DEBUG", "pubsub", "Pubsub kill output: " + JSON.stringify(buffer));
+            }
+        }
     }
     getInfo() {
         const host = this.args.host || constants_1.Constants.getDefaultHost();

package/lib/extensions/emulator/triggerHelper.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionResourceToEmulatedTriggerDefintion = void 0;
-const functionsEmulatorShared_1 = require("../../emulator/functionsEmulatorShared");
 const emulatorLogger_1 = require("../../emulator/emulatorLogger");
+const functionsEmulatorShared_1 = require("../../emulator/functionsEmulatorShared");
 const types_1 = require("../../emulator/types");
+const error_1 = require("../../error");
 const types_2 = require("../../extensions/types");
 const proto = require("../../gcp/proto");
-const error_1 = require("../../error");
 function functionResourceToEmulatedTriggerDefintion(resource) {
     const resourceType = resource.type;
     if (resource.type === types_2.FUNCTIONS_RESOURCE_TYPE) {
@@ -29,6 +29,16 @@ function functionResourceToEmulatedTriggerDefintion(resource) {
                 service: (0, functionsEmulatorShared_1.getServiceFromEventType)(properties.eventTrigger.eventType),
             };
         }
+        else if (properties.scheduleTrigger) {
+            const schedule = {
+                schedule: properties.scheduleTrigger.schedule,
+            };
+            etd.schedule = schedule;
+            etd.eventTrigger = {
+                eventType: "google.pubsub.topic.publish",
+                resource: "",
+            };
+        }
         else {
             emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("WARN", `Function '${resource.name} is missing a trigger in extension.yaml. Please add one, as triggers defined in code are ignored.`);
         }

package/lib/serve/hosting.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = exports.start = exports.stop = void 0;
 const morgan = require("morgan");
-const { server: superstatic } = require("superstatic");
-const clc = require("colorette");
 const net_1 = require("net");
+const superstatic_1 = require("superstatic");
+const clc = require("colorette");
 const detectProjectRoot_1 = require("../detectProjectRoot");
 const error_1 = require("../error");
 const implicitInit_1 = require("../hosting/implicitInit");
@@ -36,13 +36,13 @@ function startServer(options, config, port, init) {
     const after = options.frameworksDevModeHandle && {
         files: options.frameworksDevModeHandle,
     };
-    const server = superstatic({
+    const server = (0, superstatic_1.server)({
         debug: false,
         port: port,
-        host: options.host,
+        hostname: options.host,
         config: config,
         compression: true,
-        cwd: (0, detectProjectRoot_1.detectProjectRoot)(options),
+        cwd: (0, detectProjectRoot_1.detectProjectRoot)(options) || undefined,
         stack: "strict",
         before: {
             files: (req, res, next) => {