firebase-tools 13.3.1 → 13.4.1

package/lib/firestore/api.js

@@ -12,9 +12,11 @@ const prompt_1 = require("../prompt");
 const api_1 = require("../api");
 const error_1 = require("../error");
 const apiv2_1 = require("../apiv2");
+const pretty_print_1 = require("./pretty-print");
 class FirestoreApi {
     constructor() {
         this.apiClient = new apiv2_1.Client({ urlPrefix: api_1.firestoreOrigin, apiVersion: "v1" });
+        this.printer = new pretty_print_1.PrettyPrint();
     }
     async deploy(options, indexes, fieldOverrides, databaseId = "(default)") {
         const spec = this.upgradeOldSpec({
@@ -49,7 +51,7 @@ class FirestoreApi {
             }
             else if (!options.force) {
                 const indexesString = indexesToDelete
-                    .map((x) => this.prettyIndexString(x, false))
+                    .map((x) => this.printer.prettyIndexString(x, false))
                     .join("\n\t");
                 utils.logLabeledBullet("firestore", `The following indexes are defined in your project but are not present in your firestore indexes file:\n\t${indexesString}`);
             }
@@ -86,7 +88,7 @@ class FirestoreApi {
             }
             else if (!options.force) {
                 const indexesString = fieldOverridesToDelete
-                    .map((x) => this.prettyFieldString(x))
+                    .map((x) => this.printer.prettyFieldString(x))
                     .join("\n\t");
                 utils.logLabeledBullet("firestore", `The following field overrides are defined in your project but are not present in your firestore indexes file:\n\t${indexesString}`);
             }
@@ -145,7 +147,7 @@ class FirestoreApi {
             return [];
         }
         return fields.filter((field) => {
-            return field.name.indexOf("__default__") < 0;
+            return !field.name.includes("__default__");
         });
     }
     makeIndexSpec(indexes, fields) {
@@ -184,64 +186,6 @@ class FirestoreApi {
             fieldOverrides: sortedFields,
         };
     }
-    prettyPrintIndexes(indexes) {
-        if (indexes.length === 0) {
-            logger_1.logger.info("None");
-            return;
-        }
-        const sortedIndexes = indexes.sort(sort.compareApiIndex);
-        sortedIndexes.forEach((index) => {
-            logger_1.logger.info(this.prettyIndexString(index));
-        });
-    }
-    prettyPrintDatabases(databases) {
-        if (databases.length === 0) {
-            logger_1.logger.info("No databases found.");
-            return;
-        }
-        const sortedDatabases = databases.sort(sort.compareApiDatabase);
-        const Table = require("cli-table");
-        const table = new Table({
-            head: ["Database Name"],
-            colWidths: [Math.max(...sortedDatabases.map((database) => database.name.length + 5), 20)],
-        });
-        table.push(...sortedDatabases.map((database) => [this.prettyDatabaseString(database)]));
-        logger_1.logger.info(table.toString());
-    }
-    prettyPrintDatabase(database) {
-        const Table = require("cli-table");
-        const table = new Table({
-            head: ["Field", "Value"],
-            colWidths: [25, Math.max(50, 5 + database.name.length)],
-        });
-        table.push(["Name", clc.yellow(database.name)], ["Create Time", clc.yellow(database.createTime)], ["Last Update Time", clc.yellow(database.updateTime)], ["Type", clc.yellow(database.type)], ["Location", clc.yellow(database.locationId)], ["Delete Protection State", clc.yellow(database.deleteProtectionState)], ["Point In Time Recovery", clc.yellow(database.pointInTimeRecoveryEnablement)], ["Earliest Version Time", clc.yellow(database.earliestVersionTime)], ["Version Retention Period", clc.yellow(database.versionRetentionPeriod)]);
-        logger_1.logger.info(table.toString());
-    }
-    prettyPrintLocations(locations) {
-        if (locations.length === 0) {
-            logger_1.logger.info("No Locations Available");
-            return;
-        }
-        const Table = require("cli-table");
-        const table = new Table({
-            head: ["Display Name", "LocationId"],
-            colWidths: [20, 30],
-        });
-        table.push(...locations
-            .sort(sort.compareLocation)
-            .map((location) => [location.displayName, location.locationId]));
-        logger_1.logger.info(table.toString());
-    }
-    printFieldOverrides(fields) {
-        if (fields.length === 0) {
-            logger_1.logger.info("None");
-            return;
-        }
-        const sortedFields = fields.sort(sort.compareApiField);
-        sortedFields.forEach((field) => {
-            logger_1.logger.info(this.prettyFieldString(field));
-        });
-    }
     validateSpec(spec) {
         validator.assertHas(spec, "indexes");
         spec.indexes.forEach((index) => {
@@ -391,7 +335,7 @@ class FirestoreApi {
             return index.order || index.arrayConfig;
         });
         for (const mode of fieldModes) {
-            if (specModes.indexOf(mode) < 0) {
+            if (!specModes.includes(mode)) {
                 return false;
             }
         }
@@ -507,60 +451,19 @@ class FirestoreApi {
         }
         return database;
     }
-    prettyIndexString(index, includeState = true) {
-        let result = "";
-        if (index.state && includeState) {
-            const stateMsg = `[${index.state}] `;
-            if (index.state === types.State.READY) {
-                result += clc.green(stateMsg);
-            }
-            else if (index.state === types.State.CREATING) {
-                result += clc.yellow(stateMsg);
-            }
-            else {
-                result += clc.red(stateMsg);
-            }
-        }
-        const nameInfo = util.parseIndexName(index.name);
-        result += clc.cyan(`(${nameInfo.collectionGroupId})`);
-        result += " -- ";
-        index.fields.forEach((field) => {
-            if (field.fieldPath === "__name__") {
-                return;
-            }
-            const orderOrArrayConfig = field.order ? field.order : field.arrayConfig;
-            result += `(${field.fieldPath},${orderOrArrayConfig}) `;
-        });
-        return result;
-    }
-    prettyDatabaseString(database) {
-        return clc.yellow(database.name);
-    }
-    prettyFieldString(field) {
-        let result = "";
-        const parsedName = util.parseFieldName(field.name);
-        result +=
-            "[" +
-                clc.cyan(parsedName.collectionGroupId) +
-                "." +
-                clc.yellow(parsedName.fieldPath) +
-                "] --";
-        const fieldIndexes = field.indexConfig.indexes || [];
-        if (fieldIndexes.length > 0) {
-            fieldIndexes.forEach((index) => {
-                const firstField = index.fields[0];
-                const mode = firstField.order || firstField.arrayConfig;
-                result += ` (${mode})`;
-            });
-        }
-        else {
-            result += " (no indexes)";
-        }
-        const fieldTtl = field.ttlConfig;
-        if (fieldTtl) {
-            result += ` TTL(${fieldTtl.state})`;
+    async restoreDatabase(project, databaseId, backupName) {
+        const url = `/projects/${project}/databases:restore`;
+        const payload = {
+            databaseId,
+            backup: backupName,
+        };
+        const options = { queryParams: { databaseId: databaseId } };
+        const res = await this.apiClient.post(url, payload, options);
+        const database = res.body.response;
+        if (!database) {
+            throw new error_1.FirebaseError("Not found");
         }
-        return result;
+        return database;
     }
 }
 exports.FirestoreApi = FirestoreApi;

package/lib/firestore/backupUtils.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateRetention = exports.Duration = exports.DURATION_REGEX = void 0;
+const error_1 = require("../error");
+exports.DURATION_REGEX = /^(\d+)([hdmw])$/;
+var Duration;
+(function (Duration) {
+    Duration[Duration["MINUTE"] = 60] = "MINUTE";
+    Duration[Duration["HOUR"] = 3600] = "HOUR";
+    Duration[Duration["DAY"] = 86400] = "DAY";
+    Duration[Duration["WEEK"] = 604800] = "WEEK";
+})(Duration = exports.Duration || (exports.Duration = {}));
+const DURATIONS = {
+    m: Duration.MINUTE,
+    h: Duration.HOUR,
+    d: Duration.DAY,
+    w: Duration.WEEK,
+};
+function calculateRetention(flag) {
+    const match = exports.DURATION_REGEX.exec(flag);
+    if (!match) {
+        throw new error_1.FirebaseError(`"retention" flag must be a duration string (e.g. 24h, 2w, or 7d)`);
+    }
+    const d = parseInt(match[1], 10) * DURATIONS[match[2]];
+    if (isNaN(d)) {
+        throw new error_1.FirebaseError(`Failed to parse provided retention time "${flag}"`);
+    }
+    return d;
+}
+exports.calculateRetention = calculateRetention;

package/lib/firestore/pretty-print.js

@@ -0,0 +1,184 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrettyPrint = void 0;
+const clc = require("colorette");
+const Table = require("cli-table");
+const sort = require("./api-sort");
+const types = require("./api-types");
+const logger_1 = require("../logger");
+const util = require("./util");
+class PrettyPrint {
+    prettyPrintIndexes(indexes) {
+        if (indexes.length === 0) {
+            logger_1.logger.info("None");
+            return;
+        }
+        const sortedIndexes = indexes.sort(sort.compareApiIndex);
+        sortedIndexes.forEach((index) => {
+            logger_1.logger.info(this.prettyIndexString(index));
+        });
+    }
+    prettyPrintDatabases(databases) {
+        if (databases.length === 0) {
+            logger_1.logger.info("No databases found.");
+            return;
+        }
+        const sortedDatabases = databases.sort(sort.compareApiDatabase);
+        const table = new Table({
+            head: ["Database Name"],
+            colWidths: [Math.max(...sortedDatabases.map((database) => database.name.length + 5), 20)],
+        });
+        table.push(...sortedDatabases.map((database) => [this.prettyDatabaseString(database)]));
+        logger_1.logger.info(table.toString());
+    }
+    prettyPrintDatabase(database) {
+        const table = new Table({
+            head: ["Field", "Value"],
+            colWidths: [25, Math.max(50, 5 + database.name.length)],
+        });
+        table.push(["Name", clc.yellow(database.name)], ["Create Time", clc.yellow(database.createTime)], ["Last Update Time", clc.yellow(database.updateTime)], ["Type", clc.yellow(database.type)], ["Location", clc.yellow(database.locationId)], ["Delete Protection State", clc.yellow(database.deleteProtectionState)], ["Point In Time Recovery", clc.yellow(database.pointInTimeRecoveryEnablement)], ["Earliest Version Time", clc.yellow(database.earliestVersionTime)], ["Version Retention Period", clc.yellow(database.versionRetentionPeriod)]);
+        logger_1.logger.info(table.toString());
+    }
+    prettyPrintBackups(backups) {
+        if (backups.length === 0) {
+            logger_1.logger.info("No backups found.");
+            return;
+        }
+        const sortedBackups = backups.sort(sort.compareApiBackup);
+        const table = new Table({
+            head: ["Backup Name", "Database Name", "Snapshot Time", "State"],
+            colWidths: [
+                Math.max(...sortedBackups.map((backup) => backup.name.length + 5), 20),
+                Math.max(...sortedBackups.map((backup) => backup.database.length + 5), 20),
+                30,
+                10,
+            ],
+        });
+        table.push(...sortedBackups.map((backup) => [
+            this.prettyBackupString(backup),
+            this.prettyDatabaseString(backup.database || ""),
+            backup.snapshotTime,
+            backup.state,
+        ]));
+        logger_1.logger.info(table.toString());
+    }
+    prettyPrintBackupSchedules(backupSchedules, databaseId) {
+        if (backupSchedules.length === 0) {
+            logger_1.logger.info(`No backup schedules for database ${databaseId} found.`);
+            return;
+        }
+        const sortedBackupSchedules = backupSchedules.sort(sort.compareApiBackupSchedule);
+        sortedBackupSchedules.forEach((schedule) => this.prettyPrintBackupSchedule(schedule));
+    }
+    prettyPrintBackupSchedule(backupSchedule) {
+        const table = new Table({
+            head: ["Field", "Value"],
+            colWidths: [25, Math.max(50, 5 + backupSchedule.name.length)],
+        });
+        table.push(["Name", clc.yellow(backupSchedule.name)], ["Create Time", clc.yellow(backupSchedule.createTime)], ["Last Update Time", clc.yellow(backupSchedule.updateTime)], ["Retention", clc.yellow(backupSchedule.retention)], ["Recurrence", this.prettyRecurrenceString(backupSchedule)]);
+        logger_1.logger.info(table.toString());
+    }
+    prettyRecurrenceString(backupSchedule) {
+        if (backupSchedule.dailyRecurrence) {
+            return clc.yellow("DAILY");
+        }
+        else if (backupSchedule.weeklyRecurrence) {
+            return clc.yellow(`WEEKLY (${backupSchedule.weeklyRecurrence.day})`);
+        }
+        return "";
+    }
+    prettyPrintBackup(backup) {
+        const table = new Table({
+            head: ["Field", "Value"],
+            colWidths: [25, Math.max(50, 5 + backup.name.length, 5 + backup.database.length)],
+        });
+        table.push(["Name", clc.yellow(backup.name)], ["Database", clc.yellow(backup.database)], ["Database UID", clc.yellow(backup.databaseUid)], ["State", clc.yellow(backup.state)], ["Snapshot Time", clc.yellow(backup.snapshotTime)], ["Expire Time", clc.yellow(backup.expireTime)], ["Stats", clc.yellow(backup.stats)]);
+        logger_1.logger.info(table.toString());
+    }
+    prettyPrintLocations(locations) {
+        if (locations.length === 0) {
+            logger_1.logger.info("No Locations Available");
+            return;
+        }
+        const table = new Table({
+            head: ["Display Name", "LocationId"],
+            colWidths: [20, 30],
+        });
+        table.push(...locations
+            .sort(sort.compareLocation)
+            .map((location) => [location.displayName, location.locationId]));
+        logger_1.logger.info(table.toString());
+    }
+    printFieldOverrides(fields) {
+        if (fields.length === 0) {
+            logger_1.logger.info("None");
+            return;
+        }
+        const sortedFields = fields.sort(sort.compareApiField);
+        sortedFields.forEach((field) => {
+            logger_1.logger.info(this.prettyFieldString(field));
+        });
+    }
+    prettyIndexString(index, includeState = true) {
+        let result = "";
+        if (index.state && includeState) {
+            const stateMsg = `[${index.state}] `;
+            if (index.state === types.State.READY) {
+                result += clc.green(stateMsg);
+            }
+            else if (index.state === types.State.CREATING) {
+                result += clc.yellow(stateMsg);
+            }
+            else {
+                result += clc.red(stateMsg);
+            }
+        }
+        const nameInfo = util.parseIndexName(index.name);
+        result += clc.cyan(`(${nameInfo.collectionGroupId})`);
+        result += " -- ";
+        index.fields.forEach((field) => {
+            if (field.fieldPath === "__name__") {
+                return;
+            }
+            const orderOrArrayConfig = field.order ? field.order : field.arrayConfig;
+            result += `(${field.fieldPath},${orderOrArrayConfig}) `;
+        });
+        return result;
+    }
+    prettyBackupString(backup) {
+        return clc.yellow(backup.name || "");
+    }
+    prettyBackupScheduleString(backupSchedule) {
+        return clc.yellow(backupSchedule.name || "");
+    }
+    prettyDatabaseString(database) {
+        return clc.yellow(typeof database === "string" ? database : database.name);
+    }
+    prettyFieldString(field) {
+        let result = "";
+        const parsedName = util.parseFieldName(field.name);
+        result +=
+            "[" +
+                clc.cyan(parsedName.collectionGroupId) +
+                "." +
+                clc.yellow(parsedName.fieldPath) +
+                "] --";
+        const fieldIndexes = field.indexConfig.indexes || [];
+        if (fieldIndexes.length > 0) {
+            fieldIndexes.forEach((index) => {
+                const firstField = index.fields[0];
+                const mode = firstField.order || firstField.arrayConfig;
+                result += ` (${mode})`;
+            });
+        }
+        else {
+            result += " (no indexes)";
+        }
+        const fieldTtl = field.ttlConfig;
+        if (fieldTtl) {
+            result += ` TTL(${fieldTtl.state})`;
+        }
+        return result;
+    }
+}
+exports.PrettyPrint = PrettyPrint;

package/lib/frameworks/index.js

@@ -32,6 +32,7 @@ const projectPath_1 = require("../projectPath");
 const logger_1 = require("../logger");
 const frameworks_1 = require("./frameworks");
 Object.defineProperty(exports, "WebFrameworks", { enumerable: true, get: function () { return frameworks_1.WebFrameworks; } });
+const fetchWebSetup_1 = require("../fetchWebSetup");
 async function discover(dir, warn = true) {
     const allFrameworkTypes = [
         ...new Set(Object.values(frameworks_1.WebFrameworks).map(({ type }) => type)),
@@ -149,12 +150,15 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
         });
         let firebaseConfig = null;
         if (usesFirebaseJsSdk) {
-            const sites = await (0, api_1.listSites)(project);
+            const isDemoProject = constants_1.Constants.isDemoProject(project);
+            const sites = isDemoProject ? (0, api_1.listDemoSites)(project) : await (0, api_1.listSites)(project);
             const selectedSite = sites.find((it) => it.name && it.name.split("/").pop() === site);
             if (selectedSite) {
                 const { appId } = selectedSite;
                 if (appId) {
-                    firebaseConfig = await (0, apps_1.getAppConfig)(appId, apps_1.AppPlatform.WEB);
+                    firebaseConfig = isDemoProject
+                        ? (0, fetchWebSetup_1.constructDefaultWebSetup)(project)
+                        : await (0, apps_1.getAppConfig)(appId, apps_1.AppPlatform.WEB);
                     firebaseDefaults || (firebaseDefaults = {});
                     firebaseDefaults.config = firebaseConfig;
                 }

package/lib/frameworks/next/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ESBUILD_VERSION = exports.APP_PATHS_MANIFEST = exports.ROUTES_MANIFEST = exports.PRERENDER_MANIFEST = exports.PAGES_MANIFEST = exports.MIDDLEWARE_MANIFEST = exports.IMAGES_MANIFEST = exports.EXPORT_MARKER = exports.APP_PATH_ROUTES_MANIFEST = void 0;
+exports.WEBPACK_LAYERS = exports.ESBUILD_VERSION = exports.SERVER_REFERENCE_MANIFEST = exports.APP_PATHS_MANIFEST = exports.ROUTES_MANIFEST = exports.PRERENDER_MANIFEST = exports.PAGES_MANIFEST = exports.MIDDLEWARE_MANIFEST = exports.IMAGES_MANIFEST = exports.EXPORT_MARKER = exports.APP_PATH_ROUTES_MANIFEST = void 0;
 exports.APP_PATH_ROUTES_MANIFEST = "app-path-routes-manifest.json";
 exports.EXPORT_MARKER = "export-marker.json";
 exports.IMAGES_MANIFEST = "images-manifest.json";
@@ -9,4 +9,38 @@ exports.PAGES_MANIFEST = "pages-manifest.json";
 exports.PRERENDER_MANIFEST = "prerender-manifest.json";
 exports.ROUTES_MANIFEST = "routes-manifest.json";
 exports.APP_PATHS_MANIFEST = "app-paths-manifest.json";
+exports.SERVER_REFERENCE_MANIFEST = "server-reference-manifest.json";
 exports.ESBUILD_VERSION = "0.19.2";
+const WEBPACK_LAYERS_NAMES = {
+    shared: "shared",
+    reactServerComponents: "rsc",
+    serverSideRendering: "ssr",
+    actionBrowser: "action-browser",
+    api: "api",
+    middleware: "middleware",
+    edgeAsset: "edge-asset",
+    appPagesBrowser: "app-pages-browser",
+    appMetadataRoute: "app-metadata-route",
+    appRouteHandler: "app-route-handler",
+};
+exports.WEBPACK_LAYERS = Object.assign(Object.assign({}, WEBPACK_LAYERS_NAMES), { GROUP: {
+        server: [
+            WEBPACK_LAYERS_NAMES.reactServerComponents,
+            WEBPACK_LAYERS_NAMES.actionBrowser,
+            WEBPACK_LAYERS_NAMES.appMetadataRoute,
+            WEBPACK_LAYERS_NAMES.appRouteHandler,
+        ],
+        nonClientServerTarget: [
+            WEBPACK_LAYERS_NAMES.middleware,
+            WEBPACK_LAYERS_NAMES.api,
+        ],
+        app: [
+            WEBPACK_LAYERS_NAMES.reactServerComponents,
+            WEBPACK_LAYERS_NAMES.actionBrowser,
+            WEBPACK_LAYERS_NAMES.appMetadataRoute,
+            WEBPACK_LAYERS_NAMES.appRouteHandler,
+            WEBPACK_LAYERS_NAMES.serverSideRendering,
+            WEBPACK_LAYERS_NAMES.appPagesBrowser,
+            WEBPACK_LAYERS_NAMES.shared,
+        ],
+    } });

package/lib/frameworks/next/index.js

@@ -114,9 +114,10 @@ async function build(dir, target, context) {
         source: (0, utils_2.cleanEscapedChars)(source),
         headers,
     }));
-    const [appPathsManifest, appPathRoutesManifest] = await Promise.all([
+    const [appPathsManifest, appPathRoutesManifest, serverReferenceManifest] = await Promise.all([
         (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, "server", constants_2.APP_PATHS_MANIFEST)).catch(() => undefined),
         (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, constants_2.APP_PATH_ROUTES_MANIFEST)).catch(() => undefined),
+        (0, utils_1.readJSON)((0, path_1.join)(dir, distDir, "server", constants_2.SERVER_REFERENCE_MANIFEST)).catch(() => undefined),
     ]);
     if (appPathRoutesManifest) {
         const headersFromMetaFiles = await (0, utils_2.getHeadersFromMetaFiles)(dir, distDir, baseUrl, appPathRoutesManifest);
@@ -131,6 +132,12 @@ async function build(dir, target, context) {
                 reasonsForBackend.add(`non-static component ${key}`);
             }
         }
+        if (serverReferenceManifest) {
+            const routesWithServerAction = (0, utils_2.getRoutesWithServerAction)(serverReferenceManifest, appPathRoutesManifest);
+            for (const key of routesWithServerAction) {
+                reasonsForBackend.add(`route with server action ${key}`);
+            }
+        }
     }
     const isEveryRedirectSupported = nextJsRedirects
         .filter((it) => !it.internal)
@@ -212,12 +219,13 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
         await (0, fs_extra_1.copy)(publicPath, (0, path_1.join)(destDir, basePath));
     }
     await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, distDir, "static"), (0, path_1.join)(destDir, basePath, "_next", "static"));
-    const [middlewareManifest, prerenderManifest, routesManifest, pagesManifest, appPathRoutesManifest,] = await Promise.all([
+    const [middlewareManifest, prerenderManifest, routesManifest, pagesManifest, appPathRoutesManifest, serverReferenceManifest,] = await Promise.all([
         (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, "server", constants_2.MIDDLEWARE_MANIFEST)),
         (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, constants_2.PRERENDER_MANIFEST)),
         (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, constants_2.ROUTES_MANIFEST)),
         (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, "server", constants_2.PAGES_MANIFEST)),
         (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, constants_2.APP_PATH_ROUTES_MANIFEST)).catch(() => ({})),
+        (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, "server", constants_2.SERVER_REFERENCE_MANIFEST)).catch(() => ({ node: {}, edge: {}, encryptionKey: "" })),
     ]);
     const appPathRoutesEntries = Object.entries(appPathRoutesManifest);
     const middlewareMatcherRegexes = (0, utils_2.getMiddlewareMatcherRegexes)(middlewareManifest);
