firebase-tools 15.13.0 → 15.14.1-main.0

package/lib/apphosting/constants.js

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

package/lib/command.js

@@ -111,22 +111,23 @@ class Command {
                     });
                 }
                 const duration = Math.floor((process.uptime() - start) * 1000);
-                const trackSuccess = (0, track_1.trackGA4)("command_execution", {
-                    command_name: this.name,
-                    result: "success",
-                    interactive: (0, utils_1.getInheritedOption)(options, "nonInteractive") ? "false" : "true",
-                }, duration);
-                if (!isEmulator) {
-                    await (0, utils_1.withTimeout)(5000, trackSuccess);
-                }
-                else {
-                    await (0, utils_1.withTimeout)(5000, Promise.all([
-                        trackSuccess,
-                        (0, track_1.trackEmulator)("command_success", {
+                try {
+                    const trackSuccess = (0, track_1.trackGA4)("command_execution", {
+                        command_name: this.name,
+                        result: "success",
+                        interactive: (0, utils_1.getInheritedOption)(options, "nonInteractive") ? "false" : "true",
+                    }, duration);
+                    const tracks = [trackSuccess];
+                    if (isEmulator) {
+                        tracks.push((0, track_1.trackEmulator)("command_success", {
                             command_name: this.name,
                             duration,
-                        }),
-                    ]));
+                        }));
+                    }
+                    await (0, utils_1.withTimeout)(1000, Promise.all(tracks));
+                }
+                catch (gaErr) {
+                    logger_1.logger.debug("Analytics tracking failed during success path:", gaErr);
                 }
                 process.exit();
             })
@@ -140,20 +141,25 @@ class Command {
                     });
                 }
                 const duration = Math.floor((process.uptime() - start) * 1000);
-                await (0, utils_1.withTimeout)(5000, Promise.all([
-                    (0, track_1.trackGA4)("command_execution", {
+                try {
+                    const trackError = (0, track_1.trackGA4)("command_execution", {
                         command_name: this.name,
                         result: "error",
                         interactive: (0, utils_1.getInheritedOption)(options, "nonInteractive") ? "false" : "true",
-                    }, duration),
-                    isEmulator
-                        ? (0, track_1.trackEmulator)("command_error", {
+                    }, duration);
+                    const tracks = [trackError];
+                    if (isEmulator) {
+                        tracks.push((0, track_1.trackEmulator)("command_error", {
                             command_name: this.name,
                             duration,
-                            error_type: err.exit === 1 ? "user" : "unexpected",
-                        })
-                        : Promise.resolve(),
-                ]));
+                            error_type: err?.exit === 1 ? "user" : "unexpected",
+                        }));
+                    }
+                    await (0, utils_1.withTimeout)(1000, Promise.all(tracks));
+                }
+                catch (gaErr) {
+                    logger_1.logger.debug("Analytics tracking failed during error path:", gaErr);
+                }
                 client.errorOut(err);
             });
         });
@@ -178,6 +184,13 @@ class Command {
         if ((0, utils_1.getInheritedOption)(options, "config")) {
             options.configPath = (0, utils_1.getInheritedOption)(options, "config");
         }
+        const onlyOption = (0, utils_1.getInheritedOption)(options, "only");
+        if (onlyOption) {
+            options.only = onlyOption
+                .split(/[\s,]+/)
+                .filter(Boolean)
+                .join(",");
+        }
         try {
             options.config = config_1.Config.load(options);
         }

package/lib/deploy/functions/prepare.js

@@ -169,7 +169,9 @@ async function prepare(context, options, payload) {
             const exportType = backend.someEndpoint(wantBackend, (e) => e.platform === "run")
                 ? "tar.gz"
                 : "zip";
-            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(options.config.projectDir, sourceDir, localCfg, [...schPathSet], undefined, { exportType });
+            const isDart = supported.runtimeIsLanguage(wantBuilds[codebase].runtime, "dart");
+            const executablePaths = isDart ? ["bin/server"] : [];
+            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(options.config.projectDir, sourceDir, localCfg, [...schPathSet], undefined, { exportType, executablePaths });
             source.functionsSourceV2 = packagedSource?.pathToSource;
             source.functionsSourceV2Hash = packagedSource?.hash;
         }

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFunctionsConfig = getFunctionsConfig;
+exports.addFilesToArchive = addFilesToArchive;
 exports.prepareFunctionsUpload = prepareFunctionsUpload;
 exports.convertToSortedKeyValueArray = convertToSortedKeyValueArray;
 const archiver = require("archiver");
@@ -45,6 +46,24 @@ async function pipeAsync(from, to) {
         to.on("error", reject);
     });
 }
+async function addFilesToArchive(archive, files, sourceDir, executablePaths) {
+    const hashes = [];
+    for (const file of files) {
+        const name = path.relative(sourceDir, file.name);
+        const normalizedName = name.split(path.sep).join("/");
+        const fileHash = await (0, hash_1.getSourceHash)(file.name);
+        hashes.push(fileHash);
+        let mode = file.mode;
+        if (executablePaths?.includes(normalizedName)) {
+            mode = 0o755;
+        }
+        archive.file(file.name, {
+            name: normalizedName,
+            mode,
+        });
+    }
+    return hashes;
+}
 async function packageSource(projectDir, sourceDir, config, additionalSources, runtimeConfig, options) {
     const exportType = options?.exportType || "zip";
     const postfix = `.${exportType}`;
@@ -60,15 +79,7 @@ async function packageSource(projectDir, sourceDir, config, additionalSources, r
     ignore.push("firebase-debug.log", "firebase-debug.*.log", CONFIG_DEST_FILE);
     try {
         const files = await fsAsync.readdirRecursive({ path: sourceDir, ignore: ignore });
-        for (const file of files) {
-            const name = path.relative(sourceDir, file.name);
-            const fileHash = await (0, hash_1.getSourceHash)(file.name);
-            hashes.push(fileHash);
-            archive.file(file.name, {
-                name,
-                mode: file.mode,
-            });
-        }
+        hashes.push(...(await addFilesToArchive(archive, files, sourceDir, options?.executablePaths)));
         for (const name of additionalSources) {
             const absPath = utils.resolveWithin(projectDir, name);
             if (!fs.existsSync(absPath)) {

package/lib/deploy/functions/release/index.js

@@ -18,6 +18,7 @@ const error_1 = require("../../../error");
 const getProjectNumber_1 = require("../../../getProjectNumber");
 const extensions_1 = require("../../extensions");
 const artifacts = require("../../../functions/artifacts");
+const supported_1 = require("../runtimes/supported");
 async function release(context, options, payload) {
     if (context.extensions && payload.extensions) {
         await (0, extensions_1.release)(context.extensions, options, payload.extensions);
@@ -88,6 +89,10 @@ async function release(context, options, payload) {
     reporter.printErrors(summary);
     const wantBackend = backend.merge(...Object.values(payload.functions).map((p) => p.wantBackend));
     printTriggerUrls(wantBackend, projectNumber);
+    if (backend.someEndpoint(wantBackend, (endpoint) => (0, supported_1.runtimeIsLanguage)(endpoint.runtime, "dart"))) {
+        utils.logLabeledBullet("functions", "Dart functions may not yet be visible in the Firebase Console. " +
+            `View them in the Cloud Console at https://console.cloud.google.com/run/services?project=${context.projectId}`);
+    }
     await setupArtifactCleanupPolicies(options, options.projectId, Object.keys(wantBackend.endpoints));
     const allErrors = summary.results.filter((r) => r.error).map((r) => r.error);
     if (allErrors.length) {

package/lib/deploy/functions/runtimes/dart/index.js

@@ -13,12 +13,14 @@ const error_1 = require("../../../../error");
 const utils_1 = require("../../../../utils");
 const registry_1 = require("../../../../emulator/registry");
 const types_1 = require("../../../../emulator/types");
+const experiments = require("../../../../experiments");
 async function tryCreateDelegate(context) {
     const pubspecYamlPath = path.join(context.sourceDir, "pubspec.yaml");
     if (!(await (0, util_1.promisify)(fs.exists)(pubspecYamlPath))) {
         logger_1.logger.debug("Customer code is not Dart code.");
         return;
     }
+    experiments.assertEnabled("dartfunctions", "use Dart functions");
     const runtime = context.runtime ?? supported.latest("dart");
     if (!supported.isRuntime(runtime)) {
         throw new error_1.FirebaseError(`Runtime ${runtime} is not a valid Dart runtime`);

package/lib/deploy/functions/runtimes/index.js

@@ -7,13 +7,10 @@ const python = require("./python");
 const validate = require("../validate");
 const error_1 = require("../../../error");
 const supported = require("./supported");
-const experiments = require("../../../experiments");
 const factories = [
     node.tryCreateDelegate,
     python.tryCreateDelegate,
-    (ctx) => experiments.isEnabled("functionsrunapionly")
-        ? dart.tryCreateDelegate(ctx)
-        : Promise.resolve(undefined),
+    dart.tryCreateDelegate,
 ];
 async function getRuntimeDelegate(context) {
     const { projectDir, sourceDir, runtime } = context;

package/lib/deploy/functions/runtimes/supported/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRuntime = isRuntime;
 exports.runtimeIsLanguage = runtimeIsLanguage;
-exports.isLanguageRuntime = isLanguageRuntime;
 exports.latest = latest;
 exports.isDecommissioned = isDecommissioned;
 exports.guardVersionSupport = guardVersionSupport;
@@ -28,9 +27,6 @@ function isRuntime(maybe) {
     return maybe in types_1.RUNTIMES;
 }
 function runtimeIsLanguage(runtime, language) {
-    return runtime.startsWith(language);
-}
-function isLanguageRuntime(runtime, language) {
     return !!runtime && runtime.startsWith(language);
 }
 function latest(language, runtimes = Object.keys(types_1.RUNTIMES)) {

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

@@ -5,11 +5,12 @@ exports.isAILogicEvent = isAILogicEvent;
 const backend = require("../backend");
 const error_1 = require("../../../error");
 const ailogicApi = require("../../../gcp/ailogic");
-exports.AI_LOGIC_BEFORE_GENERATE_CONTENT = "firebase.vertexai.v1beta.beforeGenerateContent";
-exports.AI_LOGIC_AFTER_GENERATE_CONTENT = "firebase.vertexai.v1beta.afterGenerateContent";
+const ailogic_1 = require("../../../gcp/ailogic");
+Object.defineProperty(exports, "AI_LOGIC_BEFORE_GENERATE_CONTENT", { enumerable: true, get: function () { return ailogic_1.AI_LOGIC_BEFORE_GENERATE_CONTENT; } });
+Object.defineProperty(exports, "AI_LOGIC_AFTER_GENERATE_CONTENT", { enumerable: true, get: function () { return ailogic_1.AI_LOGIC_AFTER_GENERATE_CONTENT; } });
 exports.AI_LOGIC_EVENTS = [
-    exports.AI_LOGIC_BEFORE_GENERATE_CONTENT,
-    exports.AI_LOGIC_AFTER_GENERATE_CONTENT,
+    ailogic_1.AI_LOGIC_BEFORE_GENERATE_CONTENT,
+    ailogic_1.AI_LOGIC_AFTER_GENERATE_CONTENT,
 ];
 function isAILogicEvent(endpoint) {
     if (!backend.isBlockingTriggered(endpoint)) {

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

@@ -124,8 +124,8 @@ const EVENT_SERVICE_MAPPING = {
     "google.cloud.firestore.document.v1.updated.withAuthContext": firestoreService,
     "google.cloud.firestore.document.v1.deleted.withAuthContext": firestoreService,
     "google.firebase.dataconnect.connector.v1.mutationExecuted": dataconnectService,
-    "firebase.vertexai.v1beta.beforeGenerateContent": aiLogicService,
-    "firebase.vertexai.v1beta.afterGenerateContent": aiLogicService,
+    "google.firebase.ailogic.v1.beforeGenerate": aiLogicService,
+    "google.firebase.ailogic.v1.afterGenerate": aiLogicService,
 };
 function serviceForEndpoint(endpoint) {
     if (backend.isEventTriggered(endpoint)) {

package/lib/deploy/functions/validate.js

@@ -55,7 +55,13 @@ function endpointsAreValid(wantBackend) {
     validateTimeoutConfig(endpoints);
     for (const ep of endpoints) {
         validateScheduledTimeout(ep);
-        (0, services_1.serviceForEndpoint)(ep).validateTrigger(ep, wantBackend);
+        const service = (0, services_1.serviceForEndpoint)(ep);
+        if (backend.isBlockingTriggered(ep)) {
+            if (service.name === "noop") {
+                throw new error_1.FirebaseError(`Unrecognized blocking trigger type: ${ep.blockingTrigger.eventType}. Please update your CLI with ${clc.bold("npm install -g firebase-tools@latest")}.`, { exit: 1 });
+            }
+        }
+        service.validateTrigger(ep, wantBackend);
     }
     const gcfV1WithConcurrency = matchingIds(endpoints, (endpoint) => (endpoint.concurrency || 1) !== 1 && endpoint.platform === "gcfv1");
     if (gcfV1WithConcurrency.length) {

package/lib/emulator/controller.js

@@ -419,10 +419,20 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         const firestoreLogger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FIRESTORE);
         const firestoreAddr = legacyGetFirstAddr(types_1.Emulators.FIRESTORE);
         const websocketPort = legacyGetFirstAddr("firestore.websocket").port;
+        const prodEdition = options.config.data.firestore?.edition;
+        const emulatorEdition = options.config.src.emulators?.firestore?.edition;
+        if (prodEdition !== emulatorEdition) {
+            firestoreLogger.logLabeled("WARN", "firestore", `The edition configured in your firebase.json#firestore and firebase.json#emulators.firestore do not match. The latter will be used to start up the Firestore emulator.`);
+        }
+        const edition = (emulatorEdition || prodEdition || "standard").toLowerCase();
+        if (edition !== "standard" && edition !== "enterprise") {
+            throw new error_1.FirebaseError("The Firestore emulator edition must be either 'standard' or 'enterprise'.", { exit: 1 });
+        }
         const args = {
             host: firestoreAddr.host,
             port: firestoreAddr.port,
             websocket_port: websocketPort,
+            "database-edition": edition,
             project_id: projectId,
             auto_download: true,
         };
@@ -472,6 +482,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         }
         const firestoreEmulator = new firestoreEmulator_1.FirestoreEmulator(args);
         await startEmulator(firestoreEmulator);
+        firestoreLogger.logLabeled("SUCCESS", types_1.Emulators.FIRESTORE, `Firestore Emulator was started in ${edition} edition.`);
         firestoreLogger.logLabeled("SUCCESS", types_1.Emulators.FIRESTORE, `Firestore Emulator UI websocket is running on ${websocketPort}.`);
     }
     if (listenForEmulator.database) {

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,36 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "3.3.1",
-            "expectedSize": 32105392,
-            "expectedChecksum": "dfe6ff725864c37889c238aac24be304",
-            "expectedChecksumSHA256": "1ccfebb4c0ff85f0503b907aa589658774bb6d4fac0180c3fa6bdff3a865090d",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.3.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.3.1"
+            "version": "3.4.1",
+            "expectedSize": 32274112,
+            "expectedChecksum": "ccd7e0be14784f6ac6f6b2102180e062",
+            "expectedChecksumSHA256": "2ae6cb5c5da239d272f29b1f14c4630a45ed8e841f8eadd330189dc821fb93bd",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.1"
         },
         "darwin_arm64": {
-            "version": "3.3.1",
-            "expectedSize": 30287922,
-            "expectedChecksum": "59af3cb51c78e8114d634afea811f8cc",
-            "expectedChecksumSHA256": "75bde31d15c4cc14de7071ff50cdd0d8fb644491e0c9ee3c1da82fdaf8d976a9",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.3.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.3.1"
+            "version": "3.4.1",
+            "expectedSize": 30437282,
+            "expectedChecksum": "ea76099299d6f50862d9a0bb194bb921",
+            "expectedChecksumSHA256": "ec51f9bcc0668ca25713c57385d2f12a2776ee64170dcdd861968be30925c7be",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.1"
         },
         "win32": {
-            "version": "3.3.1",
-            "expectedSize": 32148992,
-            "expectedChecksum": "3205dc92bbc7edb4c5821641486dc70c",
-            "expectedChecksumSHA256": "fa7796077728414b0682f6ccf1df0fc7b2f56bb590f1e62698dbb7c1ddaf0fb0",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.3.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.3.1.exe"
+            "version": "3.4.1",
+            "expectedSize": 32315904,
+            "expectedChecksum": "2d433690efb1e7931d0d5ab4fe5a6d25",
+            "expectedChecksumSHA256": "7d8ecff49ac0492569c855badbabd5b1600a2ff63814900a1bbea8b16d96d76a",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.1.exe"
         },
         "linux": {
-            "version": "3.3.1",
-            "expectedSize": 31264952,
-            "expectedChecksum": "85ffdef78810e0074ac94c453a200daa",
-            "expectedChecksumSHA256": "f232e03165c28f72bc99dfbd2dde1bcaf8298045817b60d72d407da7dae9e9f1",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.3.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.3.1"
+            "version": "3.4.1",
+            "expectedSize": 31432888,
+            "expectedChecksum": "8e11775e6df3d5dbe583f1f346f299f6",
+            "expectedChecksumSHA256": "7124f38854f72c7aa0daff91439825725cb31db138bc1c15976ca97aa27837c4",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.1"
         }
     }
 }

package/lib/emulator/downloadableEmulators.js

@@ -199,6 +199,7 @@ const Commands = {
             "host",
             "rules",
             "websocket_port",
+            "database-edition",
             "functions_emulator",
             "seed_from_export",
             "project_id",

package/lib/emulator/functionsEmulator.js

@@ -232,7 +232,7 @@ class FunctionsEmulator {
             "Content-Type": "application/json",
             "Content-Length": `${reqBody.length}`,
         };
-        const isDart = (0, supported_1.isLanguageRuntime)(record.backend.runtime, "dart");
+        const isDart = (0, supported_1.runtimeIsLanguage)(record.backend.runtime, "dart");
         const path = isDart ? `/${trigger.entryPoint}` : `/`;
         return new Promise((resolve, reject) => {
             const req = http.request({
@@ -271,7 +271,7 @@ class FunctionsEmulator {
         for (const backend of this.staticBackends) {
             this.logger.logLabeled("BULLET", "functions", `Watching "${backend.functionsDir}" for Cloud Functions...`);
             await this.loadTriggers(backend, true);
-            const isDart = (0, supported_1.isLanguageRuntime)(backend.runtime, "dart");
+            const isDart = (0, supported_1.runtimeIsLanguage)(backend.runtime, "dart");
             if (isDart) {
                 const runtimeDelegateContext = {
                     projectId: this.args.projectId,
@@ -1168,10 +1168,10 @@ class FunctionsEmulator {
         const runtimeEnv = this.getRuntimeEnvs(backend, trigger);
         const secretEnvs = await this.resolveSecretEnvs(backend, trigger);
         let runtime;
-        if ((0, supported_1.isLanguageRuntime)(backend.runtime, "python")) {
+        if ((0, supported_1.runtimeIsLanguage)(backend.runtime, "python")) {
             runtime = await this.startPython(backend, { ...runtimeEnv, ...secretEnvs });
         }
-        else if ((0, supported_1.isLanguageRuntime)(backend.runtime, "dart")) {
+        else if ((0, supported_1.runtimeIsLanguage)(backend.runtime, "dart")) {
             runtime = await this.startDart(backend, { ...runtimeEnv, ...secretEnvs });
         }
         else {
@@ -1242,8 +1242,7 @@ class FunctionsEmulator {
         this.logger.log("DEBUG", `[functions] Runtime ready! Sending request!`);
         const url = new url_1.URL(`${req.protocol}://${req.hostname}${req.url}`);
         let path = `${url.pathname}${url.search}`.replace(new RegExp(`\/${this.args.projectId}\/[^\/]*\/${req.params.trigger_name}\/?`), "/");
-        const isDart = (0, supported_1.isLanguageRuntime)(record.backend.runtime, "dart");
-        if (isDart) {
+        if ((0, supported_1.runtimeIsLanguage)(record.backend.runtime, "dart")) {
             const isBackgroundRoute = req.url.startsWith("/functions/projects/");
             if (isBackgroundRoute || path === "/") {
                 path = `/${trigger.entryPoint}`;

package/lib/emulator/functionsRuntimeWorker.js

@@ -231,7 +231,7 @@ class RuntimeWorkerPool {
         if (this.mode === types_1.FunctionsExecutionMode.SEQUENTIAL) {
             return "~shared~";
         }
-        if ((0, supported_1.isLanguageRuntime)(runtime, "dart")) {
+        if ((0, supported_1.runtimeIsLanguage)(runtime, "dart")) {
             return "~dart-shared~";
         }
         return triggerId || "~diagnostic~";

package/lib/experiments.js

@@ -74,6 +74,11 @@ exports.ALL_EXPERIMENTS = experiments({
         public: false,
         default: false,
     },
+    dartfunctions: {
+        shortDescription: "Enable Dart Functions.",
+        public: false,
+        default: false,
+    },
     emulatoruisnapshot: {
         shortDescription: "Load pre-release versions of the emulator UI",
     },
@@ -169,7 +174,7 @@ exports.ALL_EXPERIMENTS = experiments({
     },
     fdcrealtime: {
         shortDescription: "Enable Firebase Data Connect realtime feature.",
-        default: false,
+        default: true,
         public: false,
     },
 });

package/lib/frameworks/next/constants.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WEBPACK_LAYERS = exports.ESBUILD_VERSION = exports.CONFIG_FILES = 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.WEBPACK_LAYERS = exports.ESBUILD_VERSION = exports.CONFIG_FILES = exports.SERVER_REFERENCE_MANIFEST = exports.APP_PATHS_MANIFEST = exports.ROUTES_MANIFEST = exports.PRERENDER_MANIFEST = exports.PAGES_MANIFEST = exports.FUNCTIONS_CONFIG_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";
 exports.MIDDLEWARE_MANIFEST = "middleware-manifest.json";
+exports.FUNCTIONS_CONFIG_MANIFEST = "functions-config-manifest.json";
 exports.PAGES_MANIFEST = "pages-manifest.json";
 exports.PRERENDER_MANIFEST = "prerender-manifest.json";
 exports.ROUTES_MANIFEST = "routes-manifest.json";

package/lib/frameworks/next/index.js

@@ -255,16 +255,17 @@ 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, serverReferenceManifest,] = await Promise.all([
+    const [middlewareManifest, prerenderManifest, routesManifest, pagesManifest, appPathRoutesManifest, serverReferenceManifest, functionsConfigManifest,] = 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: "" })),
+        (0, utils_1.readJSON)((0, path_1.join)(sourceDir, distDir, "server", constants_2.FUNCTIONS_CONFIG_MANIFEST)).catch(() => ({ version: 0, functions: {} })),
     ]);
     const appPathRoutesEntries = Object.entries(appPathRoutesManifest);
-    const middlewareMatcherRegexes = (0, utils_2.getMiddlewareMatcherRegexes)(middlewareManifest);
+    const middlewareMatcherRegexes = (0, utils_2.getMiddlewareMatcherRegexes)(middlewareManifest, functionsConfigManifest);
     const { redirects = [], rewrites = [], headers = [] } = routesManifest;
     const rewritesRegexesNotSupportedByHosting = (0, utils_2.getNextjsRewritesToUse)(rewrites)
         .filter((rewrite) => !(0, utils_2.isRewriteSupportedByHosting)(rewrite))

package/lib/frameworks/next/utils.js

@@ -14,6 +14,8 @@ exports.hasUnoptimizedImage = hasUnoptimizedImage;
 exports.isUsingMiddleware = isUsingMiddleware;
 exports.isUsingImageOptimization = isUsingImageOptimization;
 exports.isUsingNextImageInAppDirectory = isUsingNextImageInAppDirectory;
+exports.isUsingNextImageInServerComponent = isUsingNextImageInServerComponent;
+exports.isUsingNextImageInClientComponent = isUsingNextImageInClientComponent;
 exports.isUsingAppDirectory = isUsingAppDirectory;
 exports.allDependencyNames = allDependencyNames;
 exports.getMiddlewareMatcherRegexes = getMiddlewareMatcherRegexes;
@@ -100,23 +102,33 @@ async function hasUnoptimizedImage(sourceDir, distDir) {
 }
 async function isUsingMiddleware(dir, isDevMode) {
     if (isDevMode) {
-        const [middlewareJs, middlewareTs] = await Promise.all([
+        const middlewareFiles = await Promise.all([
             (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "middleware.js")),
             (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "middleware.ts")),
+            (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "proxy.js")),
+            (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "proxy.ts")),
+            (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "src", "middleware.js")),
+            (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "src", "middleware.ts")),
+            (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "src", "proxy.js")),
+            (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "src", "proxy.ts")),
         ]);
-        return middlewareJs || middlewareTs;
+        return middlewareFiles.some((file) => file);
     }
     else {
         const middlewareManifest = await (0, utils_1.readJSON)((0, path_1.join)(dir, "server", constants_1.MIDDLEWARE_MANIFEST));
+        if (middlewareManifest.version === 3) {
+            const functionsConfigManifest = await (0, utils_1.readJSON)((0, path_1.join)(dir, "server", constants_1.FUNCTIONS_CONFIG_MANIFEST)).catch(() => undefined);
+            if ((functionsConfigManifest?.functions?.["/_middleware"]?.matchers || [])?.length > 0) {
+                return true;
+            }
+        }
         return Object.keys(middlewareManifest.middleware).length > 0;
     }
 }
 async function isUsingImageOptimization(projectDir, distDir) {
     let isNextImageImported = await usesNextImage(projectDir, distDir);
     if (!isNextImageImported && isUsingAppDirectory((0, path_1.join)(projectDir, distDir))) {
-        if (await isUsingNextImageInAppDirectory(projectDir, distDir)) {
-            isNextImageImported = true;
-        }
+        isNextImageImported = await isUsingNextImageInAppDirectory(projectDir, distDir);
     }
     if (isNextImageImported) {
         const imagesManifest = await (0, utils_1.readJSON)((0, path_1.join)(projectDir, distDir, constants_1.IMAGES_MANIFEST));
@@ -124,7 +136,11 @@ async function isUsingImageOptimization(projectDir, distDir) {
     }
     return false;
 }
-async function isUsingNextImageInAppDirectory(projectDir, nextDir) {
+async function isUsingNextImageInAppDirectory(projectDir, distDir) {
+    return ((await isUsingNextImageInServerComponent(projectDir, distDir)) ||
+        isUsingNextImageInClientComponent(projectDir, distDir));
+}
+async function isUsingNextImageInServerComponent(projectDir, nextDir) {
     const nextImagePath = ["node_modules", "next", "dist", "client", "image"];
     const nextImageString = utils_2.IS_WINDOWS
         ?
@@ -139,6 +155,16 @@ async function isUsingNextImageInAppDirectory(projectDir, nextDir) {
     }
     return false;
 }
+async function isUsingNextImageInClientComponent(projectDir, distDir) {
+    const htmlFiles = await (0, glob_1.glob)((0, path_1.join)(projectDir, distDir, "server", "app", "**", "*.html"));
+    for (const filepath of htmlFiles) {
+        const contents = await (0, promises_1.readFile)(filepath, "utf-8");
+        if (contents.includes('data-nimg="')) {
+            return true;
+        }
+    }
+    return false;
+}
 function isUsingAppDirectory(dir) {
     const appPathRoutesManifestPath = (0, path_1.join)(dir, constants_1.APP_PATH_ROUTES_MANIFEST);
     return (0, fsutils_1.fileExistsSync)(appPathRoutesManifestPath);
@@ -149,16 +175,28 @@ function allDependencyNames(mod) {
     const dependencyNames = Object.keys(mod.dependencies).reduce((acc, it) => [...acc, it, ...allDependencyNames(mod.dependencies[it])], []);
     return dependencyNames;
 }
-function getMiddlewareMatcherRegexes(middlewareManifest) {
+function getMiddlewareMatcherRegexes(middlewareManifest, functionsConfigManifest) {
     const middlewareObjectValues = Object.values(middlewareManifest.middleware);
-    let middlewareMatchers;
+    const middlewareMatchers = [];
     if (middlewareManifest.version === 1) {
-        middlewareMatchers = middlewareObjectValues.map((page) => ({ regexp: page.regexp }));
+        middlewareMatchers.push(...middlewareObjectValues.map((page) => ({
+            regexp: page.regexp,
+        })));
     }
-    else {
-        middlewareMatchers = middlewareObjectValues
+    else if (middlewareManifest.version === 2) {
+        middlewareMatchers.push(...middlewareObjectValues
             .map((page) => page.matchers)
-            .flat();
+            .flat());
+    }
+    else if (middlewareManifest.version === 3) {
+        if (functionsConfigManifest?.functions?.["/_middleware"]) {
+            middlewareMatchers.push(...(functionsConfigManifest.functions["/_middleware"].matchers || []));
+        }
+        else {
+            middlewareMatchers.push(...middlewareObjectValues
+                .map((page) => page.matchers)
+                .flat());
+        }
     }
     return middlewareMatchers.map((matcher) => new RegExp(matcher.regexp));
 }

package/lib/functions/events/v2.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CONVERTABLE_EVENTS = exports.DATACONNECT_EVENT = exports.FIREALERTS_EVENT = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+exports.AI_LOGIC_TRIGGERS_TO_EVENTS = exports.AI_LOGIC_EVENTS_TO_TRIGGER = exports.CONVERTABLE_EVENTS = exports.DATACONNECT_EVENT = exports.FIREALERTS_EVENT = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+const ailogic_1 = require("../../deploy/functions/services/ailogic");
 exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 exports.STORAGE_EVENTS = [
     "google.cloud.storage.object.v1.finalized",
@@ -35,3 +36,11 @@ exports.CONVERTABLE_EVENTS = {
     "google.cloud.firestore.document.v1.deleted": "google.cloud.firestore.document.v1.deleted.withAuthContext",
     "google.cloud.firestore.document.v1.written": "google.cloud.firestore.document.v1.written.withAuthContext",
 };
+exports.AI_LOGIC_EVENTS_TO_TRIGGER = {
+    [ailogic_1.AI_LOGIC_BEFORE_GENERATE_CONTENT]: "before-generate-content",
+    [ailogic_1.AI_LOGIC_AFTER_GENERATE_CONTENT]: "after-generate-content",
+};
+exports.AI_LOGIC_TRIGGERS_TO_EVENTS = {
+    "before-generate-content": ailogic_1.AI_LOGIC_BEFORE_GENERATE_CONTENT,
+    "after-generate-content": ailogic_1.AI_LOGIC_AFTER_GENERATE_CONTENT,
+};