refactor: avoid breaking change for useRouteMeta api (#2002)

* refactor: avoid empty tabs from useRouteMeta * refactor: version check include prerelease
umijs · Jan 8, 2024 · c29cd1e · c29cd1e
1 parent a80758a
commit c29cd1e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/src/features/theme/index.ts b/src/features/theme/index.ts
@@ -87,7 +87,7 @@ function checkMinor2ByPkg(pkg: IApi['pkg']) {
   const ver =
     pkg.peerDependencies?.dumi || pkg.devDependencies?.dumi || '^2.0.0';
 
-  return semver.subset(ver, VERSION_2_LEVEL_NAV);
+  return semver.subset(ver, VERSION_2_LEVEL_NAV, { includePrerelease: true });
 }
 
 export default (api: IApi) => {

diff --git a/src/loaders/markdown/transformer/index.ts b/src/loaders/markdown/transformer/index.ts
@@ -83,7 +83,9 @@ function keepSoftBreak(pkg: IApi['pkg']) {
   if (pkg?.name?.startsWith('@examples/') || pkg?.name === 'dumi') return false;
 
   const ver = pkg?.devDependencies?.dumi ?? pkg?.dependencies?.dumi ?? '^2.0.0';
-  return !semver.subset(ver, VERSION_2_DEPRECATE_SOFT_BREAKS);
+  return !semver.subset(ver, VERSION_2_DEPRECATE_SOFT_BREAKS, {
+    includePrerelease: true,
+  });
 }
 
 async function applyUnifiedPlugin(opts: {

diff --git a/src/templates/meta/exports.ts.tpl b/src/templates/meta/exports.ts.tpl
@@ -109,33 +109,38 @@ export function getRouteMetaById<T extends { syncOnly?: boolean }>(
   ? undefined | IRouteMeta
   : Promise<undefined | IRouteMeta> | undefined {
   if (filesMeta[id]) {
-    const { frontmatter, toc, textGetter, tabs = [] } = filesMeta[id];
+    const { frontmatter, toc, textGetter, tabs } = filesMeta[id];
     const routeMeta: IRouteMeta = {
       frontmatter,
       toc: toc,
       texts: [],
     };
 
     if (opts?.syncOnly) {
-      routeMeta.tabs = tabs.map((tabId) =>
-        genTab(tabId, getRouteMetaById(tabId, opts)),
-      );
+      if (tabs) {
+        routeMeta.tabs = tabs.map((tabId) =>
+          genTab(tabId, getRouteMetaById(tabId, opts)),
+        );
+      }
+
+      return routeMeta;
     } else {
       return new Promise(async (resolve) => {
         if (textGetter) {
           ({ texts: routeMeta.texts } = await textGetter());
         }
 
-        routeMeta.tabs = await Promise.all(
-          tabs.map(async (tabId) =>
-            genTab(tabId, await getRouteMetaById(tabId, opts)),
-          ),
-        );
+        if (tabs) {
+          routeMeta.tabs = await Promise.all(
+            tabs.map(async (tabId) =>
+              genTab(tabId, await getRouteMetaById(tabId, opts)),
+            ),
+          );
+        }
+
         resolve(routeMeta);
       });
     }
-
-    return routeMeta;
   }
 }