diff --git a/demos/base-path/package.json b/demos/base-path/package.json
index 01a2ebd5ee..8c231b5370 100644
--- a/demos/base-path/package.json
+++ b/demos/base-path/package.json
@@ -14,7 +14,7 @@
     "typescript": "^4.6.3"
   },
   "dependencies": {
-    "next": "^13.4.1"
+    "next": "^13.5.4"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/demos/custom-routes/package.json b/demos/custom-routes/package.json
index 348bc88d53..1ca275b2ac 100644
--- a/demos/custom-routes/package.json
+++ b/demos/custom-routes/package.json
@@ -15,7 +15,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "next": "^13.4.1"
+    "next": "^13.5.4"
   },
   "scripts": {
     "build": "next build",
diff --git a/demos/default/package.json b/demos/default/package.json
index e403e79d6c..6080b333d8 100644
--- a/demos/default/package.json
+++ b/demos/default/package.json
@@ -22,7 +22,7 @@
     "@reach/dialog": "^0.16.2",
     "@reach/visually-hidden": "^0.16.0",
     "@vercel/og": "^0.5.0",
-    "next": "^13.4.1",
+    "next": "^13.5.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/demos/middleware/package.json b/demos/middleware/package.json
index 85b962bb09..3498302b07 100644
--- a/demos/middleware/package.json
+++ b/demos/middleware/package.json
@@ -12,7 +12,7 @@
     "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
     "isomorphic-unfetch": "^3.1.0",
-    "next": "^13.4.1",
+    "next": "^13.5.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/demos/next-auth/package.json b/demos/next-auth/package.json
index c7a86524aa..2d30fd6301 100644
--- a/demos/next-auth/package.json
+++ b/demos/next-auth/package.json
@@ -23,7 +23,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "next": "^13.4.1",
+    "next": "^13.5.4",
     "next-auth": "^4.15.0",
     "nodemailer": "^6.6.3",
     "react": "^18.2.0",
diff --git a/demos/next-export/package.json b/demos/next-export/package.json
index 94c7336aa3..e03357b03d 100644
--- a/demos/next-export/package.json
+++ b/demos/next-export/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "next": "^13.4.1"
+    "next": "^13.5.4"
   },
   "devDependencies": {
     "@netlify/next": "*",
diff --git a/demos/next-with-edge-functions/package.json b/demos/next-with-edge-functions/package.json
index 59fcb08618..b02f6acb21 100644
--- a/demos/next-with-edge-functions/package.json
+++ b/demos/next-with-edge-functions/package.json
@@ -7,7 +7,7 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "^13.4.1",
+    "next": "^13.5.4",
     "react": "^18.0.2",
     "react-dom": "^18.0.2"
   }
diff --git a/demos/static-root/package.json b/demos/static-root/package.json
index 91fd6e45bb..2df27cd449 100644
--- a/demos/static-root/package.json
+++ b/demos/static-root/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "next": "^13.4.1"
+    "next": "^13.5.4"
   },
   "devDependencies": {
     "@netlify/next": "*",
diff --git a/package-lock.json b/package-lock.json
index edef316599..fa7030f10d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "demos/next-with-edge-functions"
       ],
       "dependencies": {
-        "next": "^13.4.1"
+        "next": "^13.5.4"
       },
       "devDependencies": {
         "@babel/core": "^7.15.8",
@@ -80,7 +80,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "next": "^13.4.1"
+        "next": "^13.5.4"
       },
       "devDependencies": {
         "@netlify/next": "*",
@@ -122,7 +122,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "next": "^13.4.1"
+        "next": "^13.5.4"
       },
       "devDependencies": {
         "@netlify/next": "*",
@@ -146,7 +146,7 @@
         "@reach/dialog": "^0.16.2",
         "@reach/visually-hidden": "^0.16.0",
         "@vercel/og": "^0.5.0",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
       },
@@ -169,7 +169,7 @@
         "@netlify/next": "*",
         "@netlify/plugin-nextjs": "*",
         "isomorphic-unfetch": "^3.1.0",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
       },
