firebase-tools 13.0.3 → 13.1.0

package/lib/commands/apphosting-backends-list.js

@@ -1,58 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
+const Table = require("cli-table");
 const command_1 = require("../command");
-const projectUtils_1 = require("../projectUtils");
+const utils_1 = require("../utils");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
+const projectUtils_1 = require("../projectUtils");
 const apphosting = require("../gcp/apphosting");
-const Table = require("cli-table");
-const COLUMN_LENGTH = 20;
-const TABLE_HEAD = ["Backend Id", "Repository", "Location", "URL", "Created Date", "Updated Date"];
+const TABLE_HEAD = ["Backend ID", "Repository", "Location", "URL", "Created Date", "Updated Date"];
 exports.command = new command_1.Command("apphosting:backends:list")
     .description("List backends of a Firebase project.")
     .option("-l, --location <location>", "App Backend location", "-")
     .before(apphosting.ensureApiEnabled)
     .action(async (options) => {
+    var _a, _b, _c;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const location = options.location;
-    const table = new Table({
-        head: TABLE_HEAD,
-        style: { head: ["green"] },
-    });
-    table.colWidths = COLUMN_LENGTH;
-    const backendsList = [];
+    const table = new Table({ head: TABLE_HEAD, style: { head: ["green"] } });
+    let backendRes;
     try {
-        const backendsPerRegion = await apphosting.listBackends(projectId, location);
-        backendsList.push(...(backendsPerRegion.backends || []));
-        populateTable(backendsList, table);
-        logger_1.logger.info(table.toString());
+        backendRes = await apphosting.listBackends(projectId, location);
     }
     catch (err) {
         throw new error_1.FirebaseError(`Unable to list backends present for project: ${projectId}. Please check the parameters you have provided.`, { original: err });
     }
-    return backendsList;
-});
-function populateTable(backends, table) {
-    var _a, _b;
+    const backends = backendRes === null || backendRes === void 0 ? void 0 : backendRes.backends;
     for (const backend of backends) {
-        const [location, , backendId] = backend.name.split("/").slice(3, 6);
-        const entry = [
+        const [backendLocation, , backendId] = backend.name.split("/").slice(3, 6);
+        table.push([
             backendId,
-            (_b = (_a = backend.codebase) === null || _a === void 0 ? void 0 : _a.repository) === null || _b === void 0 ? void 0 : _b.split("/").pop(),
-            location,
-            backend.uri,
-            backend.createTime,
-            backend.updateTime,
-        ];
-        const newRow = entry.map((name) => {
-            const maxCellWidth = COLUMN_LENGTH - 2;
-            const chunks = [];
-            for (let i = 0; name && i < name.length; i += maxCellWidth) {
-                chunks.push(name.substring(i, i + maxCellWidth));
-            }
-            return chunks.join("\n");
-        });
-        table.push(newRow);
+            (_c = (_b = (_a = backend.codebase) === null || _a === void 0 ? void 0 : _a.repository) === null || _b === void 0 ? void 0 : _b.split("/").pop()) !== null && _c !== void 0 ? _c : "",
+            backendLocation,
+            backend.uri.startsWith("https:") ? backend.uri : "https://" + backend.uri,
+            (0, utils_1.datetimeString)(new Date(backend.createTime)),
+            (0, utils_1.datetimeString)(new Date(backend.updateTime)),
+        ]);
     }
-}
+    logger_1.logger.info(table.toString());
+    return backends;
+});

package/lib/deploy/hosting/convertConfig.js

@@ -125,6 +125,11 @@ async function convertConfig(context, functionsPayload, deploy) {
                     region: endpoint.region,
                 } });
             if (rewrite.function.pinTag) {
+                if (endpoint.minInstances) {
+                    throw new error_1.FirebaseError(`Function ${endpoint.id} has minInstances set and is in a rewrite ` +
+                        "pinTags=true. These features are not currently compatible with each " +
+                        "other.");
+                }
                 experiments.assertEnabled("pintags", "pin a function version");
                 apiRewrite.run.tag = runTags.TODO_TAG_NAME;
             }

package/lib/emulator/auth/handlers.js

