Remove app routes from _devPagesManifest

packages/next/server/dev/next-dev-server.ts

@@ -1226,7 +1226,9 @@ export default class DevServer extends Server {
         res
           .body(
             JSON.stringify({
-              pages: this.sortedRoutes,
+              pages: this.sortedRoutes?.filter(
+                (route) => !this.appPathRoutes![route]
+              ),
             })
           )
           .send()

test/e2e/app-dir/app/app/dynamic-pages-route-app-overlap/app-dir/page.js

@@ -0,0 +1,7 @@
+export default function Page() {
+  return (
+    <p id="app-text">
+      hello from app/dynamic-pages-route-app-overlap/app-dir/page
+    </p>
+  )
+}

test/e2e/app-dir/app/pages/dynamic-pages-route-app-overlap.js

@@ -0,0 +1,9 @@
+import Link from 'next/link'
+
+export default function Page() {
+  return (
+    <Link id="pages-link" href="/dynamic-pages-route-app-overlap/app-dir">
+      To /dynamic-pages-route-app-overlap/app-dir
+    </Link>
+  )
+}

test/e2e/app-dir/app/pages/dynamic-pages-route-app-overlap/[slug].js

@@ -0,0 +1,7 @@
+export default function Page() {
+  return (
+    <p id="pages-text">
+      hello from pages/dynamic-pages-route-app-overlap/[slug]
+    </p>
+  )
+}

test/e2e/app-dir/index.test.ts

@@ -615,6 +615,29 @@ describe('app dir', () => {
           await browser.close()
         }
       })
+
+      it('should navigate to pages dynamic route from pages page if it overlaps with an app page', async () => {
+        const browser = await webdriver(
+          next.url,
+          '/dynamic-pages-route-app-overlap'
+        )
+
+        try {
+          // Click the link.
+          await browser.elementById('pages-link').click()
+          expect(await browser.waitForElementByCss('#pages-text').text()).toBe(
+            'hello from pages/dynamic-pages-route-app-overlap/[slug]'
+          )
+
+          // When refreshing the browser, the app page should be rendered
+          await browser.refresh()
+          expect(await browser.waitForElementByCss('#app-text').text()).toBe(
+            'hello from app/dynamic-pages-route-app-overlap/app-dir/page'
+          )
+        } finally {
+          await browser.close()
+        }
+      })
     })
 
     describe('server components', () => {