@@ -188,7 +188,7 @@
       "version": "0.0.0",
       "license": "MIT",
       "dependencies": {
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "next-auth": "^4.15.0",
         "nodemailer": "^6.6.3",
         "react": "^18.2.0",
@@ -214,7 +214,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "next": "^13.4.1"
+        "next": "^13.5.4"
       },
       "devDependencies": {
         "@netlify/next": "*",
@@ -230,7 +230,7 @@
     },
     "demos/next-with-edge-functions": {
       "dependencies": {
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "react": "^18.0.2",
         "react-dom": "^18.0.2"
       }
@@ -256,7 +256,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "next": "^13.4.1"
+        "next": "^13.5.4"
       },
       "devDependencies": {
         "@netlify/next": "*",
@@ -6059,9 +6059,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.3.tgz",
-      "integrity": "sha512-pa1ErjyFensznttAk3EIv77vFbfSYT6cLzVRK5jx4uiRuCQo+m2wCFAREaHKIy63dlgvOyMlzh6R8Inu8H3KrQ=="
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.4.tgz",
+      "integrity": "sha512-LGegJkMvRNw90WWphGJ3RMHMVplYcOfRWf2Be3td3sUa+1AaxmsYyANsA+znrGCBjXJNi4XAQlSoEfUxs/4kIQ=="
     },
     "node_modules/@next/eslint-plugin-next": {
       "version": "12.3.4",
@@ -6115,9 +6115,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.3.tgz",
-      "integrity": "sha512-yx18udH/ZmR4Bw4M6lIIPE3JxsAZwo04iaucEfA2GMt1unXr2iodHUX/LAKNyi6xoLP2ghi0E+Xi1f4Qb8f1LQ==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.4.tgz",
+      "integrity": "sha512-Df8SHuXgF1p+aonBMcDPEsaahNo2TCwuie7VXED4FVyECvdXfRT9unapm54NssV9tF3OQFKBFOdlje4T43VO0w==",
       "cpu": [
         "arm64"
       ],
@@ -6130,9 +6130,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.3.tgz",
-      "integrity": "sha512-Mi8xJWh2IOjryAM1mx18vwmal9eokJ2njY4nDh04scy37F0LEGJ/diL6JL6kTXi0UfUCGbMsOItf7vpReNiD2A==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.4.tgz",
+      "integrity": "sha512-siPuUwO45PnNRMeZnSa8n/Lye5ZX93IJom9wQRB5DEOdFrw0JjOMu1GINB8jAEdwa7Vdyn1oJ2xGNaQpdQQ9Pw==",
       "cpu": [
         "x64"
       ],
@@ -6145,9 +6145,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.3.tgz",
-      "integrity": "sha512-aBvtry4bxJ1xwKZ/LVPeBGBwWVwxa4bTnNkRRw6YffJnn/f4Tv4EGDPaVeYHZGQVA56wsGbtA6nZMuWs/EIk4Q==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.4.tgz",
+      "integrity": "sha512-l/k/fvRP/zmB2jkFMfefmFkyZbDkYW0mRM/LB+tH5u9pB98WsHXC0WvDHlGCYp3CH/jlkJPL7gN8nkTQVrQ/2w==",
       "cpu": [
         "arm64"
       ],
@@ -6160,9 +6160,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.3.tgz",
-      "integrity": "sha512-krT+2G3kEsEUvZoYte3/2IscscDraYPc2B+fDJFipPktJmrv088Pei/RjrhWm5TMIy5URYjZUoDZdh5k940Dyw==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.4.tgz",
+      "integrity": "sha512-YYGb7SlLkI+XqfQa8VPErljb7k9nUnhhRrVaOdfJNCaQnHBcvbT7cx/UjDQLdleJcfyg1Hkn5YSSIeVfjgmkTg==",
       "cpu": [
         "arm64"
       ],
@@ -6175,9 +6175,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.3.tgz",
-      "integrity": "sha512-AMdFX6EKJjC0G/CM6hJvkY8wUjCcbdj3Qg7uAQJ7PVejRWaVt0sDTMavbRfgMchx8h8KsAudUCtdFkG9hlEClw==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.4.tgz",
+      "integrity": "sha512-uE61vyUSClnCH18YHjA8tE1prr/PBFlBFhxBZis4XBRJoR+txAky5d7gGNUIbQ8sZZ7LVkSVgm/5Fc7mwXmRAg==",
       "cpu": [
         "x64"
       ],
@@ -6190,9 +6190,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.3.tgz",
-      "integrity": "sha512-jySgSXE48shaLtcQbiFO9ajE9mqz7pcAVLnVLvRIlUHyQYR/WyZdK8ehLs65Mz6j9cLrJM+YdmdJPyV4WDaz2g==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.4.tgz",
+      "integrity": "sha512-qVEKFYML/GvJSy9CfYqAdUexA6M5AklYcQCW+8JECmkQHGoPxCf04iMh7CPR7wkHyWWK+XLt4Ja7hhsPJtSnhg==",
       "cpu": [
         "x64"
       ],
@@ -6205,9 +6205,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.3.tgz",
-      "integrity": "sha512-5DxHo8uYcaADiE9pHrg8o28VMt/1kR8voDehmfs9AqS0qSClxAAl+CchjdboUvbCjdNWL1MISCvEfKY2InJ3JA==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.4.tgz",
+      "integrity": "sha512-mDSQfqxAlfpeZOLPxLymZkX0hYF3juN57W6vFHTvwKlnHfmh12Pt7hPIRLYIShk8uYRsKPtMTth/EzpwRI+u8w==",
       "cpu": [
         "arm64"
       ],
@@ -6220,9 +6220,9 @@
       }
     },
     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.3.tgz",
