fix: rename

c0dedance · Oct 30, 2023 · 2a2f5fb · 2a2f5fb
1 parent 076cba0
commit 2a2f5fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/node/build.ts b/src/node/build.ts
@@ -49,7 +49,7 @@ export async function renderPage({
   const renderIndexHTML = (
     appHtml: string,
     islandsCode: string,
-    propsData: unknown[]
+    islandProps: unknown[]
   ) =>
     `\
   <!DOCTYPE html>
@@ -67,21 +67,25 @@ export async function renderPage({
       <div id="root">${appHtml}</div>
       <script type="module">${islandsCode}</script>
       <script type="module" src="/${clientChunk?.fileName}"></script>
-      <script id="island-props">${JSON.stringify(propsData)}</script>
+      <script id="island-props">${JSON.stringify(islandProps)}</script>
     </body>
   </html>`.trim()
   console.log(`Rendering page in server side...`)
   await Promise.all(
     routes.map(async (r) => {
       // 渲染路由对应的页面
-      const { appHtml, islandPathToMap, propsData = [] } = await render(r.path)
+      const {
+        appHtml,
+        islandPathToMap,
+        islandProps = [],
+      } = await render(r.path)
 
       // 打包 Islands 组件代码
       const islandBundle = await buildIslands(root, islandPathToMap)
       const islandsCode = (islandBundle as RollupOutput).output[0].code
 
       // 组件HTML嵌入到模板中
-      const html = renderIndexHTML(appHtml, islandsCode, propsData)
+      const html = renderIndexHTML(appHtml, islandsCode, islandProps)
       // htlm文件名处理
       const outputFilePath = r.path.endsWith('/')
         ? `${r.path}index.html`

diff --git a/src/runtime/ssr-entry.tsx b/src/runtime/ssr-entry.tsx
@@ -5,7 +5,7 @@ import { DataContext } from './hooks'
 
 export interface RenderResult {
   appHtml: string
-  propsData: unknown[]
+  islandProps: unknown[]
   islandPathToMap: Record<string, string>
 }
 
@@ -15,7 +15,6 @@ export async function render(pagePath: string) {
   const pageData = await initPageData(pagePath)
   // 清除 islands 数据
   const { clearIslandData, data } = await import('./jsx-runtime')
-  const { islandProps, islandPathToMap } = data
   clearIslandData()
 
   const appHtml = renderToString(
@@ -25,6 +24,8 @@ export async function render(pagePath: string) {
       </StaticRouter>
     </DataContext.Provider>
   )
+  // 保证每次都能拿到最新的数据
+  const { islandProps, islandPathToMap } = data
   return {
     appHtml,
     islandProps,