Merge branch 'main' into mk/dev-watch

Author: ascorbic

demos/custom-routes/package.json

@@ -8,7 +8,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
-    "@types/react": "^17.0.47",
+    "@types/react": "^18.0.25",
     "husky": "^7.0.4",
     "if-env": "^1.0.4",
     "npm-run-all": "^4.1.5",

demos/middleware/middleware.ts

@@ -1,6 +1,9 @@
 import { NextResponse } from 'next/server'
 import { MiddlewareRequest, NextRequest } from '@netlify/next'
 
+// Next.js replaces this with a stub polyfill. This import is just to test that stub.
+import pointlessFetch from 'isomorphic-unfetch'
+
 export async function middleware(req: NextRequest) {
   let response
   const { pathname } = req.nextUrl
@@ -58,6 +61,12 @@ export async function middleware(req: NextRequest) {
   }
 
   if (pathname.startsWith('/shows')) {
+    if (pathname.startsWith('/shows/222')) {
+      response = NextResponse.next()
+      const res = await pointlessFetch('http://www.example.com/')
+      response.headers.set('x-example-server', res.headers.get('server'))
+    }
+
     if (pathname.startsWith('/shows/rewrite-absolute')) {
       response = NextResponse.rewrite(new URL('/shows/100', req.url))
       response.headers.set('x-modified-in-rewrite', 'true')

demos/middleware/package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
+    "isomorphic-unfetch": "^3.1.0",
     "next": "^13.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
@@ -19,9 +20,9 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
-    "@types/react": "^17.0.43",
+    "@types/react": "^18.0.25",
     "husky": "^7.0.4",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   }
-}
+}

demos/nx-next-monorepo-demo/package-lock.json

@@ -30,7 +30,7 @@
     "@testing-library/react": "13.4.0",
     "@types/jest": "28.1.8",
     "@types/node": "16.11.7",
-    "@types/react": "18.0.25",
+    "@types/react": "18.0.26",
     "@types/react-dom": "18.0.6",
     "@typescript-eslint/eslint-plugin": "^5.36.1",
     "@typescript-eslint/parser": "^5.36.1",

demos/nx-next-monorepo-demo/package.json

@@ -21,7 +21,7 @@
     "next-transpile-modules": "9.0.0",
     "tsconfig": "*",
     "@types/node": "^17.0.12",
-    "@types/react": "18.0.25",
+    "@types/react": "18.0.26",
     "typescript": "^4.5.3"
   }
 }

demos/turborepo-next-monorepo-demo/apps/docs/package.json

@@ -21,7 +21,7 @@
     "next-transpile-modules": "9.0.0",
     "tsconfig": "*",
     "@types/node": "^17.0.12",
-    "@types/react": "18.0.25",
+    "@types/react": "18.0.26",
     "typescript": "^4.5.3"
   }
 }