Skip to content
This repository was archived by the owner on Jul 6, 2025. It is now read-only.

Commit c1ce7f9

Browse files
committed
fix: fix loadPageData function
1 parent bf2e786 commit c1ce7f9

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

framework/react/pagedata.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@ import type { RouterURL } from '../../types.ts'
33

44
const global = window as any
55

6-
export async function loadPageData({ pathname }: RouterURL): Promise<void> {
7-
if (`pagedata://${pathname}` in global) {
8-
const { expires, keys } = global[`pagedata://${pathname}`]
6+
export async function loadPageData({ baseURL, pathname }: RouterURL) {
7+
const url = `pagedata://${pathname}`
8+
if (url in global) {
9+
const { expires, keys } = global[url]
910
if (expires === 0 || Date.now() < expires) {
1011
return
1112
}
12-
delete global[`pagedata://${pathname}`]
13+
delete global[url]
1314
keys.forEach((key: string) => {
14-
delete global[`pagedata://${pathname}#key`]
15+
delete global[`${url}#${key}`]
1516
})
1617
}
17-
const url = `/_aleph/data${pathname === '/' ? '/index' : pathname}.json`
18-
const data = await fetch(url).then(resp => resp.json())
18+
const dataUrl = `${util.trimSuffix(baseURL, '/')}/_aleph/data${pathname === '/' ? '/index' : pathname}.json`
19+
const data = await (await fetch(dataUrl)).json()
1920
if (util.isPlainObject(data)) {
2021
storeData(data, pathname)
2122
}

0 commit comments

Comments
 (0)