dumi 2.0.0-rc.0 → 2.0.0-rc.2

package/dist/assetParsers/block.js

@@ -71,7 +71,7 @@ async function parseBlockAsset(opts) {
               return { path: args.path, external: true };
             }
             return {
-              path: import_path.default.join(args.resolveDir, args.path),
+              path: args.kind !== "entry-point" ? opts.resolver(args.resolveDir, args.path) : import_path.default.join(args.resolveDir, args.path),
               pluginData: { kind: args.kind, resolveDir: args.resolveDir }
             };
           });

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

@@ -16,5 +16,5 @@ export var DumiDemo = function DumiDemo(props) {
     asset: asset,
     demoUrl: // allow user override demoUrl by frontmatter
     props.previewerProps.demoUrl || "/".concat(SP_ROUTE_PREFIX, "demos/").concat(props.demo.id)
-  }, props.previewerProps), /*#__PURE__*/createElement(component));
+  }, props.previewerProps), props.previewerProps.iframe ? null : /*#__PURE__*/createElement(component));
 };

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

@@ -127,10 +127,11 @@ export declare type ILocalesConfig = ILocale[];
 export interface INavItem {
     title: string;
     link: string;
+    order: number;
     activePath?: string;
     [key: string]: any;
 }
-interface ISidebarItem {
+export interface ISidebarItem {
     title: string;
     link: string;
     order: number;

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

@@ -1,5 +1,3 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -14,7 +12,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useFullSidebarData, useSiteData } from 'dumi';
 import { useState } from 'react';
-import { useLocaleDocRoutes } from "./utils";
+import { pickRouteSortMeta, useLocaleDocRoutes, useRouteDataComparer } from "./utils";
 /**
  * hook for get nav data
  */
@@ -26,6 +24,7 @@ export var useNavData = function useNavData() {
       themeConfig = _useSiteData.themeConfig;
 
   var sidebar = useFullSidebarData();
+  var sidebarDataComparer = useRouteDataComparer();
 
   var _useState = useState(function () {
     // use user config first
@@ -37,22 +36,9 @@ export var useNavData = function useNavData() {
           groups = _ref2[1];
 
       var meta = Object.values(routes).reduce(function (ret, route) {
-        var _route$meta, _frontmatter$nav$orde;
-
         // find routes which within the nav path
         if (route.path.startsWith(link.slice(1))) {
-          switch (_typeof((_route$meta = route.meta) === null || _route$meta === void 0 ? void 0 : _route$meta.frontmatter.nav)) {
-            case 'object':
-              ret.title = route.meta.frontmatter.nav.title || ret.title;
-              ret.order = (_frontmatter$nav$orde = route.meta.frontmatter.nav.order) !== null && _frontmatter$nav$orde !== void 0 ? _frontmatter$nav$orde : ret.order;
-              break;
-
-            case 'string':
-              ret.title = route.meta.frontmatter.nav || ret.title;
-              break;
-
-            default:
-          }
+          pickRouteSortMeta(ret, 'nav', route.meta.frontmatter);
         }
 
         return ret;
@@ -65,11 +51,7 @@ export var useNavData = function useNavData() {
       };
     }); // TODO: 2-level nav data
 
-    return data.sort(function (a, b) {
-      var _a$title;
-
-      return a.order - b.order || ((_a$title = a.title) === null || _a$title === void 0 ? void 0 : _a$title.localeCompare(b.title));
-    });
+    return data.sort(sidebarDataComparer);
   }),
       _useState2 = _slicedToArray(_useState, 1),
       nav = _useState2[0];

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

@@ -11,11 +11,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { matchRoutes, useAppData, useLocation, useRouteData } from 'dumi';
-import { useCallback, useLayoutEffect, useState } from 'react';
-
+import { useCallback, useState } from 'react';
+import { useIsomorphicLayoutEffect } from "./utils";
 /**
  * hook for get matched route meta
  */
+
 export var useRouteMeta = function useRouteMeta() {
   var _useRouteData = useRouteData(),
       route = _useRouteData.route;
@@ -52,7 +53,7 @@ export var useRouteMeta = function useRouteMeta() {
       meta = _useState2[0],
       setMeta = _useState2[1];
 
-  useLayoutEffect(function () {
+  useIsomorphicLayoutEffect(function () {
     setMeta(getter);
   }, [clientRoutes.length, pathname]);
   return meta;

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

@@ -3,7 +3,18 @@ import type { ISidebarGroup } from './types';
  * hook for get sidebar data for all nav
  */
 export declare const useFullSidebarData: () => Record<string, ISidebarGroup[]>;
+interface ITreeSidebarLeaf {
+    path: string;
+    title: string;
+    order: number;
+    children: (ITreeSidebarLeaf | ISidebarGroup)[];
+}
+/**
+ * hook for get full sidebar data in tree structure
+ */
+export declare const useTreeSidebarData: () => ITreeSidebarLeaf[];
 /**
  * hook for get sidebar data for current nav
  */
 export declare const useSidebarData: () => ISidebarGroup[];
+export {};

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

@@ -1,3 +1,11 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -6,8 +14,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -22,7 +28,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useLocale, useLocation, useSiteData } from 'dumi';
 import { useState } from 'react';
-import { useLocaleDocRoutes } from "./utils";
+import { pickRouteSortMeta, useLocaleDocRoutes, useRouteDataComparer } from "./utils";
 var DEFAULT_GROUP_STUB_TITLE = '$default-group-title';
 
 var getLocaleClearPath = function getLocaleClearPath(routePath, locale) {
@@ -40,6 +46,8 @@ export var useFullSidebarData = function useFullSidebarData() {
   var _useSiteData = useSiteData(),
       themeConfig = _useSiteData.themeConfig;
 
+  var sidebarDataComparer = useRouteDataComparer();
+
   var _useState = useState(function () {
     // auto generate sidebar data from routes
     var data = Object.values(routes).reduce(function (ret, route) {
@@ -55,12 +63,11 @@ export var useFullSidebarData = function useFullSidebarData() {
         // en-US/a/b => /en-US/a
         var parentPath = "/".concat(route.path.replace(/\/[^/]+$/, ''));
 
-        var _ref = _typeof(route.meta.frontmatter.group) === 'object' ? route.meta.frontmatter.group : {
-          title: route.meta.frontmatter.group
-        },
-            title = _ref.title,
-            _ref$order = _ref.order,
-            order = _ref$order === void 0 ? 0 : _ref$order;
+        var _pickRouteSortMeta = pickRouteSortMeta({
+          order: 0
+        }, 'group', route.meta.frontmatter),
+            title = _pickRouteSortMeta.title,
+            order = _pickRouteSortMeta.order;
 
         var titleKey = title || DEFAULT_GROUP_STUB_TITLE; // create group data by nav path & group name
 
@@ -80,25 +87,15 @@ export var useFullSidebarData = function useFullSidebarData() {
       return ret;
     }, {}); // destruct sidebar data into sidebar config
 
-    var sidebarConfig = Object.entries(data).reduce(function (ret, _ref2) {
-      var _ref3 = _slicedToArray(_ref2, 2),
-          navPath = _ref3[0],
-          groups = _ref3[1];
-
-      ret[navPath] = Object.values(groups).sort(function (a, b) {
-        var _a$title;
+    var sidebarConfig = Object.entries(data).reduce(function (ret, _ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          navPath = _ref2[0],
+          groups = _ref2[1];
 
-        return (// sort by group order
-          a.order - b.order || (a.title ? // sort by group title
-          (_a$title = a.title) === null || _a$title === void 0 ? void 0 : _a$title.localeCompare(b.title || '') : // put non-title group at the end
-          1)
-        );
-      }); // sort group children by order or title
+      ret[navPath] = Object.values(groups).sort(sidebarDataComparer); // sort group children by order or title
 
       ret[navPath].forEach(function (group) {
-        return group.children.sort(function (a, b) {
-          return a.order - b.order || a.title.localeCompare(b.title);
-        });
+        return group.children.sort(sidebarDataComparer);
       });
       return ret;
     }, {}); // allow user partial override
@@ -110,6 +107,106 @@ export var useFullSidebarData = function useFullSidebarData() {
 
   return sidebar;
 };
+
+function getLeafMeta(data) {
+  var leafMeta = {
+    order: 0,
+    title: ''
+  };
+
+  var _iterator = _createForOfIteratorHelper(data),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var group = _step.value;
+
+      var _iterator2 = _createForOfIteratorHelper(group.children),
+          _step2;
+
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var item = _step2.value;
+
+          if ('frontmatter' in item) {
+            pickRouteSortMeta(leafMeta, 'nav', item.frontmatter);
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  return leafMeta;
+}
+/**
+ * hook for get full sidebar data in tree structure
+ */
+
+
+export var useTreeSidebarData = function useTreeSidebarData() {
+  var original = useFullSidebarData();
+  var sidebarDataComparer = useRouteDataComparer();
+
+  var _useState3 = useState(function () {
+    var data = Object.entries(original) // match from the deepest level
+    .sort(function (a, b) {
+      return b[0].split('/').length - a[0].split('/').length;
+    }).reduce(function (ret, _ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+          path = _ref4[0],
+          data = _ref4[1];
+
+      var parent = path.replace(/\/[^/]+$/, '');
+
+      if (parent) {
+        var _ret$parent;
+
+        // handle nested sidebar data
+        // init parent first
+        (_ret$parent = ret[parent]) !== null && _ret$parent !== void 0 ? _ret$parent : ret[parent] = _objectSpread({
+          path: parent,
+          children: original[parent] || []
+        }, getLeafMeta(original[parent] || []));
+
+        if (ret[path]) {
+          // sort children first
+          ret[path].children.sort(sidebarDataComparer); // put n-level sidebar data as parent children
+
+          ret[parent].children.push(ret[path]);
+          delete ret[path];
+        } else {
+          var _ret$parent$children;
+
+          // put last-level sidebar data as parent children
+          (_ret$parent$children = ret[parent].children).push.apply(_ret$parent$children, _toConsumableArray(data));
+        }
+      } else {
+        // sort children first
+        data.sort(sidebarDataComparer); // put top-level sidebar data
+
+        ret[path] = _objectSpread({
+          path: path,
+          children: data
+        }, getLeafMeta(data));
+      }
+
+      return ret;
+    }, {});
+    return Object.values(data);
+  }),
+      _useState4 = _slicedToArray(_useState3, 1),
+      sidebar = _useState4[0];
+
+  return sidebar;
+};
 /**
  * hook for get sidebar data for current nav
  */

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

@@ -1,4 +1,5 @@
-import type { IRoutesById } from './types';
+import { useEffect } from 'react';
+import type { INavItem, IRouteMeta, IRoutesById } from './types';
 export declare const useLocaleDocRoutes: () => IRoutesById;
 /**
  * 在 react 18 中需要新的 render 方式，这个函数用来处理不同的 jsx 模式。
@@ -6,3 +7,17 @@ export declare const useLocaleDocRoutes: () => IRoutesById;
  * @returns code string
  */
 export declare const genReactRenderCode: (version: string) => string;
+export declare const useIsomorphicLayoutEffect: typeof useEffect;
+/**
+ * common comparer for sidebar/nav items
+ */
+export declare const useRouteDataComparer: <T extends {
+    order?: number | undefined;
+    link?: string | undefined;
+    path?: string | undefined;
+    title?: string | undefined;
+}>() => (a: T, b: T) => number;
+/**
+ * common util for pick meta to sort sidebar/nav items
+ */
+export declare const pickRouteSortMeta: (original: Partial<Pick<INavItem, 'order' | 'title'>>, field: 'nav' | 'group', fm: IRouteMeta['frontmatter']) => Partial<Pick<INavItem, "title" | "order">>;

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

@@ -1,3 +1,5 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -11,7 +13,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useAppData, useIntl, useSiteData } from 'dumi';
-import { useState } from 'react';
+import { useCallback, useEffect, useLayoutEffect, useState } from 'react';
+import { useLocale } from "./useLocale";
 export var useLocaleDocRoutes = function useLocaleDocRoutes() {
   var intl = useIntl();
 
@@ -55,5 +58,45 @@ export var genReactRenderCode = function genReactRenderCode(version) {
     return "".concat(annotation, "\n\nimport React from 'react';\nimport { createRoot } from \"react-dom/client\";\nimport App from \"./App\";\n\nconst rootElement = document.getElementById(\"root\");\nconst root = createRoot(rootElement);\n\nroot.render(<App />);");
   }
 
-  return "".concat(annotation, "\n    \nimport React from 'react';\nimport ReactDOM from 'react-dom';\nimport App from './App';\n    \nReactDOM.render(\n  <App />,\n  document.getElementById('root'),\n);");
+  return "".concat(annotation, "\n\nimport React from 'react';\nimport ReactDOM from 'react-dom';\nimport App from './App';\n\nReactDOM.render(\n  <App />,\n  document.getElementById('root'),\n);");
+};
+export var useIsomorphicLayoutEffect = typeof window !== 'undefined' ? useLayoutEffect : useEffect;
+/**
+ * common comparer for sidebar/nav items
+ */
+
+export var useRouteDataComparer = function useRouteDataComparer() {
+  var locale = useLocale();
+  return useCallback(function (a, b) {
+    return (// smaller before larger for all
+      ('order' in a && 'order' in b ? a.order - b.order : 0) || ( // shallower before deeper for sidebar item
+      'link' in a && 'link' in b ? a.link.split('/').length - b.link.split('/').length : 0) || ( // shallower before deeper for sidebar leaf
+      'path' in a && 'path' in b ? a.path.split('/').length - b.path.split('/').length : 0) || ( // fallback to compare title (put non-title item at the end)
+      a.title ? a.title.localeCompare(b.title || '', locale.id) : -1)
+    );
+  }, []);
+};
+/**
+ * common util for pick meta to sort sidebar/nav items
+ */
+
+export var pickRouteSortMeta = function pickRouteSortMeta(original, field, fm) {
+  var _sub$order;
+
+  var sub = fm[field];
+
+  switch (_typeof(sub)) {
+    case 'object':
+      original.title = sub.title || original.title;
+      original.order = (_sub$order = sub.order) !== null && _sub$order !== void 0 ? _sub$order : original.order;
+      break;
+
+    case 'string':
+      original.title = sub || original.title;
+      break;
+
+    default:
+  }
+
+  return original;
 };

package/dist/features/compile.js

@@ -67,7 +67,7 @@ var compile_default = (api) => {
     memo.module.rule("dumi-page").type("javascript/auto").test(/\.(j|t)sx?$/).resourceQuery(/meta$/).use("page-meta-loader").loader(require.resolve("../loaders/page"));
     memo.module.rule("dumi-demo").type("javascript/auto").test(/\..+$/).enforce("pre").resourceQuery(/techStack/).use("demo-loader").loader(require.resolve("../loaders/demo")).options({ techStacks, cwd: api.cwd });
     memo.module.rule("dumi-raw").resourceQuery(/raw/).use("raw-loader").loader(require.resolve("raw-loader"));
-    if (api.env === "development") {
+    if (api.env === "development" && memo.plugins.has("fastRefresh")) {
       memo.plugin("fastRefresh").tap(([params]) => [
         {
           ...params,

package/dist/features/derivative.js

@@ -103,6 +103,7 @@ var derivative_default = (api) => {
   api.addRuntimePlugin(() => {
     return strategies.appJS().slice(0, 1);
   });
+  api.registerPlugins([require.resolve("@umijs/plugins/dist/analytics")]);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/locales.js

@@ -77,6 +77,7 @@ export const messages = ${JSON.stringify(api.service.themeData.locales, null, 2)
 import { history } from 'dumi';
 import React, { useState, useLayoutEffect, useCallback, type ReactNode } from 'react';
 import { RawIntlProvider, createIntl, createIntlCache } from '${(0, import_plugin_utils.winPath)(import_path.default.dirname(require.resolve("react-intl/package")))}';
+import { useIsomorphicLayoutEffect } from '${(0, import_plugin_utils.winPath)(require.resolve("../client/theme-api/utils"))}'
 import { locales, messages } from './config';
 
 const cache = createIntlCache();
@@ -96,7 +97,7 @@ const LocalesContainer: FC<{ children: ReactNode }> = (props) => {
   }, []);
   const [intl, setIntl] = useState(() => getIntl());
 
-  useLayoutEffect(() => {
+  useIsomorphicLayoutEffect(() => {
     return history.listen(() => {
       setIntl(getIntl());
     });

package/dist/loaders/markdown/index.js

@@ -31,10 +31,19 @@ var import_fs = __toESM(require("fs"));
 var import_plugin_utils = require("umi/plugin-utils");
 var import_transformer = __toESM(require("./transformer"));
 var import_rehypeText = require("./transformer/rehypeText");
+function getDemoSourceFiles(demos = []) {
+  return demos.reduce((ret, demo) => {
+    if ("sources" in demo) {
+      ret.push(...Object.values(demo.sources));
+    }
+    return ret;
+  }, []);
+}
 function emit(opts, ret) {
   if (opts.mode === "meta") {
     const { demos, frontmatter, toc, texts, embeds = [] } = ret.meta;
     embeds.forEach((file) => this.addDependency(file));
+    getDemoSourceFiles(demos).forEach((file) => this.addDependency(file));
     if (demos && opts.onResolveDemos) {
       opts.onResolveDemos(demos);
     }
@@ -87,11 +96,11 @@ function DumiMarkdownContent() {
 export default DumiMarkdownContent;`;
   }
 }
-function getEmbedsCacheKey(embeds = []) {
-  return JSON.stringify(embeds.map((file) => `${file}:${import_fs.default.statSync(file).mtimeMs}`));
+function getDepsCacheKey(deps = []) {
+  return JSON.stringify(deps.map((file) => `${file}:${import_fs.default.statSync(file).mtimeMs}`));
 }
 var deferrer = {};
-var embedsMapping = {};
+var depsMapping = {};
 function mdLoader(content) {
   const opts = this.getOptions();
   const cb = this.async();
@@ -103,7 +112,7 @@ function mdLoader(content) {
   ].join(":");
   const cacheKey = [
     baseCacheKey,
-    getEmbedsCacheKey(embedsMapping[this.resourcePath])
+    getDepsCacheKey(depsMapping[this.resourcePath])
   ].join(":");
   const cacheRet = cache.getSync(cacheKey, "");
   if (cacheRet) {
@@ -120,11 +129,11 @@ function mdLoader(content) {
     fileAbsPath: this.resourcePath
   });
   deferrer[cacheKey].then((ret) => {
+    depsMapping[this.resourcePath] = (ret.meta.embeds || []).concat(getDemoSourceFiles(ret.meta.demos));
     const finalCacheKey = [
       baseCacheKey,
-      getEmbedsCacheKey(ret.meta.embeds)
+      getDepsCacheKey(depsMapping[this.resourcePath])
     ].join(":");
-    embedsMapping[this.resourcePath] = ret.meta.embeds || [];
     cache.setSync(finalCacheKey, ret);
     cb(null, emit.call(this, opts, ret));
   }).catch(cb);

package/dist/loaders/markdown/transformer/index.js

@@ -27,6 +27,7 @@ __export(transformer_exports, {
 module.exports = __toCommonJS(transformer_exports);
 var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
 var import_rehypeDemo = __toESM(require("./rehypeDemo"));
+var import_rehypeDesc = __toESM(require("./rehypeDesc"));
 var import_rehypeEnhancedTag = __toESM(require("./rehypeEnhancedTag"));
 var import_rehypeImg = __toESM(require("./rehypeImg"));
 var import_rehypeIsolation = __toESM(require("./rehypeIsolation"));
@@ -73,7 +74,7 @@ var transformer_default = async (raw, opts) => {
     fileAbsPath: opts.fileAbsPath,
     resolve: opts.resolve,
     resolver
-  }).use(import_rehypeSlug.default).use(rehypeAutolinkHeadings).use(import_rehypeIsolation.default).use(import_rehypeEnhancedTag.default).use(import_rehypeText.default);
+  }).use(import_rehypeSlug.default).use(rehypeAutolinkHeadings).use(import_rehypeIsolation.default).use(import_rehypeEnhancedTag.default).use(import_rehypeDesc.default).use(import_rehypeText.default);
   (_b = opts.extraRehypePlugins) == null ? void 0 : _b.forEach((plugin) => applyUnifiedPlugin({
     plugin,
     processor,

package/dist/loaders/markdown/transformer/rehypeDesc.d.ts

@@ -0,0 +1,6 @@
+import type { Root } from 'hast';
+import type { Transformer } from 'unified';
+/**
+ * rehype plugin for extract fallback description from markdown content
+ */
+export default function rehypeDesc(): Transformer<Root>;

package/dist/loaders/markdown/transformer/rehypeDesc.js

@@ -0,0 +1,51 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/loaders/markdown/transformer/rehypeDesc.ts
+var rehypeDesc_exports = {};
+__export(rehypeDesc_exports, {
+  default: () => rehypeDesc
+});
+module.exports = __toCommonJS(rehypeDesc_exports);
+var visit;
+var EXIT;
+var toString;
+(async () => {
+  ({ visit, EXIT } = await import("unist-util-visit"));
+  ({ toString } = await import("hast-util-to-string"));
+})();
+function rehypeDesc() {
+  return async (tree, vFile) => {
+    if (!vFile.data.frontmatter.description) {
+      visit(tree, "element", (node) => {
+        if (node.tagName === "p") {
+          const text = toString(node).trim();
+          if (text) {
+            vFile.data.frontmatter.description = text;
+            return EXIT;
+          }
+        }
+      });
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/loaders/markdown/transformer/remarkEmbed.js

@@ -68,7 +68,7 @@ function remarkEmbed(opts) {
           } else if (hash.startsWith("RE-")) {
             content = (0, import_utils.getFileContentByRegExp)(content, hash.slice(3), absPath);
           }
-          const mdast = unified().use(remarkParse).use(remarkFrontmatter).use(remarkRawAST).processSync(content).result;
+          const mdast = unified().use(remarkParse).use(remarkEmbed, { ...opts, fileAbsPath: absPath }).use(remarkFrontmatter).use(remarkRawAST).processSync(content).result;
           if (!node.value.endsWith(EMBED_CLOSE_TAG)) {
             for (let j = i; j < parent.children.length; j++) {
               const sibling = parent.children[j];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0-rc.2",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",
@@ -21,10 +21,11 @@
     "dev": "father dev",
     "docs:build": "node ./bin/dumi.js build",
     "docs:dev": "node ./bin/dumi.js dev",
+    "docs:sync": "node ./scripts/sync-from-umi.js",
     "lint": "npm run lint:es && npm run lint:css",
     "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "npm run build && node ./bin/dumi.js setup",
+    "prepare": "npm run build && node ./bin/dumi.js setup && npm run docs:sync",
     "prepublishOnly": "npm run build",
     "test": "vitest"
   },
@@ -58,6 +59,7 @@
     "@types/mdast": "^3.0.10",
     "@umijs/bundler-utils": "^4.0.29",
     "@umijs/core": "^4.0.29",
+    "@umijs/plugins": "^4.0.29",
     "codesandbox": "^2.2.3",
     "deepmerge": "^4.2.2",
     "dumi-afx-deps": "^1.0.0-alpha.1",

package/theme-default/slots/Hero/index.js

@@ -24,7 +24,8 @@ var Hero = function Hero() {
     return /^(\w+:)\/\/|^(mailto|tel):/.test(link) ? /*#__PURE__*/React.createElement("a", {
       href: link,
       target: "_blank",
-      rel: "noreferrer"
+      rel: "noreferrer",
+      key: text
     }, text) : /*#__PURE__*/React.createElement(Link, {
       key: text,
       to: link

package/theme-default/slots/SearchBar/index.js

@@ -1,3 +1,5 @@
+var _navigator;
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -15,7 +17,7 @@ import { useIntl, useSiteSearch } from 'dumi';
 import React, { useEffect, useRef, useState } from 'react';
 import { SearchResult } from "../SearchResult";
 import "./index.less";
-var isAppleDevice = /(mac|iphone|ipod|ipad)/i.test(navigator.platform);
+var isAppleDevice = /(mac|iphone|ipod|ipad)/i.test(typeof navigator !== 'undefined' ? (_navigator = navigator) === null || _navigator === void 0 ? void 0 : _navigator.platform : '');
 
 var SearchBar = function SearchBar() {
   var intl = useIntl();
@@ -27,7 +29,11 @@ var SearchBar = function SearchBar() {
       setFocusing = _useState2[1];
 
   var input = useRef(null);
-  var symbol = isAppleDevice ? '⌘' : 'Ctrl';
+
+  var _useState3 = useState('⌘'),
+      _useState4 = _slicedToArray(_useState3, 2),
+      symbol = _useState4[0],
+      setSymbol = _useState4[1];
 
   var _useSiteSearch = useSiteSearch(),
       keywords = _useSiteSearch.keywords,
@@ -36,6 +42,12 @@ var SearchBar = function SearchBar() {
       loading = _useSiteSearch.loading;
 
   useEffect(function () {
+    // why put useEffect?
+    // to avoid Text content mismatch between server & client in ssr
+    if (!isAppleDevice) {
+      setSymbol('Ctrl');
+    }
+
     var handler = function handler(ev) {
       if ((isAppleDevice ? ev.metaKey : ev.ctrlKey) && ev.key === 'k') {
         var _input$current;