tweak a little

packages/next/client/link.tsx

@@ -13,7 +13,6 @@ import { addBasePath, resolveHref } from '../next-server/lib/router/router'
 function isLocal(url: string): boolean {
   const locationOrigin = getLocationOrigin()
   const resolved = new URL(url, locationOrigin)
-  // TODO: Investigate shouldn't we add: && resolved.pathname.startsWith(router.basePath) ?
   return resolved.origin === locationOrigin
 }
 
@@ -169,12 +168,12 @@ function Link(props: React.PropsWithChildren<LinkProps>) {
   const router = useRouter()
 
   const { href, as } = React.useMemo(() => {
-    const resolvedHref = resolveHref(router, props.href)
+    const resolvedHref = resolveHref(router.pathname, props.href)
     return {
       href: resolvedHref,
-      as: props.as ? resolveHref(router, props.as) : resolvedHref,
+      as: props.as ? resolveHref(router.pathname, props.as) : resolvedHref,
     }
-  }, [router, props.href, props.as])
+  }, [router.pathname, props.href, props.as])
 
   React.useEffect(() => {
     if (p && IntersectionObserver && childElm && childElm.tagName) {

packages/next/next-server/lib/router/router.ts

@@ -42,9 +42,9 @@ type Url = UrlObject | string
  * Resolves a given hyperlink with a certain router state (basePath not included).
  * Preserves absolute urls.
  */
-export function resolveHref(router: NextRouter, href: Url): string {
+export function resolveHref(currentPath: string, href: Url): string {
   // we use a dummy base url for relative urls
-  const base = new URL(router.pathname, 'http://n')
+  const base = new URL(currentPath, 'http://n')
   const urlAsString =
     typeof href === 'string' ? href : formatWithValidation(href)
   const finalUrl = normalizeTrailingSlash(new URL(urlAsString, base))
@@ -58,8 +58,8 @@ function prepareUrlAs(router: NextRouter, url: Url, as: Url) {
   // If url and as provided as an object representation,
   // we'll format them into the string version here.
   return {
-    url: addBasePath(resolveHref(router, url)),
-    as: as ? addBasePath(resolveHref(router, as)) : as,
+    url: addBasePath(resolveHref(router.pathname, url)),
+    as: as ? addBasePath(resolveHref(router.pathname, as)) : as,
   }
 }