@netlify/plugin-nextjs 4.30.3-als.0 → 4.30.4-ipx-layer.0

package/lib/helpers/edge.js

@@ -36,18 +36,12 @@ const preamble = /* js */ `
 import {
   decode as _base64Decode,
 } from "https://deno.land/std@0.159.0/encoding/base64.ts";
-
-import { AsyncLocalStorage } from "https://raw.githubusercontent.com/crowlKats/deno_std/asynclocalstorage/node/async_hooks.ts";
-
 // 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' } }
 globalThis.EdgeRuntime = "netlify-edge"
 let _ENTRIES = {}
 
-// Next.js expects this as a global
-globalThis.AsyncLocalStorage = AsyncLocalStorage
-
 // Next.js uses this extension to the Headers API implemented by Cloudflare workerd
 if(!('getAll' in Headers.prototype)) {
   Headers.prototype.getAll = function getAll(name) {
@@ -240,6 +234,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
     var _a;
     const manifest = {
         functions: [],
+        layers: [],
         version: 1,
     };
     const edgeFunctionRoot = (0, path_1.resolve)('.netlify', 'edge-functions');
@@ -262,7 +257,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',
         });
     }
     if (!(0, destr_1.default)(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.30.3-als.0",
+  "version": "4.30.4-ipx-layer.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -41,7 +41,7 @@
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
-    "next": "^13.1.5",
+    "next": "^13.0.7",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },

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/next-utils.ts

@@ -42,6 +42,7 @@ export type Rewrite = {
   basePath?: false
   locale?: false
   has?: RouteHas[]
+  missing?: RouteHas[]
   regex: string
 }
 
@@ -51,6 +52,7 @@ export type Header = {
   locale?: false
   headers: Array<{ key: string; value: string }>
   has?: RouteHas[]
+  missing?: RouteHas[]
   regex: string
 }
 export type Redirect = {
@@ -59,6 +61,7 @@ export type Redirect = {
   basePath?: false
   locale?: false
   has?: RouteHas[]
+  missing?: RouteHas[]
   statusCode?: number
   permanent?: boolean
   regex: string
@@ -138,11 +141,16 @@ export function parseUrl(url: string): ParsedUrl {
 
 // prepare-destination.ts
 // Changed to use WHATWG Fetch Request instead of IncomingMessage
-export function matchHas(req: Pick<Request, 'headers' | 'url'>, has: RouteHas[], query: Params): false | Params {
+export function matchHas(
+  req: Pick<Request, 'headers' | 'url'>,
+  query: Params,
+  has: RouteHas[] = [],
+  missing: RouteHas[] = [],
+): false | Params {
   const params: Params = {}
   const cookies = getCookies(req.headers)
   const url = new URL(req.url)
-  const allMatch = has.every((hasItem) => {
+  const hasMatch = (hasItem: RouteHas) => {
     let value: undefined | string | null
     let key = hasItem.key
 
@@ -189,7 +197,9 @@ export function matchHas(req: Pick<Request, 'headers' | 'url'>, has: RouteHas[],
       }
     }
     return false
-  })
+  }
+
+  const allMatch = has.every((item) => hasMatch(item)) && !missing.some((item) => hasMatch(item))
 
   if (allMatch) {
     return params
@@ -371,6 +381,7 @@ export interface MiddlewareMatcher {
   regexp: string
   locale?: false
   has?: RouteHas[]
+  missing?: RouteHas[]
 }
 
 export function getMiddlewareRouteMatcher(matchers: MiddlewareMatcher[]): MiddlewareRouteMatch {
@@ -381,8 +392,8 @@ export function getMiddlewareRouteMatcher(matchers: MiddlewareMatcher[]): Middle
         continue
       }
 
-      if (matcher.has) {
-        const hasParams = matchHas(req, matcher.has, query)
+      if (matcher.has || matcher.missing) {
+        const hasParams = matchHas(req, query, matcher.has, matcher.missing)
         if (!hasParams) {
           continue
         }