firebase-tools 11.0.0 → 11.2.0

package/lib/gcp/index.js

@@ -1,11 +1,11 @@
 "use strict";
-module.exports = {
-    cloudbilling: require("./cloudbilling"),
-    cloudfunctions: require("./cloudfunctions"),
-    cloudscheduler: require("./cloudscheduler"),
-    cloudlogging: require("./cloudlogging"),
-    iam: require("./iam"),
-    pubsub: require("./pubsub"),
-    storage: require("./storage"),
-    rules: require("./rules"),
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rules = exports.storage = exports.pubsub = exports.iam = exports.cloudlogging = exports.cloudscheduler = exports.cloudfunctions = exports.cloudbilling = void 0;
+exports.cloudbilling = require("./cloudbilling");
+exports.cloudfunctions = require("./cloudfunctions");
+exports.cloudscheduler = require("./cloudscheduler");
+exports.cloudlogging = require("./cloudlogging");
+exports.iam = require("./iam");
+exports.pubsub = require("./pubsub");
+exports.storage = require("./storage");
+exports.rules = require("./rules");

package/lib/gcp/rules.js

@@ -20,7 +20,7 @@ function _handleErrorResponse(response) {
 async function getLatestRulesetName(projectId, service) {
     const releases = await listAllReleases(projectId);
     const prefix = `projects/${projectId}/releases/${service}`;
-    const release = _.find(releases, (r) => r.name.startsWith(prefix));
+    const release = releases.find((r) => r.name.startsWith(prefix));
     if (!release) {
         return null;
     }

package/lib/gcp/runtimeconfig.js

@@ -1,66 +1,66 @@
 "use strict";
-const { runtimeconfigOrigin } = require("../api");
-const { Client } = require("../apiv2");
-const { logger } = require("../logger");
-var _ = require("lodash");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.variables = exports.configs = void 0;
+const _ = require("lodash");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
+const logger_1 = require("../logger");
 const API_VERSION = "v1beta1";
-const apiClient = new Client({ urlPrefix: runtimeconfigOrigin, apiVersion: API_VERSION });
-function _listConfigs(projectId) {
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.runtimeconfigOrigin, apiVersion: API_VERSION });
+function listConfigs(projectId) {
     return apiClient
         .get(`/projects/${projectId}/configs`, {
         retryCodes: [500, 503],
     })
-        .then(function (resp) {
-        return resp.body.configs;
-    });
+        .then((resp) => resp.body.configs);
 }
-function _createConfig(projectId, configId) {
-    var path = _.join(["projects", projectId, "configs"], "/");
+function createConfig(projectId, configId) {
+    const path = ["projects", projectId, "configs"].join("/");
     return apiClient
         .post(`/projects/${projectId}/configs`, {
         name: path + "/" + configId,
     }, {
         retryCodes: [500, 503],
     })
-        .catch(function (err) {
+        .catch((err) => {
         if (_.get(err, "context.response.statusCode") === 409) {
             return Promise.resolve();
         }
         return Promise.reject(err);
     });
 }
-function _deleteConfig(projectId, configId) {
+function deleteConfig(projectId, configId) {
     return apiClient
         .delete(`/projects/${projectId}/configs/${configId}`, {
         retryCodes: [500, 503],
     })
-        .catch(function (err) {
+        .catch((err) => {
         if (_.get(err, "context.response.statusCode") === 404) {
-            logger.debug("Config already deleted.");
+            logger_1.logger.debug("Config already deleted.");
             return Promise.resolve();
         }
-        return Promise.reject(err);
+        throw err;
     });
 }
-function _listVariables(configPath) {
+function listVariables(configPath) {
     return apiClient
         .get(`${configPath}/variables`, {
         retryCodes: [500, 503],
     })
-        .then(function (resp) {
+        .then((resp) => {
         return Promise.resolve(resp.body.variables);
     });
 }
-function _getVariable(varPath) {
+function getVariable(varPath) {
     return apiClient
         .get(varPath, {
         retryCodes: [500, 503],
     })
-        .then(function (resp) {
+        .then((resp) => {
         return Promise.resolve(resp.body);
     });
 }
-function _createVariable(projectId, configId, varId, value) {
+function createVariable(projectId, configId, varId, value) {
     const path = `/projects/${projectId}/configs/${configId}/variables`;
     return apiClient
         .post(path, {
@@ -69,16 +69,16 @@ function _createVariable(projectId, configId, varId, value) {
     }, {
         retryCodes: [500, 503],
     })
-        .catch(function (err) {
+        .catch((err) => {
         if (_.get(err, "context.response.statusCode") === 404) {
-            return _createConfig(projectId, configId).then(function () {
-                return _createVariable(projectId, configId, varId, value);
+            return createConfig(projectId, configId).then(() => {
+                return createVariable(projectId, configId, varId, value);
             });
         }
         return Promise.reject(err);
     });
 }
-function _updateVariable(projectId, configId, varId, value) {
+function updateVariable(projectId, configId, varId, value) {
     const path = `/projects/${projectId}/configs/${configId}/variables/${varId}`;
     return apiClient.put(path, {
         name: path,
@@ -87,43 +87,41 @@ function _updateVariable(projectId, configId, varId, value) {
         retryCodes: [500, 503],
     });
 }
-function _setVariable(projectId, configId, varId, value) {
-    var path = _.join(["projects", projectId, "configs", configId, "variables", varId], "/");
-    return _getVariable(path)
-        .then(function () {
-        return _updateVariable(projectId, configId, varId, value);
+function setVariable(projectId, configId, varId, value) {
+    const path = ["projects", projectId, "configs", configId, "variables", varId].join("/");
+    return getVariable(path)
+        .then(() => {
+        return updateVariable(projectId, configId, varId, value);
     })
-        .catch(function (err) {
+        .catch((err) => {
         if (_.get(err, "context.response.statusCode") === 404) {
-            return _createVariable(projectId, configId, varId, value);
+            return createVariable(projectId, configId, varId, value);
         }
         return Promise.reject(err);
     });
 }
-function _deleteVariable(projectId, configId, varId) {
+function deleteVariable(projectId, configId, varId) {
     return apiClient
         .delete(`/projects/${projectId}/configs/${configId}/variables/${varId}`, {
         retryCodes: [500, 503],
         queryParams: { recursive: "true" },
     })
-        .catch(function (err) {
+        .catch((err) => {
         if (_.get(err, "context.response.statusCode") === 404) {
-            logger.debug("Variable already deleted.");
+            logger_1.logger.debug("Variable already deleted.");
             return Promise.resolve();
         }
         return Promise.reject(err);
     });
 }
-module.exports = {
-    configs: {
-        list: _listConfigs,
-        create: _createConfig,
-        delete: _deleteConfig,
-    },
-    variables: {
-        list: _listVariables,
-        get: _getVariable,
-        set: _setVariable,
-        delete: _deleteVariable,
-    },
+exports.configs = {
+    list: listConfigs,
+    create: createConfig,
+    delete: deleteConfig,
+};
+exports.variables = {
+    list: listVariables,
+    get: getVariable,
+    set: setVariable,
+    delete: deleteVariable,
 };

package/lib/gcp/storage.js

@@ -62,10 +62,8 @@ async function uploadObject(source, bucketName) {
 }
 exports.uploadObject = uploadObject;
 function deleteObject(location) {
-    return api_1.default.request("DELETE", location, {
-        auth: true,
-        origin: api_1.default.storageOrigin,
-    });
+    const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
+    return localAPIClient.delete(location);
 }
 exports.deleteObject = deleteObject;
 async function getBucket(bucketName) {

package/lib/hosting/cloudRunProxy.js

@@ -1,31 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = require("lodash");
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
 const proxy_1 = require("./proxy");
-const projectUtils_1 = require("../projectUtils");
+const error_1 = require("../error");
 const logger_1 = require("../logger");
-const api_1 = require("../api");
+const projectUtils_1 = require("../projectUtils");
 const cloudRunCache = {};
-function getCloudRunUrl(rewrite, projectId) {
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.cloudRunApiOrigin, apiVersion: "v1" });
+async function getCloudRunUrl(rewrite, projectId) {
+    var _a;
     const alreadyFetched = cloudRunCache[`${rewrite.run.region}/${rewrite.run.serviceId}`];
     if (alreadyFetched) {
         return Promise.resolve(alreadyFetched);
     }
-    const path = `/v1/projects/${projectId}/locations/${rewrite.run.region || "us-central1"}/services/${rewrite.run.serviceId}`;
-    logger_1.logger.info(`[hosting] Looking up Cloud Run service "${path}" for its URL`);
-    return (0, api_1.request)("GET", path, { origin: api_1.cloudRunApiOrigin, auth: true })
-        .then((res) => {
-        const url = (0, lodash_1.get)(res, "body.status.url");
+    const path = `/projects/${projectId}/locations/${rewrite.run.region || "us-central1"}/services/${rewrite.run.serviceId}`;
+    try {
+        logger_1.logger.info(`[hosting] Looking up Cloud Run service "${path}" for its URL`);
+        const res = await apiClient.get(path);
+        const url = (_a = res.body.status) === null || _a === void 0 ? void 0 : _a.url;
         if (!url) {
-            return Promise.reject("Cloud Run URL doesn't exist in response.");
+            throw new error_1.FirebaseError("Cloud Run URL doesn't exist in response.");
         }
         cloudRunCache[`${rewrite.run.region}/${rewrite.run.serviceId}`] = url;
         return url;
-    })
-        .catch((err) => {
-        const errInfo = `error looking up URL for Cloud Run service: ${err}`;
-        return Promise.reject(errInfo);
-    });
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Error looking up URL for Cloud Run service: ${err}`, {
+            original: err,
+        });
+    }
 }
 function default_1(options) {
     return async (rewrite) => {

package/lib/hosting/proxy.js

@@ -133,7 +133,7 @@ function proxyRequestHandler(url, rewriteIdentifier) {
 }
 exports.proxyRequestHandler = proxyRequestHandler;
 function errorRequestHandler(error) {
-    return (req, res, next) => {
+    return (req, res) => {
         res.statusCode = 500;
         const out = `A problem occurred while trying to handle a proxied rewrite: ${error}`;
         logger_1.logger.error(out);

package/lib/index.js

@@ -1,10 +1,10 @@
 "use strict";
-var program = require("commander");
-var pkg = require("../package.json");
-var clc = require("cli-color");
-const { logger } = require("./logger");
-var { setupLoggers } = require("./utils");
-var leven = require("leven");
+const program = require("commander");
+const clc = require("cli-color");
+const leven = require("leven");
+const logger_1 = require("./logger");
+const utils_1 = require("./utils");
+const pkg = require("../package.json");
 program.version(pkg.version);
 program.option("-P, --project <alias_or_project_id>", "the Firebase project to use for this command");
 program.option("--account <email>", "the Google account to use for authorization");
@@ -14,33 +14,34 @@ program.option("--non-interactive", "error out of the command instead of waiting
 program.option("-i, --interactive", "force prompts to be displayed");
 program.option("--debug", "print verbose debug output and keep a debug log file");
 program.option("-c, --config <path>", "path to the firebase.json file to use for configuration");
-var client = {};
-client.cli = program;
-client.logger = require("./logger");
-client.errorOut = require("./errorOut").errorOut;
-client.getCommand = function (name) {
-    for (var i = 0; i < client.cli.commands.length; i++) {
-        if (client.cli.commands[i]._name === name) {
-            return client.cli.commands[i];
+const client = {
+    cli: program,
+    logger: require("./logger"),
+    errorOut: require("./errorOut").errorOut,
+    getCommand: (name) => {
+        for (let i = 0; i < client.cli.commands.length; i++) {
+            if (client.cli.commands[i]._name === name) {
+                return client.cli.commands[i];
+            }
         }
-    }
-    return null;
+        return;
+    },
 };
-require("./commands")(client);
+require("./commands").load(client);
 function suggestCommands(cmd, cmdList) {
-    var suggestion = cmdList.find(function (c) {
+    const suggestion = cmdList.find((c) => {
         return leven(c, cmd) < c.length * 0.4;
     });
     if (suggestion) {
-        logger.error();
-        logger.error("Did you mean " + clc.bold(suggestion) + "?");
+        logger_1.logger.error();
+        logger_1.logger.error("Did you mean " + clc.bold(suggestion) + "?");
         return suggestion;
     }
 }
-var commandNames = program.commands.map(function (cmd) {
+const commandNames = program.commands.map((cmd) => {
     return cmd._name;
 });
-var RENAMED_COMMANDS = {
+const RENAMED_COMMANDS = {
     "delete-site": "hosting:disable",
     "disable:hosting": "hosting:disable",
     "data:get": "database:get",
@@ -52,13 +53,13 @@ var RENAMED_COMMANDS = {
     "deploy:database": "deploy --only database",
     "prefs:token": "login:ci",
 };
-program.action(function (_, args) {
-    setupLoggers();
-    var cmd = args[0];
-    logger.error(clc.bold.red("Error:"), clc.bold(cmd), "is not a Firebase command");
+program.action((_, args) => {
+    (0, utils_1.setupLoggers)();
+    const cmd = args[0];
+    logger_1.logger.error(clc.bold.red("Error:"), clc.bold(cmd), "is not a Firebase command");
     if (RENAMED_COMMANDS[cmd]) {
-        logger.error();
-        logger.error(clc.bold(cmd) + " has been renamed, please run", clc.bold("firebase " + RENAMED_COMMANDS[cmd]), "instead");
+        logger_1.logger.error();
+        logger_1.logger.error(clc.bold(cmd) + " has been renamed, please run", clc.bold("firebase " + RENAMED_COMMANDS[cmd]), "instead");
     }
     else {
         if (!suggestCommands(cmd, commandNames)) {

package/lib/init/features/database.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
 const clc = require("cli-color");
-const api = require("../../api");
 const prompt_1 = require("../../prompt");
 const logger_1 = require("../../logger");
 const utils = require("../../utils");
@@ -12,16 +11,23 @@ const ora = require("ora");
 const ensureApiEnabled_1 = require("../../ensureApiEnabled");
 const getDefaultDatabaseInstance_1 = require("../../getDefaultDatabaseInstance");
 const error_1 = require("../../error");
+const apiv2_1 = require("../../apiv2");
 const DEFAULT_RULES = JSON.stringify({ rules: { ".read": "auth != null", ".write": "auth != null" } }, null, 2);
 async function getDBRules(instanceDetails) {
     if (!instanceDetails || !instanceDetails.name) {
         return DEFAULT_RULES;
     }
-    const response = await api.request("GET", "/.settings/rules.json", {
-        auth: true,
-        origin: instanceDetails.databaseUrl,
+    const client = new apiv2_1.Client({ urlPrefix: instanceDetails.databaseUrl });
+    const response = await client.request({
+        method: "GET",
+        path: "/.settings/rules.json",
+        responseType: "stream",
+        resolveOnHTTPError: true,
     });
-    return response.body;
+    if (response.status !== 200) {
+        throw new error_1.FirebaseError(`Failed to fetch current rules. Code: ${response.status}`);
+    }
+    return await response.response.text();
 }
 function writeDBRules(rules, logMessagePrefix, filename, config) {
     config.writeProjectFile(filename, rules);

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

@@ -44,6 +44,6 @@ async function doSetup(setup, config, options) {
         default: "javascript",
         choices,
     });
-    return require("./" + language)(setup, config);
+    return require("./" + language).setup(setup, config);
 }
 exports.doSetup = doSetup;

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

@@ -1,17 +1,19 @@
 "use strict";
-var _ = require("lodash");
-var fs = require("fs");
-var path = require("path");
-var npmDependencies = require("./npm-dependencies");
-var { prompt } = require("../../../prompt");
-var TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/javascript/");
-var INDEX_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "index.js"), "utf8");
-var PACKAGE_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.lint.json"), "utf8");
-var PACKAGE_NO_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.nolint.json"), "utf8");
-var ESLINT_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_eslintrc"), "utf8");
-var GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
-module.exports = function (setup, config) {
-    return prompt(setup.functions, [
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setup = void 0;
+const _ = require("lodash");
+const fs = require("fs");
+const path = require("path");
+const npm_dependencies_1 = require("./npm-dependencies");
+const prompt_1 = require("../../../prompt");
+const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/javascript/");
+const INDEX_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "index.js"), "utf8");
+const PACKAGE_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.lint.json"), "utf8");
+const PACKAGE_NO_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.nolint.json"), "utf8");
+const ESLINT_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_eslintrc"), "utf8");
+const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+function setup(setup, config) {
+    return (0, prompt_1.prompt)(setup.functions, [
         {
             name: "lint",
             type: "confirm",
@@ -19,24 +21,25 @@ module.exports = function (setup, config) {
             default: false,
         },
     ])
-        .then(function () {
+        .then(() => {
         if (setup.functions.lint) {
             _.set(setup, "config.functions.predeploy", ['npm --prefix "$RESOURCE_DIR" run lint']);
             return config
                 .askWriteProjectFile("functions/package.json", PACKAGE_LINTING_TEMPLATE)
-                .then(function () {
+                .then(() => {
                 config.askWriteProjectFile("functions/.eslintrc.js", ESLINT_TEMPLATE);
             });
         }
         return config.askWriteProjectFile("functions/package.json", PACKAGE_NO_LINTING_TEMPLATE);
     })
-        .then(function () {
+        .then(() => {
         return config.askWriteProjectFile("functions/index.js", INDEX_TEMPLATE);
     })
-        .then(function () {
+        .then(() => {
         return config.askWriteProjectFile("functions/.gitignore", GITIGNORE_TEMPLATE);
     })
-        .then(function () {
-        return npmDependencies.askInstallDependencies(setup.functions, config);
+        .then(() => {
+        return (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
     });
-};
+}
+exports.setup = setup;

package/lib/init/features/functions/npm-dependencies.js

@@ -1,34 +1,37 @@
 "use strict";
-var spawn = require("cross-spawn");
-const { logger } = require("../../../logger");
-var { prompt } = require("../../../prompt");
-exports.askInstallDependencies = function (setup, config) {
-    return prompt(setup, [
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.askInstallDependencies = void 0;
+const spawn = require("cross-spawn");
+const logger_1 = require("../../../logger");
+const prompt_1 = require("../../../prompt");
+function askInstallDependencies(setup, config) {
+    return (0, prompt_1.prompt)(setup, [
         {
             name: "npm",
             type: "confirm",
             message: "Do you want to install dependencies with npm now?",
             default: true,
         },
-    ]).then(function () {
+    ]).then(() => {
         if (setup.npm) {
-            return new Promise(function (resolve) {
-                var installer = spawn("npm", ["install"], {
+            return new Promise((resolve) => {
+                const installer = spawn("npm", ["install"], {
                     cwd: config.projectDir + "/functions",
                     stdio: "inherit",
                 });
-                installer.on("error", function (err) {
-                    logger.debug(err.stack);
+                installer.on("error", (err) => {
+                    logger_1.logger.debug(err.stack);
                 });
-                installer.on("close", function (code) {
+                installer.on("close", (code) => {
                     if (code === 0) {
                         return resolve();
                     }
-                    logger.info();
-                    logger.error("NPM install failed, continuing with Firebase initialization...");
+                    logger_1.logger.info();
+                    logger_1.logger.error("NPM install failed, continuing with Firebase initialization...");
                     return resolve();
                 });
             });
         }
     });
-};
+}
+exports.askInstallDependencies = askInstallDependencies;

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

@@ -1,19 +1,21 @@
 "use strict";
-var _ = require("lodash");
-var fs = require("fs");
-var path = require("path");
-var npmDependencies = require("./npm-dependencies");
-var { prompt } = require("../../../prompt");
-var TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/typescript/");
-var PACKAGE_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.lint.json"), "utf8");
-var PACKAGE_NO_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.nolint.json"), "utf8");
-var ESLINT_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_eslintrc"), "utf8");
-var TSCONFIG_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.json"), "utf8");
-var TSCONFIG_DEV_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.dev.json"), "utf8");
-var INDEX_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "index.ts"), "utf8");
-var GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
-module.exports = function (setup, config) {
-    return prompt(setup.functions, [
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setup = void 0;
+const _ = require("lodash");
+const fs = require("fs");
+const path = require("path");
+const npm_dependencies_1 = require("./npm-dependencies");
+const prompt_1 = require("../../../prompt");
+const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/typescript/");
+const PACKAGE_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.lint.json"), "utf8");
+const PACKAGE_NO_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.nolint.json"), "utf8");
+const ESLINT_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_eslintrc"), "utf8");
+const TSCONFIG_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.json"), "utf8");
+const TSCONFIG_DEV_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.dev.json"), "utf8");
+const INDEX_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "index.ts"), "utf8");
+const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+function setup(setup, config) {
+    return (0, prompt_1.prompt)(setup.functions, [
         {
             name: "lint",
             type: "confirm",
@@ -21,7 +23,7 @@ module.exports = function (setup, config) {
             default: true,
         },
     ])
-        .then(function () {
+        .then(() => {
         if (setup.functions.lint) {
             _.set(setup, "config.functions.predeploy", [
                 'npm --prefix "$RESOURCE_DIR" run lint',
@@ -29,28 +31,29 @@ module.exports = function (setup, config) {
             ]);
             return config
                 .askWriteProjectFile("functions/package.json", PACKAGE_LINTING_TEMPLATE)
-                .then(function () {
+                .then(() => {
                 return config.askWriteProjectFile("functions/.eslintrc.js", ESLINT_TEMPLATE);
             });
         }
         _.set(setup, "config.functions.predeploy", 'npm --prefix "$RESOURCE_DIR" run build');
         return config.askWriteProjectFile("functions/package.json", PACKAGE_NO_LINTING_TEMPLATE);
     })
-        .then(function () {
+        .then(() => {
         return config.askWriteProjectFile("functions/tsconfig.json", TSCONFIG_TEMPLATE);
     })
-        .then(function () {
+        .then(() => {
         if (setup.functions.lint) {
             return config.askWriteProjectFile("functions/tsconfig.dev.json", TSCONFIG_DEV_TEMPLATE);
         }
     })
-        .then(function () {
+        .then(() => {
         return config.askWriteProjectFile("functions/src/index.ts", INDEX_TEMPLATE);
     })
-        .then(function () {
+        .then(() => {
         return config.askWriteProjectFile("functions/.gitignore", GITIGNORE_TEMPLATE);
     })
-        .then(function () {
-        return npmDependencies.askInstallDependencies(setup.functions, config);
+        .then(() => {
+        return (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
     });
-};
+}
+exports.setup = setup;