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

package/README.md

@@ -3,6 +3,29 @@
 Next.js is supported natively on Netlify, and in most cases you will not need to install or
 configure anything. This repo includes the packages used to support Next.js on Netlify.
 
+## Lambda Folder structure:
+
+For a simple next.js app
+
+```
+/___netlify-server-handler
+├── .netlify
+│   ├── tags-manifest.json
+│   └── dist // the compiled runtime code
+│       └── run
+│           ├── handlers
+│           │   ├── server.js
+│           │   └── cache.cjs
+│           └── next.cjs
+├── .next // or distDir name from the next.config.js
+│   └── // content from standalone
+├── run-config.json // the config object from the required-server-files.json
+├── node_modules
+├── ___netlify-server-handler.json
+├── ___netlify-server-handler.mjs
+└── package.json
+```
+
 ## Testing
 
 ### Integration testing

package/dist/build/cache.js

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

package/dist/build/content/prerendered.js

@@ -7,8 +7,9 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "../../esm-chunks/chunk-XFDUV7DP.js";
+} from "../../esm-chunks/chunk-67EWAGDQ.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
+import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   copyFetchContent,

package/dist/build/content/server.js

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

package/dist/build/functions/edge.js

@@ -6,10 +6,9 @@
     
 import {
   createEdgeHandlers
-} from "../../esm-chunks/chunk-ETPYUOBQ.js";
-import "../../esm-chunks/chunk-IZ2AVCVF.js";
+} from "../../esm-chunks/chunk-YIE34LVX.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
+import "../../esm-chunks/chunk-DWC6JSN7.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   createEdgeHandlers

package/dist/build/functions/server.js

@@ -6,11 +6,11 @@
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-WSPFUAK4.js";
-import "../../esm-chunks/chunk-YMFYCTRI.js";
-import "../../esm-chunks/chunk-IZ2AVCVF.js";
+} from "../../esm-chunks/chunk-T6AZTXZF.js";
+import "../../esm-chunks/chunk-4J4A5OE2.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
+import "../../esm-chunks/chunk-DWC6JSN7.js";
+import "../../esm-chunks/chunk-UYKENJEU.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   createServerHandler

package/dist/build/image-cdn.js

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

package/dist/build/plugin-context.js

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

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

@@ -1,4 +1,4 @@
-import tracing, { trace } from '{{cwd}}/dist/run/handlers/tracing.js'
+import tracing, { trace } from '{{cwd}}/.netlify/dist/run/handlers/tracing.js'
 
 process.chdir('{{cwd}}')
 
@@ -8,36 +8,39 @@ export default async function (req, context) {
     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()
+  /** @type {import('@opentelemetry/api').Tracer} */
+  const tracer = trace.getTracer('Next.js Runtime')
+  return tracer.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)
+      if (error instanceof Error) {
+        span.addEvent({ name: error.name, message: error.message })
+      }
+      throw error
+    } finally {
+      span.end()
+    }
+  })
 }
 
 export const config = {

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

@@ -1,34 +1,40 @@
-import serverHandler from './dist/run/handlers/server.js'
-import tracing, { trace } from './dist/run/handlers/tracing.js'
+import serverHandler from './.netlify/dist/run/handlers/server.js'
+import tracing, { trace } from './.netlify/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()
+
+  /** @type {import('@opentelemetry/api').Tracer} */
+  const tracer = trace.getTracer('Next.js Runtime')
+  return tracer.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: false,
+        cwd: process.cwd(),
+      })
+      const response = await serverHandler(req, context)
+      span.setAttributes({
+        'http.status_code': response.status,
+      })
+      return response
+    } catch (error) {
+      span.recordException(error)
+      if (error instanceof Error) {
+        span.addEvent({ name: error.name, message: error.message })
       }
-    })
+      throw error
+    } finally {
+      span.end()
+    }
+  })
 }
 
 export const config = {

package/dist/esm-chunks/{chunk-YMFYCTRI.js → chunk-4J4A5OE2.js}

@@ -7,6 +7,9 @@
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
+import {
+  RUN_CONFIG
+} from "./chunk-UYKENJEU.js";
 import {
   __toESM
 } from "./chunk-5JVNISGM.js";
@@ -18,8 +21,25 @@ import { cp, mkdir, readFile, readdir, readlink, symlink, writeFile } from "node
 import { createRequire } from "node:module";
 import { dirname, join, resolve } from "node:path";
 var copyNextServerCode = async (ctx) => {
-  const srcDir = join(ctx.standaloneDir, ".next");
-  const destDir = join(ctx.serverHandlerDir, ".next");
+  const reqServerFilesPath = join(
+    ctx.standaloneRootDir,
+    ctx.relPublishDir,
+    "required-server-files.json"
+  );
+  const reqServerFiles = JSON.parse(await readFile(reqServerFilesPath, "utf-8"));
+  if (ctx.distDir.replace(new RegExp(`^${ctx.packagePath}/?`), "") !== reqServerFiles.config.distDir) {
+    reqServerFiles.config.distDir = ctx.nextDistDir;
+    await writeFile(reqServerFilesPath, JSON.stringify(reqServerFiles));
+  }
+  await mkdir(ctx.serverHandlerDir, { recursive: true });
+  await writeFile(
+    join(ctx.serverHandlerDir, RUN_CONFIG),
+    JSON.stringify(reqServerFiles.config),
+    "utf-8"
+  );
+  const srcDir = join(ctx.standaloneDir, ctx.nextDistDir);
+  const nextFolder = ctx.distDir === ctx.buildConfig.distDir ? ctx.distDir : ctx.nextDistDir;
+  const destDir = join(ctx.serverHandlerDir, nextFolder);
   const paths = await (0, import_fast_glob.default)(
     [`*`, `server/*`, `server/chunks/*`, `server/edge-chunks/*`, `server/+(app|pages)/**/*.js`],
     {
@@ -67,7 +87,7 @@ async function recreateNodeModuleSymlinks(src, dest, org) {
 var copyNextDependencies = async (ctx) => {
   const entries = await readdir(ctx.standaloneDir);
   const promises = entries.map(async (entry) => {
-    if (entry === "package.json" || entry === ".next") {
+    if (entry === "package.json" || entry === ctx.nextDistDir) {
       return;
     }
     const src = join(ctx.standaloneDir, entry);

package/dist/esm-chunks/{chunk-XFDUV7DP.js → chunk-67EWAGDQ.js}

@@ -7,6 +7,9 @@
 import {
   require_out
 } from "./chunk-VZNKO4OO.js";
+import {
+  encodeBlobKey
+} from "./chunk-TYCYFZ22.js";
 import {
   __toESM
 } from "./chunk-5JVNISGM.js";
@@ -14,13 +17,25 @@ import {
 // src/build/content/prerendered.ts
 var import_fast_glob = __toESM(require_out(), 1);
 import { existsSync } from "node:fs";
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+var writeCacheEntry = async (route, value, lastModified, ctx) => {
+  const path = join(ctx.blobDir, await encodeBlobKey(route));
+  const entry = JSON.stringify({
+    lastModified,
+    value
+  });
+  await mkdir(dirname(path), { recursive: true });
+  await writeFile(path, entry, "utf-8");
+};
 var routeToFilePath = (path) => path === "/" ? "/index" : path;
 var buildPagesCacheValue = async (path) => ({
   kind: "PAGE",
   html: await readFile(`${path}.html`, "utf-8"),
-  pageData: JSON.parse(await readFile(`${path}.json`, "utf-8"))
+  pageData: JSON.parse(await readFile(`${path}.json`, "utf-8")),
+  postponed: void 0,
+  headers: void 0,
+  status: void 0
 });
 var buildAppCacheValue = async (path) => ({
   kind: "PAGE",
@@ -42,39 +57,32 @@ var copyPrerenderedContent = async (ctx) => {
     const manifest = await ctx.getPrerenderManifest();
     await Promise.all(
       Object.entries(manifest.routes).map(async ([route, meta]) => {
+        const lastModified = meta.initialRevalidateSeconds ? Date.now() - 31536e6 : Date.now();
         const key = routeToFilePath(route);
         let value;
-        let path;
         switch (true) {
           case (meta.dataRoute?.endsWith("/default.rsc") && !existsSync(join(ctx.publishDir, "server/app", `${key}.html`))):
             return;
           case meta.dataRoute?.endsWith(".json"):
-            path = join(ctx.publishDir, "server/pages", key);
-            value = await buildPagesCacheValue(path);
+            value = await buildPagesCacheValue(join(ctx.publishDir, "server/pages", key));
             break;
           case meta.dataRoute?.endsWith(".rsc"):
-            path = join(ctx.publishDir, "server/app", key);
-            value = await buildAppCacheValue(path);
+            value = await buildAppCacheValue(join(ctx.publishDir, "server/app", key));
             break;
           case meta.dataRoute === null:
-            path = join(ctx.publishDir, "server/app", key);
-            value = await buildRouteCacheValue(path);
+            value = await buildRouteCacheValue(join(ctx.publishDir, "server/app", key));
             break;
           default:
             throw new Error(`Unrecognized content: ${route}`);
         }
-        await ctx.writeCacheEntry(
-          key,
-          value,
-          meta.dataRoute === null ? `${path}.body` : `${path}.html`
-        );
+        await writeCacheEntry(key, value, lastModified, ctx);
       })
     );
     if (existsSync(join(ctx.publishDir, `server/app/_not-found.html`))) {
+      const lastModified = Date.now();
       const key = "/404";
-      const path = join(ctx.publishDir, "server/app/_not-found");
-      const value = await buildAppCacheValue(path);
-      await ctx.writeCacheEntry(key, value, `${path}.html`);
+      const value = await buildAppCacheValue(join(ctx.publishDir, "server/app/_not-found"));
+      await writeCacheEntry(key, value, lastModified, ctx);
     }
   } catch (error) {
     ctx.failBuild("Failed assembling prerendered content for upload", error);
@@ -82,15 +90,16 @@ var copyPrerenderedContent = async (ctx) => {
 };
 var copyFetchContent = async (ctx) => {
   try {
-    const paths = await (0, import_fast_glob.default)(["!(*.*)"], {
+    const paths = await (0, import_fast_glob.glob)(["!(*.*)"], {
       cwd: join(ctx.publishDir, "cache/fetch-cache"),
       extglob: true
     });
     await Promise.all(
       paths.map(async (key) => {
+        const lastModified = Date.now() - 31536e6;
         const path = join(ctx.publishDir, "cache/fetch-cache", key);
         const value = await buildFetchCacheValue(path);
-        await ctx.writeCacheEntry(key, value, path);
+        await writeCacheEntry(key, value, lastModified, ctx);
       })
     );
   } catch (error) {

package/dist/esm-chunks/chunk-72ZI2IVI.js

@@ -0,0 +1,36 @@
+
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+
+// src/build/cache.ts
+import { existsSync } from "node:fs";
+import { rm } from "node:fs/promises";
+import { join } from "node:path";
+var saveBuildCache = async (ctx) => {
+  const { cache } = ctx.utils;
+  const cacheDir = join(ctx.publishDir, "cache");
+  if (existsSync(cacheDir)) {
+    await rm(join(cacheDir, "fetch-cache"), { recursive: true, force: true });
+    await cache.save(cacheDir);
+    console.log("Next.js cache saved");
+  } else {
+    console.log("No Next.js cache to save");
+  }
+};
+var restoreBuildCache = async (ctx) => {
+  const { cache } = ctx.utils;
+  const cacheDir = join(ctx.publishDir, "cache");
+  if (await cache.restore(cacheDir)) {
+    console.log("Next.js cache restored");
+  } else {
+    console.log("No Next.js cache to restore");
+  }
+};
+
+export {
+  saveBuildCache,
+  restoreBuildCache
+};

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

@@ -536,7 +536,7 @@ var mapHeaderValues = (header, callback) => {
 };
 var setVaryHeaders = (headers, request, { basePath, i18n }) => {
   const netlifyVaryValues = {
-    headers: [],
+    headers: ["x-nextjs-data"],
     languages: [],
     cookies: ["__prerender_bypass", "__next_preview_data"]
   };
@@ -553,7 +553,13 @@ var setVaryHeaders = (headers, request, { basePath, i18n }) => {
   headers.set(`netlify-vary`, generateNetlifyVaryValues(netlifyVaryValues));
 };
 var fetchBeforeNextPatchedIt = globalThis.fetch;
-var adjustDateHeader = async (headers, request, span, tracer) => {
+var adjustDateHeader = async ({
+  headers,
+  request,
+  span,
+  tracer,
+  requestContext
+}) => {
   const cacheState = headers.get("x-nextjs-cache");
   const isServedFromCache = cacheState === "HIT" || cacheState === "STALE";
   span.setAttributes({
@@ -564,22 +570,43 @@ var adjustDateHeader = async (headers, request, span, tracer) => {
     return;
   }
   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;
-    }
-  );
+  let lastModified;
+  if (requestContext.responseCacheGetLastModified) {
+    lastModified = requestContext.responseCacheGetLastModified;
+  } else {
+    span.recordException(
+      new Error("lastModified not found in requestContext, falling back to trying blobs")
+    );
+    span.setAttributes({
+      severity: "alert",
+      warning: true
+    });
+    const blobKey = await encodeBlobKey(key);
+    const blobStore = getDeployStore({ fetch: fetchBeforeNextPatchedIt, consistency: "strong" });
+    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.lastModified;
+      }
+    );
+  }
   if (!lastModified) {
+    span.recordException(
+      new Error(
+        "lastModified not found in either requestContext or blobs, date header for cached response is not set"
+      )
+    );
+    span.setAttributes({
+      severity: "alert",
+      warning: true
+    });
     return;
   }
   const lastModifiedDate = new Date(lastModified);
@@ -589,29 +616,34 @@ var adjustDateHeader = async (headers, request, span, tracer) => {
 var setCacheControlHeaders = (headers, request) => {
   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 privateCacheControl = omitHeaderValues(cacheControl, [
+    const browserCacheControl = omitHeaderValues(cacheControl, [
       "s-maxage",
       "stale-while-revalidate"
     ]);
-    const sharedCacheControl = mapHeaderValues(
-      cacheControl,
-      (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
+    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" : mapHeaderValues(
+        cacheControl,
+        (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
+      )
     );
-    headers.set("cache-control", privateCacheControl || "public, max-age=0, must-revalidate");
-    headers.set("netlify-cdn-cache-control", sharedCacheControl);
+    headers.set("cache-control", browserCacheControl || "public, max-age=0, must-revalidate");
+    headers.set("netlify-cdn-cache-control", cdnCacheControl);
   }
 };
 var setCacheTagsHeaders = (headers, request, manifest) => {
   const path = new URL(request.url).pathname;
   const tags = manifest[path];
-  headers.set("cache-tag", tags);
+  if (tags !== void 0) {
+    headers.set("netlify-cache-tag", tags);
+  }
 };
 var NEXT_CACHE_TO_CACHE_STATUS = {
   HIT: `hit`,
   MISS: `fwd=miss`,
   STALE: `hit; fwd=stale`
 };
-var handleNextCacheHeader = (headers) => {
+var setCacheStatusHeader = (headers) => {
   const nextCache = headers.get("x-nextjs-cache");
   if (typeof nextCache === "string") {
     if (nextCache in NEXT_CACHE_TO_CACHE_STATUS) {
@@ -627,5 +659,5 @@ export {
   adjustDateHeader,
   setCacheControlHeaders,
   setCacheTagsHeaders,
-  handleNextCacheHeader
+  setCacheStatusHeader
 };