firebase-tools 10.4.0 → 10.5.0

package/lib/emulator/storage/files.js

@@ -9,12 +9,10 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageLayer = exports.StoredFile = void 0;
 const fs_1 = require("fs");
-const list_1 = require("./list");
 const metadata_1 = require("./metadata");
 const errors_1 = require("./errors");
 const path = require("path");
 const fse = require("fs-extra");
-const cloudFunctions_1 = require("./cloudFunctions");
 const logger_1 = require("../../logger");
 const adminSdkConfig_1 = require("../adminSdkConfig");
 const types_1 = require("./rules/types");
@@ -39,17 +37,14 @@ class StoredFile {
 }
 exports.StoredFile = StoredFile;
 class StorageLayer {
-    constructor(_projectId, _rulesValidator, _adminCredsValidator, _persistence) {
+    constructor(_projectId, _files, _buckets, _rulesValidator, _adminCredsValidator, _persistence, _cloudFunctions) {
         this._projectId = _projectId;
+        this._files = _files;
+        this._buckets = _buckets;
         this._rulesValidator = _rulesValidator;
         this._adminCredsValidator = _adminCredsValidator;
         this._persistence = _persistence;
-        this.reset();
-        this._cloudFunctions = new cloudFunctions_1.StorageCloudFunctions(this._projectId);
-    }
-    reset() {
-        this._files = new Map();
-        this._buckets = new Map();
+        this._cloudFunctions = _cloudFunctions;
     }
     createBucket(id) {
         if (!this._buckets.has(id)) {
@@ -66,11 +61,11 @@ class StorageLayer {
         }
         return [...this._buckets.values()];
     }
-    async handleGetObject(request, skipAuth = false) {
+    async getObject(request) {
         var _a;
         const metadata = this.getMetadata(request.bucketId, request.decodedObjectId);
         const hasValidDownloadToken = ((metadata === null || metadata === void 0 ? void 0 : metadata.downloadTokens) || []).includes((_a = request.downloadToken) !== null && _a !== void 0 ? _a : "");
-        let authorized = skipAuth || hasValidDownloadToken;
+        let authorized = hasValidDownloadToken;
         if (!authorized) {
             authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.GET, { before: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, request.authorization);
         }
@@ -99,10 +94,9 @@ class StorageLayer {
         }
         return undefined;
     }
-    async handleDeleteObject(request, skipAuth = false) {
+    async deleteObject(request) {
         const storedMetadata = this.getMetadata(request.bucketId, request.decodedObjectId);
-        const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.DELETE, { before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource() }, request.authorization));
+        const authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.DELETE, { before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource() }, request.authorization);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
@@ -131,13 +125,12 @@ class StorageLayer {
             return true;
         }
     }
-    async handleUpdateObjectMetadata(request, skipAuth = false) {
+    async updateObjectMetadata(request) {
         const storedMetadata = this.getMetadata(request.bucketId, request.decodedObjectId);
-        const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.UPDATE, {
-                before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
-                after: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(request.metadata),
-            }, request.authorization));
+        const authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.UPDATE, {
+            before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
+            after: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(request.metadata),
+        }, request.authorization);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
@@ -147,7 +140,7 @@ class StorageLayer {
         storedMetadata.update(request.metadata);
         return storedMetadata;
     }
-    async handleUploadObject(upload, skipAuth = false) {
+    async uploadObject(upload) {
         if (upload.status !== upload_1.UploadStatus.FINISHED) {
             throw new Error(`Unexpected upload status encountered: ${upload.status}.`);
         }
@@ -162,8 +155,7 @@ class StorageLayer {
             cacheControl: upload.metadata.cacheControl,
             customMetadata: upload.metadata.metadata,
         }, this._cloudFunctions, this._persistence.readBytes(upload.path, upload.size));
-        const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, { after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, upload.authorization));
+        const authorized = await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, { after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, upload.authorization);
         if (!authorized) {
             this._persistence.deleteFile(upload.path);
             throw new errors_1.ForbiddenError();
@@ -174,17 +166,24 @@ class StorageLayer {
         this._cloudFunctions.dispatch("finalize", new metadata_1.CloudStorageObjectMetadata(metadata));
         return metadata;
     }
-    copyFile(sourceFile, destinationBucket, destinationObject, incomingMetadata) {
-        const filePath = this.path(destinationBucket, destinationObject);
-        this._persistence.deleteFile(filePath, true);
-        const bytes = this.getBytes(sourceFile.bucket, sourceFile.name);
-        this._persistence.appendBytes(filePath, bytes);
-        const newMetadata = Object.assign(Object.assign(Object.assign({}, sourceFile), { metadata: sourceFile.customMetadata }), incomingMetadata);
-        if (sourceFile.downloadTokens.length &&
+    copyObject({ sourceBucket, sourceObject, destinationBucket, destinationObject, incomingMetadata, authorization, }) {
+        if (!this._adminCredsValidator.validate(authorization)) {
+            throw new errors_1.ForbiddenError();
+        }
+        const sourceMetadata = this.getMetadata(sourceBucket, sourceObject);
+        if (!sourceMetadata) {
+            throw new errors_1.NotFoundError();
+        }
+        const sourceBytes = this.getBytes(sourceBucket, sourceObject);
+        const destinationFilePath = this.path(destinationBucket, destinationObject);
+        this._persistence.deleteFile(destinationFilePath, true);
+        this._persistence.appendBytes(destinationFilePath, sourceBytes);
+        const newMetadata = Object.assign(Object.assign(Object.assign({}, sourceMetadata), { metadata: sourceMetadata.customMetadata }), incomingMetadata);
+        if (sourceMetadata.downloadTokens.length &&
             !((incomingMetadata === null || incomingMetadata === void 0 ? void 0 : incomingMetadata.metadata) && Object.keys(incomingMetadata === null || incomingMetadata === void 0 ? void 0 : incomingMetadata.metadata).length)) {
             if (!newMetadata.metadata)
                 newMetadata.metadata = {};
-            newMetadata.metadata.firebaseStorageDownloadTokens = sourceFile.downloadTokens.join(",");
+            newMetadata.metadata.firebaseStorageDownloadTokens = sourceMetadata.downloadTokens.join(",");
         }
         if (newMetadata.metadata) {
             for (const [k, v] of Object.entries(newMetadata.metadata)) {
@@ -201,27 +200,23 @@ class StorageLayer {
             contentLanguage: newMetadata.contentLanguage,
             cacheControl: newMetadata.cacheControl,
             customMetadata: newMetadata.metadata,
-        }, this._cloudFunctions, bytes, incomingMetadata);
-        const file = new StoredFile(copiedFileMetadata, this._persistence.getDiskPath(filePath));
-        this._files.set(filePath, file);
+        }, this._cloudFunctions, sourceBytes, incomingMetadata);
+        const file = new StoredFile(copiedFileMetadata, this._persistence.getDiskPath(destinationFilePath));
+        this._files.set(destinationFilePath, file);
         this._cloudFunctions.dispatch("finalize", new metadata_1.CloudStorageObjectMetadata(file.metadata));
         return file.metadata;
     }
-    async handleListObjects(request, skipAuth = false) {
-        var _a, _b, _c;
-        const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.prefix].join("/"), request.bucketId, types_1.RulesetOperationMethod.LIST, {}, request.authorization));
+    async listObjects(request) {
+        var _a;
+        const { bucketId, prefix, delimiter, pageToken, authorization } = request;
+        const authorized = await this._rulesValidator.validate(["b", bucketId, "o", prefix].join("/"), bucketId, types_1.RulesetOperationMethod.LIST, {}, authorization);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
-        const itemsResults = this.listItems(request.bucketId, request.prefix, request.delimiter, request.pageToken, request.maxResults);
-        return new list_1.ListResponse((_a = itemsResults.prefixes) !== null && _a !== void 0 ? _a : [], (_c = (_b = itemsResults.items) === null || _b === void 0 ? void 0 : _b.map((i) => new list_1.ListItem(i.name, i.bucket))) !== null && _c !== void 0 ? _c : [], itemsResults.nextPageToken);
-    }
-    listItems(bucket, prefix, delimiter, pageToken, maxResults) {
         let items = [];
         const prefixes = new Set();
         for (const [, file] of this._files) {
-            if (file.metadata.bucket !== bucket) {
+            if (file.metadata.bucket !== bucketId) {
                 continue;
             }
             const name = file.metadata.name;
@@ -258,9 +253,7 @@ class StorageLayer {
                 items = items.slice(idx);
             }
         }
-        if (!maxResults) {
-            maxResults = 1000;
-        }
+        const maxResults = (_a = request.maxResults) !== null && _a !== void 0 ? _a : 1000;
         let nextPageToken = undefined;
         if (items.length > maxResults) {
             nextPageToken = items[maxResults].name;
@@ -269,10 +262,10 @@ class StorageLayer {
         return {
             nextPageToken,
             prefixes: prefixes.size > 0 ? [...prefixes].sort() : undefined,
-            items: items.length > 0 ? items.map((item) => new metadata_1.CloudStorageObjectMetadata(item)) : undefined,
+            items: items.length > 0 ? items : undefined,
         };
     }
-    handleCreateDownloadToken(request) {
+    createDownloadToken(request) {
         if (!this._adminCredsValidator.validate(request.authorization)) {
             throw new errors_1.ForbiddenError();
         }
@@ -283,7 +276,7 @@ class StorageLayer {
         metadata.addDownloadToken();
         return metadata;
     }
-    handleDeleteDownloadToken(request) {
+    deleteDownloadToken(request) {
         if (!this._adminCredsValidator.validate(request.authorization)) {
             throw new errors_1.ForbiddenError();
         }

package/lib/emulator/storage/index.js

@@ -13,19 +13,30 @@ const runtime_1 = require("./rules/runtime");
 const utils_1 = require("./rules/utils");
 const persistence_1 = require("./persistence");
 const upload_1 = require("./upload");
+const cloudFunctions_1 = require("./cloudFunctions");
 class StorageEmulator {
     constructor(args) {
         this.args = args;
         this._logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE);
+        this._files = new Map();
+        this._buckets = new Map();
         this._rulesRuntime = new runtime_1.StorageRulesRuntime();
         this._rulesManager = (0, manager_1.createStorageRulesManager)(this.args.rules, this._rulesRuntime);
+        this._cloudFunctions = new cloudFunctions_1.StorageCloudFunctions(args.projectId);
         this._persistence = new persistence_1.Persistence(this.getPersistenceTmpDir());
-        this._storageLayer = new files_1.StorageLayer(args.projectId, (0, utils_1.getRulesValidator)((resource) => this._rulesManager.getRuleset(resource)), (0, utils_1.getAdminCredentialValidator)(), this._persistence);
         this._uploadService = new upload_1.UploadService(this._persistence);
+        const createStorageLayer = (rulesValidator) => {
+            return new files_1.StorageLayer(args.projectId, this._files, this._buckets, rulesValidator, (0, utils_1.getAdminCredentialValidator)(), this._persistence, this._cloudFunctions);
+        };
+        this._storageLayer = createStorageLayer((0, utils_1.getFirebaseRulesValidator)((resource) => this._rulesManager.getRuleset(resource)));
+        this._adminStorageLayer = createStorageLayer((0, utils_1.getAdminOnlyFirebaseRulesValidator)());
     }
     get storageLayer() {
         return this._storageLayer;
     }
+    get adminStorageLayer() {
+        return this._adminStorageLayer;
+    }
     get uploadService() {
         return this._uploadService;
     }
@@ -36,7 +47,8 @@ class StorageEmulator {
         return this._logger;
     }
     reset() {
-        this._storageLayer.reset();
+        this._files.clear();
+        this._buckets.clear();
         this._persistence.reset(this.getPersistenceTmpDir());
         this._uploadService.reset();
     }

package/lib/emulator/storage/rules/utils.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPermitted = exports.getAdminCredentialValidator = exports.getRulesValidator = void 0;
+exports.isPermitted = exports.getAdminCredentialValidator = exports.getAdminOnlyFirebaseRulesValidator = exports.getFirebaseRulesValidator = void 0;
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
-function getRulesValidator(rulesetProvider) {
+function getFirebaseRulesValidator(rulesetProvider) {
     return {
         validate: async (path, bucketId, method, variableOverrides, authorization) => {
             return await isPermitted({
@@ -16,7 +16,15 @@ function getRulesValidator(rulesetProvider) {
         },
     };
 }
-exports.getRulesValidator = getRulesValidator;
+exports.getFirebaseRulesValidator = getFirebaseRulesValidator;
+function getAdminOnlyFirebaseRulesValidator() {
+    return {
+        validate: (_path, _bucketId, _method, _variableOverrides, _authorization) => {
+            return Promise.resolve(true);
+        },
+    };
+}
+exports.getAdminOnlyFirebaseRulesValidator = getAdminOnlyFirebaseRulesValidator;
 function getAdminCredentialValidator() {
     return { validate: isValidAdminCredentials };
 }

package/lib/extensions/askUserForParam.js

@@ -12,6 +12,7 @@ const utils_1 = require("./utils");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
+const projectUtils_1 = require("../projectUtils");
 var SecretLocation;
 (function (SecretLocation) {
     SecretLocation[SecretLocation["CLOUD"] = 1] = "CLOUD";
@@ -60,21 +61,21 @@ function checkResponse(response, spec) {
     return valid;
 }
 exports.checkResponse = checkResponse;
-async function ask(projectId, instanceId, paramSpecs, firebaseProjectParams, reconfiguring) {
-    if (_.isEmpty(paramSpecs)) {
+async function ask(args) {
+    if (_.isEmpty(args.paramSpecs)) {
         logger_1.logger.debug("No params were specified for this extension.");
         return {};
     }
     utils.logLabeledBullet(extensionsHelper_1.logPrefix, "answer the questions below to configure your extension:");
-    const substituted = (0, extensionsHelper_1.substituteParams)(paramSpecs, firebaseProjectParams);
+    const substituted = (0, extensionsHelper_1.substituteParams)(args.paramSpecs, args.firebaseProjectParams);
     const result = {};
     const promises = _.map(substituted, (paramSpec) => {
         return async () => {
             result[paramSpec.param] = await askForParam({
-                projectId,
-                instanceId,
-                paramSpec,
-                reconfiguring,
+                projectId: args.projectId,
+                instanceId: args.instanceId,
+                paramSpec: paramSpec,
+                reconfiguring: args.reconfiguring,
             });
         };
     });
@@ -129,13 +130,14 @@ async function askForParam(args) {
                 valid = checkResponse(response, paramSpec);
                 break;
             case extensionsApi_1.ParamType.SECRET:
-                while (!secretLocations.length) {
-                    secretLocations = await promptSecretLocations();
-                }
+                do {
+                    secretLocations = await promptSecretLocations(paramSpec);
+                } while (!isValidSecretLocations(secretLocations, paramSpec));
                 if (secretLocations.includes(SecretLocation.CLOUD.toString())) {
+                    const projectId = (0, projectUtils_1.needProjectId)({ projectId: args.projectId });
                     response = args.reconfiguring
-                        ? await promptReconfigureSecret(args.projectId, args.instanceId, paramSpec)
-                        : await promptCreateSecret(args.projectId, args.instanceId, paramSpec);
+                        ? await promptReconfigureSecret(projectId, args.instanceId, paramSpec)
+                        : await promptCreateSecret(projectId, args.instanceId, paramSpec);
                 }
                 if (secretLocations.includes(SecretLocation.LOCAL.toString())) {
                     responseForLocal = await promptLocalSecret(args.instanceId, paramSpec);
@@ -155,14 +157,40 @@ async function askForParam(args) {
     return Object.assign({ baseValue: response }, (responseForLocal ? { local: responseForLocal } : {}));
 }
 exports.askForParam = askForParam;
-async function promptSecretLocations() {
+function isValidSecretLocations(secretLocations, paramSpec) {
+    if (paramSpec.required) {
+        return !!secretLocations.length;
+    }
+    return true;
+}
+async function promptSecretLocations(paramSpec) {
+    if (paramSpec.required) {
+        return await (0, prompt_1.promptOnce)({
+            name: "input",
+            type: "checkbox",
+            message: "Where would you like to store your secrets? You must select at least one value",
+            choices: [
+                {
+                    checked: true,
+                    name: "Google Cloud Secret Manager",
+                    value: SecretLocation.CLOUD.toString(),
+                },
+                {
+                    checked: false,
+                    name: "Local file (Only used by Firebase Emulator)",
+                    value: SecretLocation.LOCAL.toString(),
+                },
+            ],
+        });
+    }
     return await (0, prompt_1.promptOnce)({
         name: "input",
         type: "checkbox",
-        message: "Where would you like to store your secrets? You must select at least one value",
+        message: "Where would you like to store your secrets? " +
+            "If you don't want to set this optional secret, leave both options unselected to skip it",
         choices: [
             {
-                checked: true,
+                checked: false,
                 name: "Google Cloud Secret Manager",
                 value: SecretLocation.CLOUD.toString(),
             },

package/lib/extensions/extensionsHelper.js

@@ -80,6 +80,9 @@ function getDBInstanceFromURL(databaseUrl = "") {
 exports.getDBInstanceFromURL = getDBInstanceFromURL;
 async function getFirebaseProjectParams(projectId, emulatorMode = false) {
     var _a, _b;
+    if (!projectId) {
+        return {};
+    }
     const body = emulatorMode
         ? await (0, adminSdkConfig_1.getProjectAdminSdkConfigOrCached)(projectId)
         : await (0, functionsConfig_1.getFirebaseConfig)({ project: projectId });
@@ -263,7 +266,10 @@ async function promptForValidInstanceId(instanceId) {
 }
 exports.promptForValidInstanceId = promptForValidInstanceId;
 async function ensureExtensionsApiEnabled(options) {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectId = (0, projectUtils_1.getProjectId)(options);
+    if (!projectId) {
+        return;
+    }
     return await (0, ensureApiEnabled_1.ensure)(projectId, "firebaseextensions.googleapis.com", "extensions", options.markdown);
 }
 exports.ensureExtensionsApiEnabled = ensureExtensionsApiEnabled;
@@ -519,7 +525,10 @@ async function confirm(args) {
 }
 exports.confirm = confirm;
 async function diagnoseAndFixProject(options) {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectId = (0, projectUtils_1.getProjectId)(options);
+    if (!projectId) {
+        return;
+    }
     const ok = await (0, diagnose_1.diagnose)(projectId);
     if (!ok) {
         throw new error_1.FirebaseError("Unable to proceed until all issues are resolved.");

package/lib/extensions/paramHelper.js

@@ -57,14 +57,19 @@ async function getParams(args) {
     }
     else if (args.paramsEnvPath) {
         params = getParamsFromFile({
-            projectId: args.projectId,
             paramSpecs: args.paramSpecs,
             paramsEnvPath: args.paramsEnvPath,
         });
     }
     else {
         const firebaseProjectParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId);
-        params = await askUserForParam.ask(args.projectId, args.instanceId, args.paramSpecs, firebaseProjectParams, !!args.reconfiguring);
+        params = await askUserForParam.ask({
+            projectId: args.projectId,
+            instanceId: args.instanceId,
+            paramSpecs: args.paramSpecs,
+            firebaseProjectParams,
+            reconfiguring: !!args.reconfiguring,
+        });
     }
     void track("Extension Params", _.isEmpty(params) ? "Not Present" : "Present", _.size(params));
     return params;
@@ -85,7 +90,6 @@ async function getParamsForUpdate(args) {
     }
     else if (args.paramsEnvPath) {
         params = getParamsFromFile({
-            projectId: args.projectId,
             paramSpecs: args.newSpec.params,
             paramsEnvPath: args.paramsEnvPath,
         });

package/lib/functions/projectConfig.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeAndValidate = exports.validate = exports.normalize = void 0;
+const error_1 = require("../error");
+function normalize(config) {
+    if (!config) {
+        throw new error_1.FirebaseError("No valid functions configuration detected in firebase.json");
+    }
+    if (Array.isArray(config)) {
+        if (config.length < 1) {
+            throw new error_1.FirebaseError("Requires at least one functions.source in firebase.json.");
+        }
+        return config;
+    }
+    return [config];
+}
+exports.normalize = normalize;
+function validateSingle(config) {
+    if (!config.source) {
+        throw new error_1.FirebaseError("functions.source must be specified");
+    }
+    return Object.assign(Object.assign({}, config), { source: config.source });
+}
+function validate(config) {
+    if (config.length > 1) {
+        throw new error_1.FirebaseError("More than one functions.source detected in firebase.json.");
+    }
+    return [validateSingle(config[0])];
+}
+exports.validate = validate;
+function normalizeAndValidate(config) {
+    return validate(normalize(config));
+}
+exports.normalizeAndValidate = normalizeAndValidate;

package/lib/init/features/functions/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.doSetup = void 0;
 const clc = require("cli-color");
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const requirePermissions_1 = require("../../../requirePermissions");
 const previews_1 = require("../../../previews");
 const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
-module.exports = async function (setup, config, options) {
+async function doSetup(setup, config, options) {
     var _a, _b;
     logger_1.logger.info();
     logger_1.logger.info("A " + clc.bold("functions") + " directory will be created in your project with sample code");
@@ -44,4 +45,5 @@ module.exports = async function (setup, config, options) {
         choices,
     });
     return require("./" + language)(setup, config);
-};
+}
+exports.doSetup = doSetup;

package/lib/init/features/hosting/index.js

@@ -1,23 +1,23 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.doSetup = void 0;
 const clc = require("cli-color");
 const fs = require("fs");
-const { Client } = require("../../../apiv2");
-const { initGitHub } = require("./github");
-const { prompt } = require("../../../prompt");
-const { logger } = require("../../../logger");
+const apiv2_1 = require("../../../apiv2");
+const github_1 = require("./github");
+const prompt_1 = require("../../../prompt");
+const logger_1 = require("../../../logger");
 const INDEX_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/index.html", "utf8");
 const MISSING_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/404.html", "utf8");
 const DEFAULT_IGNORES = ["firebase.json", "**/.*", "**/node_modules/**"];
-module.exports = function (setup, config, options) {
+async function doSetup(setup, config, options) {
     setup.hosting = {};
-    logger.info();
-    logger.info("Your " +
-        clc.bold("public") +
-        " directory is the folder (relative to your project directory) that");
-    logger.info("will contain Hosting assets to be uploaded with " + clc.bold("firebase deploy") + ". If you");
-    logger.info("have a build process for your assets, use your build's output directory.");
-    logger.info();
-    return prompt(setup.hosting, [
+    logger_1.logger.info();
+    logger_1.logger.info(`Your ${clc.bold("public")} directory is the folder (relative to your project directory) that`);
+    logger_1.logger.info(`will contain Hosting assets to be uploaded with ${clc.bold("firebase deploy")}. If you`);
+    logger_1.logger.info("have a build process for your assets, use your build's output directory.");
+    logger_1.logger.info();
+    await (0, prompt_1.prompt)(setup.hosting, [
         {
             name: "public",
             type: "input",
@@ -36,31 +36,22 @@ module.exports = function (setup, config, options) {
             default: false,
             message: "Set up automatic builds and deploys with GitHub?",
         },
-    ]).then(function () {
-        setup.config.hosting = {
-            public: setup.hosting.public,
-            ignore: DEFAULT_IGNORES,
-        };
-        let next;
-        if (setup.hosting.spa) {
-            setup.config.hosting.rewrites = [{ source: "**", destination: "/index.html" }];
-            next = Promise.resolve();
-        }
-        else {
-            next = config.askWriteProjectFile(setup.hosting.public + "/404.html", MISSING_TEMPLATE);
-        }
-        return next
-            .then(() => {
-            const c = new Client({ urlPrefix: "https://www.gstatic.com", auth: false });
-            return c.get("/firebasejs/releases.json");
-        })
-            .then((response) => {
-            return config.askWriteProjectFile(setup.hosting.public + "/index.html", INDEX_TEMPLATE.replace(/{{VERSION}}/g, response.body.current.version));
-        })
-            .then(() => {
-            if (setup.hosting.github) {
-                return initGitHub(setup, config, options);
-            }
-        });
-    });
-};
+    ]);
+    setup.config.hosting = {
+        public: setup.hosting.public,
+        ignore: DEFAULT_IGNORES,
+    };
+    if (setup.hosting.spa) {
+        setup.config.hosting.rewrites = [{ source: "**", destination: "/index.html" }];
+    }
+    else {
+        await config.askWriteProjectFile(`${setup.hosting.public}/404.html`, MISSING_TEMPLATE);
+    }
+    const c = new apiv2_1.Client({ urlPrefix: "https://www.gstatic.com", auth: false });
+    const response = await c.get("/firebasejs/releases.json");
+    await config.askWriteProjectFile(`${setup.hosting.public}/index.html`, INDEX_TEMPLATE.replace(/{{VERSION}}/g, response.body.current.version));
+    if (setup.hosting.github) {
+        return (0, github_1.initGitHub)(setup, config, options);
+    }
+}
+exports.doSetup = doSetup;

package/lib/init/features/index.js

@@ -1,13 +1,23 @@
 "use strict";
-module.exports = {
-    account: require("./account").doSetup,
-    database: require("./database").doSetup,
-    firestore: require("./firestore").doSetup,
-    functions: require("./functions"),
-    hosting: require("./hosting"),
-    storage: require("./storage").doSetup,
-    emulators: require("./emulators").doSetup,
-    project: require("./project").doSetup,
-    remoteconfig: require("./remoteconfig").doSetup,
-    "hosting:github": require("./hosting/github").initGitHub,
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hostingGithub = exports.remoteconfig = exports.project = exports.emulators = exports.storage = exports.hosting = exports.functions = exports.firestore = exports.database = exports.account = void 0;
+var account_1 = require("./account");
+Object.defineProperty(exports, "account", { enumerable: true, get: function () { return account_1.doSetup; } });
+var database_1 = require("./database");
+Object.defineProperty(exports, "database", { enumerable: true, get: function () { return database_1.doSetup; } });
+var firestore_1 = require("./firestore");
+Object.defineProperty(exports, "firestore", { enumerable: true, get: function () { return firestore_1.doSetup; } });
+var functions_1 = require("./functions");
+Object.defineProperty(exports, "functions", { enumerable: true, get: function () { return functions_1.doSetup; } });
+var hosting_1 = require("./hosting");
+Object.defineProperty(exports, "hosting", { enumerable: true, get: function () { return hosting_1.doSetup; } });
+var storage_1 = require("./storage");
+Object.defineProperty(exports, "storage", { enumerable: true, get: function () { return storage_1.doSetup; } });
+var emulators_1 = require("./emulators");
+Object.defineProperty(exports, "emulators", { enumerable: true, get: function () { return emulators_1.doSetup; } });
+var project_1 = require("./project");
+Object.defineProperty(exports, "project", { enumerable: true, get: function () { return project_1.doSetup; } });
+var remoteconfig_1 = require("./remoteconfig");
+Object.defineProperty(exports, "remoteconfig", { enumerable: true, get: function () { return remoteconfig_1.doSetup; } });
+var github_1 = require("./hosting/github");
+Object.defineProperty(exports, "hostingGithub", { enumerable: true, get: function () { return github_1.initGitHub; } });