@@ -240,10 +248,20 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
         ...redirectsRegexesNotSupportedByHosting,
         ...headersRegexesNotSupportedByHosting,
     ];
+    const staticRoutesUsingServerActions = (0, utils_2.getRoutesWithServerAction)(serverReferenceManifest, appPathRoutesManifest);
     const pagesManifestLikePrerender = Object.fromEntries(Object.entries(pagesManifest)
         .filter(([, srcRoute]) => srcRoute.endsWith(".html"))
         .map(([path]) => {
-        return [path, { srcRoute: null, initialRevalidateSeconds: false, dataRoute: "" }];
+        return [
+            path,
+            {
+                srcRoute: null,
+                initialRevalidateSeconds: false,
+                dataRoute: "",
+                experimentalPPR: false,
+                prefetchDataRoute: "",
+            },
+        ];
     }));
     const routesToCopy = Object.assign(Object.assign({}, prerenderManifest.routes), pagesManifestLikePrerender);
     await Promise.all(Object.entries(routesToCopy).map(async ([path, route]) => {
@@ -256,6 +274,10 @@ async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {
             logger_1.logger.debug(`skipping ${path} due to it matching an unsupported rewrite/redirect/header or middlware`);
             return;
         }
+        if (staticRoutesUsingServerActions.some((it) => path === it)) {
+            logger_1.logger.debug(`skipping ${path} due to server action`);
+            return;
+        }
         const appPathRoute = route.srcRoute && ((_a = appPathRoutesEntries.find(([, it]) => it === route.srcRoute)) === null || _a === void 0 ? void 0 : _a[0]);
         const contentDist = (0, path_1.join)(sourceDir, distDir, "server", appPathRoute ? "app" : "pages");
         const sourceParts = path.split("/").filter((it) => !!it);

package/lib/frameworks/next/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasStaticAppNotFoundComponent = exports.getNextVersion = exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingNextImageInAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
+exports.getRoutesWithServerAction = exports.hasStaticAppNotFoundComponent = exports.getNextVersion = exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingNextImageInAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -199,3 +199,22 @@ async function hasStaticAppNotFoundComponent(sourceDir, distDir) {
     return (0, fs_extra_1.pathExists)((0, path_1.join)(sourceDir, distDir, "server", "app", "_not-found.html"));
 }
 exports.hasStaticAppNotFoundComponent = hasStaticAppNotFoundComponent;
+function getRoutesWithServerAction(serverReferenceManifest, appPathRoutesManifest) {
+    const routesWithServerAction = new Set();
+    for (const key of Object.keys(serverReferenceManifest)) {
+        if (key !== "edge" && key !== "node")
+            continue;
+        const edgeOrNode = serverReferenceManifest[key];
+        for (const actionId of Object.keys(edgeOrNode)) {
+            if (!edgeOrNode[actionId].layer)
+                continue;
+            for (const [route, type] of Object.entries(edgeOrNode[actionId].layer)) {
+                if (type === constants_1.WEBPACK_LAYERS.actionBrowser) {
+                    routesWithServerAction.add(appPathRoutesManifest[route.replace("app", "")]);
+                }
+            }
+        }
+    }
+    return Array.from(routesWithServerAction);
+}
+exports.getRoutesWithServerAction = getRoutesWithServerAction;

package/lib/functions/secrets.js

@@ -44,7 +44,7 @@ function toUpperSnakeCase(key) {
 }
 function ensureApi(options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    return ensureApiEnabled.ensure(projectId, "secretmanager.googleapis.com", "secretmanager", true);
+    return ensureApiEnabled.ensure(projectId, api_1.secretManagerOrigin, "secretmanager", true);
 }
 exports.ensureApi = ensureApi;
 async function ensureValidKey(key, options) {

package/lib/gcp/apphosting.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextRolloutId = exports.ensureApiEnabled = exports.listLocations = exports.updateTraffic = exports.listRollouts = exports.createRollout = exports.createBuild = exports.listBuilds = exports.getBuild = exports.deleteBackend = exports.listBackends = exports.getBackend = exports.createBackend = exports.client = exports.API_VERSION = exports.API_HOST = void 0;
+exports.getNextRolloutId = exports.ensureApiEnabled = exports.listLocations = exports.updateTraffic = exports.listRollouts = exports.createRollout = exports.createBuild = exports.listBuilds = exports.getBuild = exports.deleteBackend = exports.listBackends = exports.getBackend = exports.createBackend = exports.client = exports.API_VERSION = void 0;
 const proto = require("../gcp/proto");
 const apiv2_1 = require("../apiv2");
 const projectUtils_1 = require("../projectUtils");
@@ -9,7 +9,6 @@ const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const deploymentTool = require("../deploymentTool");
 const error_1 = require("../error");
 const metaprogramming_1 = require("../metaprogramming");
-exports.API_HOST = new URL(api_1.apphostingOrigin).host;
 exports.API_VERSION = "v1alpha";
 exports.client = new apiv2_1.Client({
     urlPrefix: api_1.apphostingOrigin,
@@ -126,7 +125,7 @@ async function listLocations(projectId) {
 exports.listLocations = listLocations;
 async function ensureApiEnabled(options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    return await (0, ensureApiEnabled_1.ensure)(projectId, exports.API_HOST, "app hosting", true);
+    return await (0, ensureApiEnabled_1.ensure)(projectId, api_1.apphostingOrigin, "app hosting", true);
 }
 exports.ensureApiEnabled = ensureApiEnabled;
 async function getNextRolloutId(projectId, location, backendId, counter) {

package/lib/gcp/auth.js

@@ -5,12 +5,15 @@ const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const apiClient = new apiv2_1.Client({ urlPrefix: api_1.identityOrigin, auth: true });
 async function getAuthDomains(project) {
-    const res = await apiClient.get(`/admin/v2/projects/${project}/config`);
+    const res = await apiClient.get(`/admin/v2/projects/${project}/config`, { headers: { "x-goog-user-project": project } });
     return res.body.authorizedDomains;
 }
 exports.getAuthDomains = getAuthDomains;
 async function updateAuthDomains(project, authDomains) {
-    const res = await apiClient.patch(`/admin/v2/projects/${project}/config`, { authorizedDomains: authDomains }, { queryParams: { update_mask: "authorizedDomains" } });
+    const res = await apiClient.patch(`/admin/v2/projects/${project}/config`, { authorizedDomains: authDomains }, {
+        queryParams: { update_mask: "authorizedDomains" },
+        headers: { "x-goog-user-project": project },
+    });
     return res.body.authorizedDomains;
 }
 exports.updateAuthDomains = updateAuthDomains;