dumi 2.4.0-alpha.8 → 2.4.0

package/compiled/loader-runner/index.d.ts

@@ -64,4 +64,4 @@ options: RunLoaderOption,
 callback: (err: NodeJS.ErrnoException | null, result: RunLoaderResult) => any,
 ): void;
 
-export { }
+export { }

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

@@ -41,14 +41,19 @@ function getCachedRouteMeta(route) {
     var proxyGetter = function proxyGetter(target, prop) {
       if (ASYNC_META_PROPS.includes(prop)) {
         if (!asyncCache.get(cacheKey)) {
+          var routeMetaPromise = getRouteMetaById(route.id);
           // load async meta then replace cache
-          asyncCache.set(cacheKey, getRouteMetaById(route.id).then(function (full) {
-            return cache.set(cacheKey, merge(full)).get(cacheKey);
-          }));
+          if (routeMetaPromise) {
+            asyncCache.set(cacheKey, routeMetaPromise.then(function (full) {
+              return cache.set(cacheKey, merge(full)).get(cacheKey);
+            }));
+          }
         }
-
         // throw promise to trigger suspense
-        throw asyncCache.get(cacheKey);
+        var currentCache = asyncCache.get(cacheKey);
+        if (currentCache) {
+          throw currentCache;
+        }
       }
       return target[prop];
     };

package/dist/features/compile/index.js

@@ -151,17 +151,20 @@ var compile_default = (api) => {
     }
     return memo;
   });
