Ensure client filter with basePath is correct (vercel#60580)

Follow-up to vercel#60542 this adds
regression tests for `basePath` with the client router filter to ensure
we hard navigate to the correct URL when going from pages -> app.


x-ref: vercel#47486
Closes NEXT-2086

packages/next/src/shared/lib/router/router.ts

@@ -1319,13 +1319,6 @@ export default class Router implements BaseRouter {
     let parsed = parseRelativeUrl(url)
     let { pathname, query } = parsed
 
-    // if we detected the path as app route during prefetching
-    // trigger hard navigation
-    if ((this.components[pathname] as any)?.__appRouter) {
-      handleHardNavigation({ url: as, router: this })
-      return new Promise(() => {})
-    }
-
     // The build manifest needs to be loaded before auto-static dynamic pages
     // get their query parameters to allow ensuring they can be parsed properly
     // when rewritten to
@@ -1366,6 +1359,13 @@ export default class Router implements BaseRouter {
     let route = removeTrailingSlash(pathname)
     const parsedAsPathname = as.startsWith('/') && parseRelativeUrl(as).pathname
 
+    // if we detected the path as app route during prefetching
+    // trigger hard navigation
+    if ((this.components[pathname] as any)?.__appRouter) {
+      handleHardNavigation({ url: as, router: this })
+      return new Promise(() => {})
+    }
+
     const isMiddlewareRewrite = !!(
       parsedAsPathname &&
       route !== parsedAsPathname &&

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

@@ -11,6 +11,12 @@ createNextDescribe(
     },
   },
   ({ next }) => {
+    it('should successfully hard navigate from pages -> app', async () => {
+      const browser = await next.browser('/base/pages-path')
+      await browser.elementByCss('#to-another').click()
+      await browser.waitForElementByCss('#page-2')
+    })
+
     it('should support `basePath`', async () => {
       const html = await next.render('/base')
       expect(html).toContain('<h1>Test Page</h1>')

test/e2e/app-dir/app-basepath/pages/pages-path.js

@@ -0,0 +1,12 @@
+import Link from 'next/link'
+
+export default function Page() {
+  return (
+    <>
+      <p>pages-path</p>
+      <Link href="/another" id="to-another">
+        to /another
+      </Link>
+    </>
+  )
+}

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

@@ -139,6 +139,13 @@ createNextDescribe(
       })
     }
 
+    it('should successfully hard navigate from pages -> app', async () => {
+      const browser = await next.browser('/')
+
+      await browser.elementByCss('a').click()
+      await browser.waitForElementByCss('#from-dashboard')
+    })
+
     it('should encode chunk path correctly', async () => {
       await next.fetch('/dynamic-client/first/second')
       const browser = await next.browser('/')