@netlify/plugin-nextjs 4.37.2 → 4.37.4

package/lib/helpers/edge.js

@@ -315,7 +315,6 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
     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/helpers/functions.js

@@ -152,8 +152,13 @@ const setupImageFunction = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIO
 };
 exports.setupImageFunction = setupImageFunction;
 const traceRequiredServerFiles = async (publish) => {
-    const { files, relativeAppDir, config: { experimental: { outputFileTracingRoot }, }, } = await (0, config_1.getRequiredServerFiles)(publish);
-    const appDirRoot = (0, pathe_1.join)(outputFileTracingRoot, relativeAppDir);
+    var _a, _b, _c;
+    const requiredServerFiles = await (0, config_1.getRequiredServerFiles)(publish);
+    let appDirRoot = (_a = requiredServerFiles.appDir) !== null && _a !== void 0 ? _a : (0, pathe_1.join)(publish, '..');
+    if (requiredServerFiles.relativeAppDir && ((_b = requiredServerFiles.config) === null || _b === void 0 ? void 0 : _b.experimental.outputFileTracingRoot)) {
+        appDirRoot = (0, pathe_1.join)(requiredServerFiles.config.experimental.outputFileTracingRoot, requiredServerFiles.relativeAppDir);
+    }
+    const files = (_c = requiredServerFiles.files) !== null && _c !== void 0 ? _c : [];
     const absoluteFiles = files.map((file) => (0, pathe_1.join)(appDirRoot, file));
     absoluteFiles.push((0, pathe_1.join)(publish, 'required-server-files.json'));
     return absoluteFiles;

package/lib/templates/getHandler.js

@@ -87,6 +87,15 @@ const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mod
         // Next expects to be able to parse the query from the URL
         const query = new URLSearchParams(event.queryStringParameters).toString();
         event.path = query ? `${event.path}?${query}` : event.path;
+        if (event.headers['accept-language'] && (mode === 'odb' || event.headers['x-next-just-first-accept-language'])) {
+            // keep just first language to match Netlify redirect limitation:
+            // https://docs.netlify.com/routing/redirects/redirect-options/#redirect-by-country-or-language
+            // > Language-based redirects always match against the first language reported by the browser in the Accept-Language header regardless of quality value weighting.
+            // If we wouldn't keep just first language, it's possible for `next-server` to generate locale redirect that could be cached by ODB
+            // because it matches on every language listed: https://github.com/vercel/next.js/blob/5d9597879c46b383d595d6f7b37fd373325b7544/test/unit/accept-headers.test.ts
+            // 'x-next-just-first-accept-language' header is escape hatch to be able to hit this code for tests (both automated and manual)
+            event.headers['accept-language'] = event.headers['accept-language'].replace(/\s*,.*$/, '');
+        }
         const { headers, ...result } = await getBridge(event, context).launcher(event, context);
         // Convert all headers to multiValueHeaders
         const multiValueHeaders = getMultiValueHeaders(headers);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.37.2",
+  "version": "4.37.4",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.11.5",
+    "@netlify/build": "^29.11.6",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",