@netlify/plugin-nextjs 5.0.0-beta.6 → 5.0.0-beta.8

package/dist/build/cache.js

@@ -8,7 +8,7 @@ import {
   restoreBuildCache,
   saveBuildCache
 } from "../esm-chunks/chunk-XA2CZH5Y.js";
-import "../esm-chunks/chunk-WELZ7LFO.js";
+import "../esm-chunks/chunk-5JVNISGM.js";
 export {
   restoreBuildCache,
   saveBuildCache

package/dist/build/content/prerendered.js

@@ -7,9 +7,9 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "../../esm-chunks/chunk-UDWVXRI2.js";
-import "../../esm-chunks/chunk-MFN4GH7U.js";
-import "../../esm-chunks/chunk-WELZ7LFO.js";
+} from "../../esm-chunks/chunk-XFDUV7DP.js";
+import "../../esm-chunks/chunk-VZNKO4OO.js";
+import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   copyFetchContent,
   copyPrerenderedContent

package/dist/build/content/server.js

@@ -8,9 +8,9 @@ import {
   copyNextDependencies,
   copyNextServerCode,
   writeTagsManifest
-} from "../../esm-chunks/chunk-COJ526HO.js";
-import "../../esm-chunks/chunk-MFN4GH7U.js";
-import "../../esm-chunks/chunk-WELZ7LFO.js";
+} from "../../esm-chunks/chunk-YMFYCTRI.js";
+import "../../esm-chunks/chunk-VZNKO4OO.js";
+import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   copyNextDependencies,
   copyNextServerCode,

package/dist/build/content/static.js

@@ -9,10 +9,10 @@ import {
   copyStaticContent,
   publishStaticDir,
   unpublishStaticDir
-} from "../../esm-chunks/chunk-AMJYZZKR.js";
-import "../../esm-chunks/chunk-MFN4GH7U.js";
+} from "../../esm-chunks/chunk-ZWFKLYLH.js";
+import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
-import "../../esm-chunks/chunk-WELZ7LFO.js";
+import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   copyStaticAssets,
   copyStaticContent,

package/dist/build/functions/edge.js

@@ -6,11 +6,11 @@
     
 import {
   createEdgeHandlers
-} from "../../esm-chunks/chunk-PCJY2SS7.js";
-import "../../esm-chunks/chunk-MFN4GH7U.js";
+} from "../../esm-chunks/chunk-ETPYUOBQ.js";
 import "../../esm-chunks/chunk-IZ2AVCVF.js";
+import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
-import "../../esm-chunks/chunk-WELZ7LFO.js";
+import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   createEdgeHandlers
 };

package/dist/build/functions/server.js

@@ -6,12 +6,12 @@
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-KDRFBPAR.js";
-import "../../esm-chunks/chunk-COJ526HO.js";
-import "../../esm-chunks/chunk-MFN4GH7U.js";
+} from "../../esm-chunks/chunk-WSPFUAK4.js";
+import "../../esm-chunks/chunk-YMFYCTRI.js";
 import "../../esm-chunks/chunk-IZ2AVCVF.js";
+import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
-import "../../esm-chunks/chunk-WELZ7LFO.js";
+import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   createServerHandler
 };

package/dist/build/image-cdn.js

@@ -7,7 +7,7 @@
 import {
   setImageConfig
 } from "../esm-chunks/chunk-EPSI5TTB.js";
-import "../esm-chunks/chunk-WELZ7LFO.js";
+import "../esm-chunks/chunk-5JVNISGM.js";
 export {
   setImageConfig
 };

package/dist/build/plugin-context.js

@@ -10,7 +10,7 @@ import {
   SERVER_HANDLER_NAME
 } from "../esm-chunks/chunk-IZ2AVCVF.js";
 import "../esm-chunks/chunk-TYCYFZ22.js";
-import "../esm-chunks/chunk-WELZ7LFO.js";
+import "../esm-chunks/chunk-5JVNISGM.js";
 export {
   EDGE_HANDLER_NAME,
   PluginContext,

package/dist/build/templates/handler-monorepo.tmpl.js

@@ -0,0 +1,46 @@
+import tracing, { trace } from '{{cwd}}/dist/run/handlers/tracing.js'
+
+process.chdir('{{cwd}}')
+
+let cachedHandler
+export default async function (req, context) {
+  if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL) {
+    tracing.start()
+  }
+
+  return trace
+    .getTracer('Next.js Runtime')
+    .startActiveSpan('Next.js Server Handler', async (span) => {
+      try {
+        span.setAttributes({
+          'account.id': context.account.id,
+          'deploy.id': context.deploy.id,
+          'request.id': context.requestId,
+          'site.id': context.site.id,
+          'http.method': req.method,
+          'http.target': req.url,
+          monorepo: true,
+          cwd: '{{cwd}}',
+        })
+        if (!cachedHandler) {
+          const { default: handler } = await import('./{{nextServerHandler}}')
+          cachedHandler = handler
+        }
+        const response = await cachedHandler(req, context)
+        span.setAttributes({
+          'http.status_code': response.status,
+        })
+        return response
+      } catch (error) {
+        span.recordException(error)
+        throw error
+      } finally {
+        span.end()
+      }
+    })
+}
+
+export const config = {
+  path: '/*',
+  preferStatic: true,
+}

