@netlify/plugin-nextjs 5.14.3 → 5.14.5

package/dist/build/functions/edge.js

@@ -534,7 +534,7 @@ var copyHandlerDependenciesForNodeMiddleware = async (ctx) => {
   const parts = [shim];
   const entry = "server/middleware.js";
   const nft = `${entry}.nft.json`;
-  const nftFilesPath = join(process.cwd(), ctx.nextDistDir, nft);
+  const nftFilesPath = join(process.cwd(), ctx.distDir, nft);
   const nftManifest = JSON.parse(await readFile(nftFilesPath, "utf8"));
   const files = nftManifest.files.map((file) => join("server", file));
   files.push(entry);

package/dist/run/handlers/tags-handler.cjs

@@ -86,7 +86,7 @@ var pipeline = (0, import_util.promisify)(import_stream.pipeline);
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.14.3";
+var version = "5.14.5";
 
 // src/run/handlers/tags-handler.cts
 var import_storage = require("../storage/storage.cjs");

package/dist/run/next.cjs

@@ -498,6 +498,7 @@ var import_request_context = require("./handlers/request-context.cjs");
 var import_tracer = require("./handlers/tracer.cjs");
 var import_storage = require("./storage/storage.cjs");
 process.env.NODE_ENV = "production";
+process.env.NEXT_OTEL_FETCH_DISABLED = "1";
 var { getRequestHandlers } = require("next/dist/server/lib/start-server.js");
 var ResponseCache = require("next/dist/server/response-cache/index.js").default;
 var originalGet = ResponseCache.prototype.get;

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

@@ -25,7 +25,7 @@ __export(regional_blob_store_exports, {
 });
 module.exports = __toCommonJS(regional_blob_store_exports);
 
-// node_modules/@netlify/blobs/node_modules/@netlify/runtime-utils/dist/main.js
+// node_modules/@netlify/runtime-utils/dist/main.js
 var getString = (input) => typeof input === "string" ? input : JSON.stringify(input);
 var base64Decode = globalThis.Buffer ? (input) => Buffer.from(input, "base64").toString() : (input) => atob(input);
 var base64Encode = globalThis.Buffer ? (input) => Buffer.from(getString(input)).toString("base64") : (input) => btoa(getString(input));
@@ -337,6 +337,22 @@ var getClientOptions = (options, contextOverride) => {
   return clientOptions;
 };
 
+// node_modules/@netlify/otel/dist/main.js
+var GET_TRACER = "__netlify__getTracer";
+var getTracer = (name, version) => {
+  return globalThis[GET_TRACER]?.(name, version);
+};
+function withActiveSpan(tracer, name, optionsOrFn, contextOrFn, fn) {
+  const func = typeof contextOrFn === "function" ? contextOrFn : typeof optionsOrFn === "function" ? optionsOrFn : fn;
+  if (!func) {
+    throw new Error("function to execute with active span is missing");
+  }
+  if (!tracer) {
+    return func();
+  }
+  return tracer.withActiveSpan(name, optionsOrFn, contextOrFn, func);
+}
+
 // node_modules/@netlify/blobs/dist/main.js
 var DEPLOY_STORE_PREFIX = "deploy:";
 var LEGACY_STORE_INTERNAL_PREFIX = "netlify-internal/legacy-namespace/";
@@ -368,155 +384,245 @@ var Store = class _Store {
       throw new BlobsInternalError(res);
     }
   }
