firebase-tools 11.21.0 → 11.23.0

package/lib/frameworks/nuxt/index.js

@@ -10,30 +10,34 @@ const utils_1 = require("../utils");
 exports.name = "Nuxt";
 exports.support = "experimental";
 exports.type = 4;
+const utils_2 = require("./utils");
 const DEFAULT_BUILD_SCRIPT = ["nuxt build"];
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
-    const nuxtDependency = (0, __1.findDependency)("nuxt", { cwd: dir, depth: 0, omitDev: false });
-    const configFilesExist = await Promise.all([
-        (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "nuxt.config.js")),
-        (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "nuxt.config.ts")),
-    ]);
-    const anyConfigFileExists = configFilesExist.some((it) => it);
+    const nuxtDependency = (0, __1.findDependency)("nuxt", {
+        cwd: dir,
+        depth: 0,
+        omitDev: false,
+    });
+    const version = nuxtDependency === null || nuxtDependency === void 0 ? void 0 : nuxtDependency.version;
+    const anyConfigFileExists = await (0, utils_2.nuxtConfigFilesExist)(dir);
     if (!anyConfigFileExists && !nuxtDependency)
         return;
-    return { mayWantBackend: true };
+    if (version && (0, semver_1.gte)(version, "3.0.0-0"))
+        return { mayWantBackend: true };
+    return;
 }
 exports.discover = discover;
 async function build(root) {
     const { buildNuxt } = await (0, __1.relativeRequire)(root, "@nuxt/kit");
-    const nuxtApp = await getNuxtApp(root);
+    const nuxtApp = await getNuxt3App(root);
     await (0, utils_1.warnIfCustomBuildScript)(root, exports.name, DEFAULT_BUILD_SCRIPT);
     await buildNuxt(nuxtApp);
     return { wantsBackend: true };
 }
 exports.build = build;
-async function getNuxtApp(cwd) {
+async function getNuxt3App(cwd) {
     const { loadNuxt } = await (0, __1.relativeRequire)(cwd, "@nuxt/kit");
     return await loadNuxt({
         cwd,
@@ -42,29 +46,17 @@ async function getNuxtApp(cwd) {
         },
     });
 }
-function isNuxt3(cwd) {
-    const { version } = (0, __1.findDependency)("nuxt", { cwd, depth: 0, omitDev: false });
-    return (0, semver_1.gte)(version, "3.0.0-0");
-}
 async function ɵcodegenPublicDirectory(root, dest) {
-    const app = await getNuxtApp(root);
-    const distPath = isNuxt3(root) ? (0, path_1.join)(root, ".output", "public") : app.options.generate.dir;
+    const distPath = (0, path_1.join)(root, ".output", "public");
     await (0, fs_extra_1.copy)(distPath, dest);
 }
 exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
     const packageJsonBuffer = await (0, promises_1.readFile)((0, path_1.join)(sourceDir, "package.json"));
     const packageJson = JSON.parse(packageJsonBuffer.toString());
-    if (isNuxt3(sourceDir)) {
-        const outputPackageJsonBuffer = await (0, promises_1.readFile)((0, path_1.join)(sourceDir, ".output", "server", "package.json"));
-        const outputPackageJson = JSON.parse(outputPackageJsonBuffer.toString());
-        await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, ".output", "server"), destDir);
-        return { packageJson: Object.assign(Object.assign({}, packageJson), outputPackageJson), frameworksEntry: "nuxt3" };
-    }
-    else {
-        const { options: { buildDir }, } = await getNuxtApp(sourceDir);
-        await (0, fs_extra_1.copy)(buildDir, (0, path_1.join)(destDir, (0, path_1.basename)(buildDir)));
-        return { packageJson };
-    }
+    const outputPackageJsonBuffer = await (0, promises_1.readFile)((0, path_1.join)(sourceDir, ".output", "server", "package.json"));
+    const outputPackageJson = JSON.parse(outputPackageJsonBuffer.toString());
+    await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, ".output", "server"), destDir);
+    return { packageJson: Object.assign(Object.assign({}, packageJson), outputPackageJson), frameworksEntry: "nuxt3" };
 }
 exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;

package/lib/frameworks/nuxt/interfaces.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/frameworks/nuxt/utils.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nuxtConfigFilesExist = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+async function nuxtConfigFilesExist(dir) {
+    const configFilesExist = await Promise.all([
+        (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "nuxt.config.js")),
+        (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "nuxt.config.ts")),
+    ]);
+    return configFilesExist.some((it) => it);
+}
+exports.nuxtConfigFilesExist = nuxtConfigFilesExist;