@@ -159,7 +159,7 @@ function registerHandlers(app, getProjectStateByApiKey) {
         res.set("Content-Type", "text/html; charset=utf-8");
         const apiKey = req.query.apiKey;
         const providerId = req.query.providerId;
-        const tenantId = req.query.tenantId;
+        const tenantId = (req.query.tenantId || req.query.tid);
         if (!apiKey || !providerId) {
             return res.status(400).json({
                 authEmulator: {

package/lib/emulator/auth/operations.js

@@ -1151,7 +1151,7 @@ async function signInWithIdp(state, reqBody) {
     }
     else {
         if (!response.localId) {
-            throw new Error("Internal assertion error: localId not set for exising user.");
+            throw new Error("Internal assertion error: localId not set for existing user.");
         }
         const maybeUser = state.getUserByLocalId(response.localId);
         (0, errors_1.assert)(maybeUser, "USER_NOT_FOUND");

package/lib/frameworks/angular/index.js

@@ -22,7 +22,7 @@ async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "angular.json"))))
         return;
     const version = (0, utils_2.getAngularVersion)(dir);
-    return { mayWantBackend: true, publicDirectory: (0, path_1.join)(dir, "src", "assets"), version };
+    return { mayWantBackend: true, version };
 }
 exports.discover = discover;
 function init(setup, config) {
@@ -59,7 +59,7 @@ async function build(dir, configuration) {
 }
 exports.build = build;
 async function getDevModeHandle(dir, configuration) {
-    const { targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
+    const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
     const { serveTarget } = await (0, utils_2.getContext)(dir, configuration);
     if (!serveTarget)
         throw new Error("Could not find the serveTarget");

package/lib/frameworks/angular/utils.js

@@ -9,7 +9,7 @@ const utils_2 = require("../../utils");
 const semver_1 = require("semver");
 async function localesForTarget(dir, architectHost, target, workspaceProject) {
     var _a;
-    const { targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
+    const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
     const targetOptions = await architectHost.getOptionsForTarget(target);
     if (!targetOptions) {
         const targetString = targetStringFromTarget(target);
@@ -72,9 +72,11 @@ function getValidBuilders(purpose) {
 }
 async function getAllTargets(purpose, dir) {
     const validBuilders = getValidBuilders(purpose);
-    const { NodeJsAsyncHost } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node");
-    const { workspaces } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/core");
-    const { targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
+    const [{ NodeJsAsyncHost }, { workspaces }, { targetStringFromTarget }] = await Promise.all([
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/core"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect"),
+    ]);
     const host = workspaces.createWorkspaceHost(new NodeJsAsyncHost());
     const { workspace } = await workspaces.readWorkspace(dir, host);
     const targets = [];
@@ -98,11 +100,13 @@ async function getAllTargets(purpose, dir) {
 }
 exports.getAllTargets = getAllTargets;
 async function getContext(dir, targetOrConfiguration) {
-    const { NodeJsAsyncHost } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node");
-    const { workspaces } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/core");
-    const { WorkspaceNodeModulesArchitectHost } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect/node");
-    const { Architect, targetFromTargetString, targetStringFromTarget } = (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect");
-    const { parse } = (0, utils_1.relativeRequire)(dir, "jsonc-parser");
+    const [{ NodeJsAsyncHost }, { workspaces }, { WorkspaceNodeModulesArchitectHost }, { Architect, targetFromTargetString, targetStringFromTarget }, { parse },] = await Promise.all([
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/core/node"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/core"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect/node"),
+        (0, utils_1.relativeRequire)(dir, "@angular-devkit/architect"),
+        (0, utils_1.relativeRequire)(dir, "jsonc-parser"),
+    ]);
     const host = workspaces.createWorkspaceHost(new NodeJsAsyncHost());
     const { workspace } = await workspaces.readWorkspace(dir, host);
     const architectHost = new WorkspaceNodeModulesArchitectHost(workspace, dir);
@@ -427,7 +431,7 @@ async function getServerConfig(sourceDir, configuration) {
 }
 exports.getServerConfig = getServerConfig;
 async function getBuildConfig(sourceDir, configuration) {
-    const { targetStringFromTarget } = (0, utils_1.relativeRequire)(sourceDir, "@angular-devkit/architect");
+    const { targetStringFromTarget } = await (0, utils_1.relativeRequire)(sourceDir, "@angular-devkit/architect");
     const { buildTarget, browserTarget, baseHref, prerenderTarget, serverTarget, architectHost, workspaceProject, serveOptimizedImages, ssr, } = await getContext(sourceDir, configuration);
     const targets = (buildTarget
         ? [buildTarget]

package/lib/frameworks/astro/index.js

@@ -17,10 +17,9 @@ async function discover(dir) {
     const version = (0, utils_2.getAstroVersion)(dir);
     if (!version)
         return;
-    const { output, publicDir: publicDirectory } = await (0, utils_2.getConfig)(dir);
+    const { output } = await (0, utils_2.getConfig)(dir);
     return {
         mayWantBackend: output !== "static",
-        publicDirectory,
         version,
     };
 }

package/lib/frameworks/flutter/index.js

@@ -23,7 +23,7 @@ async function discover(dir) {
     const usingFlutter = (_a = pubSpec.dependencies) === null || _a === void 0 ? void 0 : _a.flutter;
     if (!usingFlutter)
         return;
-    return { mayWantBackend: false, publicDirectory: (0, path_1.join)(dir, "web") };
+    return { mayWantBackend: false };
 }
 exports.discover = discover;
 function init(setup, config) {

package/lib/frameworks/index.js

@@ -189,7 +189,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
         if (!results) {
             throw new error_1.FirebaseError((0, utils_1.frameworksCallToAction)("Unable to detect the web framework in use, check firebase-debug.log for more info."));
         }
-        const { framework, mayWantBackend, publicDirectory } = results;
+        const { framework, mayWantBackend } = results;
         const { build, ɵcodegenPublicDirectory, ɵcodegenFunctionsDirectory: codegenProdModeFunctionsDirectory, getDevModeHandle, name, support, docsUrl, supportedRange, getValidBuildTargets = constants_2.GET_DEFAULT_BUILD_TARGETS, shouldUseDevModeHandle = constants_2.DEFAULT_SHOULD_USE_DEV_MODE_HANDLE, } = frameworks_1.WebFrameworks[framework];
         logger_1.logger.info(`\n${(0, utils_1.frameworksCallToAction)(constants_2.SupportLevelWarnings[support](name), docsUrl, "   ", name, results.version, supportedRange, results.vite)}\n`);
         const hostingEmulatorInfo = emulators.find((e) => e.name === types_1.Emulators.HOSTING);
@@ -211,7 +211,6 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             getDevModeHandle &&
             (await getDevModeHandle(getProjectPath(), frameworksBuildTarget, hostingEmulatorInfo));
         if (devModeHandle) {
-            config.public = (0, path_1.relative)(projectRoot, publicDirectory);
             options.frameworksDevModeHandle = devModeHandle;
             if (mayWantBackend && firebaseDefaults) {
                 codegenFunctionsDirectory = codegenDevModeFunctionsDirectory;
@@ -239,10 +238,10 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
                 project,
                 site,
             });
-            config.public = (0, path_1.relative)(projectRoot, hostingDist);
             if (wantsBackend && !omitCloudFunction)
                 codegenFunctionsDirectory = codegenProdModeFunctionsDirectory;
         }
+        config.public = (0, path_1.relative)(projectRoot, hostingDist);
         config.webFramework = `${framework}${codegenFunctionsDirectory ? "_ssr" : ""}`;
         if (codegenFunctionsDirectory) {
             if (firebaseDefaults) {

package/lib/frameworks/next/index.js

@@ -379,7 +379,7 @@ async function getDevModeHandle(dir, _, hostingEmulatorInfo) {
             throw new error_1.FirebaseError(`${clc.bold("firebase serve")} does not support Next.js Middleware. Please use ${clc.bold("firebase emulators:start")} instead.`);
         }
     }
-    let next = (0, utils_1.relativeRequire)(dir, "next");
+    let next = await (0, utils_1.relativeRequire)(dir, "next");
     if ("default" in next)
         next = next.default;
     const nextApp = next({
@@ -405,8 +405,10 @@ async function getConfig(dir) {
         if (!version)
             throw new Error("Unable to find the next dep, try NPM installing?");
         if ((0, semver_1.gte)(version, "12.0.0")) {
-            const { default: loadConfig } = (0, utils_1.relativeRequire)(dir, "next/dist/server/config");
-            const { PHASE_PRODUCTION_BUILD } = (0, utils_1.relativeRequire)(dir, "next/constants");
+            const [{ default: loadConfig }, { PHASE_PRODUCTION_BUILD }] = await Promise.all([
+                (0, utils_1.relativeRequire)(dir, "next/dist/server/config"),
+                (0, utils_1.relativeRequire)(dir, "next/constants"),
+            ]);
             config = await loadConfig(PHASE_PRODUCTION_BUILD, dir);
         }
         else {

package/lib/frameworks/nuxt/index.js

@@ -25,8 +25,8 @@ async function discover(dir) {
         return;
     if (version && (0, semver_1.lt)(version, "3.0.0-0"))
         return;
-    const { dir: { public: publicDirectory }, ssr: mayWantBackend, } = await getConfig(dir);
-    return { publicDirectory, mayWantBackend, version };
+    const { ssr: mayWantBackend } = await getConfig(dir);
+    return { mayWantBackend, version };
 }
 exports.discover = discover;
 async function build(cwd) {

package/lib/frameworks/nuxt2/index.js

@@ -25,8 +25,7 @@ async function discover(rootDir) {
     const version = (0, utils_2.getNuxtVersion)(rootDir);
     if (!version || (version && (0, semver_1.gte)(version, "3.0.0-0")))
         return;
-    const { app } = await getAndLoadNuxt({ rootDir, for: "build" });
-    return { mayWantBackend: true, publicDirectory: app.options.dir.static, version };
+    return { mayWantBackend: true, version };
 }
 exports.discover = discover;
 async function build(rootDir) {

package/lib/frameworks/sveltekit/index.js

@@ -13,11 +13,11 @@ 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; } });
 Object.defineProperty(exports, "supportedRange", { enumerable: true, get: function () { return vite_2.supportedRange; } });
-async function build(root) {
+async function build(root, target) {
     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);
+    await (0, vite_1.build)(root, target);
     return { wantsBackend };
 }
 exports.build = build;

package/lib/frameworks/utils.js

@@ -189,11 +189,20 @@ function findDependency(name, options = {}) {
     return scanDependencyTree(name, json.dependencies);
 }
 exports.findDependency = findDependency;
-function relativeRequire(dir, mod) {
+async function relativeRequire(dir, mod) {
     try {
         const requireFunc = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require;
         const path = requireFunc.resolve(mod, { paths: [dir] });
-        if ((0, path_1.extname)(path) === ".mjs") {
+        let packageJson;
+        let isEsm = (0, path_1.extname)(path) === ".mjs";
+        if (!isEsm) {
+            packageJson = await readJSON((0, path_1.join)((0, path_1.dirname)(path), "package.json")).catch(() => undefined);
+            isEsm = (packageJson === null || packageJson === void 0 ? void 0 : packageJson.type) === "module";
+        }
+        if (isEsm) {
+            if ((0, path_1.extname)(path) === ".cjs" && (packageJson === null || packageJson === void 0 ? void 0 : packageJson.main)) {
+                return dynamicImport((0, path_1.join)((0, path_1.dirname)(path), packageJson.main));
+            }
             return dynamicImport((0, url_1.pathToFileURL)(path).toString());
         }
         else {

package/lib/frameworks/vite/index.js

@@ -68,13 +68,17 @@ async function discover(dir, plugin, npmDependency) {
     };
 }
 exports.discover = discover;
-async function build(root) {
-    const { build } = (0, utils_1.relativeRequire)(root, "vite");
+async function build(root, target) {
+    const { build } = await (0, utils_1.relativeRequire)(root, "vite");
     await (0, utils_1.warnIfCustomBuildScript)(root, exports.name, exports.DEFAULT_BUILD_SCRIPT);
     const cwd = process.cwd();
     process.chdir(root);
-    await build({ root, mode: "production" });
+    const originalNodeEnv = process.env.NODE_ENV;
+    const envKey = "NODE_ENV";
+    process.env[envKey] = target;
+    await build({ root, mode: target });
     process.chdir(cwd);
+    process.env[envKey] = originalNodeEnv;
     return { rewrites: [{ source: "**", destination: "/index.html" }] };
 }
 exports.build = build;
@@ -104,7 +108,7 @@ async function getDevModeHandle(dir) {
 }
 exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(root) {
-    const { resolveConfig } = (0, utils_1.relativeRequire)(root, "vite");
+    const { resolveConfig } = await (0, utils_1.relativeRequire)(root, "vite");
     const cwd = process.cwd();
     process.chdir(root);
     const config = await resolveConfig({ root }, "build", "production");

package/lib/gcp/apphosting.js

@@ -31,7 +31,7 @@ async function listBackends(projectId, location) {
 }
 exports.listBackends = listBackends;
 async function deleteBackend(projectId, location, backendId) {
-    const name = `projects/${projectId}/locations/${location}/backends/${backendId}`;
+    const name = `projects/${projectId}/locations/${location}/backends/${backendId}?force=true`;
     const res = await client.delete(name);
     return res.body;
 }

package/lib/gcp/cloudfunctionsv2.js

@@ -91,7 +91,7 @@ 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: "" });
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replaceAll("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", ".") });
     try {
         const res = await client.post(components.join("/"), cloudFunction, { queryParams: { functionId } });
         return res.body;
@@ -144,12 +144,10 @@ async function listFunctionsInternal(projectId, region) {
     }
 }
 async function updateFunction(cloudFunction) {
-    const components = cloudFunction.name.split("/");
-    const functionId = components.splice(-1, 1)[0];
     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");
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replaceAll("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", ".") });
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),

package/lib/hosting/api.js

@@ -46,15 +46,13 @@ async function getChannel(project = "-", site, channelId) {
 }
 exports.getChannel = getChannel;
 async function listChannels(project = "-", site) {
+    var _a;
     const channels = [];
     let nextPageToken = "";
     for (;;) {
         try {
             const res = await apiClient.get(`/projects/${project}/sites/${site}/channels`, { queryParams: { pageToken: nextPageToken, pageSize: 10 } });
-            const c = res.body.channels;
-            if (c) {
-                channels.push(...c);
-            }
+            channels.push(...((_a = res.body.channels) !== null && _a !== void 0 ? _a : []));
             nextPageToken = res.body.nextPageToken || "";
             if (!nextPageToken) {
                 return channels;
@@ -100,6 +98,7 @@ async function updateVersion(site, versionId, version) {
 }
 exports.updateVersion = updateVersion;
 async function listVersions(site) {
+    var _a;
     let pageToken = undefined;
     const versions = [];
     do {
@@ -110,7 +109,7 @@ async function listVersions(site) {
         const res = await apiClient.get(`projects/-/sites/${site}/versions`, {
             queryParams,
         });
-        versions.push(...res.body.versions);
+        versions.push(...((_a = res.body.versions) !== null && _a !== void 0 ? _a : []));
         pageToken = res.body.nextPageToken;
     } while (pageToken);
     return versions;
@@ -137,15 +136,13 @@ async function createRelease(site, channel, version, partialRelease) {
 }
 exports.createRelease = createRelease;
 async function listSites(project) {
+    var _a;
     const sites = [];
     let nextPageToken = "";
     for (;;) {
         try {
             const res = await apiClient.get(`/projects/${project}/sites`, { queryParams: { pageToken: nextPageToken, pageSize: 10 } });
-            const c = res.body.sites;
-            if (c) {
-                sites.push(...c);
-            }
+            sites.push(...((_a = res.body.sites) !== null && _a !== void 0 ? _a : []));
             nextPageToken = res.body.nextPageToken || "";
             if (!nextPageToken) {
                 return sites;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.0.3",
+  "version": "13.1.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {