Merge branch 'canary' into add-turbo-powered-packing

Author: jankaifer

.github/labeler.json

@@ -31,7 +31,18 @@
       { "type": "user", "pattern": "styfle" },
       { "type": "user", "pattern": "leerob" },
       { "type": "user", "pattern": "kdy1" },
-      { "type": "user", "pattern": "timneutkens" }
+      { "type": "user", "pattern": "timneutkens" },
+      { "type": "user", "pattern": "sebmarkbage" },
+      { "type": "user", "pattern": "wyattjoh" },
+      { "type": "user", "pattern": "kwonoj" },
+      { "type": "user", "pattern": "gnoff" },
+      { "type": "user", "pattern": "padmaia" },
+      { "type": "user", "pattern": "Brooooooklyn" },
+      { "type": "user", "pattern": "ForsakenHarmony" },
+      { "type": "user", "pattern": "feedthejim" },
+      { "type": "user", "pattern": "JanKaifer" },
+      { "type": "user", "pattern": "balazsorban44" },
+      { "type": "user", "pattern": "hanneslund" }
     ],
     "created-by: Next.js docs team": [
       { "type": "user", "pattern": "MaedahBatool" },

docs/advanced-features/middleware.md

@@ -9,6 +9,7 @@ description: Learn how to use Middleware to run code before a request is complet
 
 | Version   | Changes                                                                                    |
 | --------- | ------------------------------------------------------------------------------------------ |
+| `v13.1.0` | Advanced Middleware flags added                                                            |
 | `v13.0.0` | Middleware can modify request headers, response headers, and send responses                |
 | `v12.2.0` | Middleware is stable                                                                       |
 | `v12.0.9` | Enforce absolute URLs in Edge Runtime ([PR](https://github.com/vercel/next.js/pull/33410)) |
@@ -220,18 +221,7 @@ export function middleware(request: NextRequest) {
 
 ## Producing a Response
 
-You can respond to middleware directly by returning a `NextResponse` (responding from middleware is available since Next.js v13.0.0).
-
-To enable middleware responses, update `next.config.js`:
-
-```js
-// next.config.js
-module.exports = {
-  experimental: {
-    allowMiddlewareResponseBody: true,
-  },
-}
-```
+You can respond to middleware directly by returning a `NextResponse` (responding from middleware is available since Next.js v13.1.0).
 
 Once enabled, you can provide a response from middleware using the `Response` or `NextResponse` API:
 
@@ -257,6 +247,66 @@ export function middleware(request: NextRequest) {
 }
 ```
 
+## Advanced Middleware Flags
+
+In `v13.1` of Next.js two additional flags were introduced for middleware, `skipMiddlewareUrlNormalize` and `skipTrailingSlashRedirect` to handle advanced use cases.
+
+`skipTrailingSlashRedirect` allows disabling Next.js default redirects for adding or removing trailing slashes allowing custom handling inside middleware which can allow maintaining the trailing slash for some paths but not others allowing easier incremental migrations.
+
+```js
+// next.config.js
+module.exports = {
+  skipTrailingSlashRedirect: true,
+}
+```
+
+```js
+// middleware.js
+
+const legacyPrefixes = ['/docs', '/blog']
+
+export default async function middleware(req) {
+  const { pathname } = req.nextUrl
+
+  if (legacyPrefixes.some((prefix) => pathname.startsWith(prefix))) {
+    return NextResponse.next()
+  }
+
+  // apply trailing slash handling
+  if (
+    !pathname.endsWith('/') &&
+    !pathname.match(/((?!\.well-known(?:\/.*)?)(?:[^/]+\/)*[^/]+\.\w+)/)
+  ) {
+    req.nextUrl.pathname += '/'
+    return NextResponse.redirect(req.nextUrl)
+  }
+}
+```
+
+`skipMiddlewareUrlNormalize` allows disabling the URL normalizing Next.js does to make handling direct visits and client-transitions the same. There are some advanced cases where you need full control using the original URL which this unlocks.
+
+```js
+// next.config.js
+
+module.exports = {
+  skipMiddlewareUrlNormalize: true,
+}
+```
+
+```js
+// middleware.js
+
+export default async function middleware(req) {
+  const { pathname } = req.nextUrl
+
+  // GET /_next/data/build-id/hello.json
+
+  console.log(pathname)
+  // with the flag this now /_next/data/build-id/hello.json
+  // without the flag this would be normalized to /hello
+}
+```
+
 ## Related
 
 <div class="card">

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.0.8-canary.2"
+  "version": "13.0.8-canary.4"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.0.8-canary.2",
+  "version": "13.0.8-canary.4",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.0.8-canary.2",
+  "version": "13.0.8-canary.4",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "13.0.8-canary.2",
+    "@next/eslint-plugin-next": "13.0.8-canary.4",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.0",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.0.8-canary.2",
+  "version": "13.0.8-canary.4",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.0.8-canary.2",
+  "version": "13.0.8-canary.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "13.0.8-canary.2",
+  "version": "13.0.8-canary.4",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.0.8-canary.2",
+  "version": "13.0.8-canary.4",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.0.8-canary.2",
+  "version": "13.0.8-canary.4",
   "keywords": [
     "react",
     "next",