Add hard navigation guard and fix middleware rewrite cases

packages/next/client/index.tsx

@@ -79,6 +79,7 @@ let headManager: {
   updateHead: (head: JSX.Element[]) => void
   getIsSsr?: () => boolean
 }
+let initialMatchesMiddleware = false
 
 let lastRenderReject: (() => void) | null
 let webpackHMR: any
@@ -104,28 +105,30 @@ class Container extends React.Component<{
     // - the page was (auto) exported and has a query string or search (hash)
     // - it was auto exported and is a dynamic route (to provide params)
     // - if it is a client-side skeleton (fallback render)
-    const handleQueryUpdate = (matchesMiddleware = false) => {
-      if (
-        router.isSsr &&
-        // We don't update for 404 requests as this can modify
-        // the asPath unexpectedly e.g. adding basePath when
-        // it wasn't originally present
-        initialData.page !== '/404' &&
-        initialData.page !== '/_error' &&
-        (initialData.isFallback ||
-          (initialData.nextExport &&
-            (isDynamicRoute(router.pathname) ||
-              location.search ||
-              process.env.__NEXT_HAS_REWRITES ||
-              matchesMiddleware)) ||
-          (initialData.props &&
-            initialData.props.__N_SSG &&
-            (location.search ||
-              process.env.__NEXT_HAS_REWRITES ||
-              matchesMiddleware)))
-      ) {
-        // update query on mount for exported pages
-        router.replace(
+    // - if middleware matches the current page (may have rewrite params)
+    // - if rewrites in next.config.js match (may have rewrite params)
+    if (
+      router.isSsr &&
+      // We don't update for 404 requests as this can modify
+      // the asPath unexpectedly e.g. adding basePath when
+      // it wasn't originally present
+      initialData.page !== '/404' &&
+      initialData.page !== '/_error' &&
+      (initialData.isFallback ||
+        (initialData.nextExport &&
+          (isDynamicRoute(router.pathname) ||
+            location.search ||
+            process.env.__NEXT_HAS_REWRITES ||
+            initialMatchesMiddleware)) ||
+        (initialData.props &&
+          initialData.props.__N_SSG &&
+          (location.search ||
+            process.env.__NEXT_HAS_REWRITES ||
+            initialMatchesMiddleware)))
+    ) {
+      // update query on mount for exported pages
+      router
+        .replace(
           router.pathname +
             '?' +
             String(
@@ -145,14 +148,13 @@ class Container extends React.Component<{
             // not shallow.
             // Other pages (strictly updating query) happens shallowly, as data
             // requirements would already be present.
-            shallow: !initialData.isFallback && !matchesMiddleware,
+            shallow: !initialData.isFallback && !initialMatchesMiddleware,
           }
         )
-      }
+        .catch((err) => {
+          if (!err.cancelled) throw err
+        })
     }
-    router._initialMatchesMiddlewarePromise
-      .then((matchesMiddleware) => handleQueryUpdate(matchesMiddleware))
-      .catch(() => handleQueryUpdate())
   }
 
   componentDidUpdate() {
@@ -420,6 +422,8 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) {
     isRsc: initialData.rsc,
   })
 
+  initialMatchesMiddleware = await router._initialMatchesMiddlewarePromise
+
   const renderCtx: RenderRouteInfo = {
     App: CachedApp,
     initial: true,

packages/next/client/next-dev.js

@@ -90,6 +90,11 @@ initialize({ webpackHMR })
                 router.asPath,
                 { scroll: false }
               )
+              .catch(() => {
+                // trigger hard reload when failing to refresh data
+                // to show error overlay properly
+                location.reload()
+              })
               .finally(clearIndicator)
           }
         }

packages/next/server/web/adapter.ts

@@ -25,6 +25,10 @@ export async function adapter(params: {
 
   const isDataReq = params.request.headers['x-nextjs-data']
 
+  if (isDataReq && requestUrl.pathname === '/index') {
+    requestUrl.pathname = '/'
+  }
+
   // clean-up any internal query params
   for (const key of [...requestUrl.searchParams.keys()]) {
     if (key.startsWith('__next')) {