package/lib/frameworks/nuxt2/index.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.build = exports.discover = exports.type = exports.support = exports.name = void 0;
+const fs_extra_1 = require("fs-extra");
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+const semver_1 = require("semver");
+const __1 = require("..");
+const utils_1 = require("../nuxt/utils");
+exports.name = "Nuxt";
+exports.support = "experimental";
+exports.type = 2;
+async function discover(dir) {
+    if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
+        return;
+    const nuxtDependency = (0, __1.findDependency)("nuxt", {
+        cwd: dir,
+        depth: 0,
+        omitDev: false,
+    });
+    const version = nuxtDependency === null || nuxtDependency === void 0 ? void 0 : nuxtDependency.version;
+    const anyConfigFileExists = await (0, utils_1.nuxtConfigFilesExist)(dir);
+    if (!anyConfigFileExists && !nuxtDependency)
+        return;
+    if (version && (0, semver_1.lt)(version, "3.0.0-0"))
+        return { mayWantBackend: true };
+    return;
+}
+exports.discover = discover;
+async function getNuxtApp(cwd) {
+    return await (0, __1.relativeRequire)(cwd, "nuxt/dist/nuxt.js");
+}
+async function build(root) {
+    const nuxt = await getNuxtApp(root);
+    const nuxtApp = await nuxt.loadNuxt({
+        for: "build",
+        rootDir: root,
+    });
+    const { options: { ssr, target }, } = await nuxt.build(nuxtApp);
+    if (ssr === true && target === "server") {
+        return { wantsBackend: true };
+    }
+    else {
+        if (ssr === false && target === "static") {
+            console.log("Firebase: Nuxt 2: Static target is not supported with `ssr: false`. Please use `target: 'server'` in your `nuxt.config.js` file.");
+            console.log("Firebase: Nuxt 2: Bundling only for client side.\n");
+        }
+        await buildAndGenerate(nuxt, root);
+        return { wantsBackend: false };
+    }
+}
+exports.build = build;
+async function buildAndGenerate(nuxt, root) {
+    const nuxtApp = await nuxt.loadNuxt({
+        for: "start",
+        rootDir: root,
+    });
+    const builder = await nuxt.getBuilder(nuxtApp);
+    const generator = new nuxt.Generator(nuxtApp, builder);
+    await generator.generate({ build: false, init: true });
+}
+async function ɵcodegenPublicDirectory(root, dest) {
+    var _a, _b;
+    const nuxt = await getNuxtApp(root);
+    const nuxtConfig = await nuxt.loadNuxtConfig();
+    const { ssr, target } = nuxtConfig;
+    if (!(ssr === true && target === "server")) {
+        const source = ((_a = nuxtConfig === null || nuxtConfig === void 0 ? void 0 : nuxtConfig.generate) === null || _a === void 0 ? void 0 : _a.dir) !== undefined
+            ? (0, path_1.join)(root, (_b = nuxtConfig === null || nuxtConfig === void 0 ? void 0 : nuxtConfig.generate) === null || _b === void 0 ? void 0 : _b.dir)
+            : (0, path_1.join)(root, "dist");
+        await (0, fs_extra_1.copy)(source, dest);
+    }
+    const staticPath = (0, path_1.join)(root, "static");
+    if (await (0, fs_extra_1.pathExists)(staticPath)) {
+        await (0, fs_extra_1.copy)(staticPath, dest);
+    }
+}
+exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
+async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
+    const packageJsonBuffer = await (0, promises_1.readFile)((0, path_1.join)(sourceDir, "package.json"));
+    const packageJson = JSON.parse(packageJsonBuffer.toString());
+    const nuxt = await getNuxtApp(sourceDir);
+    const nuxtConfig = await nuxt.loadNuxtConfig();
+    await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, ".nuxt"), (0, path_1.join)(destDir, ".nuxt"));
+    if (!nuxtConfig.ssr) {
+        const nuxtConfigFile = nuxtConfig._nuxtConfigFile.split("/").pop();
+        await (0, fs_extra_1.copy)(nuxtConfig._nuxtConfigFile, (0, path_1.join)(destDir, nuxtConfigFile));
+    }
+    return { packageJson: Object.assign({}, packageJson), frameworksEntry: "nuxt" };
+}
+exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;

