@netlify/plugin-nextjs 4.23.2 → 4.23.4

package/lib/helpers/edge.js

@@ -1,10 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableEdgeInNextConfig = exports.writeEdgeFunctions = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadMiddlewareManifest = void 0;
 /* eslint-disable max-lines */
 const fs_1 = require("fs");
 const path_1 = require("path");
+const chalk_1 = require("chalk");
+const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
+const outdent_1 = require("outdent");
+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)) {
@@ -106,8 +113,12 @@ const writeEdgeFunctions = async (netlifyConfig) => {
     };
     const edgeFunctionRoot = (0, path_1.resolve)('.netlify', 'edge-functions');
     await (0, fs_extra_1.emptyDir)(edgeFunctionRoot);
+    const { publish } = netlifyConfig.build;
+    const nextConfigFile = await (0, config_1.getRequiredServerFiles)(publish);
+    const nextConfig = nextConfigFile.config;
     await (0, fs_extra_1.copy)(getEdgeTemplatePath('../edge-shared'), (0, path_1.join)(edgeFunctionRoot, 'edge-shared'));
-    if (!process.env.NEXT_DISABLE_EDGE_IMAGES) {
+    await (0, fs_extra_1.writeJSON)((0, path_1.join)(edgeFunctionRoot, 'edge-shared', 'nextConfig.json'), nextConfig);
+    if (!(0, destr_1.default)(process.env.NEXT_DISABLE_EDGE_IMAGES) && !(0, destr_1.default)(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
         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');
         await (0, fs_extra_1.ensureDir)(edgeFunctionDir);
@@ -118,13 +129,15 @@ const writeEdgeFunctions = async (netlifyConfig) => {
             path: '/_next/image*',
         });
     }
-    if (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1') {
+    if (!(0, destr_1.default)(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
         const middlewareManifest = await (0, exports.loadMiddlewareManifest)(netlifyConfig);
         if (!middlewareManifest) {
             console.error("Couldn't find the middleware manifest");
             return;
         }
+        let usesEdge = false;
         for (const middleware of middlewareManifest.sortedMiddleware) {
+            usesEdge = true;
             const edgeFunctionDefinition = middlewareManifest.middleware[middleware];
             const functionDefinitions = await writeEdgeFunction({
                 edgeFunctionDefinition,
@@ -137,6 +150,7 @@ const writeEdgeFunctions = async (netlifyConfig) => {
         // No, the version field was not incremented
         if (typeof middlewareManifest.functions === 'object') {
             for (const edgeFunctionDefinition of Object.values(middlewareManifest.functions)) {
+                usesEdge = true;
                 const functionDefinitions = await writeEdgeFunction({
                     edgeFunctionDefinition,
                     edgeFunctionRoot,
@@ -145,6 +159,12 @@ const writeEdgeFunctions = async (netlifyConfig) => {
                 manifest.functions.push(...functionDefinitions);
             }
         }
+        if (usesEdge) {
+            console.log((0, outdent_1.outdent) `
+        ✨ Deploying middleware and functions to ${(0, chalk_1.greenBright) `Netlify Edge Functions`} ✨
+        This feature is in beta. Please share your feedback here: https://ntl.fyi/next-netlify-edge
+      `);
+        }
     }
     await (0, fs_extra_1.writeJson)((0, path_1.join)(edgeFunctionRoot, 'manifest.json'), manifest);
 };

package/lib/index.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable max-lines */
 const path_1 = require("path");
 const chalk_1 = require("chalk");
+const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const outdent_1 = require("outdent");
 const constants_1 = require("./constants");
@@ -46,26 +50,23 @@ const plugin = {
         });
         await (0, edge_1.cleanupEdgeFunctions)(constants);
         const middlewareManifest = await (0, edge_1.loadMiddlewareManifest)(netlifyConfig);
-        let usingEdge = false;
-        if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.functions) && Object.keys(middlewareManifest.functions).length !== 0) {
-            usingEdge = true;
-            if (process.env.NEXT_DISABLE_NETLIFY_EDGE === 'true' || process.env.NEXT_DISABLE_NETLIFY_EDGE === '1') {
-                failBuild((0, outdent_1.outdent) `
-          You are using Next.js experimental edge runtime, but have set NEXT_DISABLE_NETLIFY_EDGE to true. This is not supported.
-          To use edge runtime, remove the env var ${(0, chalk_1.bold) `NEXT_DISABLE_NETLIFY_EDGE`} or set it to false.
-        `);
-            }
+        if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.functions) &&
+            Object.keys(middlewareManifest.functions).length !== 0 &&
+            (0, destr_1.default)(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
+            failBuild((0, outdent_1.outdent) `
+        You are using Next.js experimental edge runtime, but have set NEXT_DISABLE_NETLIFY_EDGE to true. This is not supported.
+        To use edge runtime, remove the env var ${(0, chalk_1.bold) `NEXT_DISABLE_NETLIFY_EDGE`}.
+      `);
         }
-        if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.middleware) && Object.keys(middlewareManifest.middleware).length !== 0) {
-            usingEdge = true;
-            if (process.env.NEXT_DISABLE_NETLIFY_EDGE === 'true' || process.env.NEXT_DISABLE_NETLIFY_EDGE === '1') {
-                console.log((0, chalk_1.redBright)((0, outdent_1.outdent) `
-            You are using Next.js Middleware without Netlify Edge Functions.
-            This is deprecated because it negatively affects performance and will disable ISR and static rendering.
-            It also disables advanced middleware features from @netlify/next
-            To get the best performance and use Netlify Edge Functions, remove the env var ${(0, chalk_1.bold) `NEXT_DISABLE_NETLIFY_EDGE`} or set it to false.
-          `));
-            }
+        if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.middleware) &&
+            Object.keys(middlewareManifest.middleware).length !== 0 &&
+            (0, destr_1.default)(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
+            console.log((0, chalk_1.redBright)((0, outdent_1.outdent) `
+          You are using Next.js Middleware without Netlify Edge Functions.
+          This is deprecated because it negatively affects performance and will disable ISR and static rendering.
+          It also disables advanced middleware features from @netlify/next
+          To get the best performance and use Netlify Edge Functions, remove the env var ${(0, chalk_1.bold) `NEXT_DISABLE_NETLIFY_EDGE`}.
+        `));
         }
         if ((0, utils_1.isNextAuthInstalled)()) {
             const config = await (0, config_1.getRequiredServerFiles)(publish);
@@ -93,7 +94,7 @@ const plugin = {
         await (0, functions_1.generatePagesResolver)({ target, constants });
         await (0, files_1.movePublicFiles)({ appDir, outdir, publish });
         await (0, files_1.patchNextFiles)(basePath);
-        if (!process.env.SERVE_STATIC_FILES_FROM_ORIGIN) {
+        if (!(0, destr_1.default)(process.env.SERVE_STATIC_FILES_FROM_ORIGIN)) {
             await (0, files_1.moveStaticPages)({ target, netlifyConfig, i18n, basePath });
         }
         await (0, redirects_1.generateStaticRedirects)({
@@ -113,14 +114,7 @@ const plugin = {
             nextConfig: { basePath, i18n, trailingSlash, appDir },
             buildId,
         });
-        if (usingEdge) {
-            await (0, edge_1.writeEdgeFunctions)(netlifyConfig);
-            await (0, edge_1.enableEdgeInNextConfig)(publish);
-            console.log((0, outdent_1.outdent) `
-        ✨ Deploying middleware and functions to ${(0, chalk_1.greenBright) `Netlify Edge Functions`} ✨
-        This feature is in beta. Please share your feedback here: https://ntl.fyi/next-netlify-edge
-      `);
-        }
+        await (0, edge_1.writeEdgeFunctions)(netlifyConfig);
     },
     async onPostBuild({ netlifyConfig: { build: { publish }, redirects, headers, }, utils: { status, cache, functions, build: { failBuild }, }, constants: { FUNCTIONS_DIST }, }) {
         await (0, cache_1.saveCache)({ cache, publish });

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.4",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -15,6 +15,7 @@
     "@netlify/ipx": "^1.2.5",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
+    "destr": "^1.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
@@ -63,4 +64,4 @@
   "engines": {
     "node": ">=12.0.0"
   }
-}
+}

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 {