firebase-tools 11.21.0 → 11.22.0

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