-      "integrity": "sha512-LaqkF3d+GXRA5X6zrUjQUrXm2MN/3E2arXBtn5C7avBCNYfm9G3Xc646AmmmpN3DJZVaMYliMyCIQCMDEzk80w==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.4.tgz",
+      "integrity": "sha512-aoqAT2XIekIWoriwzOmGFAvTtVY5O7JjV21giozBTP5c6uZhpvTWRbmHXbmsjZqY4HnEZQRXWkSAppsIBweKqw==",
       "cpu": [
         "ia32"
       ],
@@ -6235,9 +6235,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.3.tgz",
-      "integrity": "sha512-jglUk/x7ZWeOJWlVoKyIAkHLTI+qEkOriOOV+3hr1GyiywzcqfI7TpFSiwC7kk1scOiH7NTFKp8mA3XPNO9bDw==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.4.tgz",
+      "integrity": "sha512-cyRvlAxwlddlqeB9xtPSfNSCRy8BOa4wtMo0IuI9P7Y0XT2qpDrpFKRyZ7kUngZis59mPVla5k8X1oOJ8RxDYg==",
       "cpu": [
         "x64"
       ],
@@ -8543,9 +8543,9 @@
       }
     },
     "node_modules/@swc/helpers": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz",
-      "integrity": "sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz",
+      "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==",
       "dependencies": {
         "tslib": "^2.4.0"
       }
@@ -12251,34 +12251,6 @@
         "pretty-bytes": "^5.3.0"
       }
     },
-    "node_modules/critters/node_modules/postcss": {
-      "version": "8.4.27",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
-      "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
     "node_modules/cron-parser": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.6.0.tgz",
@@ -13026,34 +12998,6 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/detective-postcss/node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
     "node_modules/detective-sass": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-5.0.3.tgz",
@@ -16280,6 +16224,11 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+    },
     "node_modules/glob/node_modules/minimatch": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
@@ -21332,39 +21281,37 @@
       }
     },
     "node_modules/next": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.4.3.tgz",
