dumi-theme-lobehub 2.0.0 → 2.0.2

package/README.md

@@ -45,9 +45,6 @@ dumi-theme-lobehub is a documentation site theme package designed for `Dumi 2`.
 
 </details>
 
-> \[!WARNING]
-> Not Support Dumi >= 2.3 yet
-
 ## ✨ Features
 
 - [x] 🤯 **Modern Theme Style:** This theme package adopts modern design techniques such as gradient colors, frosted glass, lighting effects, and natural animations to present the interface in a more concise and visually appealing way, making the documents more intuitive, readable, and user-friendly.

package/dist/layouts/DemoLayout/index.js

@@ -1,33 +1,16 @@
-import { ThemeProvider } from '@lobehub/ui';
 import { useLocale, useLocation, useNavData, useOutlet, useRouteMeta, useSidebarData, useSiteData, useTabMeta } from 'dumi';
-import isEqual from 'fast-deep-equal';
-import { memo, useMemo } from 'react';
-import { Provider, createStore as _createStore, useThemeStore } from "../../store";
-import AntdV5MonkeyPatch from "../DocLayout/AntdV5MonkeyPatch";
+import { memo } from 'react';
+import { Provider, createStore as _createStore } from "../../store";
 import Analytics from "../DocLayout/Head/Analytics";
 import Favicons from "../DocLayout/Head/Favicons";
 import Og from "../DocLayout/Head/Og";
 import StructuredData from "../DocLayout/Head/StructuredData";
