refactor: better frontmatter code (#1892)

* refactor: better frontmatter code * fix: render loop
umijs · Sep 14, 2023 · a42dfb2 · a42dfb2
1 parent ff343de
commit a42dfb2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/src/client/theme-api/useRouteMeta.ts b/src/client/theme-api/useRouteMeta.ts
@@ -19,6 +19,12 @@ const useAsyncRouteMeta = (id: string) => {
   return use<ReturnType<getRouteMetaById>>(cache.get(id));
 };
 
+const emptyMeta = {
+  frontmatter: {},
+  toc: [],
+  texts: [],
+};
+
 /**
  * hook for get matched route meta
  */
@@ -38,14 +44,13 @@ export const useRouteMeta = () => {
     }
   }, [clientRoutes.length, pathname]);
 
-  const meta: IRouteMeta = useAsyncRouteMeta((curRoute as any)?.id) || {
-    frontmatter: {},
-    toc: [],
-    texts: [],
-  };
+  const meta: IRouteMeta =
+    useAsyncRouteMeta((curRoute as any)?.id) || emptyMeta;
 
-  if (curRoute && 'meta' in curRoute && (curRoute.meta as any)._atom_route) {
-    meta._atom_route = true;
+  if (curRoute && 'meta' in curRoute && typeof curRoute.meta === 'object') {
+    Object.keys(curRoute.meta as IRouteMeta).forEach((key) => {
+      (meta as any)[key] ??= (curRoute as any).meta[key];
+    });
   }
 
   return meta;

diff --git a/src/templates/meta-frontmatter.ts.tpl b/src/templates/meta-frontmatter.ts.tpl
@@ -4,8 +4,6 @@ import { frontmatter as fm{{{index}}} } from '{{{file}}}?type=frontmatter';
 
 export const filesFrontmatter = {
   {{#metaFiles}}
-  '{{{id}}}': {
-    frontmatter: fm{{{index}}},
-  },
+  '{{{id}}}': fm{{{index}}},
   {{/metaFiles}}
 }
diff --git a/src/templates/meta-route.ts.tpl b/src/templates/meta-route.ts.tpl
@@ -37,7 +37,7 @@ export const getRouteMetaById = async (id: string) => {
   return {
     texts: text?.texts,
     toc: text?.toc,
-    frontmatter: frontmatter?.frontmatter,
+    frontmatter,
     tabs: tabsMeta,
   };
 }
diff --git a/src/templates/meta-runtime.ts.tpl b/src/templates/meta-runtime.ts.tpl
@@ -16,20 +16,20 @@ function wrapEmpty(meta, fieldName, defaultValue) {
 export const patchRoutes = ({ routes }) => {
   Object.values(routes).forEach((route) => {
     if (filesFrontmatter[route.id]) {
-      if (process.env.NODE_ENV === 'production' && (route.meta?.frontmatter?.debug || filesFrontmatter[route.id].frontmatter.debug)) {
+      if (process.env.NODE_ENV === 'production' && (route.meta?.frontmatter?.debug || filesFrontmatter[route.id].debug)) {
         // hide route in production which set hide frontmatter
         delete routes[route.id];
       } else {
         // merge meta to route object
-        route.meta = deepmerge(route.meta, filesFrontmatter[route.id]);
+        route.meta = deepmerge(route.meta, { frontmatter: filesFrontmatter[route.id] });
 
         wrapEmpty(route.meta, 'demos', {});
         wrapEmpty(route.meta, 'texts', []);
 
         // apply real tab data from id
         route.meta.tabs = route.meta.tabs?.map((id) => {
-          const meta = filesFrontmatter[id] || {
-            frontmatter: { title: tabs[id].title },
+          const meta = {
+            frontmatter: filesFrontmatter[id] || { title: tabs[id].title },
             toc: [],
             texts: [],
           }