firebase-tools 10.0.1 → 10.1.3

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

@@ -85,7 +85,7 @@ function printErrors(summary) {
     logger_1.logger.info("Functions deploy had errors with the following functions:" +
         errored
             .filter((r) => !(r.error instanceof AbortedDeploymentError))
-            .map((result) => `\n\t${functionsDeployHelper_1.getFunctionLabel(result.endpoint)}`)
+            .map((result) => `\n\t${(0, functionsDeployHelper_1.getFunctionLabel)(result.endpoint)}`)
             .join(""));
     printIamErrors(errored);
     printQuotaErrors(errored);
@@ -99,7 +99,7 @@ function printIamErrors(results) {
     }
     logger_1.logger.info("");
     logger_1.logger.info("Unable to set the invoker for the IAM policy on the following functions:" +
-        iamFailures.map((result) => `\n\t${functionsDeployHelper_1.getFunctionLabel(result.endpoint)}`).join(""));
+        iamFailures.map((result) => `\n\t${(0, functionsDeployHelper_1.getFunctionLabel)(result.endpoint)}`).join(""));
     logger_1.logger.info("");
     logger_1.logger.info("Some common causes of this:");
     logger_1.logger.info("");
@@ -124,7 +124,11 @@ function printQuotaErrors(results) {
             return false;
         }
         const original = r.error.original;
