@umijs/plugin-docs 4.0.0-rc.15 → 4.0.0-rc.18

package/client/theme-doc/Layout.tsx

@@ -43,6 +43,7 @@ export default (props: any) => {
         components: props.components,
         themeConfig: props.themeConfig,
         location: props.location,
+        history: props.history,
       }}
     >
       <div

package/client/theme-doc/Search.tsx

@@ -95,9 +95,19 @@ export default () => {
           className={cx(
             'absolute transition-all duration-500 top-12 w-96 rounded-lg',
             'cursor-pointer shadow overflow-hidden',
-            result.length > 0 && isFocused ? 'max-h-80' : 'max-h-0',
+            keyword && isFocused ? 'max-h-80' : 'max-h-0',
           )}
         >
+          {keyword && result.length === 0 && (
+            <div>
+              <p
+                className="p-2 bg-white hover:bg-gray-50 transition
+                 duration-300 group-focus:bg-blue-200 dark:bg-gray-700"
+              >
+                {render('No result for')} "{keyword}"
+              </p>
+            </div>
+          )}
           {result.map((r, i) => (
             <components.Link
               to={(isFromPath ? currentLanguage?.locale : '') + r.href}

package/client/theme-doc/Sidebar.tsx

@@ -63,7 +63,8 @@ export default (props: SidebarProps) => {
                 return (
                   <components.Link
                     key={route.path}
-                    to={route.path}
+                    to={to.startsWith('/') ? to : `/${to}`}
+                    prefetch
                     onClick={() =>
                       props.setMenuOpened && props.setMenuOpened((o) => !o)
                     }

package/client/theme-doc/context.ts

@@ -37,6 +37,9 @@ interface IContext {
     hash: string;
     key: string;
   };
+  history: {
+    push(to: string, state?: any): void;
+  };
 }
 
 export const ThemeContext = React.createContext<IContext | null>(null);

package/client/theme-doc/tailwind.out.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.0.23 | MIT License | https://tailwindcss.com
+! tailwindcss v3.0.24 | MIT License | https://tailwindcss.com
 */
 
 /*

package/client/theme-doc/useLanguage.ts

@@ -1,5 +1,4 @@
 // @ts-ignore
-import { history } from 'umi';
 import { useThemeContext } from './context';
 
 interface useLanguageResult {
@@ -11,7 +10,7 @@ interface useLanguageResult {
 }
 
 function useLanguage(): useLanguageResult {
-  const { themeConfig, location } = useThemeContext()!;
+  const { themeConfig, location, history } = useThemeContext()!;
 
   const languages = themeConfig.i18n;
   let currentLanguage: { locale: string; text: string } | undefined = undefined;

package/dist/compiler.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compile = void 0;
-const plugin_utils_1 = require("umi/plugin-utils");
 const rehype_pretty_code_1 = __importDefault(require("rehype-pretty-code"));
+const plugin_utils_1 = require("umi/plugin-utils");
 // @ts-ignore
 const mdx_1 = require("../compiled/@mdx-js/mdx");
 // @ts-ignore
@@ -48,8 +48,11 @@ function MDXContent(props = {}) {
 
   useEffect(() => {
     if (window.location.hash.length !== 0) {
-      const hash = window.location.hash;
-      document.getElementById(hash.slice(1))?.scrollIntoView();
+      // 为了右侧内容区能正常跳转
+      const hash = decodeURIComponent(window.location.hash);
+      setTimeout(() => {
+        document.getElementById(hash.slice(1))?.scrollIntoView();
+      }, 100);
     } else {
       window.scrollTo(0, 0);
     }

package/dist/index.js

@@ -125,7 +125,7 @@ export { ${exports
             path: 'Layout.tsx',
             content: `
 import React from 'react';
-import { useOutlet, useAppData, useLocation, Link } from 'umi';
+import { useOutlet, useAppData, useLocation, Link, history } from 'umi';
 import { $Layout as Layout } from '${(0, utils_1.winPath)(require.resolve('../client/theme-doc/index.ts'))}';
 ${themeExists
                 ? `import themeConfig from '${themeConfigPath}'`
@@ -138,12 +138,12 @@ export default () => {
   const appData = useAppData();
   const location = useLocation();
   return (
-    <Layout appData={appData} components={{Link}} themeConfig={themeConfig} location={location}>
+    <Layout appData={appData} components={{Link}} themeConfig={themeConfig} location={location} history={history}>
       <div>{ outlet }</div>
     </Layout>
   );
 };
-    `,
+`,
         });
     });
 };

package/dist/markdown.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTitle = void 0;
 function parseTitle(opts) {
-    const lines = opts.content.split('\n');
+    const lines = opts.content
+        .replace(/{[\n\s\t]*\/\*[\s\S]*?\*\/[\n\s\t]*}/g, '')
+        .split('\n');
     let i = 0;
     const ret = [];
     while (i < lines.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugin-docs",
-  "version": "4.0.0-rc.15",
+  "version": "4.0.0-rc.18",
   "description": "@umijs/plugin-docs",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugin-docs#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -20,7 +20,7 @@
     "build": "pnpm tsc",
     "build:css": "tailwindcss -i ./client/theme-doc/tailwind.css -o ./client/theme-doc/tailwind.out.css",
     "build:deps": "umi-scripts bundleDeps",
-    "build:extra": "pnpm build:css && pnpm build:deps",
+    "build:extra": "pnpm build:css",
     "dev": "pnpm build -- --watch",
     "dev:css": "pnpm build:css -- --watch",
     "test": "umi-scripts jest-turbo"
@@ -28,7 +28,7 @@
   "dependencies": {
     "keymaster": "1.6.2",
     "react-helmet": "^6.1.0",
-    "rehype-pretty-code": "^0.3.0",
+    "rehype-pretty-code": "^0.3.1",
     "shiki": "^0.10.1"
   },
   "devDependencies": {
@@ -38,8 +38,8 @@
     "classnames": "^2.3.1",
     "rehype-slug": "5.0.1",
     "remark-gfm": "^3.0.1",
-    "tailwindcss": "^3.0.23",
-    "umi": "4.0.0-rc.15"
+    "tailwindcss": "^3.0.24",
+    "umi": "4.0.0-rc.18"
   },
   "publishConfig": {
     "access": "public"