Merge branch 'main' into tRaCe

Author: kodiakhq[bot]

packages/runtime/src/helpers/functions.ts

@@ -269,7 +269,7 @@ const traceNextServer = async (publish: string): Promise<string[]> => {
 
 export const traceNPMPackage = async (packageName: string, publish: string) => {
   try {
-    return await glob(join(dirname(require.resolve(packageName, { paths: [publish] })), '**', '*'), {
+    return await glob(join(dirname(require.resolve(packageName, { paths: [__dirname, publish] })), '**', '*'), {
       absolute: true,
     })
   } catch (error) {

packages/runtime/src/templates/edge-shared/utils.ts

@@ -58,6 +58,8 @@ export const addMiddlewareHeaders = async (
 }
 
 interface ResponseCookies {
+  // This is non-standard that Next.js adds.
+  // See github.com/vercel/next.js/blob/de08f8b3d31ef45131dad97a7d0e95fa01001167/packages/next/src/compiled/@edge-runtime/cookies/index.js#L158
   readonly _headers: Headers
 }
 
@@ -191,7 +193,8 @@ export const buildResponse = async ({
     }
 
     // NextResponse doesn't set cookies onto the originResponse, so we need to copy them over
-    if (response.cookies._headers.has('set-cookie')) {
+    // In some cases, it's possible there are no headers set. See https://github.com/netlify/pod-ecosystem-frameworks/issues/475
+    if (response.cookies._headers?.has('set-cookie')) {
       response.originResponse.headers.set('set-cookie', response.cookies._headers.get('set-cookie')!)
     }