firebase-tools 11.22.0 → 11.23.0

package/lib/extensions/extensionsHelper.js

@@ -4,9 +4,9 @@ exports.canonicalizeRefInput = exports.diagnoseAndFixProject = exports.confirm =
 const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const api_1 = require("../api");
@@ -329,12 +329,12 @@ async function publishExtensionVersionFromLocalSource(args) {
     catch (err) {
         throw new error_1.FirebaseError("No CHANGELOG.md file found. " +
             "Please create one and add an entry for this version. " +
-            marked("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
+            (0, marked_1.marked)("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
     }
     if (!notes && !semver.prerelease(extensionSpec.version) && extension) {
         throw new error_1.FirebaseError(`No entry for version ${extensionSpec.version} found in CHANGELOG.md. ` +
             "Please add one so users know what has changed in this version. " +
-            marked("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
+            (0, marked_1.marked)("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
     }
     displayReleaseNotes(args.publisherId, args.extensionId, extensionSpec.version, notes);
     if (!(await confirm({
@@ -380,7 +380,7 @@ async function publishExtensionVersionFromLocalSource(args) {
     catch (err) {
         publishSpinner.fail();
         if (err.status === 404) {
-            throw new error_1.FirebaseError(marked(`Couldn't find publisher ID '${clc.bold(args.publisherId)}'. Please ensure that you have registered this ID. To register as a publisher, you can check out the [Firebase documentation](https://firebase.google.com/docs/extensions/alpha/share#register_as_an_extensions_publisher) for step-by-step instructions.`));
+            throw new error_1.FirebaseError((0, marked_1.marked)(`Couldn't find publisher ID '${clc.bold(args.publisherId)}'. Please ensure that you have registered this ID. To register as a publisher, you can check out the [Firebase documentation](https://firebase.google.com/docs/extensions/alpha/share#register_as_an_extensions_publisher) for step-by-step instructions.`));
         }
         throw err;
     }
@@ -433,7 +433,7 @@ function getPublisherProjectFromName(publisherName) {
 exports.getPublisherProjectFromName = getPublisherProjectFromName;
 function displayReleaseNotes(publisherId, extensionId, versionId, releaseNotes) {
     const releaseNotesMessage = releaseNotes
-        ? ` Release notes for this version:\n${marked(releaseNotes)}\n`
+        ? ` Release notes for this version:\n${(0, marked_1.marked)(releaseNotes)}\n`
         : "\n";
     const message = `You are about to publish version ${clc.green(versionId)} of ${clc.green(`${publisherId}/${extensionId}`)} to Firebase's registry of extensions.${releaseNotesMessage}` +
         "Once an extension version is published, it cannot be changed. If you wish to make changes after publishing, you will need to publish a new version.\n\n";

package/lib/extensions/provisioningHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsedProducts = exports.bulkCheckProductsProvisioned = exports.checkProductsProvisioned = exports.DeferredProduct = void 0;
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const functional_1 = require("../functional");
@@ -64,7 +64,7 @@ async function checkProducts(projectId, usedProducts) {
                     "without server-side code.\n";
             errorMessage += `   https://console.firebase.google.com/project/${projectId}/authentication/users`;
         }
-        throw new error_1.FirebaseError(marked(errorMessage), { exit: 2 });
+        throw new error_1.FirebaseError((0, marked_1.marked)(errorMessage), { exit: 2 });
     }
 }
 function getUsedProducts(spec) {

package/lib/extensions/updateHelper.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inferUpdateSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
 const clc = require("colorette");
 const semver = require("semver");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const extensionsApi = require("./extensionsApi");
@@ -47,7 +47,7 @@ function warningUpdateToOtherSource(sourceOrigin) {
         targetText = "URL";
     }
     const warning = `All the instance's resources and logic will be overwritten to use the source code and files from the ${targetText}.\n`;
-    logger_1.logger.info(marked(warning));
+    logger_1.logger.info((0, marked_1.marked)(warning));
 }
 exports.warningUpdateToOtherSource = warningUpdateToOtherSource;
 async function update(updateOptions) {

package/lib/extensions/warnings.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.outOfBandChangesWarning = exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const clc = require("colorette");
 const types_1 = require("./types");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");
@@ -16,11 +16,11 @@ function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
     const publisherNameLink = githubLink ? `[${publisherId}](${githubLink})` : publisherId;
     const warningMsg = `This extension is in preview and is built by a developer in the [Extensions Publisher Early Access Program](http://bit.ly/firex-provider). Its functionality might change in backward-incompatible ways. Since this extension isn't built by Firebase, reach out to ${publisherNameLink} with questions about this extension.`;
     const legalMsg = "\n\nIt is provided “AS IS”, without any warranty, express or implied, from Google. Google disclaims all liability for any damages, direct or indirect, resulting from the use of the extension, and its functionality might change in backward - incompatible ways.";
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(warningMsg + legalMsg));
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(warningMsg + legalMsg));
     (0, displayExtensionInfo_1.printSourceDownloadLink)(sourceDownloadUri);
 }
 function displayExperimentalWarning() {
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`${clc.yellow(clc.bold("Important"))}: This extension is ${clc.bold("experimental")} and may not be production-ready. Its functionality might change in backward-incompatible ways before its official release, or it may be discontinued.`));
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`${clc.yellow(clc.bold("Important"))}: This extension is ${clc.bold("experimental")} and may not be production-ready. Its functionality might change in backward-incompatible ways before its official release, or it may be discontinued.`));
 }
 async function displayWarningPrompts(publisherId, launchStage, extensionVersion) {
     const trustedPublishers = await (0, resolveSource_1.getTrustedPublishers)();
@@ -58,11 +58,11 @@ async function displayWarningsForDeploy(instancesToCreate) {
     const experimental = nonEapExtensions.filter((i) => i.extension.registryLaunchStage === types_1.RegistryLaunchStage.EXPERIMENTAL);
     if (experimental.length) {
         const humanReadableList = experimental.map((i) => `\t${(0, deploymentSummary_1.humanReadable)(i)}`).join("\n");
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`The following are instances of ${clc.bold("experimental")} extensions.They may not be production-ready. Their functionality may change in backward-incompatible ways before their official release, or they may be discontinued.\n${humanReadableList}\n`, { gfm: false }));
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`The following are instances of ${clc.bold("experimental")} extensions.They may not be production-ready. Their functionality may change in backward-incompatible ways before their official release, or they may be discontinued.\n${humanReadableList}\n`, { gfm: false }));
     }
     if (eapExtensions.length) {
         const humanReadableList = eapExtensions.map(toListEntry).join("\n");
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`These extensions are in preview and are built by a developer in the Extensions Publisher Early Access Program (http://bit.ly/firex-provider). Their functionality might change in backwards-incompatible ways. Since these extensions aren't built by Firebase, reach out to their publisher with questions about them.` +
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`These extensions are in preview and are built by a developer in the Extensions Publisher Early Access Program (http://bit.ly/firex-provider). Their functionality might change in backwards-incompatible ways. Since these extensions aren't built by Firebase, reach out to their publisher with questions about them.` +
             ` They are provided “AS IS”, without any warranty, express or implied, from Google.` +
             ` Google disclaims all liability for any damages, direct or indirect, resulting from the use of these extensions\n${humanReadableList}`, { gfm: false }));
     }

package/lib/frameworks/angular/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.getDevModeHandle = exports.build = exports.init = exports.discover = exports.type = exports.support = exports.name = void 0;
 const path_1 = require("path");
 const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const __1 = require("..");
@@ -23,9 +24,10 @@ async function discover(dir) {
     return { mayWantBackend: !!serverTarget, publicDirectory: (0, path_1.join)(dir, "src", "assets") };
 }
 exports.discover = discover;
-async function init(setup) {
-    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@latest ng new ${setup.hosting.source} --skip-git`, {
+async function init(setup, config) {
+    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@latest ng new ${setup.projectId} --directory ${setup.hosting.source} --skip-git`, {
         stdio: "inherit",
+        cwd: config.projectDir,
     });
     const useAngularUniversal = await (0, prompt_1.promptOnce)({
         name: "useAngularUniversal",
@@ -36,7 +38,7 @@ async function init(setup) {
     if (useAngularUniversal) {
         (0, child_process_1.execSync)("ng add @nguniversal/express-engine --skip-confirmation", {
             stdio: "inherit",
-            cwd: setup.hosting.source,
+            cwd: (0, path_1.join)(config.projectDir, setup.hosting.source),
         });
     }
 }
@@ -74,7 +76,7 @@ async function getDevModeHandle(dir) {
     if (!serveTarget)
         return;
     const host = new Promise((resolve) => {
-        const serve = (0, child_process_1.spawn)(CLI_COMMAND, ["run", targetStringFromTarget(serveTarget), "--host", "localhost"], { cwd: dir });
+        const serve = (0, cross_spawn_1.spawn)(CLI_COMMAND, ["run", targetStringFromTarget(serveTarget), "--host", "localhost"], { cwd: dir });
         serve.stdout.on("data", (data) => {
             process.stdout.write(data);
             const match = data.toString().match(/(http:\/\/localhost:\d+)/);

package/lib/frameworks/index.js

@@ -4,6 +4,7 @@ exports.createServerResponseProxy = exports.prepareFrameworks = exports.findDepe
 const path_1 = require("path");
 const process_1 = require("process");
 const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const fs_1 = require("fs");
 const url_1 = require("url");
 const http_1 = require("http");
@@ -12,6 +13,7 @@ const fs_extra_1 = require("fs-extra");
 const clc = require("colorette");
 const process = require("node:process");
 const semver = require("semver");
+const glob = require("glob");
 const projectUtils_1 = require("../projectUtils");
 const config_1 = require("../hosting/config");
 const api_1 = require("../hosting/api");
@@ -106,7 +108,7 @@ function findDependency(name, options = {}) {
     const { cwd, depth, omitDev } = Object.assign(Object.assign({}, DEFAULT_FIND_DEP_OPTIONS), options);
     const env = Object.assign({}, process.env);
     delete env.NODE_ENV;
-    const result = (0, child_process_1.spawnSync)(NPM_COMMAND, [
+    const result = (0, cross_spawn_1.sync)(NPM_COMMAND, [
         "list",
         name,
         "--json",
@@ -325,14 +327,47 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
             (_e = packageJson.dependencies)["firebase-admin"] || (_e["firebase-admin"] = exports.FIREBASE_ADMIN_VERSION);
             packageJson.engines || (packageJson.engines = {});
             (_f = packageJson.engines).node || (_f.node = exports.NODE_VERSION);
+            for (const [name, version] of Object.entries(packageJson.dependencies)) {
+                if (version.startsWith("file:")) {
+                    const path = version.replace(/^file:/, "");
+                    if (!(await (0, fs_extra_1.pathExists)(path)))
+                        continue;
+                    const stats = await (0, fs_extra_1.stat)(path);
+                    if (stats.isDirectory()) {
+                        const result = (0, cross_spawn_1.sync)("npm", ["pack", (0, path_1.relative)(functionsDist, path)], {
+                            cwd: functionsDist,
+                        });
+                        if (!result.stdout)
+                            throw new Error(`Error running \`npm pack\` at ${path}`);
+                        const filename = result.stdout.toString().trim();
+                        packageJson.dependencies[name] = `file:${filename}`;
+                    }
+                    else {
+                        const filename = (0, path_1.basename)(path);
+                        await (0, promises_1.copyFile)(path, (0, path_1.join)(functionsDist, filename));
+                        packageJson.dependencies[name] = `file:${filename}`;
+                    }
+                }
+            }
             await (0, promises_1.writeFile)((0, path_1.join)(functionsDist, "package.json"), JSON.stringify(packageJson, null, 2));
-            await (0, promises_1.writeFile)((0, path_1.join)(functionsDist, ".env"), `__FIREBASE_FRAMEWORKS_ENTRY__=${frameworksEntry}
-${firebaseDefaults ? `__FIREBASE_DEFAULTS__=${JSON.stringify(firebaseDefaults)}\n` : ""}`);
             await (0, promises_1.copyFile)(getProjectPath("package-lock.json"), (0, path_1.join)(functionsDist, "package-lock.json")).catch(() => {
             });
             if (await (0, fs_extra_1.pathExists)(getProjectPath(".npmrc"))) {
                 await (0, promises_1.copyFile)(getProjectPath(".npmrc"), (0, path_1.join)(functionsDist, ".npmrc"));
             }
+            let existingDotEnvContents = "";
+            if (await (0, fs_extra_1.pathExists)(getProjectPath(".env"))) {
+                existingDotEnvContents = (await (0, promises_1.readFile)(getProjectPath(".env"))).toString();
+            }
+            await (0, promises_1.writeFile)((0, path_1.join)(functionsDist, ".env"), `${existingDotEnvContents}
+__FIREBASE_FRAMEWORKS_ENTRY__=${frameworksEntry}
+${firebaseDefaults ? `__FIREBASE_DEFAULTS__=${JSON.stringify(firebaseDefaults)}\n` : ""}`);
+            const envs = await new Promise((resolve, reject) => glob(getProjectPath(".env.*"), (err, matches) => {
+                if (err)
+                    reject(err);
+                resolve(matches);
+            }));
+            await Promise.all(envs.map((path) => (0, promises_1.copyFile)(path, (0, path_1.join)(functionsDist, (0, path_1.basename)(path)))));
             (0, child_process_1.execSync)(`${NPM_COMMAND} i --omit dev --no-audit`, {
                 cwd: functionsDist,
                 stdio: "inherit",

package/lib/frameworks/lit/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/next/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.init = exports.build = exports.discover = exports.type = exports.support = exports.name = void 0;
 const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
@@ -9,6 +10,10 @@ const url_1 = require("url");
 const fs_1 = require("fs");
 const semver_1 = require("semver");
 const clc = require("colorette");
+const stream_chain_1 = require("stream-chain");
+const stream_json_1 = require("stream-json");
+const Pick_1 = require("stream-json/filters/Pick");
+const StreamObject_1 = require("stream-json/streamers/StreamObject");
 const __1 = require("..");
 const prompt_1 = require("../../prompt");
 const error_1 = require("../../error");
@@ -139,14 +144,14 @@ async function build(dir) {
     return { wantsBackend, headers, redirects, rewrites, trailingSlash };
 }
 exports.build = build;
-async function init(setup) {
+async function init(setup, config) {
     const language = await (0, prompt_1.promptOnce)({
         type: "list",
-        default: "JavaScript",
+        default: "TypeScript",
         message: "What language would you like to use?",
         choices: ["JavaScript", "TypeScript"],
     });
-    (0, child_process_1.execSync)(`npx --yes create-next-app@latest -e hello-world ${setup.hosting.source} --use-npm ${language === "TypeScript" ? "--ts" : ""}`, { stdio: "inherit" });
+    (0, child_process_1.execSync)(`npx --yes create-next-app@latest -e hello-world ${setup.hosting.source} --use-npm ${language === "TypeScript" ? "--ts" : "--js"}`, { stdio: "inherit", cwd: config.projectDir });
 }
 exports.init = init;
 async function ɵcodegenPublicDirectory(sourceDir, destDir) {
@@ -217,18 +222,38 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
     const { distDir } = await getConfig(sourceDir);
     const packageJson = await (0, utils_2.readJSON)((0, path_1.join)(sourceDir, "package.json"));
     if ((0, fs_1.existsSync)((0, path_1.join)(sourceDir, "next.config.js"))) {
-        const dependencyTree = JSON.parse((0, child_process_1.spawnSync)("npm", ["ls", "--omit=dev", "--all", "--json"], {
-            cwd: sourceDir,
-        }).stdout.toString());
-        const esbuildArgs = (0, utils_1.allDependencyNames)(dependencyTree)
-            .map((it) => `--external:${it}`)
-            .concat("--bundle", "--platform=node", `--target=node${__1.NODE_VERSION}`, `--outdir=${destDir}`, "--log-level=error");
-        const bundle = (0, child_process_1.spawnSync)("npx", ["--yes", "esbuild", "next.config.js", ...esbuildArgs], {
-            cwd: sourceDir,
-        });
-        if (bundle.status) {
-            console.error(bundle.stderr.toString());
-            throw new error_1.FirebaseError("Unable to bundle next.config.js for use in Cloud Functions");
+        try {
+            const productionDeps = await new Promise((resolve) => {
+                const dependencies = [];
+                const pipeline = (0, stream_chain_1.chain)([
+                    (0, cross_spawn_1.spawn)("npm", ["ls", "--omit=dev", "--all", "--json"], { cwd: sourceDir }).stdout,
+                    (0, stream_json_1.parser)({ packValues: false, packKeys: true, streamValues: false }),
+                    (0, Pick_1.pick)({ filter: "dependencies" }),
+                    (0, StreamObject_1.streamObject)(),
+                    ({ key, value }) => [
+                        key,
+                        ...(0, utils_1.allDependencyNames)(value),
+                    ],
+                ]);
+                pipeline.on("data", (it) => dependencies.push(it));
+                pipeline.on("end", () => {
+                    resolve([...new Set(dependencies)]);
+                });
+            });
+            const esbuildArgs = productionDeps
+                .map((it) => `--external:${it}`)
+                .concat("--bundle", "--platform=node", `--target=node${__1.NODE_VERSION}`, `--outdir=${destDir}`, "--log-level=error");
+            const bundle = (0, cross_spawn_1.sync)("npx", ["--yes", "esbuild", "next.config.js", ...esbuildArgs], {
+                cwd: sourceDir,
+            });
+            if (bundle.status) {
+                throw new error_1.FirebaseError(bundle.stderr.toString());
+            }
+        }
+        catch (e) {
+            console.warn("Unable to bundle next.config.js for use in Cloud Functions, proceeding with deploy but problems may be enountered.");
+            console.error(e.message);
+            (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, "next.config.js"), (0, path_1.join)(destDir, "next.config.js"));
         }
     }
     if (await (0, fs_extra_1.pathExists)((0, path_1.join)(sourceDir, "public"))) {
@@ -267,6 +292,7 @@ async function getDevModeHandle(dir, hostingEmulatorInfo) {
 }
 exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(dir) {
+    var _a;
     let config = {};
     if ((0, fs_1.existsSync)((0, path_1.join)(dir, "next.config.js"))) {
         const version = getNextVersion(dir);
@@ -279,7 +305,7 @@ async function getConfig(dir) {
         }
         else {
             try {
-                config = await Promise.resolve().then(() => require((0, url_1.pathToFileURL)((0, path_1.join)(dir, "next.config.js")).toString()));
+                config = await (_a = (0, url_1.pathToFileURL)((0, path_1.join)(dir, "next.config.js")).toString(), Promise.resolve().then(() => require(_a)));
             }
             catch (e) {
                 throw new Error("Unable to load next.config.js.");

package/lib/frameworks/next/utils.js

@@ -87,6 +87,6 @@ function allDependencyNames(mod) {
     if (!mod.dependencies)
         return [];
     const dependencyNames = Object.keys(mod.dependencies).reduce((acc, it) => [...acc, it, ...allDependencyNames(mod.dependencies[it])], []);
-    return [...new Set(dependencyNames)];
+    return dependencyNames;
 }
 exports.allDependencyNames = allDependencyNames;

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

@@ -5,17 +5,12 @@ const path = require("path");
 const spawn = require("cross-spawn");
 const logger_1 = require("../logger");
 const DEFAULT_VENV_DIR = "venv";
-function runWithVirtualEnv(commandAndArgs, cwd, envs, venvDir = DEFAULT_VENV_DIR) {
+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, {
-        shell: true,
-        cwd,
-        stdio: ["pipe", "pipe", "pipe", "pipe"],
-        env: envs,
-    });
+    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/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})`)