@netlify/plugin-nextjs 4.31.0 → 4.32.0

package/package.json

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

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

@@ -18,19 +18,6 @@ if (!('getAll' in Headers.prototype)) {
   }
 }
 
-// Check if a file exists, given a relative path
-const exists = async (relativePath) => {
-  const path = fromFileUrl(new URL(relativePath, import.meta.url))
-  try {
-    await Deno.stat(path)
-    return true
-  } catch (error) {
-    if (error instanceof Deno.errors.NotFound) {
-      return false
-    }
-    throw error
-  }
-}
 let idx = 0
 
 const handler = async (req, context) => {
@@ -45,14 +32,19 @@ const handler = async (req, context) => {
   // We don't want to just try importing and use that to test,
   // because that would also throw if there's an error in the middleware,
   // which we would want to surface not ignore.
-  if (await exists('../../middleware.js')) {
+  try {
     // We need to cache-bust the import because otherwise it will claim it
     // doesn't exist if the user creates it after the server starts
     const nextMiddleware = await import(`../../middleware.js#${idx++}`)
     middleware = nextMiddleware.middleware
-  } else {
-    //  No middleware, so we silently return
-    return
+  } catch (importError) {
+    // Error message is `Module not found "file://<path>/middleware.js#123456".` in Deno
+    if (importError.code === 'ERR_MODULE_NOT_FOUND' && importError.message.includes(`middleware.js#${idx}`)) {
+      //  No middleware, so we silently return
+      return
+    }
+
+    throw importError
   }
 
   //  This is the format expected by Next.js along with the timezone which we support.

package/src/templates/edge-shared/utils.ts

@@ -31,12 +31,11 @@ export const addMiddlewareHeaders = async (
   // We need to await the response to get the origin headers, then we can add the ones from middleware.
   const res = await originResponse
   const response = new Response(res.body, res)
-  const originCookies = response.headers.get('set-cookie')
   middlewareResponse.headers.forEach((value, key) => {
-    response.headers.set(key, value)
-    // Append origin cookies after middleware cookies
-    if (key === 'set-cookie' && originCookies) {
-      response.headers.append(key, originCookies)
+    if (key === 'set-cookie') {
+      response.headers.append(key, value)
+    } else {
+      response.headers.set(key, value)
     }
   })
   return response