-      "integrity": "sha512-FV3pBrAAnAIfOclTvncw9dDohyeuEEXPe5KNcva91anT/rdycWbgtu3IjUj4n5yHnWK8YEPo0vrUecHmnmUNbA==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.5.4.tgz",
+      "integrity": "sha512-+93un5S779gho8y9ASQhb/bTkQF17FNQOtXLKAj3lsNgltEcF0C5PMLLncDmH+8X1EnJH1kbqAERa29nRXqhjA==",
       "dependencies": {
-        "@next/env": "13.4.3",
-        "@swc/helpers": "0.5.1",
+        "@next/env": "13.5.4",
+        "@swc/helpers": "0.5.2",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001406",
-        "postcss": "8.4.14",
+        "postcss": "8.4.31",
         "styled-jsx": "5.1.1",
-        "zod": "3.21.4"
+        "watchpack": "2.4.0"
       },
       "bin": {
         "next": "dist/bin/next"
       },
       "engines": {
-        "node": ">=16.8.0"
+        "node": ">=16.14.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "13.4.3",
-        "@next/swc-darwin-x64": "13.4.3",
-        "@next/swc-linux-arm64-gnu": "13.4.3",
-        "@next/swc-linux-arm64-musl": "13.4.3",
-        "@next/swc-linux-x64-gnu": "13.4.3",
-        "@next/swc-linux-x64-musl": "13.4.3",
-        "@next/swc-win32-arm64-msvc": "13.4.3",
-        "@next/swc-win32-ia32-msvc": "13.4.3",
-        "@next/swc-win32-x64-msvc": "13.4.3"
+        "@next/swc-darwin-arm64": "13.5.4",
+        "@next/swc-darwin-x64": "13.5.4",
+        "@next/swc-linux-arm64-gnu": "13.5.4",
+        "@next/swc-linux-arm64-musl": "13.5.4",
+        "@next/swc-linux-x64-gnu": "13.5.4",
+        "@next/swc-linux-x64-musl": "13.5.4",
+        "@next/swc-win32-arm64-msvc": "13.5.4",
+        "@next/swc-win32-ia32-msvc": "13.5.4",
+        "@next/swc-win32-x64-msvc": "13.5.4"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.1.0",
-        "fibers": ">= 3.1.0",
-        "node-sass": "^6.0.0 || ^7.0.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "sass": "^1.3.0"
@@ -21373,12 +21320,6 @@
         "@opentelemetry/api": {
           "optional": true
         },
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
         "sass": {
           "optional": true
         }
@@ -22860,9 +22801,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -22871,10 +22812,14 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -26886,6 +26831,18 @@
         "makeerror": "1.0.12"
       }
     },
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/web-streams-polyfill": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
@@ -27410,14 +27367,6 @@
         "node": ">= 12.0.0"
       }
     },
-    "node_modules/zod": {
-      "version": "3.21.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
-      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    },
     "packages/next": {
       "name": "@netlify/next",
       "version": "1.4.9",
@@ -27427,7 +27376,7 @@
         "@types/chance": "^1.1.3",
         "@types/node": "^17.0.25",
         "chance": "^1.1.11",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "typescript": "^4.6.3"
       },
@@ -27440,7 +27389,7 @@
     },
     "packages/runtime": {
       "name": "@netlify/plugin-nextjs",
-      "version": "4.40.1",
+      "version": "4.40.2",
       "license": "MIT",
       "dependencies": {
         "@netlify/esbuild": "0.14.39",
@@ -27474,7 +27423,7 @@
         "@types/jest": "^27.4.1",
         "@types/merge-stream": "^1.1.2",
         "@types/node": "^17.0.25",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "typescript": "^4.6.3"
       },
@@ -31258,7 +31207,7 @@
         "@types/chance": "^1.1.3",
         "@types/node": "^17.0.25",
         "chance": "^1.1.11",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "typescript": "^4.6.3"
       }
@@ -31296,7 +31245,7 @@
         "globby": "^11.0.4",
         "merge-stream": "^2.0.0",
         "moize": "^6.1.0",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "node-fetch": "^2.6.6",
         "node-stream-zip": "^1.15.0",
         "npm-run-all": "^4.1.5",
@@ -31551,9 +31500,9 @@
       }
     },
     "@next/env": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.3.tgz",
-      "integrity": "sha512-pa1ErjyFensznttAk3EIv77vFbfSYT6cLzVRK5jx4uiRuCQo+m2wCFAREaHKIy63dlgvOyMlzh6R8Inu8H3KrQ=="
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.4.tgz",
+      "integrity": "sha512-LGegJkMvRNw90WWphGJ3RMHMVplYcOfRWf2Be3td3sUa+1AaxmsYyANsA+znrGCBjXJNi4XAQlSoEfUxs/4kIQ=="
     },
     "@next/eslint-plugin-next": {
       "version": "12.3.4",
@@ -31600,57 +31549,57 @@
       }
     },
     "@next/swc-darwin-arm64": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.3.tgz",
-      "integrity": "sha512-yx18udH/ZmR4Bw4M6lIIPE3JxsAZwo04iaucEfA2GMt1unXr2iodHUX/LAKNyi6xoLP2ghi0E+Xi1f4Qb8f1LQ==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.4.tgz",
+      "integrity": "sha512-Df8SHuXgF1p+aonBMcDPEsaahNo2TCwuie7VXED4FVyECvdXfRT9unapm54NssV9tF3OQFKBFOdlje4T43VO0w==",
       "optional": true
     },
     "@next/swc-darwin-x64": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.3.tgz",
-      "integrity": "sha512-Mi8xJWh2IOjryAM1mx18vwmal9eokJ2njY4nDh04scy37F0LEGJ/diL6JL6kTXi0UfUCGbMsOItf7vpReNiD2A==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.4.tgz",
+      "integrity": "sha512-siPuUwO45PnNRMeZnSa8n/Lye5ZX93IJom9wQRB5DEOdFrw0JjOMu1GINB8jAEdwa7Vdyn1oJ2xGNaQpdQQ9Pw==",
       "optional": true
     },
     "@next/swc-linux-arm64-gnu": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.3.tgz",
-      "integrity": "sha512-aBvtry4bxJ1xwKZ/LVPeBGBwWVwxa4bTnNkRRw6YffJnn/f4Tv4EGDPaVeYHZGQVA56wsGbtA6nZMuWs/EIk4Q==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.4.tgz",
+      "integrity": "sha512-l/k/fvRP/zmB2jkFMfefmFkyZbDkYW0mRM/LB+tH5u9pB98WsHXC0WvDHlGCYp3CH/jlkJPL7gN8nkTQVrQ/2w==",
       "optional": true
     },
     "@next/swc-linux-arm64-musl": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.3.tgz",
-      "integrity": "sha512-krT+2G3kEsEUvZoYte3/2IscscDraYPc2B+fDJFipPktJmrv088Pei/RjrhWm5TMIy5URYjZUoDZdh5k940Dyw==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.4.tgz",
+      "integrity": "sha512-YYGb7SlLkI+XqfQa8VPErljb7k9nUnhhRrVaOdfJNCaQnHBcvbT7cx/UjDQLdleJcfyg1Hkn5YSSIeVfjgmkTg==",
       "optional": true
     },
     "@next/swc-linux-x64-gnu": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.3.tgz",
-      "integrity": "sha512-AMdFX6EKJjC0G/CM6hJvkY8wUjCcbdj3Qg7uAQJ7PVejRWaVt0sDTMavbRfgMchx8h8KsAudUCtdFkG9hlEClw==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.4.tgz",
+      "integrity": "sha512-uE61vyUSClnCH18YHjA8tE1prr/PBFlBFhxBZis4XBRJoR+txAky5d7gGNUIbQ8sZZ7LVkSVgm/5Fc7mwXmRAg==",
       "optional": true
     },
     "@next/swc-linux-x64-musl": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.3.tgz",
-      "integrity": "sha512-jySgSXE48shaLtcQbiFO9ajE9mqz7pcAVLnVLvRIlUHyQYR/WyZdK8ehLs65Mz6j9cLrJM+YdmdJPyV4WDaz2g==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.4.tgz",
+      "integrity": "sha512-qVEKFYML/GvJSy9CfYqAdUexA6M5AklYcQCW+8JECmkQHGoPxCf04iMh7CPR7wkHyWWK+XLt4Ja7hhsPJtSnhg==",
       "optional": true
     },
     "@next/swc-win32-arm64-msvc": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.3.tgz",
