dumi 2.2.12 → 2.2.14

package/dist/client/theme-api/useNavData.js

@@ -16,7 +16,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { useFullSidebarData, useLocale, useSiteData } from 'dumi';
 import { useState } from 'react';
-import { getLocaleClearPath } from "./useSidebarData";
+import { getLocaleClearPath, getRouteParentPath } from "./useSidebarData";
 import { getLocaleNav, pickRouteSortMeta, useLocaleDocRoutes, useRouteDataComparer } from "./utils";
 function genNavItem(meta, groups, activePath, link) {
   return _objectSpread({
@@ -70,11 +70,14 @@ export var useNavData = function useNavData() {
         var _ref6 = _slicedToArray(_ref5, 2),
           link = _ref6[0],
           groups = _ref6[1];
-        var _ref7 = "/".concat(getLocaleClearPath(link.replace(/^\//, ''), locale)).match(/^(\/[^/]+)([^]+)?$/),
-          _ref8 = _slicedToArray(_ref7, 3),
-          parentPath = _ref8[1],
-          restPath = _ref8[2];
-        var isNestedNav = Boolean(restPath) && is2LevelNav;
+        var clearPath = getLocaleClearPath(link.replace(/^\//, ''), locale);
+        var parentPath = link.replace(clearPath, function (s) {
+          return getRouteParentPath(s, {
+            is2LevelNav: is2LevelNav,
+            locale: locale
+          });
+        });
+        var isNestedNav = link.length > parentPath.length && is2LevelNav;
         var _Object$values$reduce = Object.values(routes).reduce(function (ret, route) {
             // find routes which within the nav path
             if (route.path.startsWith(link.slice(1))) {
@@ -90,14 +93,14 @@ export var useNavData = function useNavData() {
         if (isNestedNav) {
           var _firstMeta$title, _ret$parentPath, _second$children;
           // fallback to use parent path as 1-level nav title
-          (_firstMeta$title = firstMeta.title) !== null && _firstMeta$title !== void 0 ? _firstMeta$title : firstMeta.title = parentPath.slice(1).replace(/^[a-z]/, function (s) {
+          (_firstMeta$title = firstMeta.title) !== null && _firstMeta$title !== void 0 ? _firstMeta$title : firstMeta.title = parentPath.split('/').pop().replace(/^[a-z]/, function (s) {
             return s.toUpperCase();
           });
 
           // handle nested nav item as parent children
           var second = (_ret$parentPath = ret[parentPath]) !== null && _ret$parentPath !== void 0 ? _ret$parentPath : ret[parentPath] = genNavItem(firstMeta, groups, parentPath);
           (_second$children = second.children) !== null && _second$children !== void 0 ? _second$children : second.children = [];
-          ret[parentPath].children.push(genNavItem(secondMeta, groups, link, groups[0].children[0].link));
+          second.children.push(genNavItem(secondMeta, groups, link, groups[0].children[0].link));
         } else {
           // handle root nav item
           ret[link] = genNavItem(firstMeta, groups, link, groups[0].children[0].link);

package/dist/client/theme-api/useSidebarData.d.ts

@@ -1,5 +1,13 @@
-import type { ILocalesConfig, ISidebarGroup } from './types';
+import type { ILocalesConfig, IRouteMeta, ISidebarGroup } from './types';
 export declare const getLocaleClearPath: (routePath: string, locale: ILocalesConfig[0]) => string;
+/**
+ * get parent path from route path
+ */
+export declare function getRouteParentPath(path: string, { meta, is2LevelNav, locale, }: {
+    meta?: IRouteMeta;
+    is2LevelNav: boolean;
+    locale: ILocalesConfig[0];
+}): string;
 /**
  * hook for get sidebar data for all nav
  */

package/dist/client/theme-api/useSidebarData.js

@@ -26,11 +26,12 @@ export var getLocaleClearPath = function getLocaleClearPath(routePath, locale) {
 /**
  * get parent path from route path
  */
-function getRouteParentPath(path, _ref) {
-  var _meta$frontmatter$fil;
+export function getRouteParentPath(path, _ref) {
   var meta = _ref.meta,
-    is2LevelNav = _ref.is2LevelNav;
-  var isIndexDocRoute = ((_meta$frontmatter$fil = meta.frontmatter.filename) === null || _meta$frontmatter$fil === void 0 ? void 0 : _meta$frontmatter$fil.endsWith('index.md')) && !meta._atom_route && is2LevelNav;
+    is2LevelNav = _ref.is2LevelNav,
+    locale = _ref.locale;
+  var indexDocRegex = new RegExp("/index(\\.".concat(locale.id, ")?.md$"));
+  var isIndexDocRoute = (meta === null || meta === void 0 ? void 0 : meta.frontmatter.filename) && indexDocRegex.test(meta.frontmatter.filename) && !meta._atom_route && is2LevelNav;
   var paths = path.split('/')
   // strip end slash
   .filter(Boolean);
@@ -74,7 +75,8 @@ export var useFullSidebarData = function useFullSidebarData() {
           var parentPath = "/".concat(route.path.replace(clearPath, function (s) {
             return getRouteParentPath(s, {
               is2LevelNav: is2LevelNav,
-              meta: route.meta
+              meta: route.meta,
+              locale: locale
             });
           }));
           var _pickRouteSortMeta = pickRouteSortMeta({
@@ -227,7 +229,8 @@ export var useSidebarData = function useSidebarData() {
   var parentPath = clearPath ? pathname.replace(clearPath, function (s) {
     return getRouteParentPath(s, {
       is2LevelNav: is2LevelNav,
-      meta: meta
+      meta: meta,
+      locale: locale
     });
   }) : pathname;
   return parentPath ? sidebar[parentPath] : [];

package/dist/features/routes.js

@@ -39,9 +39,6 @@ var import_path = __toESM(require("path"));
 var import_pluralize = require("pluralize");
 var import_plugin_utils = require("umi/plugin-utils");
 var CTX_LAYOUT_ID = "dumi-context-layout";
-var ALIAS_THEME_TMP = "@/dumi__theme";
-var ALIAS_LAYOUTS_LOCAL = "@/dumi__theme__layouts";
-var ALIAS_INTERNAL_PAGES = "@/dumi__pages";
 function normalizeDocDir(docDir) {
   return typeof docDir === "object" ? docDir : { dir: docDir };
 }
@@ -80,13 +77,6 @@ function flatRoute(route, docLayoutId) {
     ) : route.absPath.slice(1);
   }
 }
-function getAliasLayoutFile({
-  source,
-  specifier
-}) {
-  const alias = source.includes("/.dumi/theme/layouts/") ? ALIAS_LAYOUTS_LOCAL : `${ALIAS_THEME_TMP}/layouts`;
-  return `${alias}/${specifier}`;
-}
 var routes_default = (api) => {
   api.describe({ key: "dumi:routes" });
   api.addTmpGenerateWatcherPaths(
@@ -104,15 +94,6 @@ var routes_default = (api) => {
           memo.resolve[key] = [];
       });
     }
-    memo.alias[ALIAS_THEME_TMP] = (0, import_plugin_utils.winPath)(
-      import_path.default.join(api.paths.absTmpPath, "dumi/theme")
-    );
-    memo.alias[ALIAS_LAYOUTS_LOCAL] = (0, import_plugin_utils.winPath)(
-      import_path.default.join(api.cwd, import_constants.LOCAL_THEME_DIR, "layouts")
-    );
-    memo.alias[ALIAS_INTERNAL_PAGES] = (0, import_plugin_utils.winPath)(
-      import_path.default.join(__dirname, "../client/pages")
-    );
     return memo;
   });
   api.modifyRoutes((oRoutes) => {
@@ -141,10 +122,7 @@ var routes_default = (api) => {
       routes[DocLayout.specifier] = {
         id: DocLayout.specifier,
         path: "/",
-        // why not use DocLayout.source?
-        // because umi will generate chunk name from file path
-        // but source may too long in pnpm/monorepo project
-        file: getAliasLayoutFile(DocLayout),
+        file: DocLayout.source,
         parentId: lastLayoutId,
         absPath: "/",
         isLayout: true
@@ -155,7 +133,7 @@ var routes_default = (api) => {
       routes[DemoLayout.specifier] = {
         id: DemoLayout.specifier,
         path: "/",
-        file: getAliasLayoutFile(DemoLayout),
+        file: DemoLayout.source,
         parentId: lastLayoutId,
         absPath: "/",
         isLayout: true
@@ -224,7 +202,7 @@ var routes_default = (api) => {
         path: "*",
         absPath: "/*",
         parentId: docLayoutId,
-        file: `${ALIAS_INTERNAL_PAGES}/404`
+        file: require.resolve("../client/pages/404")
       };
     }
     routes["demo-render"] = {
@@ -232,7 +210,7 @@ var routes_default = (api) => {
       path: `${import_constants.SP_ROUTE_PREFIX}demos/:id`,
       absPath: `/${import_constants.SP_ROUTE_PREFIX}demos/:id`,
       parentId: demoLayoutId,
-      file: `${ALIAS_INTERNAL_PAGES}/Demo`
+      file: require.resolve("../client/pages/Demo")
     };
     return routes;
   });
@@ -240,14 +218,14 @@ var routes_default = (api) => {
     const layouts = [
       {
         id: CTX_LAYOUT_ID,
-        file: `${ALIAS_THEME_TMP}/ContextWrapper`
+        file: `${api.paths.absTmpPath}/dumi/theme/ContextWrapper`
       }
     ];
     const { GlobalLayout } = api.service.themeData.layouts;
     if (GlobalLayout) {
       layouts.unshift({
         id: GlobalLayout.specifier,
-        file: getAliasLayoutFile(GlobalLayout)
+        file: GlobalLayout.source
       });
     }
     return layouts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.2.12",
+  "version": "2.2.14",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -82,9 +82,9 @@
     "@swc/core": "1.3.72",
     "@types/hast": "^2.3.5",
     "@types/mdast": "^3.0.12",
-    "@umijs/bundler-utils": "^4.0.83",
-    "@umijs/core": "^4.0.83",
-    "@umijs/utils": "^4.0.83",
+    "@umijs/bundler-utils": "^4.0.84",
+    "@umijs/core": "^4.0.84",
+    "@umijs/utils": "^4.0.84",
     "animated-scroll-to": "^2.3.0",
     "classnames": "2.3.2",
     "codesandbox": "^2.2.3",
@@ -131,7 +131,7 @@
     "remark-rehype": "^10.1.0",
     "sass": "^1.64.1",
     "sitemap": "^7.1.1",
-    "umi": "^4.0.83",
+    "umi": "^4.0.84",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.2",
     "unist-util-visit-parents": "^5.1.3",
@@ -151,7 +151,7 @@
     "@types/pluralize": "^0.0.30",
     "@types/react": "^18.2.17",
     "@types/react-copy-to-clipboard": "^5.0.4",
-    "@umijs/lint": "^4.0.83",
+    "@umijs/lint": "^4.0.84",
     "@umijs/plugins": "4.0.32",
     "dumi-theme-mobile": "workspace:*",
     "eslint": "^8.46.0",