firebase-tools 15.18.0 → 15.19.0

package/lib/accountExporter.js

@@ -40,10 +40,16 @@ const PROVIDER_ID_INDEX_MAP = new Map([
     ["facebook.com", 11],
     ["twitter.com", 15],
     ["github.com", 19],
+    ["apple.com", 28],
+    ["microsoft.com", 32],
+    ["gc.apple.com", 36],
+    ["playgames.google.com", 40],
+    ["linkedin.com", 44],
+    ["yahoo.com", 48],
 ]);
-function escapeComma(str) {
-    if (str.includes(",")) {
-        return `"${str}"`;
+function escapeCsv(str) {
+    if (str.includes(",") || str.includes('"') || str.includes("\n") || str.includes("\r")) {
+        return `"${str.replace(/"/g, '""')}"`;
     }
     return str;
 }
@@ -53,17 +59,18 @@ function convertToNormalBase64(data) {
 function addProviderUserInfo(providerInfo, arr, startPos) {
     arr[startPos] = providerInfo.rawId;
     arr[startPos + 1] = providerInfo.email || "";
-    arr[startPos + 2] = escapeComma(providerInfo.displayName || "");
+    arr[startPos + 2] = escapeCsv(providerInfo.displayName || "");
     arr[startPos + 3] = providerInfo.photoUrl || "";
 }
 function transUserToArray(user) {
-    const arr = Array(27).fill("");
+    const arrLength = Math.max(...PROVIDER_ID_INDEX_MAP.values()) + 4;
+    const arr = Array(arrLength).fill("");
     arr[0] = user.localId;
     arr[1] = user.email || "";
     arr[2] = user.emailVerified || false;
     arr[3] = convertToNormalBase64(user.passwordHash || "");
     arr[4] = convertToNormalBase64(user.salt || "");
-    arr[5] = escapeComma(user.displayName || "");
+    arr[5] = escapeCsv(user.displayName || "");
     arr[6] = user.photoUrl || "";
     for (let i = 0; i < (!user.providerUserInfo ? 0 : user.providerUserInfo.length); i++) {
         const providerInfo = user.providerUserInfo[i];

package/lib/accountImporter.js

@@ -32,7 +32,18 @@ const ALLOWED_JSON_KEYS_RENAMING = {
     lastSignedInAt: "lastLoginAt",
 };
 const ALLOWED_PROVIDER_USER_INFO_KEYS = ["providerId", "rawId", "email", "displayName", "photoUrl"];
-const ALLOWED_PROVIDER_IDS = ["google.com", "facebook.com", "twitter.com", "github.com"];
+const ALLOWED_PROVIDER_IDS = [
+    "google.com",
+    "facebook.com",
+    "twitter.com",
+    "github.com",
+    "apple.com",
+    "microsoft.com",
+    "gc.apple.com",
+    "playgames.google.com",
+    "linkedin.com",
+    "yahoo.com",
+];
 function isValidBase64(str) {
     const expected = Buffer.from(str, "base64").toString("base64");
     if (str.length < expected.length && !str.endsWith("=")) {
@@ -125,6 +136,12 @@ function transArrayToUser(arr) {
     addProviderUserInfo(user, "facebook.com", arr.slice(11, 15));
     addProviderUserInfo(user, "twitter.com", arr.slice(15, 19));
     addProviderUserInfo(user, "github.com", arr.slice(19, 23));
+    addProviderUserInfo(user, "apple.com", arr.slice(28, 32));
+    addProviderUserInfo(user, "microsoft.com", arr.slice(32, 36));
+    addProviderUserInfo(user, "gc.apple.com", arr.slice(36, 40));
+    addProviderUserInfo(user, "playgames.google.com", arr.slice(40, 44));
+    addProviderUserInfo(user, "linkedin.com", arr.slice(44, 48));
+    addProviderUserInfo(user, "yahoo.com", arr.slice(48, 52));
     if (user.passwordHash && !isValidBase64(user.passwordHash)) {
         return {
             error: "Password hash should be base64 encoded.",

package/lib/apphosting/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALLOWED_DEPLOY_METHODS = exports.DEFAULT_DEPLOY_METHOD = exports.DEFAULT_LOCATION = void 0;
+exports.LOCAL_BUILD_DIR_NAME = exports.ALLOWED_DEPLOY_METHODS = exports.DEFAULT_DEPLOY_METHOD = exports.DEFAULT_LOCATION = void 0;
 exports.DEFAULT_LOCATION = "us-east4";
 exports.DEFAULT_DEPLOY_METHOD = "github";
 exports.ALLOWED_DEPLOY_METHODS = [{ name: "Deploy using github", value: "github" }];
+exports.LOCAL_BUILD_DIR_NAME = ".local_build";

package/lib/apphosting/localbuilds.js

@@ -11,21 +11,23 @@ const error_1 = require("../error");
 const logger_1 = require("../logger");
 const utils_1 = require("../utils");
 const universalMakerDownload_1 = require("./universalMakerDownload");
-async function runUniversalMaker(projectRoot, framework) {
+async function runUniversalMaker(projectRoot, addedEnv) {
     const universalMakerBinary = await (0, universalMakerDownload_1.getOrDownloadUniversalMaker)();
-    executeUniversalMakerBinary(universalMakerBinary, projectRoot);
-    return processUniversalMakerOutput(projectRoot, framework);
+    executeUniversalMakerBinary(universalMakerBinary, projectRoot, addedEnv);
+    return processUniversalMakerOutput(projectRoot);
 }
-function executeUniversalMakerBinary(universalMakerBinary, projectRoot) {
+function executeUniversalMakerBinary(universalMakerBinary, projectRoot, addedEnv) {
     try {
-        const bundleOutput = path.join(projectRoot, "bundle_output");
-        fs.removeSync(bundleOutput);
-        fs.ensureDirSync(bundleOutput);
+        const targetAppHosting = path.join(projectRoot, ".apphosting");
+        fs.removeSync(targetAppHosting);
+        fs.ensureDirSync(targetAppHosting);
         const res = childProcess.spawnSync(universalMakerBinary, ["-application_dir", projectRoot, "-output_dir", projectRoot, "-output_format", "json"], {
+            cwd: projectRoot,
             env: {
                 ...process.env,
+                ...addedEnv,
                 X_GOOGLE_TARGET_PLATFORM: "fah",
-                FIREBASE_OUTPUT_BUNDLE_DIR: bundleOutput,
+                FIREBASE_OUTPUT_BUNDLE_DIR: targetAppHosting,
             },
             stdio: "pipe",
         });
@@ -57,33 +59,16 @@ function parseBundleYaml(projectRoot, defaultRunCommand) {
     const bundleRaw = fs.readFileSync(bundleYamlPath, "utf-8");
     const bundleData = (0, utils_1.wrappedSafeLoad)(bundleRaw);
     const runCommand = bundleData?.runConfig?.runCommand ?? defaultRunCommand;
-    const outputFiles = bundleData?.outputFiles?.serverApp?.include;
-    if (!outputFiles) {
-        throw new error_1.FirebaseError("Failed to resolve build artifacts. Ensure Universal Maker produced a valid bundle.yaml with outputFiles.");
-    }
+    const outputFiles = bundleData?.outputFiles?.serverApp?.include ?? [];
     return { runCommand, outputFiles };
 }
-function processUniversalMakerOutput(projectRoot, framework) {
+function processUniversalMakerOutput(projectRoot) {
     const outputFilePath = path.join(projectRoot, "build_output.json");
     if (!fs.existsSync(outputFilePath)) {
         throw new error_1.FirebaseError(`Universal Maker did not produce the expected output file at ${outputFilePath}`);
     }
     const outputRaw = fs.readFileSync(outputFilePath, "utf-8");
     fs.unlinkSync(outputFilePath);
-    const bundleOutput = path.join(projectRoot, "bundle_output");
-    const targetAppHosting = path.join(projectRoot, ".apphosting");
-    if (fs.existsSync(bundleOutput)) {
-        fs.ensureDirSync(targetAppHosting);
-        const files = fs.readdirSync(bundleOutput);
-        for (const file of files) {
-            const dest = path.join(targetAppHosting, file);
-            if (fs.existsSync(dest)) {
-                fs.removeSync(dest);
-            }
-            fs.moveSync(path.join(bundleOutput, file), dest);
-        }
-        fs.removeSync(bundleOutput);
-    }
     let umOutput;
     try {
         umOutput = JSON.parse(outputRaw);
@@ -94,11 +79,6 @@ function processUniversalMakerOutput(projectRoot, framework) {
     const defaultRunCommand = `${umOutput.command} ${umOutput.args.join(" ")}`;
     const { runCommand: finalRunCommand, outputFiles: finalOutputFiles } = parseBundleYaml(projectRoot, defaultRunCommand);
     return {
-        metadata: {
-            language: umOutput.language,
-            runtime: umOutput.runtime,
-            framework: framework || "nextjs",
-        },
         runConfig: {
             runCommand: finalRunCommand,
             environmentVariables: Object.entries(umOutput.envVars || {})
@@ -116,7 +96,7 @@ function processUniversalMakerOutput(projectRoot, framework) {
         },
     };
 }
-async function localBuild(projectId, projectRoot, framework, env = {}, options) {
+async function localBuild(projectId, projectRoot, env = {}, options) {
     const hasBuildAvailableSecrets = Object.values(env).some((v) => v.secret && (!v.availability || v.availability.includes("BUILD")));
     if (hasBuildAvailableSecrets && !options?.allowLocalBuildSecrets) {
         if (options?.nonInteractive) {
@@ -129,26 +109,8 @@ async function localBuild(projectId, projectRoot, framework, env = {}, options)
             throw new error_1.FirebaseError("Cancelled local build due to BUILD-available secrets.");
         }
     }
-    const originalEnv = { ...process.env };
     const addedEnv = await toProcessEnv(projectId, env);
-    for (const [key, value] of Object.entries(addedEnv)) {
-        process.env[key] = value;
-    }
-    let apphostingBuildOutput;
-    try {
-        apphostingBuildOutput = await runUniversalMaker(projectRoot, framework);
-    }
-    finally {
-        for (const key in process.env) {
-            if (!(key in originalEnv)) {
-                delete process.env[key];
-            }
-        }
-        for (const [key, value] of Object.entries(originalEnv)) {
-            process.env[key] = value;
-        }
-    }
-    const annotations = Object.fromEntries(Object.entries(apphostingBuildOutput.metadata).map(([key, value]) => [key, String(value)]));
+    const apphostingBuildOutput = await runUniversalMaker(projectRoot, addedEnv);
     const discoveredEnv = apphostingBuildOutput.runConfig.environmentVariables?.map(({ variable, value, availability }) => ({
         variable,
         value,
@@ -156,7 +118,6 @@ async function localBuild(projectId, projectRoot, framework, env = {}, options)
     }));
     return {
         outputFiles: apphostingBuildOutput.outputFiles?.serverApp.include ?? [],
-        annotations,
         buildConfig: {
             runCommand: apphostingBuildOutput.runConfig.runCommand,
             env: discoveredEnv ?? [],
@@ -164,18 +125,14 @@ async function localBuild(projectId, projectRoot, framework, env = {}, options)
     };
 }
 async function toProcessEnv(projectId, env) {
-    const entries = await Promise.all(Object.entries(env).map(async ([key, value]) => {
-        if (value.availability && !value.availability.includes("BUILD")) {
-            return null;
-        }
-        if (value.secret) {
-            const resolvedValue = await (0, index_1.loadSecret)(projectId, value.secret);
-            return [key, resolvedValue];
-        }
-        else {
-            return [key, value.value || ""];
-        }
+    const buildVars = Object.entries(env).filter(([, value]) => {
+        return !value.availability || value.availability.includes("BUILD");
+    });
+    const resolvedEntries = await Promise.all(buildVars.map(async ([key, value]) => {
+        const resolvedValue = value.secret
+            ? await (0, index_1.loadSecret)(projectId, value.secret)
+            : value.value || "";
+        return [key, resolvedValue];
     }));
-    const filteredEntries = entries.filter((entry) => entry !== null);
-    return Object.fromEntries(filteredEntries);
+    return Object.fromEntries(resolvedEntries);
 }

package/lib/apphosting/universalMakerInfo.json

@@ -1,15 +1,15 @@
 {
     "darwin_arm64": {
         "version": "1.0.0",
-        "expectedSize": 16111618,
-        "expectedChecksumSHA256": "4b77d02a5f80f26d9bd1428f388c293c1fb264995d75b51c7d50fec7c87bcf58",
+        "expectedSize": 16266914,
+        "expectedChecksumSHA256": "72dae4eeefedc096649134f6ee592248c17dba5cdaec5bf679f367b2093d41cc",
         "remoteUrl": "https://artifactregistry.googleapis.com/download/v1/projects/serverless-runtimes-qa/locations/us-central1/repositories/universal-maker/files/darwin-arm64%3A1.0.0%3Auniversal_maker:download?alt=media",
         "downloadPathRelativeToCacheDir": "universal-maker-darwin-arm64-1.0.0"
     },
     "linux_x64": {
         "version": "1.0.0",
-        "expectedSize": 16856277,
-        "expectedChecksumSHA256": "dfc8357b8ce23ef1897e5590d4390f166e27734f241b770f721d68273118845c",
+        "expectedSize": 17023802,
+        "expectedChecksumSHA256": "ba74d2d2ce61d1b773f5b9eefeb09ef48a6890f2767581b57f9871869693823d",
         "remoteUrl": "https://artifactregistry.googleapis.com/download/v1/projects/serverless-runtimes-qa/locations/us-central1/repositories/universal-maker/files/x86-64%3A1.0.0%3Auniversal_maker:download?alt=media",
         "downloadPathRelativeToCacheDir": "universal-maker-linux-x64-1.0.0"
     }

package/lib/commands/dataconnect-sql-shell.js

@@ -103,6 +103,9 @@ exports.command = new command_1.Command("dataconnect:sql:shell")
         user: username,
         database: databaseId,
     });
+    pool.on("error", (err) => {
+        logger_1.logger.debug("PostgreSQL pool error:", err);
+    });
     const conn = await pool.connect();
     await conn.query(`SET search_path TO "${schemaName}"`);
     logger_1.logger.info(`Logged in as ${username}`);
@@ -110,8 +113,23 @@ exports.command = new command_1.Command("dataconnect:sql:shell")
     logger_1.logger.info(clc.gray("Type your your SQL query or '.exit' to quit, queries should end with ';' or add empty line to execute."));
     await mainShellLoop(conn);
     logger_1.logger.info(clc.yellow("Exiting shell..."));
-    conn.release();
-    await pool.end();
-    connector.close();
+    try {
+        conn.release();
+    }
+    catch (err) {
+        logger_1.logger.debug("Error releasing pg connection:", err);
+    }
+    try {
+        connector.close();
+    }
+    catch (err) {
+        logger_1.logger.debug("Error closing Cloud SQL connector:", err);
+    }
+    try {
+        await pool.end();
+    }
+    catch (err) {
+        logger_1.logger.debug("Error ending pg pool:", err);
+    }
     return { projectId };
 });

package/lib/deploy/apphosting/deploy.js

@@ -10,6 +10,7 @@ const projectUtils_1 = require("../../projectUtils");
 const utils_1 = require("../../utils");
 const util = require("./util");
 const experiments = require("../../experiments");
+const logger_1 = require("../../logger");
 async function default_1(context, options) {
     if (Object.entries(context.backendConfigs).length === 0) {
         return;
@@ -52,31 +53,46 @@ async function default_1(context, options) {
     }));
     await Promise.all(Object.values(context.backendConfigs).map(async (cfg) => {
         const rootDir = options.projectRoot ?? process.cwd();
-        let builtAppDir;
-        const isLocalBuild = !!cfg.localBuild;
-        if (isLocalBuild) {
-            experiments.assertEnabled("apphostinglocalbuilds", "App Hosting local builds");
-            builtAppDir = context.backendLocalBuilds[cfg.backendId].buildDir;
-            if (!builtAppDir) {
-                throw new error_1.FirebaseError(`No local build dir found for ${cfg.backendId}`);
+        let localBuildScratchDir;
+        try {
+            const isLocalBuild = cfg.localBuild;
+            let outputFiles;
+            if (isLocalBuild) {
+                experiments.assertEnabled("apphostinglocalbuilds", "App Hosting local builds");
+                const localBuild = context.backendLocalBuilds[cfg.backendId];
+                outputFiles = localBuild?.outputFiles;
+                localBuildScratchDir = localBuild?.localBuildScratchDir;
+                if (!outputFiles || !localBuildScratchDir) {
+                    throw new error_1.FirebaseError(`No local build output files found for ${cfg.backendId}`);
+                }
             }
+            const zippedSourcePath = isLocalBuild
+                ? await util.createLocalBuildTarArchive(cfg, localBuildScratchDir, outputFiles ?? [])
+                : await util.createSourceDeployArchive(cfg, rootDir);
+            (0, utils_1.logLabeledBullet)("apphosting", `Zipped ${isLocalBuild ? "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 ${isLocalBuild ? "built app" : "source"} for backend ${cfg.backendId}...`);
+            const bucketName = bucketsPerLocation[backendLocation];
+            const { bucket, object } = await gcs.uploadObject({
+                file: zippedSourcePath,
+                stream: fs.createReadStream(zippedSourcePath),
+            }, bucketName, isLocalBuild ? gcs.ContentType.TAR : gcs.ContentType.ZIP);
+            (0, utils_1.logLabeledBullet)("apphosting", `Uploaded at gs://${bucket}/${object}`);
+            context.backendStorageUris[cfg.backendId] =
+                `gs://${bucketName}/${path.basename(zippedSourcePath)}`;
         }
-        const zippedSourcePath = isLocalBuild
-            ? await util.createLocalBuildTarArchive(cfg, rootDir, builtAppDir)
-            : await util.createSourceDeployArchive(cfg, rootDir);
-        (0, utils_1.logLabeledBullet)("apphosting", `Zipped ${isLocalBuild ? "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.`);
+        finally {
+            if (localBuildScratchDir && fs.existsSync(localBuildScratchDir)) {
+                try {
+                    fs.rmSync(localBuildScratchDir, { recursive: true, force: true });
+                }
+                catch (err) {
+                    logger_1.logger.debug(`Failed to clean up local build directory ${localBuildScratchDir}: ${err}`);
+                }
+            }
         }
-        (0, utils_1.logLabeledBullet)("apphosting", `Uploading ${isLocalBuild ? "built app" : "source"} for backend ${cfg.backendId}...`);
-        const bucketName = bucketsPerLocation[backendLocation];
-        const { bucket, object } = await gcs.uploadObject({
-            file: zippedSourcePath,
-            stream: fs.createReadStream(zippedSourcePath),
-        }, bucketName, isLocalBuild ? gcs.ContentType.TAR : gcs.ContentType.ZIP);
-        (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

@@ -4,7 +4,10 @@ exports.default = default_1;
 exports.injectEnvVarsFromApphostingConfig = injectEnvVarsFromApphostingConfig;
 exports.injectAutoInitEnvVars = injectAutoInitEnvVars;
 exports.getBackendConfigs = getBackendConfigs;
+const fs = require("fs");
 const path = require("path");
+const fsAsync = require("../../fsAsync");
+const util_1 = require("./util");
 const backend_1 = require("../../apphosting/backend");
 const apphosting_1 = require("../../gcp/apphosting");
 const yaml_1 = require("../../apphosting/yaml");
@@ -16,6 +19,7 @@ const getProjectNumber_1 = require("../../getProjectNumber");
 const prompt_1 = require("../../prompt");
 const utils_1 = require("../../utils");
 const localbuilds_1 = require("../../apphosting/localbuilds");
+const constants_1 = require("../../apphosting/constants");
 const error_1 = require("../../error");
 const managementApps = require("../../management/apps");
 const utils_2 = require("../../apphosting/utils");
@@ -132,21 +136,21 @@ async function default_1(context, options) {
         (0, utils_1.logLabeledBullet)("apphosting", `Starting local build for backend ${cfg.backendId}`);
         await injectEnvVarsFromApphostingConfig(configs.filter((c) => c.backendId === cfg.backendId), options, buildEnv, runtimeEnv);
         await injectAutoInitEnvVars(cfg, backends, buildEnv, runtimeEnv);
+        const rootDir = options.projectRoot || process.cwd();
+        const localBuildScratchDir = path.join(rootDir, `${constants_1.LOCAL_BUILD_DIR_NAME}_${cfg.backendId}`);
         try {
-            const { outputFiles, annotations, buildConfig } = await (0, localbuilds_1.localBuild)(projectId, options.projectRoot || "./", "nextjs", buildEnv[cfg.backendId] || {}, {
+            await prepareLocalBuildScratchDirectory(rootDir, localBuildScratchDir, cfg);
+            const { outputFiles, buildConfig } = await (0, localbuilds_1.localBuild)(projectId, localBuildScratchDir, buildEnv[cfg.backendId] || {}, {
                 nonInteractive: options.nonInteractive,
                 allowLocalBuildSecrets: !!options.allowLocalBuildSecrets,
             });
-            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],
+                outputFiles,
+                localBuildScratchDir,
                 buildConfig: {
                     ...buildConfig,
                     env: mergeEnvVars(buildConfig.env || [], runtimeEnv[cfg.backendId] || {}),
                 },
-                annotations,
             };
         }
         catch (e) {
@@ -244,3 +248,21 @@ async function ensureAppHostingServiceAgentRoles(projectId, projectNumber) {
         (0, utils_1.logLabeledWarning)("apphosting", `Unable to verify App Hosting service agent permissions for ${p4saEmail}. If you encounter a PERMISSION_DENIED error during rollout, please ensure the service agent has the "Storage Object Viewer" role.`);
     }
 }
+async function prepareLocalBuildScratchDirectory(rootDir, localBuildScratchDir, cfg) {
+    const ignore = (0, util_1.resolveIgnorePatterns)(cfg);
+    if (fs.existsSync(localBuildScratchDir)) {
+        throw new error_1.FirebaseError(`The local build scratch directory '${localBuildScratchDir}' already exists. Please delete it and try again.`);
+    }
+    fs.mkdirSync(localBuildScratchDir, { recursive: true });
+    const filesToCopy = await fsAsync.readdirRecursive({
+        path: rootDir,
+        ignoreStrings: ignore,
+        supportGitIgnore: true,
+    });
+    for (const file of filesToCopy) {
+        const relativePath = path.relative(rootDir, file.name);
+        const destPath = path.join(localBuildScratchDir, relativePath);
+        fs.mkdirSync(path.dirname(destPath), { recursive: true });
+        fs.copyFileSync(file.name, destPath);
+    }
+}

package/lib/deploy/apphosting/util.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLocalBuildTarArchive = createLocalBuildTarArchive;
 exports.createSourceDeployArchive = createSourceDeployArchive;
+exports.resolveIgnorePatterns = resolveIgnorePatterns;
 const archiver = require("archiver");
 const fs = require("fs");
 const path = require("path");
@@ -9,25 +10,28 @@ const tar = require("tar");
 const tmp = require("tmp");
 const error_1 = require("../../error");
 const fsAsync = require("../../fsAsync");
-const config_1 = require("../../apphosting/config");
-async function createLocalBuildTarArchive(config, rootDir, targetSubDir) {
+const utils_1 = require("../../utils");
+async function createLocalBuildTarArchive(config, rootDir, outputFiles) {
     const tmpFile = tmp.fileSync({ prefix: `${config.backendId}-`, postfix: ".tar.gz" }).name;
-    const targetDir = targetSubDir ? path.join(rootDir, targetSubDir) : rootDir;
-    const ignore = ["firebase-debug.log", "firebase-debug.*.log", ".git"];
-    const rdrFiles = await fsAsync.readdirRecursive({
-        path: targetDir,
-        ignoreStrings: ignore,
-        supportGitIgnore: true,
-    });
-    const allFiles = rdrFiles.map((rdrf) => path.relative(rootDir, rdrf.name));
-    if (targetSubDir) {
-        const defaultFiles = fs.readdirSync(rootDir).filter((file) => {
-            return config_1.APPHOSTING_YAML_FILE_REGEX.test(file);
-        });
-        for (const file of defaultFiles) {
-            if (!allFiles.includes(file)) {
-                allFiles.push(file);
-            }
+    const filesToPackage = outputFiles.length > 0 ? outputFiles : ["."];
+    const allFiles = [];
+    for (const fileOrDir of filesToPackage) {
+        const absolutePath = path.join(rootDir, fileOrDir);
+        if (!fs.existsSync(absolutePath)) {
+            (0, utils_1.logLabeledWarning)("apphosting", `Expected build output file or directory not found: ${fileOrDir}`);
+            continue;
+        }
+        const stat = fs.statSync(absolutePath);
+        if (stat.isDirectory()) {
+            const rdrFiles = await fsAsync.readdirRecursive({
+                path: absolutePath,
+                ignoreStrings: ["firebase-debug.log", "firebase-debug.*.log"],
+                supportGitIgnore: false,
+            });
+            allFiles.push(...rdrFiles.map((rdrf) => path.relative(rootDir, rdrf.name)));
+        }
+        else {
+            allFiles.push(path.relative(rootDir, absolutePath));
         }
     }
     try {
@@ -58,8 +62,7 @@ async function createSourceDeployArchive(config, rootDir, targetSubDir) {
     });
     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 ignore = resolveIgnorePatterns(config);
     try {
         const files = await fsAsync.readdirRecursive({
             path: targetDir,
@@ -76,10 +79,20 @@ async function createSourceDeployArchive(config, rootDir, targetSubDir) {
         await pipeAsync(archive, fileStream);
     }
     catch (err) {
-        throw new error_1.FirebaseError(`Could not read source directory. Remove links and shortcuts and try again. Original: ${err}`, { original: err, exit: 1 });
+        throw new error_1.FirebaseError(`Could not read source directory. Remove links and shortcuts and try again. Original: ${String(err)}`, { original: err, exit: 1 });
     }
     return tmpFile;
 }
+function resolveIgnorePatterns(config, skipDefaultNodeModules = false) {
+    const ignore = config.ignore
+        ? [...config.ignore]
+        : skipDefaultNodeModules
+            ? [".git"]
+            : ["node_modules", ".git"];
+    ignore.push("firebase-debug.log", "firebase-debug.*.log");
+    ignore.push(".local_build_*");
+    return ignore;
+}
 async function pipeAsync(from, to) {
     from.pipe(to);
     await from.finalize();

package/lib/deploy/functions/prepare.js

@@ -249,12 +249,11 @@ async function resolveDefaultRegionsForBuild(buildObj, have) {
             }
             else {
                 try {
-                    const fullEndpoint = { ...endpoint, id };
                     if (build.isBlockingTriggered(endpoint)) {
-                        resolvedRegion = resolveRegionForBlockingTrigger(fullEndpoint);
+                        resolvedRegion = resolveRegionForBlockingTrigger(endpoint.blockingTrigger);
                     }
                     else if (build.isEventTriggered(endpoint)) {
-                        resolvedRegion = await resolveRegionForEventTrigger(fullEndpoint);
+                        resolvedRegion = await resolveRegionForEventTrigger(endpoint.project, endpoint.eventTrigger);
                     }
                 }
                 catch (err) {
@@ -265,18 +264,17 @@ async function resolveDefaultRegionsForBuild(buildObj, have) {
         }
     }
 }
-function resolveRegionForBlockingTrigger(endpoint) {
-    const eventType = endpoint.blockingTrigger.eventType;
+function resolveRegionForBlockingTrigger(blockingTrigger) {
+    const eventType = blockingTrigger.eventType;
     if (events.AUTH_BLOCKING_EVENTS.includes(eventType)) {
         return "us-east1";
     }
-    if ((0, ailogic_1.isGlobalAILogicEndpoint)(endpoint)) {
+    if ((0, ailogic_1.isGlobalAILogicTrigger)(blockingTrigger)) {
         return "us-east1";
     }
     return exports.DEFAULT_FUNCTION_REGION;
 }
-async function resolveRegionForEventTrigger(endpoint) {
-    const eventTrigger = endpoint.eventTrigger;
+async function resolveRegionForEventTrigger(project, eventTrigger) {
     const eventType = eventTrigger.eventType;
     if (eventType.startsWith("google.cloud.pubsub.") ||
         eventType.startsWith("providers/cloud.auth/eventTypes/") ||
@@ -289,7 +287,7 @@ async function resolveRegionForEventTrigger(endpoint) {
     if (eventType.startsWith("google.cloud.firestore.")) {
         try {
             const databaseId = eventTrigger.eventFilters?.database || "(default)";
-            const db = await (0, firestore_1.getDatabase)(endpoint.project, databaseId);
+            const db = await (0, firestore_1.getDatabase)(project, databaseId);
             const locationId = db.locationId.toLowerCase();
             if (locationId === "nam5" || locationId === "nam7")
                 return "us-central1";
@@ -326,7 +324,7 @@ async function resolveRegionForEventTrigger(endpoint) {
         try {
             const instanceName = eventTrigger.eventFilters?.instance;
             if (instanceName) {
-                const details = await (0, database_1.getDatabaseInstanceDetails)(endpoint.project, instanceName);
+                const details = await (0, database_1.getDatabaseInstanceDetails)(project, instanceName);
                 if (details.location && details.location !== "-") {
                     return details.location.toLowerCase();
                 }

package/lib/deploy/functions/services/ailogic.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AILogicService = exports.AI_LOGIC_EVENTS = exports.AI_LOGIC_AFTER_GENERATE_CONTENT = exports.AI_LOGIC_BEFORE_GENERATE_CONTENT = void 0;
 exports.isAILogicEvent = isAILogicEvent;
-exports.isGlobalAILogicEndpoint = isGlobalAILogicEndpoint;
+exports.isGlobalAILogicTrigger = isGlobalAILogicTrigger;
 const backend = require("../backend");
 const error_1 = require("../../../error");
 const ailogicApi = require("../../../gcp/ailogic");
@@ -20,11 +20,9 @@ function isAILogicEvent(endpoint) {
     }
     return exports.AI_LOGIC_EVENTS.includes(endpoint.blockingTrigger.eventType);
 }
-function isGlobalAILogicEndpoint(endpoint) {
-    if (!isAILogicEvent(endpoint)) {
-        return false;
-    }
-    return !endpoint.blockingTrigger.options?.regionalWebhook;
+function isGlobalAILogicTrigger(blockingTrigger) {
+    return (exports.AI_LOGIC_EVENTS.includes(blockingTrigger.eventType) &&
+        !blockingTrigger.options?.regionalWebhook);
 }
 class AILogicService {
     constructor() {