+import ThemeProvider from "../DocLayout/ThemeProvider";
 import GlobalStyle from "./GlobalStyle";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var App = /*#__PURE__*/memo(function (_ref) {
-  var initState = _ref.initState;
-  var themeMode = useThemeStore(function (st) {
-    return st.themeMode;
-  }, isEqual);
-  var outlet = useOutlet();
-  return /*#__PURE__*/_jsxs(Provider, {
-    createStore: function createStore() {
-      return _createStore(initState);
-    },
-    children: [/*#__PURE__*/_jsx(Favicons, {}), /*#__PURE__*/_jsx(Og, {}), /*#__PURE__*/_jsx(Analytics, {}), /*#__PURE__*/_jsx(StructuredData, {}), /*#__PURE__*/_jsxs(ThemeProvider, {
-      themeMode: themeMode,
-      children: [/*#__PURE__*/_jsx(GlobalStyle, {}), outlet]
-    }), /*#__PURE__*/_jsx(AntdV5MonkeyPatch, {})]
-  });
-});
-export default /*#__PURE__*/memo(function () {
+var DemoProvider = /*#__PURE__*/memo(function (_ref) {
+  var children = _ref.children;
   var siteData = useSiteData();
   var sidebar = useSidebarData();
   var routeMeta = useRouteMeta();
@@ -35,18 +18,29 @@ export default /*#__PURE__*/memo(function () {
   var navData = useNavData();
   var location = useLocation();
   var locale = useLocale();
-  var initState = useMemo(function () {
-    return {
-      locale: locale,
-      location: location,
-      navData: navData,
-      routeMeta: routeMeta,
-      sidebar: sidebar,
-      siteData: siteData,
-      tabMeta: tabMeta
-    };
-  }, []);
-  return /*#__PURE__*/_jsx(App, {
-    initState: initState
+  return /*#__PURE__*/_jsxs(Provider, {
+    createStore: function createStore() {
+      return (
+        // @ts-ignore
+        _createStore({
+          locale: locale,
+          location: location,
+          navData: navData,
+          routeMeta: routeMeta,
+          sidebar: sidebar,
+          siteData: siteData,
+          tabMeta: tabMeta
+        })
+      );
+    },
+    children: [/*#__PURE__*/_jsx(Favicons, {}), /*#__PURE__*/_jsx(Og, {}), /*#__PURE__*/_jsx(Analytics, {}), /*#__PURE__*/_jsx(StructuredData, {}), /*#__PURE__*/_jsxs(ThemeProvider, {
+      children: [/*#__PURE__*/_jsx(GlobalStyle, {}), children]
+    })]
+  });
+});
+export default /*#__PURE__*/memo(function () {
+  var outlet = useOutlet();
+  return /*#__PURE__*/_jsx(DemoProvider, {
+    children: outlet
   });
 });

package/dist/layouts/DocLayout/DocumentLayout.d.ts

@@ -1,3 +1,5 @@
 /// <reference types="react" />
-declare const DocumentLayout: import("react").MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+declare const DocumentLayout: import("react").NamedExoticComponent<{
+    children?: import("react").ReactNode;
+}>;
 export default DocumentLayout;

package/dist/layouts/DocLayout/DocumentLayout.js

@@ -14,7 +14,8 @@ import { heroSelectors, siteSelectors, useSiteStore } from "../../store";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var DocumentLayout = /*#__PURE__*/memo(function () {
+var DocumentLayout = /*#__PURE__*/memo(function (_ref) {
+  var children = _ref.children;
   var intl = useIntl();
   var _useLocation = useLocation(),
     hash = _useLocation.hash;
@@ -104,7 +105,13 @@ var DocumentLayout = /*#__PURE__*/memo(function () {
       sidebar: hideSidebar ? undefined : /*#__PURE__*/_jsx(Sidebar, {}),
       toc: hideToc ? undefined : /*#__PURE__*/_jsx(Toc, {}),
       tocWidth: hideToc ? 0 : theme.tocWidth,
-      children: [page === 'home' && /*#__PURE__*/_jsx(Home, {}), page === 'changelog' && /*#__PURE__*/_jsx(Changelog, {}), page === 'docs' && /*#__PURE__*/_jsx(Docs, {})]
+      children: [page === 'home' && /*#__PURE__*/_jsx(Home, {
+        children: children
+      }), page === 'changelog' && /*#__PURE__*/_jsx(Changelog, {
+        children: children
+      }), page === 'docs' && /*#__PURE__*/_jsx(Docs, {
+        children: children
+      })]
     })]
   });
 });

package/dist/layouts/DocLayout/ThemeProvider.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import 'antd/dist/reset.css';
 declare const _default: import("react").NamedExoticComponent<{
     children?: import("react").ReactNode;
 }>;

package/dist/layouts/DocLayout/ThemeProvider.js

@@ -1,11 +1,11 @@
 import { ThemeProvider } from '@lobehub/ui';
 import { StyleProvider, extractStaticStyle } from 'antd-style';
+import 'antd/dist/reset.css';
 import isEqual from 'fast-deep-equal';
 import { memo } from 'react';
 import GlobalStyle from "./GlobalStyle";
 import { siteSelectors, useSiteStore, useThemeStore } from "../../store";
 import _customToken from "../../styles/customToken";
-import AntdV5MonkeyPatch from "./AntdV5MonkeyPatch";
 
 //@ts-ignore
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -17,15 +17,19 @@ export default /*#__PURE__*/memo(function (_ref) {
     return st.themeMode;
   });
   var userToken = useSiteStore(siteSelectors.token, isEqual);
-  return /*#__PURE__*/_jsxs(StyleProvider, {
+  return /*#__PURE__*/_jsx(StyleProvider, {
     cache: extractStaticStyle.cache,
     speedy: process.env.NODE_ENV === 'production',
-    children: [/*#__PURE__*/_jsxs(ThemeProvider, {
+    children: /*#__PURE__*/_jsxs(ThemeProvider, {
+      appearance: themeMode !== 'auto' ? themeMode : undefined,
       customToken: function customToken(themeToken) {
         return Object.assign({}, _customToken(themeToken), userToken);
       },
+      theme: {
+        cssVar: true
+      },
       themeMode: themeMode,
       children: [/*#__PURE__*/_jsx(GlobalStyle, {}), children]
-    }), /*#__PURE__*/_jsx(AntdV5MonkeyPatch, {})]
+    })
   });
 });

package/dist/layouts/DocLayout/index.js

@@ -1,5 +1,6 @@
+import { useOutlet } from "../../../example/.dumi/tmp/exports";
 import { useLocale, useLocation, useNavData, useRouteMeta, useSidebarData, useSiteData, useTabMeta } from 'dumi';
-import { memo, useMemo } from 'react';
+import { memo } from 'react';
 import { StoreUpdater } from "../../components/StoreUpdater";
 import { Provider, createStore as _createStore } from "../../store";
 import DocumentLayout from "./DocumentLayout";
@@ -10,37 +11,40 @@ import StructuredData from "./Head/StructuredData";
 import ThemeProvider from "./ThemeProvider";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var App = /*#__PURE__*/memo(function (_ref) {
-  var initState = _ref.initState;
+var DocProvider = /*#__PURE__*/memo(function (_ref) {
+  var children = _ref.children;
+  var siteData = useSiteData();
+  var sidebar = useSidebarData();
+  var routeMeta = useRouteMeta();
+  var tabMeta = useTabMeta();
+  var navData = useNavData();
+  var location = useLocation();
+  var locale = useLocale();
   return /*#__PURE__*/_jsxs(Provider, {
     createStore: function createStore() {
-      return _createStore(initState);
+      return (
+        // @ts-ignore
+        _createStore({
+          locale: locale,
+          location: location,
+          navData: navData,
+          routeMeta: routeMeta,
+          sidebar: sidebar,
+          siteData: siteData,
+          tabMeta: tabMeta
+        })
+      );
     },
     children: [/*#__PURE__*/_jsx(Favicons, {}), /*#__PURE__*/_jsx(Og, {}), /*#__PURE__*/_jsx(Analytics, {}), /*#__PURE__*/_jsx(StructuredData, {}), /*#__PURE__*/_jsx(StoreUpdater, {}), /*#__PURE__*/_jsx(ThemeProvider, {
-      children: /*#__PURE__*/_jsx(DocumentLayout, {})
+      children: /*#__PURE__*/_jsx(DocumentLayout, {
+        children: children
+      })
     })]
   });
 });
 export default /*#__PURE__*/memo(function () {
-  var siteData = useSiteData();
-  var sidebar = useSidebarData();
-  var routeMeta = useRouteMeta();
-  var tabMeta = useTabMeta();
-  var navData = useNavData();
-  var location = useLocation();
-  var locale = useLocale();
-  var initState = useMemo(function () {
-    return {
-      locale: locale,
-      location: location,
-      navData: navData,
-      routeMeta: routeMeta,
-      sidebar: sidebar,
-      siteData: siteData,
-      tabMeta: tabMeta
-    };
-  }, []);
-  return /*#__PURE__*/_jsx(App, {
-    initState: initState
+  var outlet = useOutlet();
+  return /*#__PURE__*/_jsx(DocProvider, {
+    children: outlet
   });
 });

package/dist/pages/Changelog/index.d.ts

@@ -1,3 +1,5 @@
 /// <reference types="react" />
-declare const Changelog: import("react").MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+declare const Changelog: import("react").NamedExoticComponent<{
+    children?: import("react").ReactNode;
+}>;
 export default Changelog;

package/dist/pages/Changelog/index.js

@@ -1,5 +1,4 @@
 import { useResponsive } from 'antd-style';
-import { useOutlet } from 'dumi';
 import isEqual from 'fast-deep-equal';
 import { memo, useEffect } from 'react';
 import { Center } from 'react-layout-kit';
@@ -9,8 +8,8 @@ import Content from "dumi/theme/slots/Content";
 import { siteSelectors, useSiteStore } from "../../store";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var Changelog = /*#__PURE__*/memo(function () {
-  var outlet = useOutlet();
+var Changelog = /*#__PURE__*/memo(function (_ref) {
+  var children = _ref.children;
   var _useResponsive = useResponsive(),
     mobile = _useResponsive.mobile;
   var repoBase = useSiteStore(siteSelectors.github);
@@ -38,7 +37,7 @@ var Changelog = /*#__PURE__*/memo(function () {
       title: fm.title
     }), /*#__PURE__*/_jsx(Content, {
       className: styles.changelog,
-      children: outlet
+      children: children
     })]
   });
 });

package/dist/pages/Docs/index.d.ts

@@ -1,3 +1,5 @@
 /// <reference types="react" />
-declare const Documents: import("react").MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+declare const Documents: import("react").NamedExoticComponent<{
+    children?: import("react").ReactNode;
+}>;
 export default Documents;

package/dist/pages/Docs/index.js

@@ -1,6 +1,5 @@
 import { Giscus } from '@lobehub/ui/awesome';
 import { useResponsive } from 'antd-style';
-import { useOutlet } from 'dumi';
 import { memo, useCallback, useEffect } from 'react';
 import { Center } from 'react-layout-kit';
 import ApiHeader from "dumi/theme/slots/ApiHeader";
@@ -9,8 +8,8 @@ import { apiHeaderSelectors, siteSelectors, useSiteStore } from "../../store";
 import { useStyles } from "./styles";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var Documents = /*#__PURE__*/memo(function () {
-  var outlet = useOutlet();
+var Documents = /*#__PURE__*/memo(function (_ref) {
+  var children = _ref.children;
   var _useResponsive = useResponsive(),
     mobile = _useResponsive.mobile;
   var _useSiteStore = useSiteStore(function (s) {
@@ -54,7 +53,7 @@ var Documents = /*#__PURE__*/memo(function () {
     children: [isApiPage && /*#__PURE__*/_jsx(ApiHeader, {
       padding: mobile ? 16 : 0
     }), /*#__PURE__*/_jsxs(Content, {
-      children: [outlet, giscus && /*#__PURE__*/_jsx(Comment, {})]
+      children: [children, giscus && /*#__PURE__*/_jsx(Comment, {})]
     })]
   });
 });

package/dist/pages/Home/index.d.ts

@@ -1,3 +1,5 @@
 /// <reference types="react" />
-declare const Home: import("react").MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+declare const Home: import("react").NamedExoticComponent<{
+    children?: import("react").ReactNode;
+}>;
 export default Home;

package/dist/pages/Home/index.js

@@ -1,12 +1,11 @@
-import { useOutlet } from 'dumi';
 import { memo, useEffect } from 'react';
 import { Flexbox } from 'react-layout-kit';
 import Features from "dumi/theme/slots/Features";
 import Hero from "dumi/theme/slots/Hero";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var Home = /*#__PURE__*/memo(function () {
-  var outlet = useOutlet();
+var Home = /*#__PURE__*/memo(function (_ref) {
+  var children = _ref.children;
   useEffect(function () {
     var _window, _document;
     (_window = window) === null || _window === void 0 || _window.scrollTo(0, 0);
@@ -19,7 +18,7 @@ var Home = /*#__PURE__*/memo(function () {
       minHeight: '64vh',
       padding: '64px 24px'
     },
-    children: [/*#__PURE__*/_jsx(Hero, {}), /*#__PURE__*/_jsx(Features, {}), outlet]
+    children: [/*#__PURE__*/_jsx(Hero, {}), /*#__PURE__*/_jsx(Features, {}), children]
   });
 });
 export default Home;

package/dist/store/selectors/site.d.ts

@@ -55,7 +55,7 @@ export declare const siteSelectors: {
     } | undefined;
     siteDesc: (s: SiteStore) => string | undefined;
     siteTitle: (s: SiteStore) => string | undefined;
-    themeConfig: (s: SiteStore) => import("dumi/dist/client/theme-api/types").IThemeConfig & import("../../types").SiteThemeConfig & Partial<import("../../types").SiteThemeConfig>;
+    themeConfig: (s: SiteStore) => Partial<import("../../types").SiteThemeConfig> & import("dumi/dist/client/theme-api/types").IThemeConfig & import("../../types").SiteThemeConfig;
     tocAnchorItem: (s: SiteStore) => AnchorItem[];
     token: (s: SiteStore) => any;
 };

package/dist/store/selectors/site.js

@@ -7,7 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { merge } from 'lodash-es';
 import { initialThemeConfig } from "../initialState";
 var themeConfig = function themeConfig(s) {
-  return merge(s.siteData.themeConfig, initialThemeConfig);
+  return merge(initialThemeConfig, s.siteData.themeConfig);
 };
 var siteTitle = function siteTitle(s) {
   return themeConfig(s).title;

package/dist/store/useSiteStore.d.ts

@@ -19,7 +19,7 @@ export interface SiteStore {
     siteData: ISiteData;
     tabMeta?: NonNullable<IRouteMeta['tabs']>[0]['meta'];
 }
-export declare const createStore: (initState: SiteStore) => import("zustand/traditional").UseBoundStoreWithEqualityFn<Omit<StoreApi<SiteStore>, "setState"> & {
+export declare const createStore: (initState: SiteStore) => import("zustand/traditional").UseBoundStoreWithEqualityFn<Omit<StoreApi<SiteStore>, "setState" | "devtools"> & {
     setState(partial: SiteStore | Partial<SiteStore> | ((state: SiteStore) => SiteStore | Partial<SiteStore>), replace?: false | undefined, action?: (string | {
         [x: string]: unknown;
         [x: number]: unknown;
@@ -32,6 +32,9 @@ export declare const createStore: (initState: SiteStore) => import("zustand/trad
         [x: symbol]: unknown;
         type: string;
     }) | undefined): void;
+    devtools: {
+        cleanup: () => void;
+    };
 }>;
 declare const useStore: import("zustand-utils").UseContextStore<StoreApi<SiteStore>>, useStoreApi: () => {
     setState: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi-theme-lobehub",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "dumi-theme-lobehub is a documentation site theme package designed for dumi2. It provides a more beautiful and user-friendly development and reading experience based on @lobehub/ui",
   "keywords": [
     "lobehub",
@@ -25,10 +25,10 @@
     "dist"
   ],
   "dependencies": {
-    "@floating-ui/react": "^0.27.5",
+    "@floating-ui/react": "^0.27.15",
     "@giscus/react": "^3.1.0",
-    "@lobehub/ui": "^2.0.0",
-    "ahooks": "^3.8.4",
+    "@lobehub/ui": "^2.9.4",
+    "ahooks": "^3.9.3",
     "animated-scroll-to": "^2.3.2",
     "antd-style": "^3.7.1",
     "chalk": "^4.1.2",
@@ -37,11 +37,11 @@
     "lucide-react": "^0.469.0",
     "polished": "^4.3.1",
     "rc-footer": "^0.6.8",
-    "react-layout-kit": "^1.9.1",
-    "swr": "^2.3.3",
+    "react-layout-kit": "^1.9.2",
+    "swr": "^2.3.6",
     "url-join": "^5.0.0",
     "use-merge-value": "^1.2.0",
-    "zustand": "^5.0.3",
+    "zustand": "^5.0.7",
     "zustand-utils": "^1.3.2"
   },
   "peerDependencies": {