@netlify/plugin-nextjs 4.29.2 → 4.29.3

package/lib/helpers/edge.js

@@ -35,27 +35,20 @@ import {
 // Deno defines "window", but naughty libraries think this means it's a browser
 delete globalThis.window
 globalThis.process = { env: {...Deno.env.toObject(), NEXT_RUNTIME: 'edge', 'NEXT_PRIVATE_MINIMAL_MODE': '1' } }
-// Next uses "self" as a function-scoped global-like object
-const self = {}
 let _ENTRIES = {}
 
-class Response extends globalThis.Response {
-  constructor(body, init) {
-    super(body, init);
-    // Next.js uses this extension to the Headers API implemented by Cloudflare workerd
-    this.headers.getAll = (name) => {
-      name = name.toLowerCase();
-      if (name !== "set-cookie") {
-        throw new Error("Headers.getAll is only supported for Set-Cookie");
-      }
-      return [...this.headers.entries()]
-        .filter(([key]) => key === name)
-        .map(([, value]) => value);
-    };
-  }
+// Next.js uses this extension to the Headers API implemented by Cloudflare workerd
+if(!('getAll' in Headers.prototype)) {
+  Headers.prototype.getAll = function getAll(name) {
+    name = name.toLowerCase();
+    if (name !== "set-cookie") {
+      throw new Error("Headers.getAll is only supported for Set-Cookie");
+    }
+    return [...this.entries()]
+      .filter(([key]) => key === name)
+      .map(([, value]) => value);
+  };
 }
-
-
 //  Next uses blob: urls to refer to local assets, so we need to intercept these
 const _fetch = globalThis.fetch
 const fetch = async (url, init) => {
@@ -73,6 +66,10 @@ const fetch = async (url, init) => {
   }
 }
 
+// Next edge runtime uses "self" as a function-scoped global-like object, but some of the older polyfills expect it to equal globalThis
+// See https://nextjs.org/docs/basic-features/supported-browsers-features#polyfills
+const self = { ...globalThis, fetch }
+
 `;
 // Slightly different spacing in different versions!
 const IMPORT_UNSUPPORTED = [

package/lib/helpers/files.js

@@ -274,11 +274,13 @@ const getServerFile = (root, includeBase = true) => {
 /**
  * Find the source file for a given page route
  */
-const getSourceFileForPage = (page, root) => {
-    for (const extension of SOURCE_FILE_EXTENSIONS) {
-        const file = (0, pathe_1.join)(root, `${page}.${extension}`);
-        if ((0, fs_extra_1.existsSync)(file)) {
-            return file;
+const getSourceFileForPage = (page, roots) => {
+    for (const root of roots) {
+        for (const extension of SOURCE_FILE_EXTENSIONS) {
+            const file = (0, pathe_1.join)(root, `${page}.${extension}`);
+            if ((0, fs_extra_1.existsSync)(file)) {
+                return file;
+            }
         }
     }
     console.log('Could not find source file for page', page);

package/lib/helpers/functions.js

@@ -123,9 +123,12 @@ exports.setupImageFunction = setupImageFunction;
 const getApiRouteConfigs = async (publish, baseDir) => {
     const pages = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(publish, 'server', 'pages-manifest.json'));
     const apiRoutes = Object.keys(pages).filter((page) => page.startsWith('/api/'));
+    // two possible places
+    // Ref: https://nextjs.org/docs/advanced-features/src-directory
     const pagesDir = (0, pathe_1.join)(baseDir, 'pages');
+    const srcPagesDir = (0, pathe_1.join)(baseDir, 'src', 'pages');
     return await Promise.all(apiRoutes.map(async (apiRoute) => {
-        const filePath = (0, files_1.getSourceFileForPage)(apiRoute, pagesDir);
+        const filePath = (0, files_1.getSourceFileForPage)(apiRoute, [pagesDir, srcPagesDir]);
         return { route: apiRoute, config: await (0, analysis_1.extractConfigFromFile)(filePath), compiled: pages[apiRoute] };
     }));
 };

package/lib/templates/ipx.js

@@ -10,4 +10,4 @@ exports.handler = (0, ipx_1.createIPXHandler)({
     remotePatterns: imageconfig_json_1.remotePatterns,
     responseHeaders: imageconfig_json_1.responseHeaders,
 });
-/* eslint-enable n/no-missing-import, import/no-unresolved, @typescript-eslint/ban-ts-comment  */
+/* eslint-enable import/no-unresolved, @typescript-eslint/ban-ts-comment  */

package/package.json

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

package/src/templates/edge/next-dev.js

@@ -6,6 +6,17 @@ import { buildResponse } from '../edge-shared/utils.ts'
 globalThis.NFRequestContextMap ||= new Map()
 globalThis.__dirname = fromFileUrl(new URL('./', import.meta.url)).slice(0, -1)
 
+// Next.js uses this extension to the Headers API implemented by Cloudflare workerd
+if (!('getAll' in Headers.prototype)) {
+  Headers.prototype.getAll = function getAll(name) {
+    name = name.toLowerCase()
+    if (name !== 'set-cookie') {
+      throw new Error('Headers.getAll is only supported for Set-Cookie')
+    }
+    return [...this.entries()].filter(([key]) => key === name).map(([, value]) => value)
+  }
+}
+
 // Check if a file exists, given a relative path
 const exists = async (relativePath) => {
   const path = fromFileUrl(new URL(relativePath, import.meta.url))