package/lib/frameworks/preact/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/frameworks/react/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/frameworks/svelte/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/frameworks/vite/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDevModeHandle = exports.ɵcodegenPublicDirectory = exports.build = exports.discover = exports.vitePluginDiscover = exports.viteDiscoverWithNpmDependency = exports.init = exports.initViteTemplate = exports.DEFAULT_BUILD_SCRIPT = exports.type = exports.support = exports.name = void 0;
 const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -14,9 +15,9 @@ exports.support = "experimental";
 exports.type = 4;
 const CLI_COMMAND = (0, path_1.join)("node_modules", ".bin", process.platform === "win32" ? "vite.cmd" : "vite");
 exports.DEFAULT_BUILD_SCRIPT = ["vite build", "tsc && vite build"];
-const initViteTemplate = (template) => async (setup) => await init(setup, template);
+const initViteTemplate = (template) => async (setup, config) => await init(setup, config, template);
 exports.initViteTemplate = initViteTemplate;
-async function init(setup, baseTemplate = "vanilla") {
+async function init(setup, config, baseTemplate = "vanilla") {
     const template = await (0, prompt_1.promptOnce)({
         type: "list",
         default: "JavaScript",
@@ -28,8 +29,9 @@ async function init(setup, baseTemplate = "vanilla") {
     });
     (0, child_process_1.execSync)(`npm create vite@latest ${setup.hosting.source} --yes -- --template ${template}`, {
         stdio: "inherit",
+        cwd: config.projectDir,
     });
-    (0, child_process_1.execSync)(`npm install`, { stdio: "inherit", cwd: setup.hosting.source });
+    (0, child_process_1.execSync)(`npm install`, { stdio: "inherit", cwd: (0, path_1.join)(config.projectDir, setup.hosting.source) });
 }
 exports.init = init;
 const viteDiscoverWithNpmDependency = (dep) => async (dir) => await discover(dir, undefined, dep);
@@ -70,7 +72,7 @@ async function ɵcodegenPublicDirectory(root, dest) {
 exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function getDevModeHandle(dir) {
     const host = new Promise((resolve) => {
-        const serve = (0, child_process_1.spawn)(CLI_COMMAND, [], { cwd: dir });
+        const serve = (0, cross_spawn_1.spawn)(CLI_COMMAND, [], { cwd: dir });
         serve.stdout.on("data", (data) => {
             process.stdout.write(data);
             const match = data.toString().match(/(http:\/\/.+:\d+)/);

package/lib/functions/python.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runWithVirtualEnv = void 0;
+const path = require("path");
+const spawn = require("cross-spawn");
+const logger_1 = require("../logger");
+const DEFAULT_VENV_DIR = "venv";
+function runWithVirtualEnv(commandAndArgs, cwd, envs, spawnOpts = {}, venvDir = DEFAULT_VENV_DIR) {
+    const activateScriptPath = process.platform === "win32" ? ["Scripts", "activate.bat"] : ["bin", "activate"];
+    const venvActivate = path.join(cwd, venvDir, ...activateScriptPath);
+    const command = process.platform === "win32" ? venvActivate : "source";
+    const args = [process.platform === "win32" ? "" : venvActivate, "&&", ...commandAndArgs];
+    logger_1.logger.debug(`Running command with virtualenv: command=${command}, args=${JSON.stringify(args)}`);
+    return spawn(command, args, Object.assign(Object.assign({ shell: true, cwd, stdio: ["pipe", "pipe", "pipe", "pipe"] }, spawnOpts), { env: envs }));
+}
+exports.runWithVirtualEnv = runWithVirtualEnv;

package/lib/gcp/cloudfunctionsv2.js

@@ -342,6 +342,14 @@ function endpointFromFunction(gcfFunction) {
     if ((_f = gcfFunction.labels) === null || _f === void 0 ? void 0 : _f[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];
     }
+    const serviceName = gcfFunction.serviceConfig.service;
+    if (!serviceName) {
+        logger_1.logger.debug("Got a v2 function without a service name." +
+            "Maybe we've migrated to using the v2 API everywhere and missed this code");
+    }
+    else {
+        endpoint.runServiceId = utils.last(serviceName.split("/"));
+    }
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;

package/lib/getDefaultHostingSite.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultHostingSite = void 0;
 const logger_1 = require("./logger");
 const projects_1 = require("./management/projects");
+const projectUtils_1 = require("./projectUtils");
 async function getDefaultHostingSite(options) {
     var _a;
-    const project = await (0, projects_1.getFirebaseProject)(options.project);
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const project = await (0, projects_1.getFirebaseProject)(projectId);
     const site = (_a = project.resources) === null || _a === void 0 ? void 0 : _a.hostingSite;
     if (!site) {
         logger_1.logger.debug(`No default hosting site found for project: ${options.project}. Using projectId as hosting site name.`);

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
 const logger_1 = require("../../../logger");
 const apiEnabled = require("../../../ensureApiEnabled");
-const ensureCloudResourceLocation_1 = require("../../../ensureCloudResourceLocation");
 const requirePermissions_1 = require("../../../requirePermissions");
 const checkDatabaseType_1 = require("../../../firestore/checkDatabaseType");
 const rules = require("./rules");
@@ -21,10 +20,9 @@ async function checkProjectSetup(setup, config, options) {
     if (!dbType) {
         throw firestoreUnusedError;
     }
-    else if (dbType !== "CLOUD_FIRESTORE") {
+    else if (dbType !== "FIRESTORE_NATIVE") {
         throw new error_1.FirebaseError(`It looks like this project is using Cloud Datastore or Cloud Firestore in Datastore mode. The Firebase CLI can only manage projects using Cloud Firestore in Native mode. For more information, visit https://cloud.google.com/datastore/docs/firestore-or-datastore`, { exit: 1 });
     }
-    (0, ensureCloudResourceLocation_1.ensureLocationSet)(setup.projectLocation, "Cloud Firestore");
     await (0, requirePermissions_1.requirePermissions)(Object.assign(Object.assign({}, options), { project: setup.projectId }));
 }
 async function doSetup(setup, config, options) {

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

@@ -8,6 +8,7 @@ const requirePermissions_1 = require("../../../requirePermissions");
 const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
 const projectConfig_1 = require("../../../functions/projectConfig");
 const error_1 = require("../../../error");
+const experiments_1 = require("../../../experiments");
 const MAX_ATTEMPTS = 5;
 async function doSetup(setup, config, options) {
     var _a, _b;
@@ -139,6 +140,12 @@ async function languageSetup(setup, config) {
             value: "typescript",
         },
     ];
+    if ((0, experiments_1.isEnabled)("pythonfunctions")) {
+        choices.push({
+            name: "Python",
+            value: "python",
+        });
+    }
     const language = await (0, prompt_1.promptOnce)({
         type: "list",
         message: "What language would you like to use to write Cloud Functions?",
@@ -153,6 +160,9 @@ async function languageSetup(setup, config) {
         case "typescript":
             cbconfig.ignore = ["node_modules", ".git", "firebase-debug.log", "firebase-debug.*.log"];
             break;
+        case "python":
+            cbconfig.ignore = ["venv", ".git", "firebase-debug.log", "firebase-debug.*.log"];
+            break;
     }
     return require("./" + language).setup(setup, config);
 }

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

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setup = void 0;
+const fs = require("fs");
+const spawn = require("cross-spawn");
+const path = require("path");
+const python_1 = require("../../../deploy/functions/runtimes/python");
+const python_2 = require("../../../functions/python");
+const prompt_1 = require("../../../prompt");
+const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/python");
+const MAIN_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "main.py"), "utf8");
+const REQUIREMENTS_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "requirements.txt"), "utf8");
+const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+async function setup(setup, config) {
+    await config.askWriteProjectFile(`${setup.functions.source}/requirements.txt`, REQUIREMENTS_TEMPLATE);
+    await config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);
+    await config.askWriteProjectFile(`${setup.functions.source}/main.py`, MAIN_TEMPLATE);
+    config.set("functions.runtime", python_1.LATEST_VERSION);
+    config.set("functions.ignore", ["venv", "__pycache__"]);
+    const venvProcess = spawn((0, python_1.getPythonBinary)(python_1.LATEST_VERSION), ["-m", "venv", "venv"], {
+        shell: true,
+        cwd: config.path(setup.functions.source),
+        stdio: ["pipe", "pipe", "pipe", "pipe"],
+    });
+    await new Promise((resolve, reject) => {
+        venvProcess.on("exit", resolve);
+        venvProcess.on("error", reject);
+    });
+    const install = await (0, prompt_1.promptOnce)({
+        name: "install",
+        type: "confirm",
+        message: "Do you want to install dependencies now?",
+        default: true,
+    });
+    if (install) {
+        const upgradeProcess = (0, python_2.runWithVirtualEnv)(["pip3", "install", "--upgrade", "pip"], config.path(setup.functions.source), {}, { stdio: ["inherit", "inherit", "inherit"] });
+        await new Promise((resolve, reject) => {
+            upgradeProcess.on("exit", resolve);
+            upgradeProcess.on("error", reject);
+        });
+        const installProcess = (0, python_2.runWithVirtualEnv)([(0, python_1.getPythonBinary)(python_1.LATEST_VERSION), "-m", "pip", "install", "-r", "requirements.txt"], config.path(setup.functions.source), {}, { stdio: ["inherit", "inherit", "inherit"] });
+        await new Promise((resolve, reject) => {
+            installProcess.on("exit", resolve);
+            installProcess.on("error", reject);
+        });
+    }
+}
+exports.setup = setup;

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

@@ -10,6 +10,7 @@ const prompt_1 = require("../../../prompt");
 const logger_1 = require("../../../logger");
 const frameworks_1 = require("../../../frameworks");
 const experiments = require("../../../experiments");
+const path_1 = require("path");
 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/**"];
@@ -51,7 +52,7 @@ async function doSetup(setup, config) {
         }, setup.hosting);
         if (setup.hosting.source !== ".")
             delete setup.hosting.useDiscoveredFramework;
-        discoveredFramework = await (0, frameworks_1.discover)(setup.hosting.source);
+        discoveredFramework = await (0, frameworks_1.discover)((0, path_1.join)(config.projectDir, setup.hosting.source));
         if (discoveredFramework) {
             const name = frameworks_1.WebFrameworks[discoveredFramework.framework].name;
             await (0, prompt_1.promptOnce)({
@@ -83,7 +84,7 @@ async function doSetup(setup, config) {
             }, setup.hosting);
             if (discoveredFramework)
                 (0, rimraf_1.sync)(setup.hosting.source);
-            await frameworks_1.WebFrameworks[setup.hosting.whichFramework].init(setup);
+            await frameworks_1.WebFrameworks[setup.hosting.whichFramework].init(setup, config);
         }
         setup.config.hosting = {
             source: setup.hosting.source,

package/lib/projectUtils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAliases = exports.needProjectNumber = exports.needProjectId = exports.getProjectId = void 0;
 const projects_1 = require("./management/projects");
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const { FirebaseError } = require("./error");
 function getProjectId({ projectId, project, }) {
     return projectId || project;
@@ -27,7 +27,7 @@ function needProjectId({ projectId, project, rc, }) {
             "To list all the Firebase projects to which you have access, run " +
             clc.bold("firebase projects:list") +
             ".\n" +
-            marked("To learn about active projects for the CLI, visit https://firebase.google.com/docs/cli#project_aliases"));
+            (0, marked_1.marked)("To learn about active projects for the CLI, visit https://firebase.google.com/docs/cli#project_aliases"));
     }
     const aliasList = Object.entries(aliases)
         .map(([aname, projectId]) => `  ${aname} (${projectId})`)

package/lib/rc.js

@@ -23,10 +23,6 @@ function loadRC(options) {
 }
 exports.loadRC = loadRC;
 class RC {
-    constructor(rcpath, data) {
-        this.path = rcpath;
-        this.data = Object.assign({ projects: {}, targets: {}, etags: {} }, data);
-    }
     static loadFile(rcpath) {
         let data = {};
         if (fsutils.fileExistsSync(rcpath)) {
@@ -39,6 +35,10 @@ class RC {
         }
         return new RC(rcpath, data);
     }
+    constructor(rcpath, data) {
+        this.path = rcpath;
+        this.data = Object.assign({ projects: {}, targets: {}, etags: {} }, data);
+    }
     set(key, value) {
         _.set(this.data, key, value);
         return;

package/lib/serve/functions.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionsServer = void 0;
 const path = require("path");
 const functionsEmulator_1 = require("../emulator/functionsEmulator");
-const functionsEmulatorUtils_1 = require("../emulator/functionsEmulatorUtils");
 const projectUtils_1 = require("../projectUtils");
 const auth_1 = require("../auth");
 const projectConfig = require("../functions/projectConfig");
@@ -22,11 +21,10 @@ class FunctionsServer {
         const backends = [];
         for (const cfg of config) {
             const functionsDir = path.join(options.config.projectDir, cfg.source);
-            const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(cfg.runtime);
             backends.push({
                 functionsDir,
                 codebase: cfg.codebase,
-                nodeMajorVersion,
+                runtime: cfg.runtime,
                 env: {},
                 secretEnv: [],
             });