firebase-tools 11.25.3 → 11.27.0

package/lib/extensions/warnings.js

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.outOfBandChangesWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
 const marked_1 = require("marked");
 const clc = require("colorette");
-const types_1 = require("./types");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");
 const extensionsHelper_1 = require("./extensionsHelper");
 const resolveSource_1 = require("./resolveSource");
 const deploymentSummary_1 = require("../deploy/extensions/deploymentSummary");
 const planner_1 = require("../deploy/extensions/planner");
-const functional_1 = require("../functional");
 const utils = require("../utils");
 const logger_1 = require("../logger");
 function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
@@ -19,10 +17,7 @@ function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
     utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(warningMsg + legalMsg));
     (0, displayExtensionInfo_1.printSourceDownloadLink)(sourceDownloadUri);
 }
-function displayExperimentalWarning() {
-    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) {
+async function displayWarningPrompts(publisherId, extensionVersion) {
     const trustedPublishers = await (0, resolveSource_1.getTrustedPublishers)();
     if (!trustedPublishers.includes(publisherId)) {
         displayEAPWarning({
@@ -31,9 +26,6 @@ async function displayWarningPrompts(publisherId, launchStage, extensionVersion)
             githubLink: extensionVersion.spec.sourceUrl,
         });
     }
-    else if (launchStage === types_1.RegistryLaunchStage.EXPERIMENTAL) {
-        displayExperimentalWarning();
-    }
     else {
         return;
     }
@@ -54,19 +46,14 @@ async function displayWarningsForDeploy(instancesToCreate) {
     for (const i of publishedExtensionInstances) {
         await (0, planner_1.getExtension)(i);
     }
-    const [eapExtensions, nonEapExtensions] = (0, functional_1.partition)(publishedExtensionInstances, (i) => { var _a, _b; return !trustedPublishers.includes((_b = (_a = i.ref) === null || _a === void 0 ? void 0 : _a.publisherId) !== null && _b !== void 0 ? _b : ""); });
-    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, (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 }));
-    }
+    const eapExtensions = publishedExtensionInstances.filter((i) => { var _a, _b; return !trustedPublishers.includes((_b = (_a = i.ref) === null || _a === void 0 ? void 0 : _a.publisherId) !== null && _b !== void 0 ? _b : ""); });
     if (eapExtensions.length) {
         const humanReadableList = eapExtensions.map(toListEntry).join("\n");
         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 }));
     }
-    return experimental.length > 0 || eapExtensions.length > 0;
+    return eapExtensions.length > 0;
 }
 exports.displayWarningsForDeploy = displayWarningsForDeploy;
 function outOfBandChangesWarning(instanceIds) {

package/lib/frameworks/angular/index.js

@@ -12,7 +12,6 @@ const utils_1 = require("../utils");
 exports.name = "Angular";
 exports.support = "experimental";
 exports.type = 3;
-const CLI_COMMAND = (0, path_1.join)("node_modules", ".bin", process.platform === "win32" ? "ng.cmd" : "ng");
 const DEFAULT_BUILD_SCRIPT = ["ng build"];
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
@@ -55,7 +54,8 @@ async function build(dir) {
     if (!browserTarget)
         throw new Error("No build target...");
     if (prerenderTarget) {
-        (0, child_process_1.execSync)(`${CLI_COMMAND} run ${targetStringFromTarget(prerenderTarget)}`, {
+        const cli = (0, __1.getNodeModuleBin)("ng", dir);
+        (0, child_process_1.execSync)(`${cli} run ${targetStringFromTarget(prerenderTarget)}`, {
             cwd: dir,
             stdio: "inherit",
         });
@@ -75,7 +75,10 @@ async function getDevModeHandle(dir) {
     if (!serveTarget)
         return;
     const host = new Promise((resolve) => {
-        const serve = (0, cross_spawn_1.spawn)(CLI_COMMAND, ["run", targetStringFromTarget(serveTarget), "--host", "localhost"], { cwd: dir });
+        const cli = (0, __1.getNodeModuleBin)("ng", dir);
+        const serve = (0, cross_spawn_1.spawn)(cli, ["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/astro/index.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDevModeHandle = exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.build = exports.discover = exports.type = exports.support = exports.name = void 0;
+const cross_spawn_1 = require("cross-spawn");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const __1 = require("..");
+const error_1 = require("../../error");
+const utils_1 = require("../utils");
+const utils_2 = require("./utils");
+exports.name = "Astro";
+exports.support = "experimental";
+exports.type = 2;
+function getAstroVersion(cwd) {
+    var _a;
+    return (_a = (0, __1.findDependency)("astro", { cwd, depth: 0, omitDev: false })) === null || _a === void 0 ? void 0 : _a.version;
+}
+async function discover(dir) {
+    if (!(0, fs_extra_1.existsSync)((0, path_1.join)(dir, "package.json")))
+        return;
+    if (!getAstroVersion(dir))
+        return;
+    const { output, publicDir: publicDirectory } = await (0, utils_2.getConfig)(dir);
+    return {
+        mayWantBackend: output === "server",
+        publicDirectory,
+    };
+}
+exports.discover = discover;
+const DEFAULT_BUILD_SCRIPT = ["astro build"];
+async function build(cwd) {
+    const cli = (0, __1.getNodeModuleBin)("astro", cwd);
+    await (0, utils_1.warnIfCustomBuildScript)(cwd, exports.name, DEFAULT_BUILD_SCRIPT);
+    const { output, adapter } = await (0, utils_2.getConfig)(cwd);
+    if (output === "server" && (adapter === null || adapter === void 0 ? void 0 : adapter.name) !== "@astrojs/node") {
+        throw new error_1.FirebaseError("Deploying an Astro application with SSR on Firebase Hosting requires the @astrojs/node adapter.");
+    }
+    const build = (0, cross_spawn_1.sync)(cli, ["build"], { cwd, stdio: "inherit" });
+    if (build.status)
+        throw new error_1.FirebaseError("Unable to build your Astro app");
+    return { wantsBackend: output === "server" };
+}
+exports.build = build;
+async function ɵcodegenPublicDirectory(root, dest) {
+    const { outDir, output } = await (0, utils_2.getConfig)(root);
+    const assetPath = (0, path_1.join)(root, outDir, output === "server" ? "client" : "");
+    await (0, fs_extra_1.copy)(assetPath, dest);
+}
+exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
+async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
+    const { outDir } = await (0, utils_2.getConfig)(sourceDir);
+    const packageJson = await (0, utils_1.readJSON)((0, path_1.join)(sourceDir, "package.json"));
+    await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, outDir, "server"), (0, path_1.join)(destDir));
+    return {
+        packageJson,
+        bootstrapScript: (0, utils_2.getBootstrapScript)(),
+    };
+}
+exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
+async function getDevModeHandle(cwd) {
+    const host = new Promise((resolve) => {
+        const cli = (0, __1.getNodeModuleBin)("astro", cwd);
+        const serve = (0, cross_spawn_1.spawn)(cli, ["dev"], { cwd });
+        serve.stdout.on("data", (data) => {
+            process.stdout.write(data);
+            const match = data.toString().match(/(http:\/\/.+:\d+)/);
+            if (match)
+                resolve(match[1]);
+        });
+        serve.stderr.on("data", (data) => {
+            process.stderr.write(data);
+        });
+    });
+    return (0, utils_1.simpleProxy)(await host);
+}
+exports.getDevModeHandle = getDevModeHandle;

package/lib/frameworks/astro/utils.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfig = exports.getBootstrapScript = void 0;
+const path_1 = require("path");
+const { dynamicImport } = require(true && "../../dynamicImport");
+function getBootstrapScript() {
+    return `const entry = import('./entry.mjs');\nexport const handle = async (req, res) => (await entry).handler(req, res)`;
+}
+exports.getBootstrapScript = getBootstrapScript;
+async function getConfig(cwd) {
+    const astroDirectory = (0, path_1.dirname)(require.resolve("astro/package.json", { paths: [cwd] }));
+    const { openConfig } = await dynamicImport((0, path_1.join)(astroDirectory, "dist", "core", "config", "config.js"));
+    const logging = undefined;
+    const { astroConfig: config } = await openConfig({ cmd: "build", cwd, logging });
+    return {
+        outDir: (0, path_1.relative)(cwd, config.outDir.pathname),
+        publicDir: (0, path_1.relative)(cwd, config.publicDir.pathname),
+        output: config.output,
+        adapter: config.adapter,
+    };
+}
+exports.getConfig = getConfig;

package/lib/frameworks/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareFrameworks = exports.findDependency = exports.discover = exports.relativeRequire = exports.WebFrameworks = exports.ALLOWED_SSR_REGIONS = exports.DEFAULT_REGION = exports.NODE_VERSION = exports.FIREBASE_ADMIN_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.FIREBASE_FRAMEWORKS_VERSION = void 0;
+exports.prepareFrameworks = exports.findDependency = exports.getNodeModuleBin = exports.discover = exports.relativeRequire = exports.WebFrameworks = exports.ALLOWED_SSR_REGIONS = exports.DEFAULT_REGION = exports.NODE_VERSION = exports.FIREBASE_ADMIN_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.FIREBASE_FRAMEWORKS_VERSION = void 0;
 const path_1 = require("path");
 const process_1 = require("process");
 const child_process_1 = require("child_process");
@@ -28,12 +28,13 @@ const requireHostingSite_1 = require("../requireHostingSite");
 const experiments = require("../experiments");
 const ensureTargeted_1 = require("../functions/ensureTargeted");
 const implicitInit_1 = require("../hosting/implicitInit");
+const fsutils_1 = require("../fsutils");
 const { dynamicImport } = require(true && "../dynamicImport");
 const SupportLevelWarnings = {
     ["experimental"]: clc.yellow(`This is an experimental integration, proceed with caution.`),
     ["community-supported"]: clc.yellow(`This is a community-supported integration, support is best effort.`),
 };
-exports.FIREBASE_FRAMEWORKS_VERSION = "^0.6.0";
+exports.FIREBASE_FRAMEWORKS_VERSION = "^0.7.0";
 exports.FIREBASE_FUNCTIONS_VERSION = "^3.23.0";
 exports.FIREBASE_ADMIN_VERSION = "^11.0.1";
 exports.NODE_VERSION = parseInt(process.versions.node, 10).toString();
@@ -49,7 +50,6 @@ const DEFAULT_FIND_DEP_OPTIONS = {
     cwd: process.cwd(),
     omitDev: true,
 };
-const NPM_COMMAND = process.platform === "win32" ? "npm.cmd" : "npm";
 exports.WebFrameworks = Object.fromEntries((0, fs_1.readdirSync)(__dirname)
     .filter((path) => (0, fs_1.statSync)((0, path_1.join)(__dirname, path)).isDirectory())
     .map((path) => [path, require((0, path_1.join)(__dirname, path))])
@@ -110,11 +110,29 @@ function scanDependencyTree(searchingFor, dependencies = {}) {
     }
     return;
 }
+function getNodeModuleBin(name, cwd) {
+    var _a;
+    const cantFindExecutable = new error_1.FirebaseError(`Could not find the ${name} executable.`);
+    const npmBin = (_a = (0, cross_spawn_1.sync)("npm", ["bin"], { cwd }).stdout) === null || _a === void 0 ? void 0 : _a.toString().trim();
+    if (!npmBin) {
+        throw cantFindExecutable;
+    }
+    const path = (0, path_1.join)(npmBin, name);
+    if (!(0, fsutils_1.fileExistsSync)(path)) {
+        throw cantFindExecutable;
+    }
+    return path;
+}
+exports.getNodeModuleBin = getNodeModuleBin;
 function findDependency(name, options = {}) {
-    const { cwd, depth, omitDev } = Object.assign(Object.assign({}, DEFAULT_FIND_DEP_OPTIONS), options);
+    var _a;
+    const { cwd: dir, depth, omitDev } = Object.assign(Object.assign({}, DEFAULT_FIND_DEP_OPTIONS), options);
+    const cwd = (_a = (0, cross_spawn_1.sync)("npm", ["root"], { cwd: dir }).stdout) === null || _a === void 0 ? void 0 : _a.toString().trim();
+    if (!cwd)
+        return;
     const env = Object.assign({}, process.env);
     delete env.NODE_ENV;
-    const result = (0, cross_spawn_1.sync)(NPM_COMMAND, [
+    const result = (0, cross_spawn_1.sync)("npm", [
         "list",
         name,
         "--json",
@@ -240,7 +258,7 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
         }
         const results = await discover(getProjectPath());
         if (!results)
-            throw new Error("Epic fail.");
+            throw new error_1.FirebaseError("Unable to detect the web framework in use, check firebase-debug.log for more info.");
         const { framework, mayWantBackend, publicDirectory } = results;
         const { build, ɵcodegenPublicDirectory, ɵcodegenFunctionsDirectory: codegenProdModeFunctionsDirectory, getDevModeHandle, name, support, } = exports.WebFrameworks[framework];
         console.log(`Detected a ${name} codebase. ${SupportLevelWarnings[support] || ""}\n`);
@@ -371,7 +389,7 @@ ${firebaseDefaults ? `__FIREBASE_DEFAULTS__=${JSON.stringify(firebaseDefaults)}\
                 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`, {
+            (0, child_process_1.execSync)(`npm i --omit dev --no-audit`, {
                 cwd: functionsDist,
                 stdio: "inherit",
             });

package/lib/frameworks/nuxt/index.js

@@ -1,32 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.build = exports.discover = exports.type = exports.support = exports.name = void 0;
+exports.getConfig = exports.getDevModeHandle = 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 cross_spawn_1 = require("cross-spawn");
 const __1 = require("..");
 const utils_1 = require("../utils");
+const utils_2 = require("./utils");
 exports.name = "Nuxt";
 exports.support = "experimental";
 exports.type = 4;
-const utils_2 = require("./utils");
-const DEFAULT_BUILD_SCRIPT = ["nuxt build"];
+const utils_3 = require("./utils");
+const DEFAULT_BUILD_SCRIPT = ["nuxt build", "nuxi 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 version = nuxtDependency === null || nuxtDependency === void 0 ? void 0 : nuxtDependency.version;
-    const anyConfigFileExists = await (0, utils_2.nuxtConfigFilesExist)(dir);
-    if (!anyConfigFileExists && !nuxtDependency)
+    const anyConfigFileExists = await (0, utils_3.nuxtConfigFilesExist)(dir);
+    const nuxtVersion = (0, utils_2.getNuxtVersion)(dir);
+    if (!anyConfigFileExists && !nuxtVersion)
+        return;
+    if (nuxtVersion && (0, semver_1.lt)(nuxtVersion, "3.0.0-0"))
         return;
-    if (version && (0, semver_1.gte)(version, "3.0.0-0"))
-        return { mayWantBackend: true };
-    return;
+    const { dir: { public: publicDirectory }, } = await getConfig(dir);
+    return { publicDirectory, mayWantBackend: true };
 }
 exports.discover = discover;
 async function build(root) {
@@ -60,3 +58,25 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
     return { packageJson: Object.assign(Object.assign({}, packageJson), outputPackageJson), frameworksEntry: "nuxt3" };
 }
 exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
+async function getDevModeHandle(cwd) {
+    const host = new Promise((resolve) => {
+        const cli = (0, __1.getNodeModuleBin)("nuxt", cwd);
+        const serve = (0, cross_spawn_1.spawn)(cli, ["dev"], { cwd: cwd });
+        serve.stdout.on("data", (data) => {
+            process.stdout.write(data);
+            const match = data.toString().match(/(http:\/\/.+:\d+)/);
+            if (match)
+                resolve(match[1]);
+        });
+        serve.stderr.on("data", (data) => {
+            process.stderr.write(data);
+        });
+    });
+    return (0, utils_1.simpleProxy)(await host);
+}
+exports.getDevModeHandle = getDevModeHandle;
+async function getConfig(dir) {
+    const { loadNuxtConfig } = await (0, __1.relativeRequire)(dir, "@nuxt/kit");
+    return await loadNuxtConfig(dir);
+}
+exports.getConfig = getConfig;

package/lib/frameworks/nuxt/utils.js

@@ -1,8 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nuxtConfigFilesExist = void 0;
+exports.nuxtConfigFilesExist = exports.getNuxtVersion = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
+const __1 = require("..");
+function getNuxtVersion(cwd) {
+    var _a;
+    return (_a = (0, __1.findDependency)("nuxt", {
+        cwd,
+        depth: 0,
+        omitDev: false,
+    })) === null || _a === void 0 ? void 0 : _a.version;
+}
+exports.getNuxtVersion = getNuxtVersion;
 async function nuxtConfigFilesExist(dir) {
     const configFilesExist = await Promise.all([
         (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "nuxt.config.js")),

package/lib/frameworks/nuxt2/index.js

@@ -13,18 +13,12 @@ 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 nuxtVersion = (0, utils_1.getNuxtVersion)(dir);
     const anyConfigFileExists = await (0, utils_1.nuxtConfigFilesExist)(dir);
-    if (!anyConfigFileExists && !nuxtDependency)
+    if (!anyConfigFileExists && !nuxtVersion)
         return;
-    if (version && (0, semver_1.lt)(version, "3.0.0-0"))
+    if (nuxtVersion && (0, semver_1.lt)(nuxtVersion, "3.0.0-0"))
         return { mayWantBackend: true };
-    return;
 }
 exports.discover = discover;
 async function getNuxtApp(cwd) {

package/lib/frameworks/sveltekit/index.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ɵcodegenFunctionsDirectory = exports.ɵcodegenPublicDirectory = exports.build = exports.getDevModeHandle = exports.discover = exports.type = exports.support = exports.name = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const vite_1 = require("../vite");
+const fsutils_1 = require("../../fsutils");
+const { dynamicImport } = require(true && "../../dynamicImport");
+exports.name = "SvelteKit";
+exports.support = "experimental";
+exports.type = 2;
+exports.discover = (0, vite_1.viteDiscoverWithNpmDependency)("@sveltejs/kit");
+var vite_2 = require("../vite");
+Object.defineProperty(exports, "getDevModeHandle", { enumerable: true, get: function () { return vite_2.getDevModeHandle; } });
+async function build(root) {
+    var _a;
+    const config = await getConfig(root);
+    const wantsBackend = ((_a = config.kit.adapter) === null || _a === void 0 ? void 0 : _a.name) !== "@sveltejs/adapter-static";
+    await (0, vite_1.build)(root);
+    return { wantsBackend };
+}
+exports.build = build;
+async function ɵcodegenPublicDirectory(root, dest) {
+    const config = await getConfig(root);
+    const output = (0, path_1.join)(root, config.kit.outDir, "output");
+    await (0, fs_extra_1.copy)((0, path_1.join)(output, "client"), dest);
+    const prerenderedPath = (0, path_1.join)(output, "prerendered", "pages");
+    if (await (0, fs_extra_1.pathExists)(prerenderedPath)) {
+        await (0, fs_extra_1.copy)(prerenderedPath, dest);
+    }
+}
+exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
+async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
+    var _a;
+    var _b;
+    const packageJsonBuffer = await (0, fs_extra_1.readFile)((0, path_1.join)(sourceDir, "package.json"));
+    const packageJson = JSON.parse(packageJsonBuffer.toString());
+    packageJson.dependencies || (packageJson.dependencies = {});
+    (_a = (_b = packageJson.dependencies)["@sveltejs/kit"]) !== null && _a !== void 0 ? _a : (_b["@sveltejs/kit"] = packageJson.devDependencies["@sveltejs/kit"]);
+    const config = await getConfig(sourceDir);
+    await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, config.kit.outDir, "output", "server"), destDir);
+    return { packageJson, frameworksEntry: "sveltekit" };
+}
+exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
+async function getConfig(root) {
+    var _a;
+    const configPath = ["svelte.config.js", "svelte.config.mjs"]
+        .map((filename) => (0, path_1.join)(root, filename))
+        .find(fsutils_1.fileExistsSync);
+    const config = configPath ? (await dynamicImport(configPath)).default : {};
+    config.kit || (config.kit = {});
+    (_a = config.kit).outDir || (_a.outDir = ".svelte-kit");
+    return config;
+}

package/lib/frameworks/sveltekit/interfaces.js

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

package/lib/frameworks/utils.js

@@ -37,8 +37,8 @@ function simpleProxy(hostOrRequestHandler) {
             return next();
         }
         if (typeof hostOrRequestHandler === "string") {
-            const host = hostOrRequestHandler;
-            const { hostname, port, protocol, username, password } = new URL(host);
+            const { hostname, port, protocol, username, password } = new URL(hostOrRequestHandler);
+            const host = `${hostname}:${port}`;
             const auth = username || password ? `${username}:${password}` : undefined;
             const opts = {
                 agent,

package/lib/frameworks/vite/index.js

@@ -12,7 +12,6 @@ const utils_1 = require("../utils");
 exports.name = "Vite";
 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, config) => await init(setup, config, template);
 exports.initViteTemplate = initViteTemplate;
@@ -40,7 +39,7 @@ exports.vitePluginDiscover = vitePluginDiscover;
 async function discover(dir, plugin, npmDependency) {
     if (!(0, fs_1.existsSync)((0, path_1.join)(dir, "package.json")))
         return;
-    const additionalDep = npmDependency && (0, __1.findDependency)(npmDependency, { cwd: dir, depth: 0, omitDev: true });
+    const additionalDep = npmDependency && (0, __1.findDependency)(npmDependency, { cwd: dir, depth: 0, omitDev: false });
     const depth = plugin ? undefined : 0;
     const configFilesExist = await Promise.all([
         (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "vite.config.js")),
@@ -60,7 +59,10 @@ exports.discover = discover;
 async function build(root) {
     const { build } = (0, __1.relativeRequire)(root, "vite");
     await (0, utils_1.warnIfCustomBuildScript)(root, exports.name, exports.DEFAULT_BUILD_SCRIPT);
-    await build({ root });
+    const cwd = process.cwd();
+    process.chdir(root);
+    await build({ root, mode: "production" });
+    process.chdir(cwd);
 }
 exports.build = build;
 async function ɵcodegenPublicDirectory(root, dest) {
@@ -71,7 +73,8 @@ async function ɵcodegenPublicDirectory(root, dest) {
 exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function getDevModeHandle(dir) {
     const host = new Promise((resolve) => {
-        const serve = (0, cross_spawn_1.spawn)(CLI_COMMAND, [], { cwd: dir });
+        const cli = (0, __1.getNodeModuleBin)("vite", dir);
+        const serve = (0, cross_spawn_1.spawn)(cli, [], { cwd: dir });
         serve.stdout.on("data", (data) => {
             process.stdout.write(data);
             const match = data.toString().match(/(http:\/\/.+:\d+)/);
@@ -87,5 +90,9 @@ async function getDevModeHandle(dir) {
 exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(root) {
     const { resolveConfig } = (0, __1.relativeRequire)(root, "vite");
-    return await resolveConfig({ root }, "build", "production");
+    const cwd = process.cwd();
+    process.chdir(root);
+    const config = await resolveConfig({ root }, "build", "production");
+    process.chdir(cwd);
+    return config;
 }

package/lib/gcp/cloudfunctions.js

@@ -44,6 +44,7 @@ exports.generateUploadUrl = generateUploadUrl;
 async function createFunction(cloudFunction) {
     const apiPath = cloudFunction.name.substring(0, cloudFunction.name.lastIndexOf("/"));
     const endpoint = `/${apiPath}`;
+    cloudFunction.buildEnvironmentVariables = Object.assign(Object.assign({}, cloudFunction.buildEnvironmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
     try {
         const res = await client.post(endpoint, cloudFunction);
         return {
@@ -131,6 +132,8 @@ exports.setInvokerUpdate = setInvokerUpdate;
 async function updateFunction(cloudFunction) {
     const endpoint = `/${cloudFunction.name}`;
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "environmentVariables", "secretEnvironmentVariables");
+    cloudFunction.buildEnvironmentVariables = Object.assign(Object.assign({}, cloudFunction.buildEnvironmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
+    fieldMasks.push("buildEnvironmentVariables");
     try {
         const res = await client.patch(endpoint, cloudFunction, {
             queryParams: {

package/lib/gcp/cloudfunctionsv2.js

@@ -80,6 +80,7 @@ exports.generateUploadUrl = generateUploadUrl;
 async function createFunction(cloudFunction) {
     const components = cloudFunction.name.split("/");
     const functionId = components.splice(-1, 1)[0];
+    cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
     try {
         const res = await client.post(components.join("/"), cloudFunction, { queryParams: { functionId } });
         return res.body;
@@ -133,6 +134,8 @@ async function listFunctionsInternal(projectId, region) {
 }
 async function updateFunction(cloudFunction) {
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables");
+    cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
+    fieldMasks.push("buildConfig.buildEnvironmentVariables");
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),
@@ -322,39 +325,49 @@ function endpointFromFunction(gcfFunction) {
     }
     const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,
         project,
-        region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime, uri: gcfFunction.serviceConfig.uri });
-    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds");
-    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccount", "serviceAccountEmail");
-    proto.convertIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", (prod) => {
-        if (prod === null) {
-            logger_1.logger.debug("Prod should always return a valid memory amount");
-            return prod;
+        region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime });
+    if (gcfFunction.serviceConfig) {
+        proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds", "uri");
+        proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccount", "serviceAccountEmail");
+        proto.convertIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", (prod) => {
+            if (prod === null) {
+                logger_1.logger.debug("Prod should always return a valid memory amount");
+                return prod;
+            }
+            const mem = mebibytes(prod);
+            if (!backend.isValidMemoryOption(mem)) {
+                logger_1.logger.warn("Converting a function to an endpoint with an invalid memory option", mem);
+            }
+            return mem;
+        });
+        proto.convertIfPresent(endpoint, gcfFunction.serviceConfig, "cpu", "availableCpu", (cpu) => {
+            let cpuVal = Number(cpu);
+            if (Number.isNaN(cpuVal)) {
+                cpuVal = null;
+            }
+            return cpuVal;
+        });
+        proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
+        proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");
+        proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "concurrency", "maxInstanceRequestConcurrency");
+        proto.copyIfPresent(endpoint, gcfFunction, "labels");
+        if (gcfFunction.serviceConfig.vpcConnector) {
+            endpoint.vpc = { connector: gcfFunction.serviceConfig.vpcConnector };
+            proto.renameIfPresent(endpoint.vpc, gcfFunction.serviceConfig, "egressSettings", "vpcConnectorEgressSettings");
         }
-        const mem = mebibytes(prod);
-        if (!backend.isValidMemoryOption(mem)) {
-            logger_1.logger.warn("Converting a function to an endpoint with an invalid memory option", mem);
+        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 mem;
-    });
-    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
-    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");
-    proto.copyIfPresent(endpoint, gcfFunction, "labels");
-    if (gcfFunction.serviceConfig.vpcConnector) {
-        endpoint.vpc = { connector: gcfFunction.serviceConfig.vpcConnector };
-        proto.renameIfPresent(endpoint.vpc, gcfFunction.serviceConfig, "egressSettings", "vpcConnectorEgressSettings");
     }
     endpoint.codebase = ((_e = gcfFunction.labels) === null || _e === void 0 ? void 0 : _e[constants_1.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
     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;