firebase-tools 10.3.1 → 10.4.2

package/lib/accountExporter.js

@@ -1,15 +1,17 @@
 "use strict";
-var os = require("os");
-var path = require("path");
-var _ = require("lodash");
-const { Client } = require("./apiv2");
-const { googleOrigin } = require("./api");
-var { FirebaseError } = require("./error");
-var utils = require("./utils");
-const apiClient = new Client({
-    urlPrefix: googleOrigin,
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serialExportUsers = exports.validateOptions = void 0;
+const _ = require("lodash");
+const os = require("os");
+const path = require("path");
+const apiv2_1 = require("./apiv2");
+const error_1 = require("./error");
+const api_1 = require("./api");
+const utils = require("./utils");
+const apiClient = new apiv2_1.Client({
+    urlPrefix: api_1.googleOrigin,
 });
-var EXPORTED_JSON_KEYS = [
+const EXPORTED_JSON_KEYS = [
     "localId",
     "email",
     "emailVerified",
@@ -23,44 +25,53 @@ var EXPORTED_JSON_KEYS = [
     "disabled",
     "customAttributes",
 ];
-var EXPORTED_JSON_KEYS_RENAMING = {
+const EXPORTED_JSON_KEYS_RENAMING = {
     lastLoginAt: "lastSignedInAt",
 };
-var EXPORTED_PROVIDER_USER_INFO_KEYS = ["providerId", "rawId", "email", "displayName", "photoUrl"];
-var PROVIDER_ID_INDEX_MAP = {
-    "google.com": 7,
-    "facebook.com": 11,
-    "twitter.com": 15,
-    "github.com": 19,
-};
-var _escapeComma = function (str) {
-    if (str.indexOf(",") !== -1) {
+const EXPORTED_PROVIDER_USER_INFO_KEYS = [
+    "providerId",
+    "rawId",
+    "email",
+    "displayName",
+    "photoUrl",
+];
+const PROVIDER_ID_INDEX_MAP = new Map([
+    ["google.com", 7],
+    ["facebook.com", 11],
+    ["twitter.com", 15],
+    ["github.com", 19],
+]);
+function escapeComma(str) {
+    if (str.includes(",")) {
         return `"${str}"`;
     }
     return str;
-};
-var _convertToNormalBase64 = function (data) {
+}
+function convertToNormalBase64(data) {
     return data.replace(/_/g, "/").replace(/-/g, "+");
-};
-var _addProviderUserInfo = function (providerInfo, arr, startPos) {
+}
+function addProviderUserInfo(providerInfo, arr, startPos) {
     arr[startPos] = providerInfo.rawId;
     arr[startPos + 1] = providerInfo.email || "";
-    arr[startPos + 2] = _escapeComma(providerInfo.displayName || "");
+    arr[startPos + 2] = escapeComma(providerInfo.displayName || "");
     arr[startPos + 3] = providerInfo.photoUrl || "";
-};
-var _transUserToArray = function (user) {
-    var arr = Array(27).fill("");
+}
+function transUserToArray(user) {
+    const arr = Array(27).fill("");
     arr[0] = user.localId;
     arr[1] = user.email || "";
     arr[2] = user.emailVerified || false;
-    arr[3] = _convertToNormalBase64(user.passwordHash || "");
-    arr[4] = _convertToNormalBase64(user.salt || "");
-    arr[5] = _escapeComma(user.displayName || "");
+    arr[3] = convertToNormalBase64(user.passwordHash || "");
+    arr[4] = convertToNormalBase64(user.salt || "");
+    arr[5] = escapeComma(user.displayName || "");
     arr[6] = user.photoUrl || "";
-    for (var i = 0; i < (!user.providerUserInfo ? 0 : user.providerUserInfo.length); i++) {
-        var providerInfo = user.providerUserInfo[i];
-        if (providerInfo && PROVIDER_ID_INDEX_MAP[providerInfo.providerId]) {
-            _addProviderUserInfo(providerInfo, arr, PROVIDER_ID_INDEX_MAP[providerInfo.providerId]);
+    for (let i = 0; i < (!user.providerUserInfo ? 0 : user.providerUserInfo.length); i++) {
+        const providerInfo = user.providerUserInfo[i];
+        if (providerInfo) {
+            const providerIndex = PROVIDER_ID_INDEX_MAP.get(providerInfo.providerId);
+            if (providerIndex) {
+                addProviderUserInfo(providerInfo, arr, providerIndex);
+            }
         }
     }
     arr[23] = user.createdAt;
@@ -69,36 +80,35 @@ var _transUserToArray = function (user) {
     arr[26] = user.disabled;
     arr[27] = user.customAttributes;
     return arr;
-};
-var _transUserJson = function (user) {
-    var newUser = {};
-    _.each(_.pick(user, EXPORTED_JSON_KEYS), function (value, key) {
-        var newKey = EXPORTED_JSON_KEYS_RENAMING[key] || key;
+}
+function transUserJson(user) {
+    const newUser = {};
+    _.each(_.pick(user, EXPORTED_JSON_KEYS), (value, key) => {
+        const newKey = EXPORTED_JSON_KEYS_RENAMING[key] || key;
         newUser[newKey] = value;
     });
     if (newUser.passwordHash) {
-        newUser.passwordHash = _convertToNormalBase64(newUser.passwordHash);
+        newUser.passwordHash = convertToNormalBase64(newUser.passwordHash);
     }
     if (newUser.salt) {
-        newUser.salt = _convertToNormalBase64(newUser.salt);
+        newUser.salt = convertToNormalBase64(newUser.salt);
     }
     if (user.providerUserInfo) {
         newUser.providerUserInfo = [];
-        user.providerUserInfo.forEach(function (providerInfo) {
-            if (!_.includes(Object.keys(PROVIDER_ID_INDEX_MAP), providerInfo.providerId)) {
-                return;
+        for (const providerInfo of user.providerUserInfo) {
+            if (PROVIDER_ID_INDEX_MAP.has(providerInfo.providerId)) {
+                newUser.providerUserInfo.push(_.pick(providerInfo, EXPORTED_PROVIDER_USER_INFO_KEYS));
             }
-            newUser.providerUserInfo.push(_.pick(providerInfo, EXPORTED_PROVIDER_USER_INFO_KEYS));
-        });
+        }
     }
     return newUser;
-};
-var validateOptions = function (options, fileName) {
-    var exportOptions = {};
+}
+function validateOptions(options, fileName) {
+    const exportOptions = {};
     if (fileName === undefined) {
-        throw new FirebaseError("Must specify data file", { exit: 1 });
+        throw new error_1.FirebaseError("Must specify data file");
     }
-    var extName = path.extname(fileName.toLowerCase());
+    const extName = path.extname(fileName.toLowerCase());
     if (extName === ".csv") {
         exportOptions.format = "csv";
     }
@@ -106,44 +116,44 @@ var validateOptions = function (options, fileName) {
         exportOptions.format = "json";
     }
     else if (options.format) {
-        var format = options.format.toLowerCase();
+        const format = options.format.toLowerCase();
         if (format === "csv" || format === "json") {
             exportOptions.format = format;
         }
         else {
-            throw new FirebaseError("Unsupported data file format, should be csv or json", { exit: 1 });
+            throw new error_1.FirebaseError("Unsupported data file format, should be csv or json");
         }
     }
     else {
-        throw new FirebaseError("Please specify data file format in file name, or use `format` parameter", {
-            exit: 1,
-        });
+        throw new error_1.FirebaseError("Please specify data file format in file name, or use `format` parameter");
     }
     return exportOptions;
-};
-var _createWriteUsersToFile = function () {
-    var jsonSep = "";
-    return function (userList, format, writeStream) {
-        userList.map(function (user) {
+}
+exports.validateOptions = validateOptions;
+function createWriteUsersToFile() {
+    let jsonSep = "";
+    return (userList, format, writeStream) => {
+        userList.map((user) => {
             if (user.passwordHash && user.version !== 0) {
                 delete user.passwordHash;
                 delete user.salt;
             }
             if (format === "csv") {
-                writeStream.write(_transUserToArray(user).join(",") + "," + os.EOL, "utf8");
+                writeStream.write(transUserToArray(user).join(",") + "," + os.EOL, "utf8");
             }
             else {
-                writeStream.write(jsonSep + JSON.stringify(_transUserJson(user), null, 2), "utf8");
+                writeStream.write(jsonSep + JSON.stringify(transUserJson(user), null, 2), "utf8");
                 jsonSep = "," + os.EOL;
             }
         });
     };
-};
-var serialExportUsers = function (projectId, options) {
+}
+async function serialExportUsers(projectId, options) {
+    var _a;
     if (!options.writeUsersToFile) {
-        options.writeUsersToFile = _createWriteUsersToFile();
+        options.writeUsersToFile = createWriteUsersToFile();
     }
-    var postBody = {
+    const postBody = {
         targetProjectId: projectId,
         maxResults: options.batchSize,
     };
@@ -153,13 +163,12 @@ var serialExportUsers = function (projectId, options) {
     if (!options.timeoutRetryCount) {
         options.timeoutRetryCount = 0;
     }
-    return apiClient
-        .post("/identitytoolkit/v3/relyingparty/downloadAccount", postBody, {
-        skipLog: { resBody: true },
-    })
-        .then(function (ret) {
+    try {
+        const ret = await apiClient.post("/identitytoolkit/v3/relyingparty/downloadAccount", postBody, {
+            skipLog: { resBody: true },
+        });
         options.timeoutRetryCount = 0;
-        var userList = ret.body.users;
+        const userList = ret.body.users;
         if (userList && userList.length > 0) {
             options.writeUsersToFile(userList, options.format, options.writeStream);
             utils.logSuccess("Exported " + userList.length + " account(s) successfully.");
@@ -169,19 +178,21 @@ var serialExportUsers = function (projectId, options) {
             options.nextPageToken = ret.body.nextPageToken;
             return serialExportUsers(projectId, options);
         }
-    })
-        .catch((err) => {
-        if (err.original.code === "ETIMEDOUT") {
+    }
+    catch (err) {
+        if (((_a = err.original) === null || _a === void 0 ? void 0 : _a.code) === "ETIMEDOUT") {
             options.timeoutRetryCount++;
             if (options.timeoutRetryCount > 5) {
                 return err;
             }
             return serialExportUsers(projectId, options);
         }
-    });
-};
-var accountExporter = {
-    validateOptions: validateOptions,
-    serialExportUsers: serialExportUsers,
-};
-module.exports = accountExporter;
+        if (err instanceof error_1.FirebaseError) {
+            throw err;
+        }
+        else {
+            throw new error_1.FirebaseError(`Failed to export accounts: ${err}`, { original: err });
+        }
+    }
+}
+exports.serialExportUsers = serialExportUsers;

package/lib/commands/deploy.js

@@ -6,7 +6,7 @@ const { checkServiceAccountIam } = require("../deploy/functions/checkIam");
 const checkValidTargetFilters = require("../checkValidTargetFilters");
 const { Command } = require("../command");
 const deploy = require("../deploy");
-const requireConfig = require("../requireConfig");
+const { requireConfig } = require("../requireConfig");
 const { filterTargets } = require("../filterTargets");
 const { requireHostingSite } = require("../requireHostingSite");
 const VALID_TARGETS = [

package/lib/commands/experimental-functions-shell.js

@@ -2,7 +2,7 @@
 var { Command } = require("../command");
 var { requirePermissions } = require("../requirePermissions");
 var { actionFunction } = require("../functionsShellCommandAction");
-var requireConfig = require("../requireConfig");
+var { requireConfig } = require("../requireConfig");
 module.exports = new Command("experimental:functions:shell")
     .description("launch full Node shell with emulated functions. (Alias for `firebase functions:shell.)")
     .option("-p, --port <port>", "the port on which to emulate functions (default: 5000)", 5000)

package/lib/commands/ext-configure.js

@@ -35,7 +35,7 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
     .before(extensionsHelper_1.diagnoseAndFixProject)
     .action(async (instanceId, options) => {
     var _a;
-    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectId = (0, projectUtils_1.getProjectId)(options);
     if (options.local) {
         if (options.nonInteractive) {
             throw new error_1.FirebaseError(`Command not supported in non-interactive mode, edit ./extensions/${instanceId}.env directly instead`);
@@ -58,12 +58,13 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
             instanceId,
             reconfiguring: true,
         });
-        const newParamValues = Object.assign(Object.assign({}, oldParamValues), (0, paramHelper_1.getBaseParamBindings)(mutableParamsBindingOptions));
+        const newParamOptions = Object.assign(Object.assign({}, (0, paramHelper_1.buildBindingOptionsWithBaseValue)(oldParamValues)), mutableParamsBindingOptions);
         await manifest.writeToManifest([
             {
                 instanceId,
                 ref: targetRef,
-                params: newParamValues,
+                params: newParamOptions,
+                paramSpecs: extensionVersion.spec.params,
             },
         ], config, {
             nonInteractive: false,
@@ -76,7 +77,7 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
     try {
         let existingInstance;
         try {
-            existingInstance = await extensionsApi.getInstance(projectId, instanceId);
+            existingInstance = await extensionsApi.getInstance((0, projectUtils_1.needProjectId)({ projectId }), instanceId);
         }
         catch (err) {
             if (err.status === 404) {
@@ -112,13 +113,13 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
         }
         spinner.start();
         const res = await extensionsApi.configureInstance({
-            projectId,
+            projectId: (0, projectUtils_1.needProjectId)({ projectId }),
             instanceId,
             params: paramBindings,
         });
         spinner.stop();
         utils.logLabeledSuccess(extensionsHelper_1.logPrefix, `successfully configured ${clc.bold(instanceId)}.`);
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`You can view your reconfigured instance in the Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=config`)}`));
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`You can view your reconfigured instance in the Firebase console: ${utils.consoleUrl((0, projectUtils_1.needProjectId)({ projectId }), `/extensions/instances/${instanceId}?tab=config`)}`));
         manifest.showDeprecationWarning();
         return res;
     }

package/lib/commands/ext-export.js

@@ -6,6 +6,7 @@ const planner = require("../deploy/extensions/planner");
 const export_1 = require("../extensions/export");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const manifest = require("../extensions/manifest");
+const paramHelper_1 = require("../extensions/paramHelper");
 const functional_1 = require("../functional");
 const getProjectNumber_1 = require("../getProjectNumber");
 const logger_1 = require("../logger");
@@ -41,8 +42,13 @@ module.exports = new command_1.Command("ext:export")
         logger_1.logger.info("Exiting. No changes made.");
         return;
     }
+    const manifestSpecs = withRef.map((spec) => ({
+        instanceId: spec.instanceId,
+        ref: spec.ref,
+        params: (0, paramHelper_1.buildBindingOptionsWithBaseValue)(spec.params),
+    }));
     const existingConfig = manifest.loadConfig(options);
-    await manifest.writeToManifest(withRef, existingConfig, {
+    await manifest.writeToManifest(manifestSpecs, existingConfig, {
         nonInteractive: options.nonInteractive,
         force: options.force,
     }, true);

package/lib/commands/ext-install.js

@@ -47,7 +47,7 @@ exports.default = new command_1.Command("ext:install [extensionName]")
     .before(extensionsHelper_1.diagnoseAndFixProject)
     .action(async (extensionName, options) => {
     var _a;
-    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectId = (0, projectUtils_1.getProjectId)(options);
     const paramsEnvPath = ((_a = options.params) !== null && _a !== void 0 ? _a : "");
     let learnMore = false;
     if (!extensionName) {
@@ -71,7 +71,7 @@ exports.default = new command_1.Command("ext:install [extensionName]")
         if (options.local) {
             throw new error_1.FirebaseError("Installing a local source locally is not supported yet, please use ext:dev:emulator commands");
         }
-        source = await infoInstallBySource(projectId, extensionName);
+        source = await infoInstallBySource((0, projectUtils_1.needProjectId)({ projectId }), extensionName);
     }
     else {
         void (0, track_1.track)("Extension Install", "Install by Extension Ref", options.interactive ? 1 : 0);
@@ -120,7 +120,7 @@ exports.default = new command_1.Command("ext:install [extensionName]")
     try {
         return installExtension({
             paramsEnvPath,
-            projectId,
+            projectId: projectId,
             extensionName,
             source,
             extVersion,
@@ -183,19 +183,20 @@ async function installToManifest(options) {
         paramsEnvPath,
         instanceId,
     });
-    const params = (0, paramHelper_1.getBaseParamBindings)(paramBindingOptions);
     const ref = refs.parse(extVersion.ref);
     await manifest.writeToManifest([
         {
             instanceId,
             ref,
-            params,
+            params: paramBindingOptions,
+            paramSpecs: spec.params,
         },
     ], config, { nonInteractive, force: force !== null && force !== void 0 ? force : false });
     manifest.showPreviewWarning();
 }
 async function installExtension(options) {
-    const { projectId, extensionName, source, extVersion, paramsEnvPath, nonInteractive, force } = options;
+    const { extensionName, source, extVersion, paramsEnvPath, nonInteractive, force } = options;
+    const projectId = (0, projectUtils_1.needProjectId)({ projectId: options.projectId });
     const spec = (source === null || source === void 0 ? void 0 : source.spec) || (extVersion === null || extVersion === void 0 ? void 0 : extVersion.spec);
     if (!spec) {
         throw new error_1.FirebaseError(`Could not find the extension.yaml for ${extensionName}. Please make sure this is a valid extension and try again.`);

package/lib/commands/ext-update.js

@@ -42,8 +42,8 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
     .option("--local", "save the update to firebase.json rather than directly update an existing Extension instance on a Firebase project")
     .action(async (instanceId, updateSource, options) => {
     var _a, _b;
-    const projectId = (0, projectUtils_1.needProjectId)(options);
     if (options.local) {
+        const projectId = (0, projectUtils_1.getProjectId)(options);
         const config = manifest.loadConfig(options);
         const oldRef = manifest.getInstanceRef(instanceId, config);
         const oldExtensionVersion = await extensionsApi.getExtensionVersion(refs.toExtensionVersionRef(oldRef));
@@ -79,12 +79,12 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
             nonInteractive: options.nonInteractive,
             instanceId,
         });
-        const newParamBindings = paramHelper.getBaseParamBindings(newParamBindingOptions);
         await manifest.writeToManifest([
             {
                 instanceId,
                 ref: refs.parse(newExtensionVersion.ref),
-                params: newParamBindings,
+                params: newParamBindingOptions,
+                paramSpecs: newExtensionVersion.spec.params,
             },
         ], config, {
             nonInteractive: options.nonInteractive,
@@ -95,6 +95,7 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
     }
     const spinner = ora(`Updating ${clc.bold(instanceId)}. This usually takes 3 to 5 minutes...`);
     try {
+        const projectId = (0, projectUtils_1.needProjectId)(options);
         let existingInstance;
         try {
             existingInstance = await extensionsApi.getInstance(projectId, instanceId);

package/lib/commands/functions-config-export.js

@@ -12,7 +12,8 @@ const requirePermissions_1 = require("../requirePermissions");
 const utils_1 = require("../utils");
 const functional_1 = require("../functional");
 const configExport = require("../functions/runtimeConfigExport");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
+const projectConfig_1 = require("../functions/projectConfig");
 const REQUIRED_PERMISSIONS = [
     "runtimeconfig.configs.list",
     "runtimeconfig.configs.get",
@@ -76,9 +77,11 @@ exports.default = new command_1.Command("functions:config:export")
     "runtimeconfig.variables.list",
     "runtimeconfig.variables.get",
 ])
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requireInteractive_1.default)
     .action(async (options) => {
+    const config = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions)[0];
+    const functionsDir = config.source;
     let pInfos = configExport.getProjectInfos(options);
     checkReservedAliases(pInfos);
     (0, utils_1.logBullet)("Importing functions configs from projects [" +
@@ -108,7 +111,6 @@ exports.default = new command_1.Command("functions:config:export")
     const filesToWrite = fromEntries((0, functional_1.zip)(filenames, dotEnvs));
     filesToWrite[".env.local"] = `${header}\n# .env.local file contains environment variables for the Functions Emulator.\n`;
     filesToWrite[".env"] = `${header}# .env file contains environment variables that applies to all projects.\n`;
-    const functionsDir = options.config.get("functions.source", ".");
     for (const [filename, content] of Object.entries(filesToWrite)) {
         await options.config.askWriteProjectFile(path.join(functionsDir, filename), content);
     }

package/lib/commands/functions-shell.js

@@ -2,7 +2,7 @@
 var { Command } = require("../command");
 var { requirePermissions } = require("../requirePermissions");
 var { actionFunction } = require("../functionsShellCommandAction");
-var requireConfig = require("../requireConfig");
+var { requireConfig } = require("../requireConfig");
 var commandUtils = require("../emulator/commandUtils");
 module.exports = new Command("functions:shell")
     .description("launch full Node shell with emulated functions")

package/lib/commands/hosting-channel-create.js

@@ -10,7 +10,7 @@ const prompt_1 = require("../prompt");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const { marked } = require("marked");
 const requireHostingSite_1 = require("../requireHostingSite");
 const LOG_TAG = "hosting:channel";
@@ -18,7 +18,7 @@ exports.default = new command_1.Command("hosting:channel:create [channelId]")
     .description("create a Firebase Hosting channel")
     .option("-e, --expires <duration>", "duration string (e.g. 12h or 30d) for channel expiration, max 30d")
     .option("--site <siteId>", "site for which to create the channel")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.update"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (channelId, options) => {

package/lib/commands/hosting-channel-delete.js

@@ -9,13 +9,13 @@ const prompt_1 = require("../prompt");
 const requireHostingSite_1 = require("../requireHostingSite");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const logger_1 = require("../logger");
 exports.default = new command_1.Command("hosting:channel:delete <channelId>")
     .description("delete a Firebase Hosting channel")
     .withForce()
     .option("--site <siteId>", "site in which the channel exists")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.update"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (channelId, options) => {

package/lib/commands/hosting-channel-deploy.js

@@ -9,7 +9,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const deploy = require("../deploy");
 const projectUtils_1 = require("../projectUtils");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const expireUtils_1 = require("../hosting/expireUtils");
 const utils_1 = require("../utils");
 const { marked } = require("marked");
@@ -21,7 +21,7 @@ exports.default = new command_1.Command("hosting:channel:deploy [channelId]")
     .option("--only <target1,target2...>", "only create previews for specified targets")
     .option("--open", "open a browser to the channel after deploying")
     .option("--no-authorized-domains", "do not sync channel domains with Firebase Auth")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.update"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (channelId, options) => {

package/lib/commands/hosting-channel-list.js

@@ -7,14 +7,14 @@ const command_1 = require("../command");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils_1 = require("../utils");
 const requireHostingSite_1 = require("../requireHostingSite");
 const TABLE_HEAD = ["Channel ID", "Last Release Time", "URL", "Expire Time"];
 exports.default = new command_1.Command("hosting:channel:list")
     .description("list all Firebase Hosting channels for your project")
     .option("--site <siteName>", "list channels for the specified site")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.update"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (options) => {

package/lib/commands/hosting-channel-open.js

@@ -8,7 +8,7 @@ const error_1 = require("../error");
 const api_1 = require("../hosting/api");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils_1 = require("../utils");
 const prompt_1 = require("../prompt");
 const requireHostingSite_1 = require("../requireHostingSite");
@@ -16,7 +16,7 @@ exports.default = new command_1.Command("hosting:channel:open [channelId]")
     .description("opens the URL for a Firebase Hosting channel")
     .help("if unable to open the URL in a browser, it will be displayed in the output")
     .option("--site <siteId>", "the site to which the channel belongs")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.get"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (channelId, options) => {

package/lib/commands/hosting-sites-delete.js

@@ -8,13 +8,13 @@ const prompt_1 = require("../prompt");
 const error_1 = require("../error");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const logger_1 = require("../logger");
 const LOG_TAG = "hosting:sites";
 exports.default = new command_1.Command("hosting:sites:delete <siteId>")
     .description("delete a Firebase Hosting site")
     .withForce()
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.delete"])
     .action(async (siteId, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);

package/lib/commands/serve.js

@@ -5,7 +5,7 @@ var { Command } = require("../command");
 const { logger } = require("../logger");
 var utils = require("../utils");
 var { requirePermissions } = require("../requirePermissions");
-var requireConfig = require("../requireConfig");
+var { requireConfig } = require("../requireConfig");
 var { serve } = require("../serve/index");
 var { filterTargets } = require("../filterTargets");
 var { needProjectNumber } = require("../projectUtils");

package/lib/commands/target-apply.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("cli-color");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");
 const error_1 = require("../error");
 exports.default = new command_1.Command("target:apply <type> <name> <resources...>")
     .description("apply a deploy target to a resource")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, name, resources, options) => {
     if (!options.project) {
         throw new error_1.FirebaseError(`Must have an active project to set deploy targets. Try ${clc.bold("firebase use --add")}`);

package/lib/commands/target-clear.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("cli-color");
 const command_1 = require("../command");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");
 exports.default = new command_1.Command("target:clear <type> <target>")
     .description("clear all resources from a named resource target")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, name, options) => {
     const existed = options.rc.clearTarget(options.project, type, name);
     if (existed) {