@netlify/plugin-nextjs 5.7.3 → 5.8.0

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/esm-chunks/{package-EEQP43EX.js → package-4GFWM3PF.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.7.3";
+var version = "5.8.0";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -58,13 +58,13 @@ 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.8",
+  "@netlify/build": "^29.55.2",
   "@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.6",
+  "@netlify/serverless-functions-api": "^1.30.1",
+  "@netlify/zip-it-and-ship-it": "^9.40.2",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
   "@opentelemetry/resources": "^1.24.0",

package/dist/run/handlers/cache.cjs

@@ -169,10 +169,10 @@ var NetlifyCacheHandler = class {
     }
     if (cacheValue.kind === "PAGE" || cacheValue.kind === "PAGES" || cacheValue.kind === "APP_PAGE" || cacheValue.kind === "ROUTE" || cacheValue.kind === "APP_ROUTE") {
       if (cacheValue.headers?.[import_constants.NEXT_CACHE_TAGS_HEADER]) {
-        const cacheTags = cacheValue.headers[import_constants.NEXT_CACHE_TAGS_HEADER].split(",");
+        const cacheTags = cacheValue.headers[import_constants.NEXT_CACHE_TAGS_HEADER].split(/,|%2c/gi);
         requestContext.responseCacheTags = cacheTags;
       } else if ((cacheValue.kind === "PAGE" || cacheValue.kind === "PAGES") && typeof cacheValue.pageData === "object") {
-        const cacheTags = [`_N_T_${key === "/index" ? "/" : key}`];
+        const cacheTags = [`_N_T_${key === "/index" ? "/" : encodeURI(key)}`];
         requestContext.responseCacheTags = cacheTags;
       }
     }
@@ -319,10 +319,10 @@ var NetlifyCacheHandler = class {
       if (data?.kind === "PAGE" || data?.kind === "PAGES") {
         const requestContext = (0, import_request_context.getRequestContext)();
         if (requestContext?.didPagesRouterOnDemandRevalidate) {
-          const tag = `_N_T_${key === "/index" ? "/" : key}`;
+          const tag = `_N_T_${key === "/index" ? "/" : encodeURI(key)}`;
           (0, import_request_context.getLogger)().debug(`Purging CDN cache for: [${tag}]`);
           requestContext.trackBackgroundWork(
-            purgeCache({ tags: [tag] }).catch((error) => {
+            purgeCache({ tags: tag.split(/,|%2c/gi) }).catch((error) => {
               (0, import_request_context.getLogger)().withError(error).error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`);
             })
           );
@@ -342,7 +342,9 @@ var NetlifyCacheHandler = class {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async doRevalidateTag(tagOrTags, ...args) {
     (0, import_request_context.getLogger)().withFields({ tagOrTags, args }).debug("NetlifyCacheHandler.revalidateTag");
-    const tags = Array.isArray(tagOrTags) ? tagOrTags : [tagOrTags];
+    const tags = (Array.isArray(tagOrTags) ? tagOrTags : [tagOrTags]).flatMap(
+      (tag) => tag.split(/,|%2c/gi)
+    );
     const data = {
       revalidatedAt: Date.now()
     };
@@ -370,7 +372,7 @@ var NetlifyCacheHandler = class {
     if (cacheEntry.value?.kind === "FETCH") {
       cacheTags = [...tags, ...softTags];
     } else if (cacheEntry.value?.kind === "PAGE" || cacheEntry.value?.kind === "PAGES" || cacheEntry.value?.kind === "APP_PAGE" || cacheEntry.value?.kind === "ROUTE" || cacheEntry.value?.kind === "APP_ROUTE") {
-      cacheTags = cacheEntry.value.headers?.[import_constants.NEXT_CACHE_TAGS_HEADER]?.split(",") || [];
+      cacheTags = cacheEntry.value.headers?.[import_constants.NEXT_CACHE_TAGS_HEADER]?.split(/,|%2c/gi) || [];
     } else {
       return false;
     }

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-EEQP43EX.js");
+} = await import("../../esm-chunks/package-4GFWM3PF.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, [

package/package.json

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