-        const code = (original === null || original === void 0 ? void 0 : original.status) || (original === null || original === void 0 ? void 0 : original.code) || ((_b = (_a = original === null || original === void 0 ? void 0 : original.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) || ((_c = original === null || original === void 0 ? void 0 : original.original) === null || _c === void 0 ? void 0 : _c.code) || ((_f = (_e = (_d = original === null || original === void 0 ? void 0 : original.original) === null || _d === void 0 ? void 0 : _d.context) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.statusCode);
+        const code = (original === null || original === void 0 ? void 0 : original.status) ||
+            (original === null || original === void 0 ? void 0 : original.code) ||
+            ((_b = (_a = original === null || original === void 0 ? void 0 : original.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) ||
+            ((_c = original === null || original === void 0 ? void 0 : original.original) === null || _c === void 0 ? void 0 : _c.code) ||
+            ((_f = (_e = (_d = original === null || original === void 0 ? void 0 : original.original) === null || _d === void 0 ? void 0 : _d.context) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.statusCode);
         return code === 429 || code === 409;
     });
     if (!hadQuotaError) {
@@ -145,7 +149,7 @@ function printAbortedErrors(results) {
     logger_1.logger.info("");
     logger_1.logger.info("Because there were errors creating or updating functions, the following " +
         "functions were not deleted" +
-        aborted.map((result) => `\n\t${functionsDeployHelper_1.getFunctionLabel(result.endpoint)}`).join(""));
+        aborted.map((result) => `\n\t${(0, functionsDeployHelper_1.getFunctionLabel)(result.endpoint)}`).join(""));
     logger_1.logger.info(`To delete these, use ${clc.bold("firebase functions:delete")}`);
 }
 exports.printAbortedErrors = printAbortedErrors;

package/lib/deploy/functions/runtimes/discovery/index.js

@@ -10,7 +10,7 @@ const logger_1 = require("../../../../logger");
 const api = require("../../.../../../../api");
 const v1alpha1 = require("./v1alpha1");
 const error_1 = require("../../../../error");
-exports.readFileAsync = util_1.promisify(fs.readFile);
+exports.readFileAsync = (0, util_1.promisify)(fs.readFile);
 function yamlToBackend(yaml, project, region, runtime) {
     try {
         if (!yaml.specVersion) {
@@ -54,7 +54,7 @@ async function detectFromPort(port, project, runtime, timeout = 30000) {
     });
     while (true) {
         try {
-            res = await Promise.race([node_fetch_1.default(`http://localhost:${port}/backend.yaml`), timedOut]);
+            res = await Promise.race([(0, node_fetch_1.default)(`http://localhost:${port}/backend.yaml`), timedOut]);
             break;
         }
         catch (err) {

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -9,8 +9,8 @@ function backendFromV1Alpha1(yaml, project, region, runtime) {
     const manifest = JSON.parse(JSON.stringify(yaml));
     const bkend = backend.empty();
     bkend.requiredAPIs = parseRequiredAPIs(manifest);
-    parsing_1.requireKeys("", manifest, "endpoints");
-    parsing_1.assertKeyTypes("", manifest, {
+    (0, parsing_1.requireKeys)("", manifest, "endpoints");
+    (0, parsing_1.assertKeyTypes)("", manifest, {
         specVersion: "string",
         requiredAPIs: "object",
         endpoints: "object",
@@ -41,7 +41,7 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
     const allParsed = [];
     const prefix = `endpoints[${id}]`;
     const ep = manifest.endpoints[id];
-    parsing_1.assertKeyTypes(prefix, ep, {
+    (0, parsing_1.assertKeyTypes)(prefix, ep, {
         region: "array",
         platform: "string",
         entryPoint: "string",
@@ -83,8 +83,8 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
     for (const region of ep.region || [defaultRegion]) {
         let triggered;
         if (backend.isEventTriggered(ep)) {
-            parsing_1.requireKeys(prefix + ".eventTrigger", ep.eventTrigger, "eventType", "eventFilters");
-            parsing_1.assertKeyTypes(prefix + ".eventTrigger", ep.eventTrigger, {
+            (0, parsing_1.requireKeys)(prefix + ".eventTrigger", ep.eventTrigger, "eventType", "eventFilters");
+            (0, parsing_1.assertKeyTypes)(prefix + ".eventTrigger", ep.eventTrigger, {
                 eventFilters: "object",
                 eventType: "string",
                 retry: "boolean",
@@ -94,19 +94,19 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             triggered = { eventTrigger: ep.eventTrigger };
         }
         else if (backend.isHttpsTriggered(ep)) {
-            parsing_1.assertKeyTypes(prefix + ".httpsTrigger", ep.httpsTrigger, {
+            (0, parsing_1.assertKeyTypes)(prefix + ".httpsTrigger", ep.httpsTrigger, {
                 invoker: "array",
             });
             triggered = { httpsTrigger: {} };
-            proto_1.copyIfPresent(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
+            (0, proto_1.copyIfPresent)(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
         }
         else if (backend.isScheduleTriggered(ep)) {
-            parsing_1.assertKeyTypes(prefix + ".scheduleTrigger", ep.scheduleTrigger, {
+            (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger", ep.scheduleTrigger, {
                 schedule: "string",
                 timeZone: "string",
                 retryConfig: "object",
             });
-            parsing_1.assertKeyTypes(prefix + ".scheduleTrigger.retryConfig", ep.scheduleTrigger.retryConfig, {
+            (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger.retryConfig", ep.scheduleTrigger.retryConfig, {
                 retryCount: "number",
                 maxDoublings: "number",
                 minBackoffDuration: "string",
@@ -116,20 +116,20 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             triggered = { scheduleTrigger: ep.scheduleTrigger };
         }
         else if (backend.isTaskQueueTriggered(ep)) {
-            parsing_1.assertKeyTypes(prefix + ".taskQueueTrigger", ep.taskQueueTrigger, {
+            (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger", ep.taskQueueTrigger, {
                 rateLimits: "object",
                 retryConfig: "object",
                 invoker: "array",
             });
             if (ep.taskQueueTrigger.rateLimits) {
-                parsing_1.assertKeyTypes(prefix + ".taskQueueTrigger.rateLimits", ep.taskQueueTrigger.rateLimits, {
+                (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.rateLimits", ep.taskQueueTrigger.rateLimits, {
                     maxBurstSize: "number",
                     maxConcurrentDispatches: "number",
                     maxDispatchesPerSecond: "number",
                 });
             }
             if (ep.taskQueueTrigger.retryConfig) {
-                parsing_1.assertKeyTypes(prefix + ".taskQueueTrigger.retryConfig", ep.taskQueueTrigger.retryConfig, {
+                (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.retryConfig", ep.taskQueueTrigger.retryConfig, {
                     maxAttempts: "number",
                     maxRetryDuration: "string",
                     minBackoff: "string",
@@ -143,12 +143,12 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             throw new error_1.FirebaseError(`Do not recognize trigger type for endpoint ${id}. Try upgrading ` +
                 "firebase-tools with npm install -g firebase-tools@latest");
         }
-        parsing_1.requireKeys(prefix, ep, "entryPoint");
+        (0, parsing_1.requireKeys)(prefix, ep, "entryPoint");
         const parsed = Object.assign({ platform: ep.platform || "gcfv2", id,
             region,
             project,
             runtime, entryPoint: ep.entryPoint }, triggered);
-        proto_1.copyIfPresent(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeout", "vpcConnector", "vpcConnectorEgressSettings", "labels", "ingressSettings", "environmentVariables");
+        (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeout", "vpcConnector", "vpcConnectorEgressSettings", "labels", "ingressSettings", "environmentVariables");
         allParsed.push(parsed);
     }
     return allParsed;

package/lib/deploy/functions/runtimes/golang/index.js

@@ -10,7 +10,6 @@ const spawn = require("cross-spawn");
 const error_1 = require("../../../../error");
 const logger_1 = require("../../../../logger");
 const discovery = require("../discovery");
-const projectUtils_1 = require("../../../../projectUtils");
 const gomod = require("./gomod");
 const VERSION_TO_RUNTIME = {
     "1.13": "go113",
@@ -19,21 +18,18 @@ exports.ADMIN_SDK = "firebase.google.com/go/v4";
 exports.FUNCTIONS_SDK = "github.com/FirebaseExtended/firebase-functions-go";
 exports.FUNCTIONS_CODEGEN = exports.FUNCTIONS_SDK + "/support/codegen";
 exports.FUNCTIONS_RUNTIME = exports.FUNCTIONS_SDK + "/support/runtime";
-async function tryCreateDelegate(context, options) {
-    const relativeSourceDir = options.config.get("functions.source");
-    const sourceDir = options.config.path(relativeSourceDir);
-    const goModPath = path.join(sourceDir, "go.mod");
-    const projectId = projectUtils_1.needProjectId(options);
+async function tryCreateDelegate(context) {
+    const goModPath = path.join(context.sourceDir, "go.mod");
     let module;
     try {
-        const modBuffer = await util_1.promisify(fs.readFile)(goModPath);
+        const modBuffer = await (0, util_1.promisify)(fs.readFile)(goModPath);
         module = gomod.parseModule(modBuffer.toString("utf8"));
     }
     catch (err) {
         logger_1.logger.debug("Customer code is not Golang code (or they aren't using gomod)");
         return;
     }
-    let runtime = options.config.get("functions.runtime");
+    let runtime = context.runtime;
     if (!runtime) {
         if (!module.version) {
             throw new error_1.FirebaseError("Could not detect Golang version from go.mod");
@@ -43,7 +39,7 @@ async function tryCreateDelegate(context, options) {
         }
         runtime = VERSION_TO_RUNTIME[module.version];
     }
-    return new Delegate(projectId, sourceDir, runtime, module);
+    return new Delegate(context.projectId, context.sourceDir, runtime, module);
 }
 exports.tryCreateDelegate = tryCreateDelegate;
 class Delegate {
@@ -59,7 +55,7 @@ class Delegate {
     }
     async build() {
         try {
-            await util_1.promisify(fs.mkdir)(path.join(this.sourceDir, "autogen"));
+            await (0, util_1.promisify)(fs.mkdir)(path.join(this.sourceDir, "autogen"));
         }
         catch (err) {
             if ((err === null || err === void 0 ? void 0 : err.code) !== "EEXIST") {
@@ -80,18 +76,19 @@ class Delegate {
                 children: [new Error(genBinary.stderr.toString())],
             });
         }
-        await util_1.promisify(fs.writeFile)(path.join(this.sourceDir, "autogen", "main.go"), genBinary.stdout);
+        await (0, util_1.promisify)(fs.writeFile)(path.join(this.sourceDir, "autogen", "main.go"), genBinary.stdout);
     }
     watch() {
         return Promise.resolve(() => Promise.resolve());
     }
     serve(port, adminPort, envs) {
+        var _a;
         const childProcess = spawn("go", ["run", "./autogen"], {
             env: Object.assign(Object.assign({}, envs), { PORT: port.toString(), ADMIN_PORT: adminPort.toString(), HOME: process.env.HOME, PATH: process.env.PATH, GOPATH: process.env.GOPATH }),
             cwd: this.sourceDir,
             stdio: ["ignore", "pipe", "inherit"],
         });
-        childProcess.stdout.on("data", (chunk) => {
+        (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
             logger_1.logger.debug(chunk.toString());
         });
         return Promise.resolve(async () => {
@@ -99,7 +96,7 @@ class Delegate {
                 childProcess.once("exit", resolve);
                 childProcess.once("error", reject);
             });
-            await node_fetch_1.default(`http://localhost:${adminPort}/quitquitquit`);
+            await (0, node_fetch_1.default)(`http://localhost:${adminPort}/quitquitquit`);
             setTimeout(() => {
                 if (!childProcess.killed) {
                     childProcess.kill("SIGKILL");
@@ -111,7 +108,7 @@ class Delegate {
     async discoverSpec(configValues, envs) {
         let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
         if (!discovered) {
-            const getPort = util_1.promisify(portfinder.getPort);
+            const getPort = (0, util_1.promisify)(portfinder.getPort);
             const port = await getPort();
             portfinder.basePort = port + 1;
             const adminPort = await getPort();

package/lib/deploy/functions/runtimes/index.js

@@ -30,22 +30,18 @@ function getHumanFriendlyRuntimeName(runtime) {
 }
 exports.getHumanFriendlyRuntimeName = getHumanFriendlyRuntimeName;
 const factories = [node.tryCreateDelegate, golang.tryCreateDelegate];
-async function getRuntimeDelegate(context, options) {
-    const sourceDirName = options.config.get("functions.source");
-    if (!sourceDirName) {
-        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions.source defined in firebase.json`);
-    }
-    validate.functionsDirectoryExists(options, sourceDirName);
-    const runtime = options.config.get("functions.runtime");
+async function getRuntimeDelegate(context) {
+    const { projectDir, sourceDir, runtime } = context;
+    validate.functionsDirectoryExists(sourceDir, projectDir);
     if (runtime && !isValidRuntime(runtime)) {
-        throw new error_1.FirebaseError("Cannot deploy function with runtime " + runtime);
+        throw new error_1.FirebaseError(`Cannot deploy function with runtime ${runtime}`);
     }
     for (const factory of factories) {
-        const delegate = await factory(context, options);
+        const delegate = await factory(context);
         if (delegate) {
             return delegate;
         }
     }
-    throw new error_1.FirebaseError(`Could not detect language for functions at ${options.config.get("functions.source")}`);
+    throw new error_1.FirebaseError(`Could not detect language for functions at ${sourceDir}`);
 }
 exports.getRuntimeDelegate = getRuntimeDelegate;

package/lib/deploy/functions/runtimes/node/index.js

@@ -6,26 +6,22 @@ const fs = require("fs");
 const path = require("path");
 const error_1 = require("../../../../error");
 const parseRuntimeAndValidateSDK_1 = require("./parseRuntimeAndValidateSDK");
-const projectUtils_1 = require("../../../../projectUtils");
-const validate = require("./validate");
 const logger_1 = require("../../../../logger");
+const validate = require("./validate");
 const versioning = require("./versioning");
 const parseTriggers = require("./parseTriggers");
-async function tryCreateDelegate(context, options) {
-    const projectRelativeSourceDir = options.config.get("functions.source");
-    const sourceDir = options.config.path(projectRelativeSourceDir);
-    const packageJsonPath = path.join(sourceDir, "package.json");
-    if (!(await util_1.promisify(fs.exists)(packageJsonPath))) {
+async function tryCreateDelegate(context) {
+    const packageJsonPath = path.join(context.sourceDir, "package.json");
+    if (!(await (0, util_1.promisify)(fs.exists)(packageJsonPath))) {
         logger_1.logger.debug("Customer code is not Node");
         return undefined;
     }
-    let runtime = options.config.get("functions.runtime") || "";
-    runtime = parseRuntimeAndValidateSDK_1.getRuntimeChoice(sourceDir, runtime);
+    const runtime = (0, parseRuntimeAndValidateSDK_1.getRuntimeChoice)(context.sourceDir, context.runtime);
     if (!runtime.startsWith("nodejs")) {
         logger_1.logger.debug("Customer has a package.json but did not get a nodejs runtime. This should not happen");
         throw new error_1.FirebaseError(`Unexpected runtime ${runtime}`);
     }
-    return new Delegate(projectUtils_1.needProjectId(options), options.config.projectDir, sourceDir, runtime);
+    return new Delegate(context.projectId, context.projectDir, context.sourceDir, runtime);
 }
 exports.tryCreateDelegate = tryCreateDelegate;
 class Delegate {

package/lib/deploy/functions/runtimes/node/parseTriggers.js

@@ -25,7 +25,7 @@ function parseTriggers(projectId, sourceDir, configValues, envs) {
         if (env.NODE_OPTIONS) {
             env.NODE_OPTIONS = removeInspectOptions(env.NODE_OPTIONS.split(" ")).join(" ");
         }
-        const parser = child_process_1.fork(TRIGGER_PARSER, [sourceDir], {
+        const parser = (0, child_process_1.fork)(TRIGGER_PARSER, [sourceDir], {
             silent: true,
             env: env,
             execArgv: execArgv,
@@ -100,9 +100,9 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             }
         }
         const endpoint = Object.assign({ platform: annotation.platform || "gcfv1", id: annotation.name, region: region, project: projectId, entryPoint: annotation.entryPoint, runtime: runtime }, triggered);
-        if (annotation.vpcConnector) {
+        if (annotation.vpcConnector != null) {
             let maybeId = annotation.vpcConnector;
-            if (!maybeId.includes("/")) {
+            if (maybeId && !maybeId.includes("/")) {
                 maybeId = `projects/${projectId}/locations/${region}/connectors/${maybeId}`;
             }
             endpoint.vpcConnector = maybeId;

package/lib/deploy/functions/runtimes/node/validate.js

@@ -9,7 +9,8 @@ const cjson = require("cjson");
 function assertFunctionsSourcePresent(data, sourceDir, projectDir) {
     const indexJsFile = path.join(sourceDir, data.main || "index.js");
     if (!fsutils.fileExistsSync(indexJsFile)) {
-        const msg = `${path.relative(projectDir, indexJsFile)} does not exist, can't deploy Cloud Functions`;
+        const relativeMainPath = path.relative(projectDir, indexJsFile);
+        const msg = `${relativeMainPath} does not exist, can't deploy Cloud Functions`;
         throw new error_1.FirebaseError(msg);
     }
 }

package/lib/deploy/functions/services/storage.js

@@ -36,7 +36,7 @@ async function ensureStorageTriggerRegion(endpoint, eventTrigger) {
     }
     if (endpoint.region !== eventTrigger.region &&
         eventTrigger.region !== "us-central1" &&
-        !location_1.regionInLocation(endpoint.region, eventTrigger.region)) {
+        !(0, location_1.regionInLocation)(endpoint.region, eventTrigger.region)) {
         throw new error_1.FirebaseError(`A function in region ${endpoint.region} cannot listen to a bucket in region ${eventTrigger.region}`);
     }
 }

package/lib/deploy/functions/triggerRegionHelper.js

@@ -9,7 +9,7 @@ async function ensureTriggerRegions(want) {
         if (ep.platform === "gcfv1" || !backend.isEventTriggered(ep)) {
             continue;
         }
-        regionLookups.push(services_1.serviceForEndpoint(ep).ensureTriggerRegion(ep, ep.eventTrigger));
+        regionLookups.push((0, services_1.serviceForEndpoint)(ep).ensureTriggerRegion(ep, ep.eventTrigger));
     }
     await Promise.all(regionLookups);
 }

package/lib/deploy/functions/validate.js

@@ -1,12 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.functionIdsAreValid = exports.functionsDirectoryExists = void 0;
+exports.functionIdsAreValid = exports.functionsDirectoryExists = exports.endpointsAreValid = void 0;
+const path = require("path");
 const clc = require("cli-color");
 const error_1 = require("../../error");
 const fsutils = require("../../fsutils");
-const projectPath = require("../../projectPath");
-function functionsDirectoryExists(options, sourceDirName) {
-    if (!fsutils.dirExistsSync(projectPath.resolveProjectPath(options, sourceDirName))) {
+const backend = require("./backend");
+function endpointsAreValid(wantBackend) {
+    functionIdsAreValid(backend.allEndpoints(wantBackend));
+    const gcfV1WithConcurrency = backend
+        .allEndpoints(wantBackend)
+        .filter((endpoint) => (endpoint.concurrency || 1) != 1 && endpoint.platform == "gcfv1")
+        .map((endpoint) => endpoint.id);
+    if (gcfV1WithConcurrency.length) {
+        const msg = `Cannot set concurrency on the functions ${gcfV1WithConcurrency.join(",")} because they are GCF gen 1`;
+        throw new error_1.FirebaseError(msg);
+    }
+    const tooSmallForConcurrency = backend
+        .allEndpoints(wantBackend)
+        .filter((endpoint) => {
+        if ((endpoint.concurrency || 1) == 1) {
+            return false;
+        }
+        const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
+        return mem < backend.MIN_MEMORY_FOR_CONCURRENCY;
+    })
+        .map((endpoint) => endpoint.id);
+    if (tooSmallForConcurrency.length) {
+        const msg = `Cannot set concurency on the functions ${tooSmallForConcurrency.join(",")} because they have fewer than 2GB memory`;
+        throw new error_1.FirebaseError(msg);
+    }
+}
+exports.endpointsAreValid = endpointsAreValid;
+function functionsDirectoryExists(sourceDir, projectDir) {
+    if (!fsutils.dirExistsSync(sourceDir)) {
+        const sourceDirName = path.relative(projectDir, sourceDir);
         const msg = `could not deploy functions because the ${clc.bold('"' + sourceDirName + '"')} ` +
             `directory was not found. Please create it or specify a different source directory in firebase.json`;
         throw new error_1.FirebaseError(msg);

package/lib/deploy/hosting/convertConfig.js

@@ -1,11 +1,24 @@
 "use strict";
-const _ = require("lodash");
-const { FirebaseError } = require("../../error");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertConfig = void 0;
+const error_1 = require("../../error");
+function has(obj, k) {
+    return obj[k] !== undefined;
+}
 function extractPattern(type, spec) {
-    const glob = spec.source || spec.glob;
-    const regex = spec.regex;
+    let glob = "";
+    let regex = "";
+    if ("source" in spec) {
+        glob = spec.source;
+    }
+    if ("glob" in spec) {
+        glob = spec.glob;
+    }
+    if ("regex" in spec) {
+        regex = spec.regex;
+    }
     if (glob && regex) {
-        throw new FirebaseError("Cannot specify a " + type + " pattern with both a glob and regex.");
+        throw new error_1.FirebaseError(`Cannot specify a ${type} pattern with both a glob and regex.`);
     }
     else if (glob) {
         return { glob: glob };
@@ -13,33 +26,38 @@ function extractPattern(type, spec) {
     else if (regex) {
         return { regex: regex };
     }
-    throw new FirebaseError("Cannot specify a " + type + " with no pattern (either a glob or regex required).");
+    throw new error_1.FirebaseError(`Cannot specify a ${type} with no pattern (either a glob or regex required).`);
 }
-module.exports = function (config) {
+function convertConfig(config) {
+    if (Array.isArray(config)) {
+        throw new error_1.FirebaseError(`convertConfig should be given a single configuration, not an array.`, {
+            exit: 2,
+        });
+    }
     const out = {};
     if (!config) {
         return out;
     }
-    if (_.isArray(config.rewrites)) {
-        out.rewrites = config.rewrites.map(function (rewrite) {
+    if (Array.isArray(config.rewrites)) {
+        out.rewrites = config.rewrites.map((rewrite) => {
             const vRewrite = extractPattern("rewrite", rewrite);
-            if (rewrite.destination) {
+            if ("destination" in rewrite) {
                 vRewrite.path = rewrite.destination;
             }
-            else if (rewrite.function) {
+            else if ("function" in rewrite) {
                 vRewrite.function = rewrite.function;
             }
-            else if (rewrite.dynamicLinks) {
+            else if ("dynamicLinks" in rewrite) {
                 vRewrite.dynamicLinks = rewrite.dynamicLinks;
             }
-            else if (rewrite.run) {
+            else if ("run" in rewrite) {
                 vRewrite.run = Object.assign({ region: "us-central1" }, rewrite.run);
             }
             return vRewrite;
         });
     }
-    if (_.isArray(config.redirects)) {
-        out.redirects = config.redirects.map(function (redirect) {
+    if (Array.isArray(config.redirects)) {
+        out.redirects = config.redirects.map((redirect) => {
             const vRedirect = extractPattern("redirect", redirect);
             vRedirect.location = redirect.destination;
             if (redirect.type) {
@@ -48,17 +66,19 @@ module.exports = function (config) {
             return vRedirect;
         });
     }
-    if (_.isArray(config.headers)) {
-        out.headers = config.headers.map(function (header) {
+    if (Array.isArray(config.headers)) {
+        out.headers = config.headers.map((header) => {
             const vHeader = extractPattern("header", header);
             vHeader.headers = {};
-            (header.headers || []).forEach(function (h) {
-                vHeader.headers[h.key] = h.value;
-            });
+            if (Array.isArray(header.headers) && header.headers.length) {
+                header.headers.forEach((h) => {
+                    vHeader.headers[h.key] = h.value;
+                });
+            }
             return vHeader;
         });
     }
-    if (_.has(config, "cleanUrls")) {
+    if (has(config, "cleanUrls")) {
         out.cleanUrls = config.cleanUrls;
     }
     if (config.trailingSlash === true) {
@@ -67,11 +87,12 @@ module.exports = function (config) {
     else if (config.trailingSlash === false) {
         out.trailingSlashBehavior = "REMOVE";
     }
-    if (_.has(config, "appAssociation")) {
+    if (has(config, "appAssociation")) {
         out.appAssociation = config.appAssociation;
     }
-    if (_.has(config, "i18n")) {
+    if (has(config, "i18n")) {
         out.i18n = config.i18n;
     }
     return out;
-};
+}
+exports.convertConfig = convertConfig;

package/lib/deploy/hosting/deploy.js

@@ -18,7 +18,7 @@ async function deploy(context, options) {
     let spins = 0;
     function updateSpinner(newMessage, debugging) {
         if (debugging) {
-            utils_1.logLabeledBullet("hosting", newMessage);
+            (0, utils_1.logLabeledBullet)("hosting", newMessage);
         }
         else {
             process.stdout.write(_ERASE_LINE + clc.move(-9999, 0));
@@ -33,20 +33,20 @@ async function deploy(context, options) {
             return;
         }
         if (!((_a = deploy.config) === null || _a === void 0 ? void 0 : _a.public)) {
-            utils_1.logLabeledBullet(`hosting[${deploy.site}]`, 'no "public" directory to upload, continuing with release');
+            (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, 'no "public" directory to upload, continuing with release');
             return runDeploys(deploys, debugging);
         }
-        utils_1.logLabeledBullet("hosting[" + deploy.site + "]", "beginning deploy...");
+        (0, utils_1.logLabeledBullet)("hosting[" + deploy.site + "]", "beginning deploy...");
         const t0 = Date.now();
         const publicDir = options.config.path(deploy.config.public);
-        const files = listFiles_1.listFiles(publicDir, deploy.config.ignore);
-        utils_1.logLabeledBullet(`hosting[${deploy.site}]`, `found ${files.length} files in ${clc.bold(deploy.config.public)}`);
+        const files = (0, listFiles_1.listFiles)(publicDir, deploy.config.ignore);
+        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, `found ${files.length} files in ${clc.bold(deploy.config.public)}`);
         const uploader = new uploader_1.Uploader({
             version: deploy.version,
             files: files,
             public: publicDir,
             cwd: options.cwd,
-            projectRoot: detectProjectRoot_1.detectProjectRoot(options),
+            projectRoot: (0, detectProjectRoot_1.detectProjectRoot)(options),
         });
         const progressInterval = setInterval(() => updateSpinner(uploader.statusMessage(), debugging), debugging ? 2000 : 200);
         try {
@@ -62,7 +62,7 @@ async function deploy(context, options) {
         if (!debugging) {
             process.stdout.write(_ERASE_LINE + clc.move(-9999, 0));
         }
-        utils_1.logLabeledSuccess("hosting[" + deploy.site + "]", "file upload complete");
+        (0, utils_1.logLabeledSuccess)("hosting[" + deploy.site + "]", "file upload complete");
         const dt = Date.now() - t0;
         logger_1.logger.debug("[hosting] deploy completed after " + dt + "ms");
         track("Hosting Deploy", "success", dt);

package/lib/deploy/hosting/prepare.js

@@ -1,7 +1,7 @@
 "use strict";
 const _ = require("lodash");
 const api = require("../../api");
-const convertConfig = require("./convertConfig");
+const { convertConfig } = require("./convertConfig");
 const deploymentTool = require("../../deploymentTool");
 const { FirebaseError } = require("../../error");
 const { normalizedHostingConfigs } = require("../../hosting/normalizedHostingConfigs");

package/lib/deploy/hosting/uploader.js

@@ -145,7 +145,7 @@ class Uploader {
         this.hashMap[hash] = filePath;
         this.pathMap[filePath] = hash;
         this.populateBatch["/" + filePath] = hash;
-        const curBatchSize = lodash_1.size(this.populateBatch);
+        const curBatchSize = (0, lodash_1.size)(this.populateBatch);
         if (curBatchSize > 0 && curBatchSize % this.populateBatchSize === 0) {
             this.queuePopulate();
         }

package/lib/deploy/hosting/validate.js

@@ -20,7 +20,7 @@ function validateDeploy(deploy, options) {
     if (!hasPublicDir && !hasAnyDynamicRewrites && !hasAnyRedirects) {
         throw new error_1.FirebaseError('Must supply a "public" directory or at least one rewrite or redirect in each "hosting" config.');
     }
-    if (hasPublicDir && !fsutils_1.dirExistsSync(projectPath_1.resolveProjectPath(options, cfg.public))) {
+    if (hasPublicDir && !(0, fsutils_1.dirExistsSync)((0, projectPath_1.resolveProjectPath)(options, cfg.public))) {
         throw new error_1.FirebaseError(`Specified "public" directory "${cfg.public}" does not exist, can't deploy hosting to site "${deploy.site}"`);
     }
     if (cfg.i18n) {
@@ -32,8 +32,8 @@ function validateDeploy(deploy, options) {
         }
         else {
             const i18nPath = path.join(cfg.public, cfg.i18n.root);
-            if (!fsutils_1.dirExistsSync(projectPath_1.resolveProjectPath(options, i18nPath))) {
-                utils_1.logLabeledWarning("hosting", `Couldn't find specified i18n root directory ${clc.bold(cfg.i18n.root)} in public directory ${clc.bold(cfg.public)}.`);
+            if (!(0, fsutils_1.dirExistsSync)((0, projectPath_1.resolveProjectPath)(options, i18nPath))) {
+                (0, utils_1.logLabeledWarning)("hosting", `Couldn't find specified i18n root directory ${clc.bold(cfg.i18n.root)} in public directory ${clc.bold(cfg.public)}.`);
             }
         }
     }

package/lib/deploy/remoteconfig/prepare.js

@@ -14,9 +14,9 @@ async function default_1(context, options) {
         return;
     }
     const template = loadCJSON(filePath);
-    const projectNumber = await projectUtils_1.needProjectNumber(options);
-    template.etag = await functions_1.getEtag(projectNumber);
-    functions_2.validateInputRemoteConfigTemplate(template);
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    template.etag = await (0, functions_1.getEtag)(projectNumber);
+    (0, functions_2.validateInputRemoteConfigTemplate)(template);
     context.remoteconfigTemplate = template;
     return;
 }

package/lib/deploy/remoteconfig/release.js

@@ -7,8 +7,8 @@ async function default_1(context, options) {
         return;
     }
     const template = context.remoteconfigTemplate;
-    const projectNumber = await projectUtils_1.needProjectNumber(options);
-    const etag = await functions_1.getEtag(projectNumber);
-    return functions_1.publishTemplate(projectNumber, template, etag, options);
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    const etag = await (0, functions_1.getEtag)(projectNumber);
+    return (0, functions_1.publishTemplate)(projectNumber, template, etag, options);
 }
 exports.default = default_1;