-  api.modifyConfig((memo) => {
-    var _a;
-    if (memo.mako || ((_a = memo.ssr) == null ? void 0 : _a.builder) === "mako") {
-      memo.mako ?? (memo.mako = {});
-      memo.mako.plugins = [
-        {
-          load: (0, import_makoHooks.getLoadHook)(api)
-        }
-      ];
+  api.modifyConfig({
+    before: "mako",
+    fn: (memo) => {
+      var _a;
+      if (memo.mako || ((_a = memo.ssr) == null ? void 0 : _a.builder) === "mako") {
+        memo.mako ?? (memo.mako = {});
+        memo.mako.plugins = [
+          {
+            load: (0, import_makoHooks.getLoadHook)(api)
+          }
+        ];
+      }
+      return memo;
     }
-    return memo;
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/features/compile/makoHooks.js

@@ -136,6 +136,10 @@ var getLoadHook = (api) => {
       return await customRunLoaders({
         resource: filePath,
         loaders: [
+          {
+            loader: require.resolve("../../loaders/post-raw"),
+            options: {}
+          },
           {
             loader: require.resolve("raw-loader"),
             options: {}

package/dist/loaders/post-raw/index.d.ts

@@ -0,0 +1,4 @@
+/**
+ * loader for mako dumi-raw watch-parent
+ */
+export default function postRawLoader(this: any, raw: string): string;

package/dist/loaders/post-raw/index.js

@@ -0,0 +1,30 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/loaders/post-raw/index.ts
+var post_raw_exports = {};
+__export(post_raw_exports, {
+  default: () => postRawLoader
+});
+module.exports = __toCommonJS(post_raw_exports);
+function postRawLoader(raw) {
+  return `
+  import '${this.resourcePath}?watch=parent';
+  ${raw};
+  `;
+}

package/dist/templates/meta/exports.ts.tpl

@@ -138,48 +138,51 @@ export function getRouteMetaById<T extends { syncOnly?: boolean }>(
   id: string,
   opts?: T,
 ): T extends { syncOnly: true }
-  ? IRouteMeta
-  : Promise<IRouteMeta> {
-     const routeMeta: IRouteMeta = {
-      frontmatter: {},
-      toc: [],
-      texts: [],
-    };
+  ? IRouteMeta | undefined
+  : Promise<IRouteMeta> | undefined {
   if (filesMeta[id]) {
     const { frontmatter, toc, textGetter, tabs } = filesMeta[id];
-    routeMeta.frontmatter = frontmatter;
-    routeMeta.toc = toc;
-
-    if (opts?.syncOnly) {
-      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());
-        }
+    const routeMeta: IRouteMeta = {
+      frontmatter,
+      toc,
+      texts: [],
+    };
+    if (filesMeta[id]) {
+      const { frontmatter, toc, textGetter, tabs } = filesMeta[id];
+      routeMeta.frontmatter = frontmatter;
+      routeMeta.toc = toc;
 
+      if (opts?.syncOnly) {
         if (tabs) {
-          routeMeta.tabs = await Promise.all(
-            tabs.map(async (tabId) =>
-              genTab(tabId, await getRouteMetaById(tabId, opts)),
-            ),
+          routeMeta.tabs = tabs.map((tabId) =>
+            genTab(tabId, getRouteMetaById(tabId, opts)),
           );
         }
 
-        resolve(routeMeta);
-      });
+        return routeMeta;
+      } else {
+        return new Promise(async (resolve) => {
+          if (textGetter) {
+            ({ texts: routeMeta.texts } = await textGetter());
+          }
+
+          if (tabs) {
+            routeMeta.tabs = await Promise.all(
+              tabs.map(async (tabId) =>
+                genTab(tabId, await getRouteMetaById(tabId, opts)),
+              ),
+            );
+          }
+
+          resolve(routeMeta);
+        });
+      }
+    }
+    if (opts?.syncOnly) {
+      return routeMeta;
     }
+    return Promise.resolve(routeMeta);
   }
-  if (opts?.syncOnly) {
-    return routeMeta;
-  } 
-  return Promise.resolve(routeMeta);
 }
 
 /**

package/dist/utils.js

@@ -146,7 +146,7 @@ function lastSlash(str) {
 }
 function componentToChunkName(component, cwdPath = "/") {
   const cwd = (0, import_plugin_utils.winPath)(cwdPath);
-  return typeof component === "string" ? component.replace(
+  return typeof component === "string" ? (0, import_plugin_utils.winPath)(component).replace(
     new RegExp(
       `^(${// match app cwd first
       import_plugin_utils.lodash.escapeRegExp(lastSlash(cwd))})`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.0-alpha.8",
+  "version": "2.4.0",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -65,9 +65,9 @@
     "@swc/core": "1.4.2",
     "@types/hast": "^2.3.5",
     "@types/mdast": "^3.0.12",
-    "@umijs/bundler-utils": "4.2.6-alpha.18",
-    "@umijs/core": "4.2.6-alpha.18",
-    "@umijs/utils": "4.2.6-alpha.18",
+    "@umijs/bundler-utils": "^4.3.0",
+    "@umijs/core": "^4.3.0",
+    "@umijs/utils": "^4.3.0",
     "animated-scroll-to": "^2.3.0",
     "classnames": "2.3.2",
     "codesandbox": "^2.2.3",
@@ -119,7 +119,7 @@
     "sass": "^1.64.1",
     "sitemap": "^7.1.1",
     "sucrase": "^3.34.0",
-    "umi": "4.2.6-alpha.18",
+    "umi": "^4.3.0",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.2",
     "unist-util-visit-parents": "^5.1.3",
@@ -142,7 +142,7 @@
     "@types/react": "^18.2.17",
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "^18.2.7",
-    "@umijs/lint": "4.2.6-alpha.18",
+    "@umijs/lint": "^4.3.0",
     "@umijs/plugins": "4.0.32",
     "codesandbox-import-utils": "^2.2.3",
     "eslint": "^8.46.0",
@@ -156,8 +156,8 @@
     "prettier": "^2.8.8",
     "prettier-plugin-organize-imports": "^3.2.3",
     "prettier-plugin-packagejson": "^2.4.5",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "stylelint": "^15.10.2",
     "ts-node": "^10.9.1",
     "typescript": "~5.0.4",

package/theme-default/builtins/API/index.js

@@ -262,7 +262,7 @@ var API = function API(props) {
     id: 'api.component.description'
   })), /*#__PURE__*/React.createElement("th", null, intl.formatMessage({
     id: 'api.component.type'
-  })), props.type === 'props' && /*#__PURE__*/React.createElement("th", null, intl.formatMessage({
+  })), type === 'props' && /*#__PURE__*/React.createElement("th", null, intl.formatMessage({
     id: 'api.component.default'
   })))), /*#__PURE__*/React.createElement("tbody", null, Object.keys(properties).length ? Object.entries(properties).map(function (_ref9) {
     var _definition$propsConf;
@@ -274,7 +274,7 @@ var API = function API(props) {
     }, /*#__PURE__*/React.createElement("td", null, releaseInfo[name] ? /*#__PURE__*/React.createElement(APIRelease, {
       name: name,
       info: releaseInfo[name]
-    }) : name), /*#__PURE__*/React.createElement("td", null, prop.description || '--'), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(APIType, prop)), props.type === 'props' && /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("code", null, (_definition$propsConf = definition.propsConfig.required) !== null && _definition$propsConf !== void 0 && _definition$propsConf.includes(name) ? intl.formatMessage({
+    }) : name), /*#__PURE__*/React.createElement("td", null, prop.description || '--'), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(APIType, prop)), type === 'props' && /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("code", null, (_definition$propsConf = definition.propsConfig.required) !== null && _definition$propsConf !== void 0 && _definition$propsConf.includes(name) ? intl.formatMessage({
       id: 'api.component.required'
     }) : JSON.stringify(prop.default) || '--')));
   }) : /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", {

package/theme-default/builtins/Tree/index.js

@@ -38,14 +38,23 @@ function getTreeFromList(nodes) {
         }
       case 'li':
         {
-          var liLeafs = getTreeFromList(node.props.children, key);
+          var _node$props$children, _node$props$children$;
+          var hasEmptyUl = (_node$props$children = node.props.children) === null || _node$props$children === void 0 ? void 0 : (_node$props$children$ = _node$props$children.some) === null || _node$props$children$ === void 0 ? void 0 : _node$props$children$.call(_node$props$children, function (child) {
+            var _child$props$children;
+            return child.type === 'ul' && !((_child$props$children = child.props.children) !== null && _child$props$children !== void 0 && _child$props$children.length);
+          });
+          var title = [].concat(node.props.children).filter(function (child) {
+            return child.type !== 'ul';
+          });
+          var children = hasEmptyUl ? [] : getTreeFromList(node.props.children, key);
           data.push({
-            title: [].concat(node.props.children).filter(function (child) {
-              return child.type !== 'ul';
-            }),
+            title: title,
             key: key,
-            children: liLeafs,
-            isLeaf: !liLeafs.length
+            children: children,
+            isLeaf: !hasEmptyUl && !children.length,
+            switcherIcon: hasEmptyUl ? /*#__PURE__*/React.createElement("span", {
+              className: "tree-switcher-leaf-line"
+            }) : undefined
           });
           break;
         }
@@ -65,8 +74,10 @@ var useListToTree = function useListToTree(nodes) {
   return tree;
 };
 var getIcon = function getIcon(props) {
+  var _data$children;
   var isLeaf = props.isLeaf,
-    expanded = props.expanded;
+    expanded = props.expanded,
+    data = props.data;
   if (isLeaf) {
     return /*#__PURE__*/React.createElement("span", {
       className: "dumi-default-tree-icon"
@@ -74,13 +85,13 @@ var getIcon = function getIcon(props) {
       fill: "currentColor"
     }));
   }
-  return expanded ? /*#__PURE__*/React.createElement("span", {
+  return !expanded || !(data !== null && data !== void 0 && (_data$children = data.children) !== null && _data$children !== void 0 && _data$children.length) ? /*#__PURE__*/React.createElement("span", {
     className: "dumi-default-tree-icon"
-  }, /*#__PURE__*/React.createElement(FolderOpenOutlined, {
+  }, /*#__PURE__*/React.createElement(FolderOutlined, {
     fill: "currentColor"
   })) : /*#__PURE__*/React.createElement("span", {
     className: "dumi-default-tree-icon"
-  }, /*#__PURE__*/React.createElement(FolderOutlined, {
+  }, /*#__PURE__*/React.createElement(FolderOpenOutlined, {
     fill: "currentColor"
   }));
 };
@@ -146,8 +157,10 @@ export default (function (props) {
   var data = useListToTree(props.children);
   var treeRef = /*#__PURE__*/createRef();
   var onClick = function onClick(event, node) {
+    var _node$children;
     var isLeaf = node.isLeaf;
-    if (isLeaf || event.shiftKey || event.metaKey || event.ctrlKey) {
+    var isEmptyUl = !isLeaf && !((_node$children = node.children) !== null && _node$children !== void 0 && _node$children.length);
+    if (isLeaf || isEmptyUl || event.shiftKey || event.metaKey || event.ctrlKey) {
       return;
     }
     treeRef.current.onNodeExpand(event, node);