dumi 2.4.0-alpha.1 → 2.4.0-alpha.11

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

@@ -109,9 +109,13 @@ export var useNavData = function useNavData() {
       }, {}));
       data.forEach(function (item, i) {
         var _item$children;
+        // item.link => the parent link is not in routes, but has children, will use parent.title or children.title
         if (!item.link && ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) === 1) {
           // hoist nav item if only one child
-          data[i] = item.children[0];
+          var first = item.children[0];
+          data[i] = _objectSpread(_objectSpread({}, first), {}, {
+            title: (item === null || item === void 0 ? void 0 : item.title) || first.title
+          });
         } else if (item.children) {
           // sort nav item children by order or title
           item.children.sort(sidebarDataComparer);

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

@@ -4,6 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import deepmerge from 'deepmerge';
 import { getRouteMetaById, matchRoutes, useAppData, useLocation, useRouteData } from 'dumi';
 import { useCallback, useState } from 'react';
 import { useIsomorphicLayoutEffect } from "./utils";
@@ -26,6 +27,11 @@ function getCachedRouteMeta(route) {
           var _ref, _ref$key;
           (_ref$key = (_ref = meta)[key]) !== null && _ref$key !== void 0 ? _ref$key : _ref[key] = route.meta[key];
         });
+        meta.frontmatter = deepmerge(meta.frontmatter, route.meta.frontmatter, {
+          arrayMerge: function arrayMerge(_destinationArray, sourceArray) {
+            return sourceArray;
+          }
+        });
       }
       return meta;
     };

package/dist/features/compile/index.js

@@ -152,11 +152,14 @@ var compile_default = (api) => {
     return memo;
   });
   api.modifyConfig((memo) => {
-    if (memo.mako) {
-      console.log(memo.mako);
-      memo.mako.hooks = {
-        load: (0, import_makoHooks.getLoadHook)(api)
-      };
+    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;
   });

package/dist/features/derivative.js

@@ -91,8 +91,8 @@ var derivative_default = (api) => {
       );
     }
     (0, import_assert.default)(
-      !api.config.ssr || api.config.ssr.builder === "webpack",
-      "Only `webpack` builder is supported in SSR mode!"
+      !api.config.ssr || api.config.ssr.builder === "webpack" || api.config.ssr.builder === "mako",
+      "Only `webpack` and mako` builder is supported in SSR mode!"
     );
     (0, import_assert.default)(
       ((_a = api.config.cssLoader) == null ? void 0 : _a.modules) === void 0 && api.config.cssLoaderModules === void 0,

package/dist/features/theme/index.js

@@ -386,17 +386,15 @@ export default DumiLoading;
   });
   api.addEntryCodeAhead(() => {
     const { prefersColor } = api.config.themeConfig;
-    if (typeof window === "undefined")
-      return "";
     if (prefersColor.switch === false && prefersColor.default !== "auto") {
-      return `document.documentElement.setAttribute('${import_constants.PREFERS_COLOR_ATTR}', '${prefersColor.default}');`;
+      return `typeof document !== 'undefined' && document.documentElement.setAttribute('${import_constants.PREFERS_COLOR_ATTR}', '${prefersColor.default}');`;
     }
     return `(function () {
   var cache = typeof navigator !== 'undefined' && navigator.cookieEnabled && typeof window.localStorage !== 'undefined' && localStorage.getItem('dumi:prefers-color') || '${prefersColor.default}';
-  var isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+  var isDark = typeof window !== 'undefined' &&  window.matchMedia('(prefers-color-scheme: dark)').matches;
   var enums = ['light', 'dark', 'auto'];
 
-  document.documentElement.setAttribute(
+  typeof document !== 'undefined' && document.documentElement.setAttribute(
     '${import_constants.PREFERS_COLOR_ATTR}',
     cache === enums[2]
       ? (isDark ? enums[1] : enums[0])

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

@@ -138,15 +138,17 @@ export function getRouteMetaById<T extends { syncOnly?: boolean }>(
   id: string,
   opts?: T,
 ): T extends { syncOnly: true }
-  ? IRouteMeta | undefined
-  : Promise<IRouteMeta> | undefined {
-  if (filesMeta[id]) {
-    const { frontmatter, toc, textGetter, tabs } = filesMeta[id];
-    const routeMeta: IRouteMeta = {
-      frontmatter,
-      toc: toc,
+  ? IRouteMeta
+  : Promise<IRouteMeta> {
+     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) {
@@ -174,6 +176,10 @@ export function getRouteMetaById<T extends { syncOnly?: boolean }>(
       });
     }
   }
+  if (opts?.syncOnly) {
+    return routeMeta;
+  } 
+  return Promise.resolve(routeMeta);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.0-alpha.1",
+  "version": "2.4.0-alpha.11",
   "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.4",
-    "@umijs/core": "4.2.6-alpha.4",
-    "@umijs/utils": "4.2.6-alpha.4",
+    "@umijs/bundler-utils": "4.2.6-alpha.22",
+    "@umijs/core": "4.2.6-alpha.22",
+    "@umijs/utils": "4.2.6-alpha.22",
     "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.4",
+    "umi": "4.2.6-alpha.22",
     "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.4",
+    "@umijs/lint": "4.2.6-alpha.22",
     "@umijs/plugins": "4.0.32",
     "codesandbox-import-utils": "^2.2.3",
     "eslint": "^8.46.0",
@@ -163,7 +163,7 @@
     "typescript": "~5.0.4",
     "vitest": "^0.33.0",
     "zx": "^7.2.3",
-    "dumi-theme-mobile": "2.3.0"
+    "dumi-theme-mobile": "2.3.5"
   },
   "peerDependencies": {
     "react": ">=16.8",