firebase-tools 11.20.0 → 11.22.0

package/lib/frameworks/next/index.js

@@ -52,7 +52,7 @@ async function build(dir) {
         throw e;
     });
     const reasonsForBackend = [];
-    const { distDir } = await getConfig(dir);
+    const { distDir, trailingSlash } = await getConfig(dir);
     if (await (0, utils_1.isUsingMiddleware)((0, path_1.join)(dir, distDir), false)) {
         reasonsForBackend.push("middleware");
     }
@@ -96,7 +96,9 @@ async function build(dir) {
         source: (0, utils_1.cleanEscapedChars)(source),
         headers,
     }));
-    const isEveryRedirectSupported = nextJsRedirects.every(utils_1.isRedirectSupportedByHosting);
+    const isEveryRedirectSupported = nextJsRedirects
+        .filter((it) => !it.internal)
+        .every(utils_1.isRedirectSupportedByHosting);
     if (!isEveryRedirectSupported) {
         reasonsForBackend.push("advanced redirects");
     }
@@ -134,7 +136,7 @@ async function build(dir) {
         }
         console.log("");
     }
-    return { wantsBackend, headers, redirects, rewrites };
+    return { wantsBackend, headers, redirects, rewrites, trailingSlash };
 }
 exports.build = build;
 async function init(setup) {
@@ -284,5 +286,5 @@ async function getConfig(dir) {
             }
         }
     }
-    return Object.assign({ distDir: ".next" }, config);
+    return Object.assign({ distDir: ".next", trailingSlash: false }, config);
 }

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/functional.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nullsafeVisitor = exports.mapObject = exports.partition = exports.assertExhaustive = exports.zipIn = exports.zip = exports.reduceFlat = exports.flatten = exports.flattenArray = exports.flattenObject = void 0;
+exports.nullsafeVisitor = exports.mapObject = exports.partitionRecord = exports.partition = exports.assertExhaustive = exports.zipIn = exports.zip = exports.reduceFlat = exports.flatten = exports.flattenArray = exports.flattenObject = void 0;
 function* flattenObject(obj) {
     function* helper(path, obj) {
         for (const [k, v] of Object.entries(obj)) {
@@ -56,13 +56,20 @@ function assertExhaustive(val) {
     throw new Error(`Never has a value (${val}). This should be impossible`);
 }
 exports.assertExhaustive = assertExhaustive;
-function partition(arr, callbackFn) {
+function partition(arr, predicate) {
     return arr.reduce((acc, elem) => {
-        acc[callbackFn(elem) ? 0 : 1].push(elem);
+        acc[predicate(elem) ? 0 : 1].push(elem);
         return acc;
     }, [[], []]);
 }
 exports.partition = partition;
+function partitionRecord(rec, predicate) {
+    return Object.entries(rec).reduce((acc, [key, val]) => {
+        acc[predicate(key, val) ? 0 : 1][key] = val;
+        return acc;
+    }, [{}, {}]);
+}
+exports.partitionRecord = partitionRecord;
 function mapObject(input, transform) {
     const result = {};
     for (const [k, v] of Object.entries(input)) {

package/lib/functions/env.js

@@ -32,7 +32,7 @@ const RESERVED_KEYS = [
 ];
 const LINE_RE = new RegExp("^" +
     "\\s*" +
-    "(\\w+)" +
+    "([\\w./]+)" +
     "\\s*=[\\f\\t\\v]*" +
     "(" +
     "\\s*'(?:\\\\'|[^'])*'|" +

package/lib/functions/python.js

@@ -0,0 +1,21 @@
+"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, 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,
+    });
+}
+exports.runWithVirtualEnv = runWithVirtualEnv;

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/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: [],
             });