Merge 3fb7913 into 950f158

vuepress · Apr 8, 2024 · 7cffb9f · 7cffb9f
2 parents 950f158 + 3fb7913
commit 7cffb9f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/packages/core/src/app/prepare/preparePageChunk.ts b/packages/core/src/app/prepare/preparePageChunk.ts
@@ -22,7 +22,7 @@ export const preparePageChunk = async (app: App, page: Page): Promise<void> => {
   // page chunk file content
   let content = `\
 import comp from ${JSON.stringify(page.componentFilePath)}
-const data = JSON.parse(${JSON.stringify(JSON.stringify(page.data))})
+const data = ${JSON.stringify(page.data)}
 export { comp, data }
 `
 

diff --git a/packages/core/src/app/prepare/prepareRoutes.ts b/packages/core/src/app/prepare/prepareRoutes.ts
@@ -52,24 +52,25 @@ const resolvePageRedirects = ({ path, pathInferred }: Page): string[] => {
 export const prepareRoutes = async (app: App): Promise<void> => {
   // routes file content
   let content = `\
-export const redirects = JSON.parse(${JSON.stringify(
-    JSON.stringify(
-      Object.fromEntries(
-        app.pages.flatMap((page) =>
-          resolvePageRedirects(page).map((redirect) => [redirect, page.path]),
-        ),
+export const redirects = ${JSON.stringify(
+    Object.fromEntries(
+      app.pages.flatMap((page) =>
+        resolvePageRedirects(page).map((redirect) => [redirect, page.path]),
       ),
     ),
-  )})
+  )}
 
-export const routes = Object.fromEntries([
+export const routes = {
 ${app.pages
   .map(
     ({ chunkFilePath, chunkName, path, routeMeta }) =>
-      `  [${JSON.stringify(path)}, { loader: () => import(${chunkName ? `/* webpackChunkName: "${chunkName}" */` : ''}${JSON.stringify(chunkFilePath)}), meta: ${JSON.stringify(routeMeta)} }],`,
+      `  ${JSON.stringify(path)}: {
+        loader: () => import(${chunkName ? `/* webpackChunkName: "${chunkName}" */` : ''}${JSON.stringify(chunkFilePath)}),
+        meta: ${JSON.stringify(routeMeta)}
+    },`,
   )
   .join('\n')}
-]);
+};
 `
 
   // inject HMR code

diff --git a/packages/core/src/app/prepare/prepareSiteData.ts b/packages/core/src/app/prepare/prepareSiteData.ts
@@ -20,9 +20,7 @@ if (import.meta.hot) {
  */
 export const prepareSiteData = async (app: App): Promise<void> => {
   let content = `\
-export const siteData = JSON.parse(${JSON.stringify(
-    JSON.stringify(app.siteData),
-  )})
+export const siteData = ${JSON.stringify(app.siteData)}
 `
 
   // inject HMR code