Skip to content

Commit 73e55f0

Browse files
committed
revert: fix(client): avoid mismatching between route path and page data (close #1249) (#1361)
This reverts commit 9b0ad9e.
1 parent 18a7afd commit 73e55f0

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

packages/client/src/router.ts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { pagesComponents } from '@internal/pagesComponents'
2-
import type { PageData } from '@vuepress/shared'
32
import { removeEndingSlash } from '@vuepress/shared'
43
import {
54
createMemoryHistory,
@@ -33,23 +32,13 @@ export const createVueRouter = (): Router => {
3332
},
3433
})
3534

36-
// ensure page data and page component have been loaded in beforeResolve hook,
37-
// but do not assign page data immediately to avoid mismatching between page data and route path.
38-
let pendingPageData: PageData
39-
let pendingToPath: string
4035
router.beforeResolve(async (to, from) => {
4136
if (to.path !== from.path || from === START_LOCATION) {
42-
;[pendingPageData] = await Promise.all([
37+
// ensure page data and page component have been loaded
38+
;[pageData.value] = await Promise.all([
4339
resolvers.resolvePageData(to.name as string),
4440
pagesComponents[to.name as string]?.__asyncLoader(),
4541
])
46-
pendingToPath = to.path
47-
}
48-
})
49-
// instead, assign page data in afterEach hook
50-
router.afterEach((to, from) => {
51-
if (to.path !== from.path && to.path === pendingToPath) {
52-
pageData.value = pendingPageData
5342
}
5443
})
5544

0 commit comments

Comments
 (0)