-  async get(key, options) {
-    const { consistency, type } = options ?? {};
-    const res = await this.client.makeRequest({ consistency, key, method: "get", storeName: this.name });
-    if (res.status === 404) {
-      return null;
-    }
+  async deleteAll() {
+    const res = await this.client.makeRequest({ method: "delete", storeName: this.name });
     if (res.status !== 200) {
       throw new BlobsInternalError(res);
     }
-    if (type === void 0 || type === "text") {
-      return res.text();
-    }
-    if (type === "arrayBuffer") {
-      return res.arrayBuffer();
-    }
-    if (type === "blob") {
-      return res.blob();
-    }
-    if (type === "json") {
-      return res.json();
-    }
-    if (type === "stream") {
-      return res.body;
-    }
-    throw new BlobsInternalError(res);
-  }
-  async getMetadata(key, { consistency } = {}) {
-    const res = await this.client.makeRequest({ consistency, key, method: "head", storeName: this.name });
-    if (res.status === 404) {
-      return null;
-    }
-    if (res.status !== 200 && res.status !== 304) {
+    const data = await res.json();
+    if (typeof data.blobs_deleted !== "number") {
       throw new BlobsInternalError(res);
     }
-    const etag = res?.headers.get("etag") ?? void 0;
-    const metadata = getMetadataFromResponse(res);
-    const result = {
-      etag,
-      metadata
+    return {
+      deletedBlobs: data.blobs_deleted
     };
-    return result;
+  }
+  async get(key, options) {
+    return withActiveSpan(getTracer(), "blobs.get", async (span) => {
+      const { consistency, type } = options ?? {};
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.type": type,
+        "blobs.method": "GET",
+        "blobs.consistency": consistency
+      });
+      const res = await this.client.makeRequest({
+        consistency,
+        key,
+        method: "get",
+        storeName: this.name
+      });
+      span?.setAttributes({
+        "blobs.response.body.size": res.headers.get("content-length") ?? void 0,
+        "blobs.response.status": res.status
+      });
+      if (res.status === 404) {
+        return null;
+      }
+      if (res.status !== 200) {
+        throw new BlobsInternalError(res);
+      }
+      if (type === void 0 || type === "text") {
+        return res.text();
+      }
+      if (type === "arrayBuffer") {
+        return res.arrayBuffer();
+      }
+      if (type === "blob") {
+        return res.blob();
+      }
+      if (type === "json") {
+        return res.json();
+      }
+      if (type === "stream") {
+        return res.body;
+      }
+      throw new BlobsInternalError(res);
+    });
+  }
+  async getMetadata(key, { consistency } = {}) {
+    return withActiveSpan(getTracer(), "blobs.getMetadata", async (span) => {
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.method": "HEAD",
+        "blobs.consistency": consistency
+      });
+      const res = await this.client.makeRequest({ consistency, key, method: "head", storeName: this.name });
+      span?.setAttributes({
+        "blobs.response.status": res.status
+      });
+      if (res.status === 404) {
+        return null;
+      }
+      if (res.status !== 200 && res.status !== 304) {
+        throw new BlobsInternalError(res);
+      }
+      const etag = res?.headers.get("etag") ?? void 0;
+      const metadata = getMetadataFromResponse(res);
+      const result = {
+        etag,
+        metadata
+      };
+      return result;
+    });
   }
   async getWithMetadata(key, options) {
-    const { consistency, etag: requestETag, type } = options ?? {};
-    const headers = requestETag ? { "if-none-match": requestETag } : void 0;
-    const res = await this.client.makeRequest({
-      consistency,
-      headers,
-      key,
-      method: "get",
-      storeName: this.name
+    return withActiveSpan(getTracer(), "blobs.getWithMetadata", async (span) => {
+      const { consistency, etag: requestETag, type } = options ?? {};
+      const headers = requestETag ? { "if-none-match": requestETag } : void 0;
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.method": "GET",
+        "blobs.consistency": options?.consistency,
+        "blobs.type": type,
+        "blobs.request.etag": requestETag
+      });
+      const res = await this.client.makeRequest({
+        consistency,
+        headers,
+        key,
+        method: "get",
+        storeName: this.name
+      });
+      const responseETag = res?.headers.get("etag") ?? void 0;
+      span?.setAttributes({
+        "blobs.response.body.size": res.headers.get("content-length") ?? void 0,
+        "blobs.response.etag": responseETag,
+        "blobs.response.status": res.status
+      });
+      if (res.status === 404) {
+        return null;
+      }
+      if (res.status !== 200 && res.status !== 304) {
+        throw new BlobsInternalError(res);
+      }
+      const metadata = getMetadataFromResponse(res);
+      const result = {
+        etag: responseETag,
+        metadata
+      };
+      if (res.status === 304 && requestETag) {
+        return { data: null, ...result };
+      }
+      if (type === void 0 || type === "text") {
+        return { data: await res.text(), ...result };
+      }
+      if (type === "arrayBuffer") {
+        return { data: await res.arrayBuffer(), ...result };
+      }
+      if (type === "blob") {
+        return { data: await res.blob(), ...result };
+      }
+      if (type === "json") {
+        return { data: await res.json(), ...result };
+      }
+      if (type === "stream") {
+        return { data: res.body, ...result };
+      }
+      throw new Error(`Invalid 'type' property: ${type}. Expected: arrayBuffer, blob, json, stream, or text.`);
     });
-    if (res.status === 404) {
-      return null;
-    }
-    if (res.status !== 200 && res.status !== 304) {
-      throw new BlobsInternalError(res);
-    }
-    const responseETag = res?.headers.get("etag") ?? void 0;
-    const metadata = getMetadataFromResponse(res);
-    const result = {
-      etag: responseETag,
-      metadata
-    };
-    if (res.status === 304 && requestETag) {
-      return { data: null, ...result };
-    }
-    if (type === void 0 || type === "text") {
-      return { data: await res.text(), ...result };
-    }
-    if (type === "arrayBuffer") {
-      return { data: await res.arrayBuffer(), ...result };
-    }
-    if (type === "blob") {
-      return { data: await res.blob(), ...result };
-    }
-    if (type === "json") {
-      return { data: await res.json(), ...result };
-    }
-    if (type === "stream") {
-      return { data: res.body, ...result };
-    }
-    throw new Error(`Invalid 'type' property: ${type}. Expected: arrayBuffer, blob, json, stream, or text.`);
   }
   list(options = {}) {
-    const iterator = this.getListIterator(options);
-    if (options.paginate) {
-      return iterator;
-    }
-    return collectIterator(iterator).then(
-      (items) => items.reduce(
-        (acc, item) => ({
-          blobs: [...acc.blobs, ...item.blobs],
-          directories: [...acc.directories, ...item.directories]
-        }),
-        { blobs: [], directories: [] }
-      )
-    );
+    return withActiveSpan(getTracer(), "blobs.list", (span) => {
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.method": "GET",
+        "blobs.list.paginate": options.paginate ?? false
+      });
+      const iterator = this.getListIterator(options);
+      if (options.paginate) {
+        return iterator;
+      }
+      return collectIterator(iterator).then(
+        (items) => items.reduce(
+          (acc, item) => ({
+            blobs: [...acc.blobs, ...item.blobs],
+            directories: [...acc.directories, ...item.directories]
+          }),
+          { blobs: [], directories: [] }
+        )
+      );
+    });
   }
   async set(key, data, options = {}) {
-    _Store.validateKey(key);
-    const conditions = _Store.getConditions(options);
-    const res = await this.client.makeRequest({
-      conditions,
-      body: data,
-      key,
-      metadata: options.metadata,
-      method: "put",
-      storeName: this.name
+    return withActiveSpan(getTracer(), "blobs.set", async (span) => {
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.method": "PUT",
+        "blobs.data.size": typeof data == "string" ? data.length : data instanceof Blob ? data.size : data.byteLength,
+        "blobs.data.type": typeof data == "string" ? "string" : data instanceof Blob ? "blob" : "arrayBuffer",
+        "blobs.atomic": Boolean(options.onlyIfMatch ?? options.onlyIfNew)
+      });
+      _Store.validateKey(key);
+      const conditions = _Store.getConditions(options);
+      const res = await this.client.makeRequest({
+        conditions,
+        body: data,
+        key,
+        metadata: options.metadata,
+        method: "put",
+        storeName: this.name
+      });
+      const etag = res.headers.get("etag") ?? "";
+      span?.setAttributes({
+        "blobs.response.etag": etag,
+        "blobs.response.status": res.status
+      });
+      if (conditions) {
+        return res.status === STATUS_PRE_CONDITION_FAILED ? { modified: false } : { etag, modified: true };
+      }
+      if (res.status === STATUS_OK) {
+        return {
+          etag,
+          modified: true
+        };
+      }
+      throw new BlobsInternalError(res);
     });
-    const etag = res.headers.get("etag") ?? "";
-    if (conditions) {
-      return res.status === STATUS_PRE_CONDITION_FAILED ? { modified: false } : { etag, modified: true };
-    }
-    if (res.status === STATUS_OK) {
-      return {
-        etag,
-        modified: true
-      };
-    }
-    throw new BlobsInternalError(res);
   }
   async setJSON(key, data, options = {}) {
-    _Store.validateKey(key);
-    const conditions = _Store.getConditions(options);
-    const payload = JSON.stringify(data);
-    const headers = {
-      "content-type": "application/json"
-    };
-    const res = await this.client.makeRequest({
-      ...conditions,
-      body: payload,
-      headers,
-      key,
-      metadata: options.metadata,
-      method: "put",
-      storeName: this.name
-    });
-    const etag = res.headers.get("etag") ?? "";
-    if (conditions) {
-      return res.status === STATUS_PRE_CONDITION_FAILED ? { modified: false } : { etag, modified: true };
-    }
-    if (res.status === STATUS_OK) {
-      return {
-        etag,
-        modified: true
+    return withActiveSpan(getTracer(), "blobs.setJSON", async (span) => {
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.method": "PUT",
+        "blobs.data.type": "json"
+      });
+      _Store.validateKey(key);
+      const conditions = _Store.getConditions(options);
+      const payload = JSON.stringify(data);
+      const headers = {
+        "content-type": "application/json"
       };
-    }
-    throw new BlobsInternalError(res);
+      const res = await this.client.makeRequest({
+        ...conditions,
+        body: payload,
+        headers,
+        key,
+        metadata: options.metadata,
+        method: "put",
+        storeName: this.name
+      });
+      const etag = res.headers.get("etag") ?? "";
+      span?.setAttributes({
+        "blobs.response.etag": etag,
+        "blobs.response.status": res.status
+      });
+      if (conditions) {
+        return res.status === STATUS_PRE_CONDITION_FAILED ? { modified: false } : { etag, modified: true };
+      }
+      if (res.status === STATUS_OK) {
+        return {
+          etag,
+          modified: true
+        };
+      }
+      throw new BlobsInternalError(res);
+    });
   }
   static formatListResultBlob(result) {
     if (!result.key) {
@@ -595,42 +701,54 @@ var Store = class _Store {
         let done = false;
         return {
           async next() {
-            if (done) {
-              return { done: true, value: void 0 };
-            }
-            const nextParameters = { ...parameters };
-            if (currentCursor !== null) {
-              nextParameters.cursor = currentCursor;
-            }
-            const res = await client.makeRequest({
-              method: "get",
-              parameters: nextParameters,
-              storeName
-            });
-            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;
+            return withActiveSpan(getTracer(), "blobs.list.next", async (span) => {
+              span?.setAttributes({
+                "blobs.store": storeName,
+                "blobs.method": "GET",
+                "blobs.list.paginate": options?.paginate ?? false,
+                "blobs.list.done": done,
+                "blobs.list.cursor": currentCursor ?? void 0
+              });
+              if (done) {
+                return { done: true, value: void 0 };
+              }
+              const nextParameters = { ...parameters };
+              if (currentCursor !== null) {
+                nextParameters.cursor = currentCursor;
+              }
+              const res = await client.makeRequest({
+                method: "get",
+                parameters: nextParameters,
+                storeName
+              });
+              span?.setAttributes({
+                "blobs.response.status": res.status
+              });
+              let blobs = [];
+              let directories = [];
+              if (![200, 204, 404].includes(res.status)) {
+                throw new BlobsInternalError(res);
               }
-              blobs = (page.blobs ?? []).map(_Store.formatListResultBlob).filter(Boolean);
-              directories = page.directories ?? [];
-            }
-            return {
-              done: false,
-              value: {
-                blobs,
-                directories
+              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 ?? [];
               }
-            };
+              return {
+                done: false,
+                value: {
+                  blobs,
+                  directories
+                }
+              };
+            });
           }
         };
       }

package/dist/run/storage/request-scoped-in-memory-cache.cjs

@@ -1400,6 +1400,9 @@ var import_blob_types = require("../../shared/blob-types.cjs");
 var import_request_context = require("../handlers/request-context.cjs");
 var import_tracer = require("../handlers/tracer.cjs");
 var NullValue = Symbol.for("null-value");
+var isDataWithEtag = (value) => {
+  return typeof value === "object" && value !== null && "data" in value && "etag" in value;
+};
 var IN_MEMORY_CACHE_MAX_SIZE = Symbol.for("nf-in-memory-cache-max-size");
 var IN_MEMORY_LRU_CACHE = Symbol.for("nf-in-memory-lru-cache");
 var extendedGlobalThis = globalThis;
@@ -1413,24 +1416,29 @@ var isPositiveNumber = (value) => {
   return typeof value === "number" && value > 0;
 };
 var BASE_BLOB_SIZE = 25;
+var BASE_BLOB_WITH_ETAG_SIZE = BASE_BLOB_SIZE + 34;
 var estimateBlobKnownTypeSize = (valueToStore) => {
-  if (valueToStore === null || (0, import_types.isPromise)(valueToStore) || (0, import_blob_types.isTagManifest)(valueToStore)) {
+  if (valueToStore === null || (0, import_types.isPromise)(valueToStore)) {
     return BASE_BLOB_SIZE;
   }
-  if ((0, import_blob_types.isHtmlBlob)(valueToStore)) {
-    return BASE_BLOB_SIZE + valueToStore.html.length;
+  const { data, baseSize } = isDataWithEtag(valueToStore) ? { data: valueToStore.data, baseSize: BASE_BLOB_WITH_ETAG_SIZE } : { data: valueToStore, baseSize: BASE_BLOB_SIZE };
+  if ((0, import_blob_types.isTagManifest)(data)) {
+    return baseSize;
+  }
+  if ((0, import_blob_types.isHtmlBlob)(data)) {
+    return baseSize + data.html.length;
   }
-  if (valueToStore.value?.kind === "FETCH") {
-    return BASE_BLOB_SIZE + valueToStore.value.data.body.length;
+  if (data.value?.kind === "FETCH") {
+    return baseSize + data.value.data.body.length;
   }
-  if (valueToStore.value?.kind === "APP_PAGE") {
-    return BASE_BLOB_SIZE + valueToStore.value.html.length + (valueToStore.value.rscData?.length ?? 0);
+  if (data.value?.kind === "APP_PAGE") {
+    return baseSize + data.value.html.length + (data.value.rscData?.length ?? 0);
   }
-  if (valueToStore.value?.kind === "PAGE" || valueToStore.value?.kind === "PAGES") {
-    return BASE_BLOB_SIZE + valueToStore.value.html.length + JSON.stringify(valueToStore.value.pageData).length;
+  if (data.value?.kind === "PAGE" || data.value?.kind === "PAGES") {
+    return baseSize + data.value.html.length + JSON.stringify(data.value.pageData).length;
   }
-  if (valueToStore.value?.kind === "ROUTE" || valueToStore.value?.kind === "APP_ROUTE") {
-    return BASE_BLOB_SIZE + valueToStore.value.body.length;
+  if (data.value?.kind === "ROUTE" || data.value?.kind === "APP_ROUTE") {
+    return baseSize + data.value.body.length;
   }
 };
 var estimateBlobSize = (valueToStore) => {
@@ -1456,13 +1464,22 @@ var estimateBlobSize = (valueToStore) => {
 function getInMemoryLRUCache() {
   if (typeof extendedGlobalThis[IN_MEMORY_LRU_CACHE] === "undefined") {
     const maxSize = typeof extendedGlobalThis[IN_MEMORY_CACHE_MAX_SIZE] === "number" ? extendedGlobalThis[IN_MEMORY_CACHE_MAX_SIZE] : DEFAULT_FALLBACK_MAX_SIZE;
-    extendedGlobalThis[IN_MEMORY_LRU_CACHE] = maxSize === 0 ? null : new LRUCache({
-      max: 1e3,
-      maxSize,
-      sizeCalculation: (valueToStore) => {
-        return estimateBlobSize(valueToStore === NullValue ? null : valueToStore);
-      }
-    });
+    if (maxSize === 0) {
+      extendedGlobalThis[IN_MEMORY_LRU_CACHE] = null;
+    } else {
+      const global = /* @__PURE__ */ new Map();
+      const perRequest = new LRUCache({
+        max: 1e3,
+        maxSize,
+        sizeCalculation: (valueToStore) => {
+          return estimateBlobSize(valueToStore === NullValue ? null : valueToStore);
+        }
+      });
+      extendedGlobalThis[IN_MEMORY_LRU_CACHE] = {
+        perRequest,
+        global
+      };
+    }
   }
   return extendedGlobalThis[IN_MEMORY_LRU_CACHE];
 }
@@ -1473,8 +1490,27 @@ var getRequestScopedInMemoryCache = () => {
     get(key) {
       if (!requestContext) return;
       try {
-        const value = inMemoryLRUCache?.get(`${requestContext.requestID}:${key}`);
-        return value === NullValue ? null : value;
+        const currentRequestValue = inMemoryLRUCache?.perRequest.get(
+          `${requestContext.requestID}:${key}`
+        );
+        if (currentRequestValue) {
+          return {
+            conditional: false,
+            currentRequestValue: currentRequestValue === NullValue ? null : isDataWithEtag(currentRequestValue) ? currentRequestValue.data : currentRequestValue
+          };
+        }
+        const globalEntry = inMemoryLRUCache?.global.get(key);
+        if (globalEntry) {
+          const derefencedGlobalEntry = globalEntry.deref();
+          if (derefencedGlobalEntry) {
+            return {
+              conditional: true,
+              globalValue: derefencedGlobalEntry.data,
+              etag: derefencedGlobalEntry.etag
+            };
+          }
+          inMemoryLRUCache?.global.delete(key);
+        }
       } catch (error) {
         (0, import_tracer.recordWarning)(new Error("Failed to get value from memory cache", { cause: error }));
       }
@@ -1482,7 +1518,10 @@ var getRequestScopedInMemoryCache = () => {
     set(key, value) {
       if (!requestContext) return;
       try {
-        inMemoryLRUCache?.set(`${requestContext?.requestID}:${key}`, value ?? NullValue);
+        if (isDataWithEtag(value)) {
+          inMemoryLRUCache?.global.set(key, new WeakRef(value));
+        }
+        inMemoryLRUCache?.perRequest.set(`${requestContext.requestID}:${key}`, value ?? NullValue);
       } catch (error) {
         (0, import_tracer.recordWarning)(new Error("Failed to store value in memory cache", { cause: error }));
       }

package/dist/run/storage/storage.cjs

@@ -51,15 +51,32 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
     async get(key, otelSpanTitle) {
       const inMemoryCache = (0, import_request_scoped_in_memory_cache.getRequestScopedInMemoryCache)();
       const memoizedValue = inMemoryCache.get(key);
-      if (typeof memoizedValue !== "undefined") {
-        return memoizedValue;
+      if (memoizedValue?.conditional === false && typeof memoizedValue?.currentRequestValue !== "undefined") {
+        return memoizedValue.currentRequestValue;
       }
       const blobKey = await encodeBlobKey(key);
       const getPromise = (0, import_tracer.withActiveSpan)(tracer, otelSpanTitle, async (span) => {
-        span?.setAttributes({ key, blobKey });
-        const blob = await store.get(blobKey, { type: "json" });
-        inMemoryCache.set(key, blob);
-        span?.addEvent(blob ? "Hit" : "Miss");
+        const { etag: previousEtag, globalValue: previousBlob } = memoizedValue?.conditional ? memoizedValue : {};
+        span?.setAttributes({ key, blobKey, previousEtag });
+        const result = await store.getWithMetadata(blobKey, {
+          type: "json",
+          etag: previousEtag
+        });
+        const shouldReuseMemoizedBlob = result?.etag && previousEtag === result?.etag;
+        const blob = shouldReuseMemoizedBlob ? previousBlob : result?.data;
+        if (result?.etag && blob) {
+          inMemoryCache.set(key, {
+            data: blob,
+            etag: result?.etag
+          });
+        } else {
+          inMemoryCache.set(key, blob);
+        }
+        span?.setAttributes({
+          etag: result?.etag,
+          reusingPreviouslyFetchedBlob: shouldReuseMemoizedBlob,
+          status: blob ? shouldReuseMemoizedBlob ? "Hit, no change" : "Hit" : "Miss"
+        });
         return blob;
       });
       inMemoryCache.set(key, getPromise);
@@ -71,7 +88,14 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
       const blobKey = await encodeBlobKey(key);
       return (0, import_tracer.withActiveSpan)(tracer, otelSpanTitle, async (span) => {
         span?.setAttributes({ key, blobKey });
-        return await store.setJSON(blobKey, value);
+        const writeResult = await store.setJSON(blobKey, value);
+        if (writeResult?.etag) {
+          inMemoryCache.set(key, {
+            data: value,
+            etag: writeResult.etag
+          });
+        }
+        return writeResult;
       });
     }
   };

package/edge-runtime/shim/node.js

@@ -1,16 +1,21 @@
 // NOTE: This is a fragment of a JavaScript program that will be inlined with
 // a Webpack bundle. You should not import this file from anywhere in the
 // application.
-import { AsyncLocalStorage } from 'node:async_hooks'
-
 import { createRequire } from 'node:module' // used in dynamically generated part
-import process from 'node:process'
 
 import { registerCJSModules } from '../edge-runtime/lib/cjs.ts' // used in dynamically generated part
 
-globalThis.process = process
+if (typeof process === 'undefined') {
+  globalThis.process = (await import('node:process')).default
+}
+
+if (typeof AsyncLocalStorage === 'undefined') {
+  globalThis.AsyncLocalStorage = (await import('node:async_hooks')).AsyncLocalStorage
+}
 
-globalThis.AsyncLocalStorage = AsyncLocalStorage
+if (typeof Buffer === 'undefined') {
+  globalThis.Buffer = (await import('node:buffer')).Buffer
+}
 
 // needed for path.relative and path.resolve to work
 Deno.cwd = () => ''

package/package.json

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