@netlify/plugin-nextjs 4.23.2 → 4.23.3

package/lib/helpers/edge.js

@@ -5,6 +5,7 @@ exports.enableEdgeInNextConfig = exports.writeEdgeFunctions = exports.writeDevEd
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
+const config_1 = require("./config");
 const loadMiddlewareManifest = (netlifyConfig) => {
     const middlewarePath = (0, path_1.resolve)(netlifyConfig.build.publish, 'server', 'middleware-manifest.json');
     if (!(0, fs_1.existsSync)(middlewarePath)) {
@@ -107,6 +108,10 @@ const writeEdgeFunctions = async (netlifyConfig) => {
     const edgeFunctionRoot = (0, path_1.resolve)('.netlify', 'edge-functions');
     await (0, fs_extra_1.emptyDir)(edgeFunctionRoot);
     await (0, fs_extra_1.copy)(getEdgeTemplatePath('../edge-shared'), (0, path_1.join)(edgeFunctionRoot, 'edge-shared'));
+    const { publish } = netlifyConfig.build;
+    const nextConfigFile = await (0, config_1.getRequiredServerFiles)(publish);
+    const nextConfig = nextConfigFile.config;
+    await (0, fs_extra_1.writeJSON)((0, path_1.join)(edgeFunctionRoot, 'edge-shared', 'nextConfig.json'), nextConfig);
     if (!process.env.NEXT_DISABLE_EDGE_IMAGES) {
         console.log('Using Netlify Edge Functions for image format detection. Set env var "NEXT_DISABLE_EDGE_IMAGES=true" to disable.');
         const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, 'ipx');

package/lib/templates/getHandler.js

@@ -103,13 +103,13 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
                 // Long-expiry TTL is basically no TTL, so we'll skip it
                 if (ttl > 0 && ttl < ONE_YEAR_IN_SECONDS) {
                     result.ttl = ttl;
-                    requestMode = 'isr';
+                    requestMode = `odb ttl=${ttl}`;
                 }
             }
             multiValueHeaders['cache-control'] = ['public, max-age=0, must-revalidate'];
         }
-        multiValueHeaders['x-render-mode'] = [requestMode];
-        console.log(`[${event.httpMethod}] ${event.path} (${requestMode === null || requestMode === void 0 ? void 0 : requestMode.toUpperCase()}${result.ttl > 0 ? ` ${result.ttl}s` : ''})`);
+        multiValueHeaders['x-nf-render-mode'] = [requestMode];
+        console.log(`[${event.httpMethod}] ${event.path} (${requestMode === null || requestMode === void 0 ? void 0 : requestMode.toUpperCase()})`);
         return {
             ...result,
             multiValueHeaders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.23.2",
+  "version": "4.23.3",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [

package/src/templates/edge/runtime.ts

@@ -1,6 +1,7 @@
 import type { Context } from 'https://edge.netlify.com'
 // Available at build time
 import matchers from './matchers.json' assert { type: 'json' }
+import nextConfig from '../edge-shared/nextConfig.json' assert { type: 'json' }
 import edgeFunction from './bundle.js'
 import { buildResponse } from '../edge-shared/utils.ts'
 import { getMiddlewareRouteMatcher, MiddlewareRouteMatch, searchParamsToUrlQuery } from '../edge-shared/next-utils.ts'
@@ -32,7 +33,7 @@ export interface RequestData {
     name?: string
     params?: { [key: string]: string }
   }
-  url: string
+  url: URL
   body?: ReadableStream<Uint8Array>
 }
 
@@ -81,10 +82,11 @@ const handler = async (req: Request, context: Context) => {
   const request: RequestData = {
     headers: Object.fromEntries(req.headers.entries()),
     geo,
-    url: url.toString(),
+    url,
     method: req.method,
     ip: context.ip,
     body: req.body ?? undefined,
+    nextConfig,
   }
 
   try {