-      "integrity": "sha512-5DxHo8uYcaADiE9pHrg8o28VMt/1kR8voDehmfs9AqS0qSClxAAl+CchjdboUvbCjdNWL1MISCvEfKY2InJ3JA==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.4.tgz",
+      "integrity": "sha512-mDSQfqxAlfpeZOLPxLymZkX0hYF3juN57W6vFHTvwKlnHfmh12Pt7hPIRLYIShk8uYRsKPtMTth/EzpwRI+u8w==",
       "optional": true
     },
     "@next/swc-win32-ia32-msvc": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.3.tgz",
-      "integrity": "sha512-LaqkF3d+GXRA5X6zrUjQUrXm2MN/3E2arXBtn5C7avBCNYfm9G3Xc646AmmmpN3DJZVaMYliMyCIQCMDEzk80w==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.4.tgz",
+      "integrity": "sha512-aoqAT2XIekIWoriwzOmGFAvTtVY5O7JjV21giozBTP5c6uZhpvTWRbmHXbmsjZqY4HnEZQRXWkSAppsIBweKqw==",
       "optional": true
     },
     "@next/swc-win32-x64-msvc": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.3.tgz",
-      "integrity": "sha512-jglUk/x7ZWeOJWlVoKyIAkHLTI+qEkOriOOV+3hr1GyiywzcqfI7TpFSiwC7kk1scOiH7NTFKp8mA3XPNO9bDw==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.4.tgz",
+      "integrity": "sha512-cyRvlAxwlddlqeB9xtPSfNSCRy8BOa4wtMo0IuI9P7Y0XT2qpDrpFKRyZ7kUngZis59mPVla5k8X1oOJ8RxDYg==",
       "optional": true
     },
     "@nicolo-ribaudo/eslint-scope-5-internals": {
@@ -33152,9 +33101,9 @@
       }
     },
     "@swc/helpers": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz",
-      "integrity": "sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz",
+      "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==",
       "requires": {
         "tslib": "^2.4.0"
       }
@@ -34389,7 +34338,7 @@
         "@types/node": "^17.0.25",
         "husky": "^7.0.4",
         "if-env": "^1.0.4",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "typescript": "^4.6.3"
       }
@@ -36030,19 +35979,6 @@
         "htmlparser2": "^8.0.2",
         "postcss": "^8.4.23",
         "pretty-bytes": "^5.3.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "8.4.27",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
-          "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
-          "dev": true,
-          "requires": {
-            "nanoid": "^3.3.6",
-            "picocolors": "^1.0.0",
-            "source-map-js": "^1.0.2"
-          }
-        }
       }
     },
     "cron-parser": {
@@ -36211,7 +36147,7 @@
         "@types/react": "^18.0.25",
         "husky": "^7.0.4",
         "if-env": "^1.0.4",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "typescript": "^4.7.4"
       }
@@ -36509,7 +36445,7 @@
         "critters": "^0.0.20",
         "husky": "^7.0.4",
         "if-env": "^1.0.4",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -36643,19 +36579,6 @@
         "is-url": "^1.2.4",
         "postcss": "^8.4.23",
         "postcss-values-parser": "^6.0.2"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "8.4.31",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-          "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
-          "dev": true,
-          "requires": {
-            "nanoid": "^3.3.6",
-            "picocolors": "^1.0.0",
-            "source-map-js": "^1.0.2"
-          }
-        }
       }
     },
     "detective-sass": {
@@ -39055,6 +38978,11 @@
         "is-glob": "^4.0.3"
       }
     },
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+    },
     "global-dirs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
