@netlify/plugin-nextjs 4.30.3-als.0 → 4.30.3

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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.30.3-als.0",
+  "version": "4.30.3",
   "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-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
         }