From 70a128e705efe84fa30c73bbae182619a3e6e439 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sun, 23 Oct 2022 09:06:03 -0700
Subject: [PATCH] Ensure we properly normalize /index in minimal mode (#41678)

x-ref: [slack
thread](https://vercel.slack.com/archives/C035J346QQL/p1666030147833759)
---
 packages/next/server/base-server.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
index b2b07f66ca006..9182931e180ef 100644
--- a/packages/next/server/base-server.ts
+++ b/packages/next/server/base-server.ts
@@ -526,6 +526,15 @@ export default abstract class Server<ServerOptions extends Options = Options> {
         typeof req.headers['x-matched-path'] === 'string'
       ) {
         try {
+          if (this.hasAppDir) {
+            // ensure /index path is normalized for prerender
+            // in minimal mode
+            if (req.url.match(/^\/index($|\?)/)) {
+              req.url = req.url.replace(/^\/index/, '/')
+            }
+            parsedUrl.pathname =
+              parsedUrl.pathname === '/index' ? '/' : parsedUrl.pathname
+          }
           // x-matched-path is the source of truth, it tells what page
           // should be rendered because we don't process rewrites in minimalMode
           let matchedPath = normalizeRscPath(