@netlify/plugin-nextjs 5.7.1 → 5.7.3

package/dist/run/headers.js

@@ -146,7 +146,7 @@ var setCacheControlHeaders = (headers, 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
-      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : `s-maxage=${requestContext.routeHandlerRevalidate === false ? 31536e3 : requestContext.routeHandlerRevalidate}, stale-while-revalidate=31536000, durable`
+      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate, durable" : `s-maxage=${requestContext.routeHandlerRevalidate === false ? 31536e3 : requestContext.routeHandlerRevalidate}, stale-while-revalidate=31536000, durable`
     );
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
@@ -159,7 +159,7 @@ var setCacheControlHeaders = (headers, request, requestContext) => {
     ]);
     const cdnCacheControl = (
       // if we are serving already stale response, instruct edge to not attempt to cache that response
-      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : [
+      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate, durable" : [
         ...getHeaderValueArray(cacheControl).map(
           (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
         ),

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

@@ -24,7 +24,7 @@ __export(regional_blob_store_exports, {
 });
 module.exports = __toCommonJS(regional_blob_store_exports);
 
-// node_modules/@netlify/blobs/dist/chunk-SGXOM2EY.js
+// node_modules/@netlify/blobs/dist/chunk-GUEW34CP.js
 var NF_ERROR = "x-nf-error";
 var NF_REQUEST_ID = "x-nf-request-id";
 var BlobsInternalError = class extends Error {
@@ -139,6 +139,20 @@ var BlobsConsistencyError = class extends Error {
     this.name = "BlobsConsistencyError";
   }
 };
+var REGION_AUTO = "auto";
+var regions = {
+  "us-east-1": true,
+  "us-east-2": true
+};
+var isValidRegion = (input) => Object.keys(regions).includes(input);
+var InvalidBlobsRegionError = class extends Error {
+  constructor(region) {
+    super(
+      `${region} is not a supported Netlify Blobs region. Supported values are: ${Object.keys(regions).join(", ")}.`
+    );
+    this.name = "InvalidBlobsRegionError";
+  }
+};
 var DEFAULT_RETRY_DELAY = getEnvironment().get("NODE_ENV") === "test" ? 1 : 5e3;
 var MIN_RETRY_DELAY = 1e3;
 var MAX_RETRY = 5;
@@ -306,6 +320,9 @@ var getClientOptions = (options, contextOverride) => {
   if (!siteID || !token) {
     throw new MissingBlobsEnvironmentError(["siteID", "token"]);
   }
+  if (options.region !== void 0 && !isValidRegion(options.region)) {
+    throw new InvalidBlobsRegionError(options.region);
+  }
   const clientOptions = {
     apiURL: context.apiURL ?? options.apiURL,
     consistency: options.consistency,
@@ -328,7 +345,11 @@ var Store = class _Store {
     this.client = options.client;
     if ("deployID" in options) {
       _Store.validateDeployID(options.deployID);
-      this.name = DEPLOY_STORE_PREFIX + options.deployID;
+      let name = DEPLOY_STORE_PREFIX + options.deployID;
+      if (options.name) {
+        name += `:${options.name}`;
+      }
+      this.name = name;
     } else if (options.name.startsWith(LEGACY_STORE_INTERNAL_PREFIX)) {
       const storeName = options.name.slice(LEGACY_STORE_INTERNAL_PREFIX.length);
       _Store.validateStoreName(storeName);
@@ -538,18 +559,28 @@ var Store = class _Store {
               parameters: nextParameters,
               storeName
             });
-            const page = await res.json();
-            if (page.next_cursor) {
-              currentCursor = page.next_cursor;
-            } else {
+            let blobs = [];
+            let directories = [];
+            if (![200, 204, 404].includes(res.status)) {
+              throw new BlobsInternalError(res);
+            }
+            if (res.status === 404) {
               done = true;
+            } else {
+              const page = await res.json();
+              if (page.next_cursor) {
+                currentCursor = page.next_cursor;
+              } else {
+                done = true;
+              }
+              blobs = (page.blobs ?? []).map(_Store.formatListResultBlob).filter(Boolean);
+              directories = page.directories ?? [];
             }
-            const blobs = (page.blobs ?? []).map(_Store.formatListResultBlob).filter(Boolean);
             return {
               done: false,
               value: {
                 blobs,
-                directories: page.directories ?? []
+                directories
               }
             };
           }
@@ -558,30 +589,28 @@ var Store = class _Store {
     };
   }
 };
-var getDeployStore = (options = {}) => {
+var getDeployStore = (input = {}) => {
   const context = getEnvironmentContext();
+  const options = typeof input === "string" ? { name: input } : input;
   const deployID = options.deployID ?? context.deployID;
   if (!deployID) {
     throw new MissingBlobsEnvironmentError(["deployID"]);
   }
   const clientOptions = getClientOptions(options, context);
-  if (options.experimentalRegion === "context") {
-    if (!context.primaryRegion) {
-      throw new Error(
-        'The Netlify Blobs client was initialized with `experimentalRegion: "context"` but there is no region configured in the environment'
-      );
-    }
-    clientOptions.region = context.primaryRegion;
-  } else if (options.experimentalRegion === "auto") {
-    if (clientOptions.edgeURL) {
-      throw new Error(
-        'The Netlify Blobs client was initialized with `experimentalRegion: "auto"` which is not compatible with the `edgeURL` property; consider using `apiURL` instead'
-      );
+  if (!clientOptions.region) {
+    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."
+        );
+      }
+      clientOptions.region = context.primaryRegion;
+    } else {
+      clientOptions.region = REGION_AUTO;
     }
-    clientOptions.region = options.experimentalRegion;
   }
   const client = new Client(clientOptions);
-  return new Store({ client, deployID });
+  return new Store({ client, deployID, name: options.name });
 };
 
 // src/run/regional-blob-store.cts
@@ -590,7 +619,7 @@ var getRegionalBlobStore = (args = {}) => {
   return getDeployStore({
     ...args,
     fetch: fetchBeforeNextPatchedIt,
-    experimentalRegion: process.env.USE_REGIONAL_BLOBS?.toUpperCase() === "TRUE" ? "context" : void 0
+    region: process.env.USE_REGIONAL_BLOBS?.toUpperCase() === "TRUE" ? void 0 : "us-east-2"
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/edge-runtime/lib/response.ts

@@ -24,7 +24,6 @@ interface BuildResponseOptions {
   request: Request
   result: FetchEventResult
   nextConfig?: RequestData['nextConfig']
-  requestLocale?: string
 }
 
 export const buildResponse = async ({
@@ -33,7 +32,6 @@ export const buildResponse = async ({
   request,
   result,
   nextConfig,
-  requestLocale,
 }: BuildResponseOptions): Promise<Response | void> => {
   logger
     .withFields({ is_nextresponse_next: result.response.headers.has('x-middleware-next') })
@@ -197,11 +195,10 @@ export const buildResponse = async ({
     return addMiddlewareHeaders(context.rewrite(target), res)
   }
 
-  // If we are redirecting a request that had a locale in the URL, we need to add it back in
-  if (redirect && requestLocale) {
-    redirect = normalizeLocalizedTarget({ target: redirect, request, nextConfig, requestLocale })
+  if (redirect) {
+    redirect = normalizeLocalizedTarget({ target: redirect, request, nextConfig })
     if (redirect === request.url) {
-      logger.withFields({ rewrite_url: rewrite }).debug('Rewrite url is same as original url')
+      logger.withFields({ redirect_url: redirect }).debug('Redirect url is same as original url')
       return
     }
     res.headers.set('location', redirect)
@@ -234,25 +231,25 @@ function normalizeLocalizedTarget({
   target,
   request,
   nextConfig,
-  requestLocale,
 }: {
   target: string
   request: Request
   nextConfig?: RequestData['nextConfig']
-  requestLocale?: string
-}) {
+}): string {
   const targetUrl = new URL(target, request.url)
 
   const normalizedTarget = normalizeLocalePath(targetUrl.pathname, nextConfig?.i18n?.locales)
 
-  const locale = normalizedTarget.detectedLocale ?? requestLocale
   if (
-    locale &&
+    normalizedTarget.detectedLocale &&
     !normalizedTarget.pathname.startsWith(`/api/`) &&
     !normalizedTarget.pathname.startsWith(`/_next/static/`)
   ) {
     targetUrl.pathname =
-      addBasePath(`/${locale}${normalizedTarget.pathname}`, nextConfig?.basePath) || `/`
+      addBasePath(
+        `/${normalizedTarget.detectedLocale}${normalizedTarget.pathname}`,
+        nextConfig?.basePath,
+      ) || `/`
   } else {
     targetUrl.pathname = addBasePath(normalizedTarget.pathname, nextConfig?.basePath) || `/`
   }

package/edge-runtime/middleware.ts

@@ -61,7 +61,6 @@ export async function handleMiddleware(
       logger: reqLogger,
       request,
       result,
-      requestLocale: nextRequest.detectedLocale,
       nextConfig,
     })
 

package/package.json

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