firebase-tools 14.19.0 → 14.19.1

package/lib/apphosting/localbuilds.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.localBuild = void 0;
+const build_1 = require("@apphosting/build");
+async function localBuild(projectRoot, framework) {
+    var _a, _b, _c;
+    const apphostingBuildOutput = await (0, build_1.localBuild)(projectRoot, framework);
+    const annotations = Object.fromEntries(Object.entries(apphostingBuildOutput.metadata).map(([key, value]) => [key, String(value)]));
+    const env = (_a = apphostingBuildOutput.runConfig.environmentVariables) === null || _a === void 0 ? void 0 : _a.map(({ variable, value, availability }) => ({
+        variable,
+        value,
+        availability,
+    }));
+    return {
+        outputFiles: (_c = (_b = apphostingBuildOutput.outputFiles) === null || _b === void 0 ? void 0 : _b.serverApp.include) !== null && _c !== void 0 ? _c : [],
+        annotations,
+        buildConfig: {
+            runCommand: apphostingBuildOutput.runConfig.runCommand,
+            env: env !== null && env !== void 0 ? env : [],
+        },
+    };
+}
+exports.localBuild = localBuild;

package/lib/deploy/apphosting/deploy.js

@@ -18,7 +18,11 @@ async function default_1(context, options) {
         return;
     }
     const bucketsPerLocation = {};