@@ -42490,7 +42418,7 @@
         "@types/react": "^18.0.25",
         "husky": "^7.0.4",
         "isomorphic-unfetch": "^3.1.0",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -42915,26 +42843,26 @@
       }
     },
     "next": {
-      "version": "13.4.3",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.4.3.tgz",
-      "integrity": "sha512-FV3pBrAAnAIfOclTvncw9dDohyeuEEXPe5KNcva91anT/rdycWbgtu3IjUj4n5yHnWK8YEPo0vrUecHmnmUNbA==",
-      "requires": {
-        "@next/env": "13.4.3",
-        "@next/swc-darwin-arm64": "13.4.3",
-        "@next/swc-darwin-x64": "13.4.3",
-        "@next/swc-linux-arm64-gnu": "13.4.3",
-        "@next/swc-linux-arm64-musl": "13.4.3",
-        "@next/swc-linux-x64-gnu": "13.4.3",
-        "@next/swc-linux-x64-musl": "13.4.3",
-        "@next/swc-win32-arm64-msvc": "13.4.3",
-        "@next/swc-win32-ia32-msvc": "13.4.3",
-        "@next/swc-win32-x64-msvc": "13.4.3",
-        "@swc/helpers": "0.5.1",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.5.4.tgz",
+      "integrity": "sha512-+93un5S779gho8y9ASQhb/bTkQF17FNQOtXLKAj3lsNgltEcF0C5PMLLncDmH+8X1EnJH1kbqAERa29nRXqhjA==",
+      "requires": {
+        "@next/env": "13.5.4",
+        "@next/swc-darwin-arm64": "13.5.4",
+        "@next/swc-darwin-x64": "13.5.4",
+        "@next/swc-linux-arm64-gnu": "13.5.4",
+        "@next/swc-linux-arm64-musl": "13.5.4",
+        "@next/swc-linux-x64-gnu": "13.5.4",
+        "@next/swc-linux-x64-musl": "13.5.4",
+        "@next/swc-win32-arm64-msvc": "13.5.4",
+        "@next/swc-win32-ia32-msvc": "13.5.4",
+        "@next/swc-win32-x64-msvc": "13.5.4",
+        "@swc/helpers": "0.5.2",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001406",
-        "postcss": "8.4.14",
+        "postcss": "8.4.31",
         "styled-jsx": "5.1.1",
-        "zod": "3.21.4"
+        "watchpack": "2.4.0"
       }
     },
     "next-auth": {
@@ -42963,7 +42891,7 @@
         "@types/node": "^17.0.14",
         "@types/react": "^18.0.0",
         "husky": "^7.0.4",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "next-auth": "^4.15.0",
         "nodemailer": "^6.6.3",
         "npm-run-all": "^4.1.5",
@@ -42982,7 +42910,7 @@
         "@types/node": "^17.0.25",
         "husky": "^7.0.4",
         "if-env": "^1.0.4",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "typescript": "^4.6.3"
       }
@@ -42990,7 +42918,7 @@
     "next-with-edge-functions": {
       "version": "file:demos/next-with-edge-functions",
       "requires": {
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "react": "^18.0.2",
         "react-dom": "^18.0.2"
       }
@@ -44029,11 +43957,11 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
@@ -45844,7 +45772,7 @@
         "@types/node": "^17.0.25",
         "husky": "^7.0.4",
         "if-env": "^1.0.4",
-        "next": "^13.4.1",
+        "next": "^13.5.4",
         "npm-run-all": "^4.1.5",
         "typescript": "^4.6.3"
       }
@@ -47116,6 +47044,15 @@
         "makeerror": "1.0.12"
       }
     },
+    "watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "requires": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      }
+    },
     "web-streams-polyfill": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
@@ -47518,11 +47455,6 @@
         "compress-commons": "^5.0.1",
         "readable-stream": "^3.6.0"
       }
-    },
-    "zod": {
-      "version": "3.21.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
-      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
     }
   }
 }
diff --git a/package.json b/package.json
index 5e6bb1731d..e28db0b278 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "wait-on": "^7.0.1"
   },
   "dependencies": {
-    "next": "^13.4.1"
+    "next": "^13.5.4"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/packages/next/package.json b/packages/next/package.json
index fe3070b6ca..8d6580c195 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -11,7 +11,7 @@
     "@types/chance": "^1.1.3",
     "@types/node": "^17.0.25",
     "chance": "^1.1.11",
-    "next": "^13.4.1",
+    "next": "^13.5.4",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index 3ef3a12246..37fedc5458 100644
--- a/packages/runtime/package.json
+++ b/packages/runtime/package.json
@@ -43,7 +43,7 @@
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
-    "next": "^13.4.1",
+    "next": "^13.5.4",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },