@netlify/plugin-nextjs 5.7.4 → 5.8.1

package/dist/build/advanced-api-routes.js

@@ -18,23 +18,38 @@ var ApiRouteType = /* @__PURE__ */ ((ApiRouteType2) => {
   return ApiRouteType2;
 })(ApiRouteType || {});
 async function getAPIRoutesConfigs(ctx) {
+  const uniqueApiRoutes = /* @__PURE__ */ new Set();
   const functionsConfigManifestPath = join(
     ctx.publishDir,
     "server",
     "functions-config-manifest.json"
   );
-  if (!existsSync(functionsConfigManifestPath)) {
+  if (existsSync(functionsConfigManifestPath)) {
+    const functionsConfigManifest = JSON.parse(
+      await readFile(functionsConfigManifestPath, "utf-8")
+    );
+    for (const apiRoute of Object.keys(functionsConfigManifest.functions)) {
+      uniqueApiRoutes.add(apiRoute);
+    }
+  }
+  const pagesManifestPath = join(ctx.publishDir, "server", "pages-manifest.json");
+  if (existsSync(pagesManifestPath)) {
+    const pagesManifest = JSON.parse(await readFile(pagesManifestPath, "utf-8"));
+    for (const route of Object.keys(pagesManifest)) {
+      if (route.startsWith("/api/")) {
+        uniqueApiRoutes.add(route);
+      }
+    }
+  }
+  if (uniqueApiRoutes.size === 0) {
     return [];
   }
-  const functionsConfigManifest = JSON.parse(
-    await readFile(functionsConfigManifestPath, "utf-8")
-  );
   const appDir = ctx.resolveFromSiteDir(".");
   const pagesDir = join(appDir, "pages");
   const srcPagesDir = join(appDir, "src", "pages");
   const { pageExtensions } = ctx.requiredServerFiles.config;
   return Promise.all(
-    Object.keys(functionsConfigManifest.functions).map(async (apiRoute) => {
+    [...uniqueApiRoutes].map(async (apiRoute) => {
       const filePath = getSourceFileForPage(apiRoute, [pagesDir, srcPagesDir], pageExtensions);
       const sharedFields = {
         apiRoute,

package/dist/build/content/prerendered.js

@@ -147,11 +147,19 @@ var writeCacheEntry = async (route, value, lastModified, ctx) => {
   });
   await writeFile(path, entry, "utf-8");
 };
-var routeToFilePath = (path) => path === "/" ? "/index" : path;
-var buildPagesCacheValue = async (path, shouldUseEnumKind) => ({
+var routeToFilePath = (path) => {
+  if (path === "/") {
+    return "/index";
+  }
+  if (path.startsWith("/")) {
+    return path;
+  }
+  return `/${path}`;
+};
+var buildPagesCacheValue = async (path, shouldUseEnumKind, shouldSkipJson = false) => ({
   kind: shouldUseEnumKind ? "PAGES" : "PAGE",
   html: await readFile(`${path}.html`, "utf-8"),
-  pageData: JSON.parse(await readFile(`${path}.json`, "utf-8")),
+  pageData: shouldSkipJson ? {} : JSON.parse(await readFile(`${path}.json`, "utf-8")),
   headers: void 0,
   status: void 0
 });
@@ -203,8 +211,8 @@ var copyPrerenderedContent = async (ctx) => {
       const shouldUseEnumKind = ctx.nextVersion ? (0, import_semver.satisfies)(ctx.nextVersion, ">=15.0.0-canary.114 <15.0.0-d || >15.0.0-rc.0", {
         includePrerelease: true
       }) : false;
-      await Promise.all(
-        Object.entries(manifest.routes).map(
+      await Promise.all([
+        ...Object.entries(manifest.routes).map(
           ([route, meta]) => limitConcurrentPrerenderContentHandling(async () => {
             const lastModified = meta.initialRevalidateSeconds ? Date.now() - 31536e6 : Date.now();
             const key = routeToFilePath(route);
@@ -243,8 +251,18 @@ var copyPrerenderedContent = async (ctx) => {
             }
             await writeCacheEntry(key, value, lastModified, ctx);
           })
-        )
-      );
+        ),
+        ...ctx.getFallbacks(manifest).map(async (route) => {
+          const key = routeToFilePath(route);
+          const value = await buildPagesCacheValue(
+            join(ctx.publishDir, "server/pages", key),
+            shouldUseEnumKind,
+            true
+            // there is no corresponding json file for fallback, so we are skipping it for this entry
+          );
+          await writeCacheEntry(key, value, Date.now(), ctx);
+        })
+      ]);
       if (existsSync(join(ctx.publishDir, `server/app/_not-found.html`))) {
         const lastModified = Date.now();
         const key = "/404";

package/dist/build/content/static.js

@@ -35,13 +35,19 @@ var copyStaticContent = async (ctx) => {
       cwd: srcDir,
       extglob: true
     });
+    const fallbacks = ctx.getFallbacks(await ctx.getPrerenderManifest());
     try {
       await mkdir(destDir, { recursive: true });
       await Promise.all(
         paths.filter((path) => !paths.includes(`${path.slice(0, -5)}.json`)).map(async (path) => {
           const html = await readFile(join(srcDir, path), "utf-8");
           verifyNetlifyForms(ctx, html);
-          await writeFile(join(destDir, await encodeBlobKey(path)), html, "utf-8");
+          const isFallback = fallbacks.includes(path.slice(0, -5));
+          await writeFile(
+            join(destDir, await encodeBlobKey(path)),
+            JSON.stringify({ html, isFallback }),
+            "utf-8"
+          );
         })
       );
     } catch (error) {

package/dist/build/plugin-context.js

@@ -266,6 +266,32 @@ var PluginContext = class {
     }
     return this.#nextVersion;
   }
+  #fallbacks = null;
+  /**
+   * Get an array of localized fallback routes
+   *
+   * Example return value for non-i18n site: `['blog/[slug]']`
+   *
+   * Example return value for i18n site: `['en/blog/[slug]', 'fr/blog/[slug]']`
+   */
+  getFallbacks(prerenderManifest) {
+    if (!this.#fallbacks) {
+      const locales = this.buildConfig.i18n?.locales ?? [""];
+      this.#fallbacks = Object.entries(prerenderManifest.dynamicRoutes).reduce(
+        (fallbacks, [route, meta]) => {
+          if (typeof meta.fallback === "string") {
+            for (const locale of locales) {
+              const localizedRoute = posixJoin(locale, route.replace(/^\/+/g, ""));
+              fallbacks.push(localizedRoute);
+            }
+          }
+          return fallbacks;
+        },
+        []
+      );
+    }
+    return this.#fallbacks;
+  }
   /** Fails a build with a message and an optional error */
   failBuild(message, error) {
     return this.utils.build.failBuild(message, error instanceof Error ? { error } : void 0);

package/dist/esm-chunks/{package-5HTSLGL2.js → package-AOKLDA5E.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.7.4";
+var version = "5.8.1";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -57,14 +57,14 @@ var bugs = {
 var homepage = "https://github.com/netlify/next-runtime#readme";
 var devDependencies = {
   "@fastly/http-compute-js": "1.1.4",
-  "@netlify/blobs": "^8.0.1",
-  "@netlify/build": "^29.54.9",
+  "@netlify/blobs": "^8.1.0",
+  "@netlify/build": "^29.55.3",
   "@netlify/edge-bundler": "^12.2.3",
   "@netlify/edge-functions": "^2.11.0",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.8.2",
-  "@netlify/serverless-functions-api": "^1.29.0",
-  "@netlify/zip-it-and-ship-it": "^9.39.7",
+  "@netlify/serverless-functions-api": "^1.30.1",
+  "@netlify/zip-it-and-ship-it": "^9.41.0",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
   "@opentelemetry/resources": "^1.24.0",
@@ -87,6 +87,7 @@ var devDependencies = {
   memfs: "^4.9.2",
   "mock-require": "^3.0.3",
   msw: "^2.0.7",
+  "netlify-cli": "^17.37.1",
   next: "^15.0.0-canary.28",
   os: "^0.1.2",
   outdent: "^0.8.0",

package/dist/run/handlers/server.js

@@ -3161,7 +3161,7 @@ var server_default = async (request, context) => {
       span.setAttribute("responseCacheKey", requestContext.responseCacheKey);
     }
     await adjustDateHeader({ headers: response.headers, request, span, tracer, requestContext });
-    setCacheControlHeaders(response.headers, request, requestContext);
+    setCacheControlHeaders(response, request, requestContext);
     setCacheTagsHeaders(response.headers, requestContext);
     setVaryHeaders(response.headers, request, nextConfig);
     setCacheStatusHeader(response.headers);

package/dist/run/handlers/tracing.js

@@ -68866,7 +68866,7 @@ var import_semantic_conventions = __toESM(require_src(), 1);
 import { getLogger } from "./request-context.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-5HTSLGL2.js");
+} = await import("../../esm-chunks/package-AOKLDA5E.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,

package/dist/run/headers.js

@@ -42,7 +42,7 @@ var generateNetlifyVaryValues = ({
   return values.join(",");
 };
 var getHeaderValueArray = (header) => {
-  return header.split(",").map((value) => value.trim());
+  return header.split(",").map((value) => value.trim()).filter(Boolean);
 };
 var omitHeaderValues = (header, values) => {
   const headerValues = getHeaderValueArray(header);
@@ -142,7 +142,7 @@ var adjustDateHeader = async ({
   headers.set("x-nextjs-date", headers.get("date") ?? lastModifiedDate.toUTCString());
   headers.set("date", lastModifiedDate.toUTCString());
 };
-var setCacheControlHeaders = (headers, request, requestContext) => {
+var setCacheControlHeaders = ({ headers, status }, request, requestContext) => {
   if (typeof requestContext.routeHandlerRevalidate !== "undefined" && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
     const cdnCacheControl = (
       // if we are serving already stale response, instruct edge to not attempt to cache that response
@@ -151,6 +151,10 @@ var setCacheControlHeaders = (headers, request, requestContext) => {
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
   }
+  if (status === 404 && request.url.endsWith(".php")) {
+    headers.set("cache-control", "public, max-age=0, must-revalidate");
+    headers.set("netlify-cdn-cache-control", `max-age=31536000, durable`);
+  }
   const cacheControl = headers.get("cache-control");
   if (cacheControl !== null && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
     const browserCacheControl = omitHeaderValues(cacheControl, [
@@ -170,13 +174,13 @@ var setCacheControlHeaders = (headers, request, requestContext) => {
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
   }
-  if (cacheControl === null && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control") && requestContext.usedFsRead) {
+  if (cacheControl === null && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control") && requestContext.usedFsReadForNonFallback) {
     headers.set("cache-control", "public, max-age=0, must-revalidate");
     headers.set("netlify-cdn-cache-control", `max-age=31536000, durable`);
   }
 };
 var setCacheTagsHeaders = (headers, requestContext) => {
-  if (requestContext.responseCacheTags) {
+  if (requestContext.responseCacheTags && (headers.has("cache-control") || headers.has("netlify-cdn-cache-control"))) {
     headers.set("netlify-cache-tag", requestContext.responseCacheTags.join(","));
   }
 };

package/dist/run/next.cjs

@@ -554,13 +554,17 @@ async function getMockedRequestHandlers(...args) {
         if (typeof path === "string" && path.endsWith(".html")) {
           const store = (0, import_regional_blob_store.getRegionalBlobStore)();
           const relPath = (0, import_path.relative)((0, import_path.resolve)(".next/server/pages"), path);
-          const file = await store.get(await encodeBlobKey(relPath));
+          const file = await store.get(await encodeBlobKey(relPath), {
+            type: "json"
+          });
           if (file !== null) {
-            const requestContext = (0, import_request_context.getRequestContext)();
-            if (requestContext) {
-              requestContext.usedFsRead = true;
+            if (!file.isFallback) {
+              const requestContext = (0, import_request_context.getRequestContext)();
+              if (requestContext) {
+                requestContext.usedFsReadForNonFallback = true;
+              }
             }
-            return file;
+            return file.html;
           }
         }
         throw error;

package/dist/run/regional-blob-store.cjs

@@ -601,7 +601,7 @@ var getDeployStore = (input = {}) => {
     if (clientOptions.edgeURL || clientOptions.uncachedEdgeURL) {
       if (!context.primaryRegion) {
         throw new Error(
-          "When accessing a deploy store, the Netlify Blobs client needs to be configured with a region, and one was not found in the environment. To manually set the region, set the `region` property in the `getDeployStore` options."
+          "When accessing a deploy store, the Netlify Blobs client needs to be configured with a region, and one was not found in the environment. To manually set the region, set the `region` property in the `getDeployStore` options. If you are using the Netlify CLI, you may have an outdated version; run `npm install -g netlify-cli@latest` to update and try again."
         );
       }
       clientOptions.region = context.primaryRegion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.7.4",
+  "version": "5.8.1",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",