-    await Promise.all(Object.values(context.backendLocations).map(async (loc) => {
+    await Promise.all(Object.entries(context.backendLocations).map(async ([backendId, loc]) => {
+        const cfg = context.backendConfigs[backendId];
+        if (!cfg) {
+            throw new error_1.FirebaseError(`Failed to find config for backend ${backendId}. Please contact support with the contents of your firebase-debug.log to report your issue.`);
+        }
         const baseName = `firebaseapphosting-sources-${options.projectNumber}-${loc.toLowerCase()}`;
         const resolvedName = await gcs.upsertBucket({
             product: "apphosting",
@@ -45,19 +49,28 @@ async function default_1(context, options) {
         bucketsPerLocation[loc] = resolvedName;
     }));
     await Promise.all(Object.values(context.backendConfigs).map(async (cfg) => {
-        const projectSourcePath = options.projectRoot ? options.projectRoot : process.cwd();
-        const zippedSourcePath = await (0, util_1.createArchive)(cfg, projectSourcePath);
+        var _a;
+        const rootDir = (_a = options.projectRoot) !== null && _a !== void 0 ? _a : process.cwd();
+        let builtAppDir;
+        if (cfg.localBuild) {
+            builtAppDir = context.backendLocalBuilds[cfg.backendId].buildDir;
+            if (!builtAppDir) {
+                throw new error_1.FirebaseError(`No local build dir found for ${cfg.backendId}`);
+            }
+        }
+        const zippedSourcePath = await (0, util_1.createArchive)(cfg, rootDir, builtAppDir);
+        (0, utils_1.logLabeledBullet)("apphosting", `Zipped ${cfg.localBuild ? "built app" : "source"} for backend ${cfg.backendId}`);
         const backendLocation = context.backendLocations[cfg.backendId];
         if (!backendLocation) {
             throw new error_1.FirebaseError(`Failed to find location for backend ${cfg.backendId}. Please contact support with the contents of your firebase-debug.log to report your issue.`);
         }
-        (0, utils_1.logLabeledBullet)("apphosting", `Uploading source code at ${projectSourcePath} for backend ${cfg.backendId}...`);
+        (0, utils_1.logLabeledBullet)("apphosting", `Uploading ${cfg.localBuild ? "built app" : "source"} for backend ${cfg.backendId}...`);
         const bucketName = bucketsPerLocation[backendLocation];
         const { bucket, object } = await gcs.uploadObject({
             file: zippedSourcePath,
             stream: fs.createReadStream(zippedSourcePath),
         }, bucketName);
-        (0, utils_1.logLabeledBullet)("apphosting", `Source code uploaded at gs://${bucket}/${object}`);
+        (0, utils_1.logLabeledBullet)("apphosting", `Uploaded at gs://${bucket}/${object}`);
         context.backendStorageUris[cfg.backendId] =
             `gs://${bucketName}/${path.basename(zippedSourcePath)}`;
     }));

package/lib/deploy/apphosting/prepare.js

@@ -8,6 +8,8 @@ const devConnect_1 = require("../../gcp/devConnect");
 const projectUtils_1 = require("../../projectUtils");
 const prompt_1 = require("../../prompt");
 const utils_1 = require("../../utils");
+const localbuilds_1 = require("../../apphosting/localbuilds");
+const error_1 = require("../../error");
 async function default_1(context, options) {
     var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -17,6 +19,7 @@ async function default_1(context, options) {
     context.backendConfigs = {};
     context.backendLocations = {};
     context.backendStorageUris = {};
+    context.backendLocalBuilds = {};
     const configs = getBackendConfigs(options);
     const { backends } = await (0, apphosting_1.listBackends)(projectId, "-");
     const foundBackends = [];
@@ -105,7 +108,26 @@ async function default_1(context, options) {
     if (skippedBackends.length > 0) {
         (0, utils_1.logLabeledWarning)("apphosting", `Skipping deployment of backend(s) ${skippedBackends.map((cfg) => cfg.backendId).join(", ")}.`);
     }
-    return;
+    for (const cfg of Object.values(context.backendConfigs)) {
+        if (!cfg.localBuild) {
+            continue;
+        }
+        (0, utils_1.logLabeledBullet)("apphosting", `Starting local build for backend ${cfg.backendId}`);
+        try {
+            const { outputFiles, annotations, buildConfig } = await (0, localbuilds_1.localBuild)(options.projectRoot || "./", "nextjs");
+            if (outputFiles.length !== 1) {
+                throw new error_1.FirebaseError(`Local build for backend ${cfg.backendId} failed: No output files found.`);
+            }
+            context.backendLocalBuilds[cfg.backendId] = {
+                buildDir: outputFiles[0],
+                buildConfig,
+                annotations,
+            };
+        }
+        catch (e) {
+            throw new error_1.FirebaseError(`Local Build for backend ${cfg.backendId} failed: ${e}`);
+        }
+    }
 }
 exports.default = default_1;
 function getBackendConfigs(options) {

package/lib/deploy/apphosting/release.js

@@ -13,6 +13,11 @@ async function default_1(context, options) {
         (0, utils_1.logLabeledWarning)("apphosting", `Failed to find metadata for backend(s) ${backendIds.join(", ")}. Please contact support with the contents of your firebase-debug.log to report your issue.`);
         backendIds = backendIds.filter((id) => !missingBackends.includes(id));
     }
+    const localBuildBackends = backendIds.filter((id) => context.backendLocalBuilds[id]);
+    if (localBuildBackends.length > 0) {
+        (0, utils_1.logLabeledWarning)("apphosting", `Skipping backend(s) ${localBuildBackends.join(", ")}. Local Builds are not supported yet.`);
+        backendIds = backendIds.filter((id) => !localBuildBackends.includes(id));
+    }
     if (backendIds.length === 0) {
         return;
     }

package/lib/deploy/apphosting/util.js

@@ -7,20 +7,21 @@ const path = require("path");
 const tmp = require("tmp");
 const error_1 = require("../../error");
 const fsAsync = require("../../fsAsync");
-async function createArchive(config, rootDir) {
+async function createArchive(config, rootDir, targetSubDir) {
     const tmpFile = tmp.fileSync({ prefix: `${config.backendId}-`, postfix: ".zip" }).name;
     const fileStream = fs.createWriteStream(tmpFile, {
         flags: "w",
         encoding: "binary",
     });
     const archive = archiver("zip");
+    const targetDir = targetSubDir ? path.join(rootDir, targetSubDir) : rootDir;
     const ignore = config.ignore || ["node_modules", ".git"];
     ignore.push("firebase-debug.log", "firebase-debug.*.log");
-    const gitIgnorePatterns = parseGitIgnorePatterns(rootDir);
+    const gitIgnorePatterns = parseGitIgnorePatterns(targetDir);
     ignore.push(...gitIgnorePatterns);
     try {
         const files = await fsAsync.readdirRecursive({
-            path: rootDir,
+            path: targetDir,
             ignore: ignore,
             isGitIgnore: true,
         });

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -60,7 +60,7 @@ async function createInstance(args) {
         await client.post(`projects/${args.projectId}/instances`, {
             name: args.instanceId,
             region: args.location,
-            databaseVersion: "POSTGRES_17",
+            databaseVersion: "POSTGRES_15",
             settings: {
                 tier: "db-f1-micro",
                 edition: "ENTERPRISE",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "14.19.0",
+  "version": "14.19.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -61,6 +61,8 @@
     ]
   },
   "dependencies": {
+    "@apphosting/build": "^0.1.6",
+    "@apphosting/common": "^0.0.8",
     "@electric-sql/pglite": "^0.3.3",
     "@electric-sql/pglite-tools": "^0.2.8",
     "@google-cloud/cloud-sql-connector": "^1.3.3",

package/schema/firebase-config.json

@@ -1107,6 +1107,9 @@
                             },
                             "type": "array"
                         },
+                        "localBuild": {
+                            "type": "boolean"
+                        },
                         "rootDir": {
                             "type": "string"
                         }
@@ -1134,6 +1137,9 @@
                                 },
                                 "type": "array"
                             },
+                            "localBuild": {
+                                "type": "boolean"
+                            },
                             "rootDir": {
                                 "type": "string"
                             }