@netlify/plugin-nextjs 4.33.0 → 4.34.0

package/lib/helpers/edge.js

@@ -189,6 +189,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
     var _a;
     const manifest = {
         functions: [],
+        layers: [],
         version: 1,
     };
     const edgeFunctionRoot = (0, path_1.resolve)('.netlify', 'edge-functions');
@@ -291,7 +292,11 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         manifest.functions.push({
             function: 'ipx',
             name: 'next/image handler',
-            path: '/_next/image*',
+            path: nextConfig.images.path || '/_next/image',
+        });
+        manifest.layers.push({
+            name: 'https://ipx-edge-function-layer.netlify.app/mod.ts',
+            flag: 'ipx-edge-function-layer-url',
         });
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.33.0",
+  "version": "4.34.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -13,7 +13,7 @@
   "dependencies": {
     "@netlify/esbuild": "0.14.39",
     "@netlify/functions": "^1.4.0",
-    "@netlify/ipx": "^1.3.3",
+    "@netlify/ipx": "^1.4.0",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.7.1",
+    "@netlify/build": "^29.9.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

package/src/templates/edge/imageconfig.json

@@ -0,0 +1,3 @@
+{
+  "formats": ["webp"]
+}

package/src/templates/edge/ipx.ts

@@ -1,73 +1,5 @@
-import { Accepts } from 'https://deno.land/x/accepts@2.1.1/mod.ts'
-import type { Context } from 'https://edge.netlify.com'
-// Available at build time
-import imageconfig from './imageconfig.json' assert { type: 'json' }
-
-const defaultFormat = 'webp'
-
-interface ImageConfig extends Record<string, unknown> {
-  formats?: string[]
-}
-
-// Checks if a URL param is numeric
-const isNumeric = (value: string | null) => Number(value).toString() === value
-
-/**
- * Implement content negotiation for images
- */
-
-// deno-lint-ignore require-await
-const handler = async (req: Request, context: Context) => {
-  const { searchParams } = new URL(req.url)
-  const accept = new Accepts(req.headers)
-  const { formats = [defaultFormat] } = imageconfig as ImageConfig
-  if (formats.length === 0) {
-    formats.push(defaultFormat)
-  }
-  let type = accept.types(formats) || defaultFormat
-  if (Array.isArray(type)) {
-    type = type[0]
-  }
-
-  const source = searchParams.get('url')
-  const width = searchParams.get('w')
-  const quality = searchParams.get('q') ?? '75'
+import { getHandler } from 'https://ipx-edge-function-layer.netlify.app/mod.ts'
 
-  const errors: Array<string> = []
-
-  if (!source) {
-    errors.push('Missing "url" parameter')
-  } else if (!source.startsWith('http') && !source.startsWith('/')) {
-    errors.push('The "url" parameter must be a valid URL or path')
-  }
-
-  if (!width) {
-    errors.push('Missing "w" parameter')
-  } else if (!isNumeric(width)) {
-    errors.push('Invalid "w" parameter')
-  }
-
-  if (!isNumeric(quality)) {
-    errors.push('Invalid "q" parameter')
-  }
-
-  if (!source || errors.length > 0) {
-    return new Response(`Invalid request: \n${errors.join('\n')}`, {
-      status: 400,
-    })
-  }
-
-  const modifiers = [`w_${width}`, `q_${quality}`]
-
-  if (type) {
-    if (type.includes('/')) {
-      // If this is a mimetype, strip "image/"
-      type = type.split('/')[1]
-    }
-    modifiers.push(`f_${type}`)
-  }
-  const target = `/_ipx/${modifiers.join(',')}/${encodeURIComponent(source)}`
-  return context.rewrite(target)
-}
+import imageconfig from './imageconfig.json' assert { type: 'json' }
 
-export default handler
+export default getHandler({ formats: imageconfig?.formats })

package/src/templates/edge-shared/rsc-data.ts

@@ -1,14 +1,18 @@
 import type { EdgeFunction } from 'https://edge.netlify.com'
 
+// These are copied from next/dist/build. This file gets copied as part of the next
+// runtime build and can't reference the next package directly.
+//
+// Latest types at https://github.com/vercel/next.js/blob/4a2df3c3752aeddc50fd5ab053440eccf71ae50b/packages/next/src/build/index.ts#L140
 export declare type SsgRoute = {
   initialRevalidateSeconds: number | false
   srcRoute: string | null
-  dataRoute: string
+  dataRoute: string | null
 }
 export declare type DynamicSsgRoute = {
   routeRegex: string
   fallback: string | null | false
-  dataRoute: string
+  dataRoute: string | null
   dataRouteRegex: string
 }
 export declare type PrerenderManifest = {
@@ -35,7 +39,7 @@ const rscifyPath = (route: string) => {
 export const getRscDataRouter = ({ routes: staticRoutes, dynamicRoutes }: PrerenderManifest): EdgeFunction => {
   const staticRouteSet = new Set(
     Object.entries(staticRoutes)
-      .filter(([, { dataRoute }]) => dataRoute.endsWith('.rsc'))
+      .filter(([, { dataRoute }]) => dataRoute?.endsWith('.rsc'))
       .map(([route]) => route),
   )
 

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

@@ -57,10 +57,15 @@ export const addMiddlewareHeaders = async (
   return response
 }
 
+interface ResponseCookies {
+  readonly _headers: Headers
+}
+
 interface MiddlewareResponse extends Response {
   originResponse: Response
   dataTransforms: NextDataTransform[]
   elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
+  get cookies(): ResponseCookies
 }
 
 interface MiddlewareRequest {
@@ -184,6 +189,12 @@ export const buildResponse = async ({
     if (request.method === 'HEAD' || request.method === 'OPTIONS') {
       return response.originResponse
     }
+
+    // NextResponse doesn't set cookies onto the originResponse, so we need to copy them over
+    if (response.cookies._headers.has('set-cookie')) {
+      response.originResponse.headers.set('set-cookie', response.cookies._headers.get('set-cookie')!)
+    }
+
     // If it's JSON we don't need to use the rewriter, we can just parse it
     if (response.originResponse.headers.get('content-type')?.includes('application/json')) {
       const props = await response.originResponse.json()