package/dist/build/templates/handler.tmpl.js

@@ -0,0 +1,37 @@
+import serverHandler from './dist/run/handlers/server.js'
+import tracing, { trace } from './dist/run/handlers/tracing.js'
+
+export default async function handler(req, context) {
+  if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL) {
+    tracing.start()
+  }
+  return trace
+    .getTracer('Next.js Runtime')
+    .startActiveSpan('Next.js Server Handler', async (span) => {
+      try {
+        span.setAttributes({
+          'account.id': context.account.id,
+          'deploy.id': context.deploy.id,
+          'request.id': context.requestId,
+          'site.id': context.site.id,
+          'http.method': req.method,
+          'http.target': req.url,
+        })
+        const response = await serverHandler(req, context)
+        span.setAttributes({
+          'http.status_code': response.status,
+        })
+        return response
+      } catch (error) {
+        span.recordException(error)
+        throw error
+      } finally {
+        span.end()
+      }
+    })
+}
+
+export const config = {
+  path: '/*',
+  preferStatic: true,
+}

package/dist/esm-chunks/{chunk-WELZ7LFO.js → chunk-5JVNISGM.js}

@@ -17,9 +17,16 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
 var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -36,9 +43,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 export {
   __require,
+  __esm,
   __commonJS,
-  __toESM
+  __export,
+  __toESM,
+  __toCommonJS
 };

package/dist/esm-chunks/{chunk-PCJY2SS7.js → chunk-ETPYUOBQ.js}

@@ -4,15 +4,15 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  require_out
-} from "./chunk-MFN4GH7U.js";
 import {
   EDGE_HANDLER_NAME
 } from "./chunk-IZ2AVCVF.js";
+import {
+  require_out
+} from "./chunk-VZNKO4OO.js";
 import {
   __toESM
-} from "./chunk-WELZ7LFO.js";
+} from "./chunk-5JVNISGM.js";
 
 // src/build/functions/edge.ts
 var import_fast_glob = __toESM(require_out(), 1);

package/dist/esm-chunks/{chunk-X7XIMV6B.js → chunk-HYBEXB2Z.js}

@@ -8,7 +8,7 @@ import {
   __commonJS,
   __require,
   __toESM
-} from "./chunk-WELZ7LFO.js";
+} from "./chunk-5JVNISGM.js";
 
 // node_modules/@netlify/functions/dist/lib/system_logger.js
 var require_system_logger = __commonJS({

package/dist/esm-chunks/{chunk-W5TLWQMF.js → chunk-N23TUUXK.js}

@@ -15,6 +15,14 @@ import { Buffer as Buffer2 } from "buffer";
 import { Buffer as Buffer3 } from "buffer";
 import stream from "stream";
 import { promisify } from "util";
+var BlobsConsistencyError = class extends Error {
+  constructor() {
+    super(
+      `Netlify Blobs has failed to perform a read using strong consistency because the environment has not been configured with a 'uncachedEdgeURL' property`
+    );
+    this.name = "BlobsConsistencyError";
+  }
+};
 var getEnvironmentContext = () => {
   const context = globalThis.netlifyBlobsContext || env.NETLIFY_BLOBS_CONTEXT;
   if (typeof context !== "string" || !context) {
@@ -106,21 +114,34 @@ var sleep = (ms) => new Promise((resolve2) => {
   setTimeout(resolve2, ms);
 });
 var Client = class {
-  constructor({ apiURL, edgeURL, fetch, siteID, token }) {
+  constructor({ apiURL, consistency, edgeURL, fetch, siteID, token, uncachedEdgeURL }) {
     this.apiURL = apiURL;
+    this.consistency = consistency ?? "eventual";
     this.edgeURL = edgeURL;
     this.fetch = fetch ?? globalThis.fetch;
     this.siteID = siteID;
     this.token = token;
+    this.uncachedEdgeURL = uncachedEdgeURL;
     if (!this.fetch) {
       throw new Error(
         "Netlify Blobs could not find a `fetch` client in the global scope. You can either update your runtime to a version that includes `fetch` (like Node.js 18.0.0 or above), or you can supply your own implementation using the `fetch` property."
       );
     }
   }
-  async getFinalRequest({ key, metadata, method, parameters = {}, storeName }) {
+  async getFinalRequest({
+    consistency: opConsistency,
+    key,
+    metadata,
+    method,
+    parameters = {},
+    storeName
+  }) {
     const encodedMetadata = encodeMetadata(metadata);
+    const consistency = opConsistency ?? this.consistency;
     if (this.edgeURL) {
+      if (consistency === "strong" && !this.uncachedEdgeURL) {
+        throw new BlobsConsistencyError();
+      }
       const headers = {
         authorization: `Bearer ${this.token}`
       };
@@ -128,7 +149,7 @@ var Client = class {
         headers[METADATA_HEADER_INTERNAL] = encodedMetadata;
       }
       const path = key ? `/${this.siteID}/${storeName}/${key}` : `/${this.siteID}/${storeName}`;
-      const url2 = new URL(path, this.edgeURL);
+      const url2 = new URL(path, consistency === "strong" ? this.uncachedEdgeURL : this.edgeURL);
       for (const key2 in parameters) {
         url2.searchParams.set(key2, parameters[key2]);
       }
@@ -172,6 +193,7 @@ var Client = class {
   }
   async makeRequest({
     body,
+    consistency,
     headers: extraHeaders,
     key,
     metadata,
@@ -180,6 +202,7 @@ var Client = class {
     storeName
   }) {
     const { headers: baseHeaders = {}, url } = await this.getFinalRequest({
+      consistency,
       key,
       metadata,
       method,
@@ -213,10 +236,12 @@ var getClientOptions = (options, contextOverride) => {
   }
   const clientOptions = {
     apiURL: context.apiURL ?? options.apiURL,
+    consistency: options.consistency,
     edgeURL: context.edgeURL ?? options.edgeURL,
     fetch: options.fetch,
     siteID,
-    token
+    token,
+    uncachedEdgeURL: context.uncachedEdgeURL ?? options.uncachedEdgeURL
   };
   return clientOptions;
 };
@@ -236,6 +261,7 @@ var collectIterator = async (iterator) => {
 var Store = class _Store {
   constructor(options) {
     this.client = options.client;
+    this.consistency = options.consistency ?? "eventual";
     if ("deployID" in options) {
       _Store.validateDeployID(options.deployID);
       this.name = `deploy:${options.deployID}`;
@@ -251,8 +277,8 @@ var Store = class _Store {
     }
   }
   async get(key, options) {
-    const { type } = options ?? {};
-    const res = await this.client.makeRequest({ key, method: "get", storeName: this.name });
+    const { consistency, type } = options ?? {};
+    const res = await this.client.makeRequest({ consistency, key, method: "get", storeName: this.name });
     if (res.status === 404) {
       return null;
     }
@@ -276,8 +302,8 @@ var Store = class _Store {
     }
     throw new BlobsInternalError(res.status);
   }
-  async getMetadata(key) {
-    const res = await this.client.makeRequest({ key, method: "head", storeName: this.name });
+  async getMetadata(key, { consistency } = {}) {
+    const res = await this.client.makeRequest({ consistency, key, method: "head", storeName: this.name });
     if (res.status === 404) {
       return null;
     }
@@ -293,9 +319,15 @@ var Store = class _Store {
     return result;
   }
   async getWithMetadata(key, options) {
-    const { etag: requestETag, type } = options ?? {};
+    const { consistency, etag: requestETag, type } = options ?? {};
     const headers = requestETag ? { "if-none-match": requestETag } : void 0;
-    const res = await this.client.makeRequest({ headers, key, method: "get", storeName: this.name });
+    const res = await this.client.makeRequest({
+      consistency,
+      headers,
+      key,
+      method: "get",
+      storeName: this.name
+    });
     if (res.status === 404) {
       return null;
     }
@@ -520,14 +552,33 @@ var setVaryHeaders = (headers, request, { basePath, i18n }) => {
   }
   headers.set(`netlify-vary`, generateNetlifyVaryValues(netlifyVaryValues));
 };
-var adjustDateHeader = async (headers, request) => {
-  if (headers.get("x-nextjs-cache") !== "HIT") {
+var fetchBeforeNextPatchedIt = globalThis.fetch;
+var adjustDateHeader = async (headers, request, span, tracer) => {
+  const cacheState = headers.get("x-nextjs-cache");
+  const isServedFromCache = cacheState === "HIT" || cacheState === "STALE";
+  span.setAttributes({
+    "x-nextjs-cache": cacheState ?? void 0,
+    isServedFromCache
+  });
+  if (!isServedFromCache) {
     return;
   }
-  const path = new URL(request.url).pathname;
-  const key = await encodeBlobKey(path);
-  const blobStore = getDeployStore();
-  const { lastModified } = await blobStore.get(key, { type: "json" }) ?? {};
+  const key = new URL(request.url).pathname;
+  const blobKey = await encodeBlobKey(key);
+  const blobStore = getDeployStore({ fetch: fetchBeforeNextPatchedIt });
+  const { lastModified } = await tracer.startActiveSpan(
+    "get cache to calculate date header",
+    async (getBlobForDateSpan) => {
+      getBlobForDateSpan.setAttributes({
+        key,
+        blobKey
+      });
+      const blob = await blobStore.get(blobKey, { type: "json" }) ?? {};
+      getBlobForDateSpan.addEvent(blob ? "Cache hit" : "Cache miss");
+      getBlobForDateSpan.end();
+      return blob;
+    }
+  );
   if (!lastModified) {
     return;
   }
@@ -557,7 +608,8 @@ var setCacheTagsHeaders = (headers, request, manifest) => {
 };
 var NEXT_CACHE_TO_CACHE_STATUS = {
   HIT: `hit`,
-  MISS: `miss,`
+  MISS: `fwd=miss`,
+  STALE: `hit; fwd=stale`
 };
 var handleNextCacheHeader = (headers) => {
   const nextCache = headers.get("x-nextjs-cache");