From 2b77a53b691de930164e72b860e83b6f7d78cf78 Mon Sep 17 00:00:00 2001
From: pengzhanbo <volodymyr@foxmail.com>
Date: Sun, 19 May 2024 16:47:07 +0800
Subject: [PATCH] chore: tweak

---
 packages/client/src/router/createVueRouter.ts | 6 ++----
 packages/client/src/router/resolveRoute.ts    | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/router/createVueRouter.ts b/packages/client/src/router/createVueRouter.ts
index 69f6b810cd..6cbb8fa8e7 100644
--- a/packages/client/src/router/createVueRouter.ts
+++ b/packages/client/src/router/createVueRouter.ts
@@ -40,10 +40,8 @@ export const createVueRouter = (): Router => {
   // and save page data to route meta
   router.beforeResolve(async (to, from): Promise<string | void> => {
     if (to.path !== from.path || from === START_LOCATION) {
-      const fullPath = to.fullPath.split(/#|\?/)[0]
-      const route = resolveRoute(fullPath)
-
-      if (route.path !== fullPath) {
+      const route = resolveRoute(to.fullPath)
+      if (route.path !== to.fullPath) {
         return route.path
       }
       const pageChunk = await route.loader()
diff --git a/packages/client/src/router/resolveRoute.ts b/packages/client/src/router/resolveRoute.ts
index e4345c9a9b..bd7a6e8b06 100644
--- a/packages/client/src/router/resolveRoute.ts
+++ b/packages/client/src/router/resolveRoute.ts
@@ -16,7 +16,8 @@ export const resolveRoute = <T extends RouteMeta = RouteMeta>(
   currentPath?: string,
 ): ResolvedRoute<T> => {
   const routePath = resolveRoutePath(path, currentPath)
-  const route = routes.value[routePath] ?? {
+  const pathname = routePath.split(/#|\?/)[0]
+  const route = routes.value[pathname] ?? {
     ...routes.value['/404.html'],
     notFound: true,
   }