From c1c1036a5d9a02a11e684f90f7b2cf0e0bf0e79d Mon Sep 17 00:00:00 2001 From: PeachScript Date: Thu, 28 Mar 2024 09:34:19 +0800 Subject: [PATCH 1/2] chore: tmp solution for runtime server loader path --- packages/renderer-react/src/dataFetcher.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/renderer-react/src/dataFetcher.ts b/packages/renderer-react/src/dataFetcher.ts index 2122a46444ec..951c35a37485 100644 --- a/packages/renderer-react/src/dataFetcher.ts +++ b/packages/renderer-react/src/dataFetcher.ts @@ -12,7 +12,10 @@ export function fetchServerLoader({ url: window.location.href, }).toString(); // 在有basename的情况下__serverLoader的请求路径需要加上basename - const url = `${withEndSlash(basename)}__serverLoader?${query}`; + // FIXME: 先临时解自定义 serverLoader 请求路径的问题，后续改造 serverLoader 时再提取成类似 runtimeServerLoader 的配置项 + const url = `${withEndSlash( + (window as any).serverLoaderPath || basename, + )}__serverLoader?${query}`; fetch(url, { credentials: 'include', }) From 44ac82740214b9369e405bb17ada4d49556c72d7 Mon Sep 17 00:00:00 2001 From: PeachScript Date: Thu, 28 Mar 2024 10:27:37 +0800 Subject: [PATCH 2/2] refactor: rename --- packages/renderer-react/src/dataFetcher.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/renderer-react/src/dataFetcher.ts b/packages/renderer-react/src/dataFetcher.ts index 951c35a37485..0db63b41a6cc 100644 --- a/packages/renderer-react/src/dataFetcher.ts +++ b/packages/renderer-react/src/dataFetcher.ts @@ -14,7 +14,7 @@ export function fetchServerLoader({ // 在有basename的情况下__serverLoader的请求路径需要加上basename // FIXME: 先临时解自定义 serverLoader 请求路径的问题，后续改造 serverLoader 时再提取成类似 runtimeServerLoader 的配置项 const url = `${withEndSlash( - (window as any).serverLoaderPath || basename, + (window as any).umiServerLoaderPath || basename, )}__serverLoader?${query}`; fetch(url, { credentials: 'include',