@umijs/plugin-docs 4.0.0-rc.14 → 4.0.0-rc.17

package/client/theme-doc/LangSwitch.tsx

@@ -17,7 +17,7 @@ export default () => {
   }
 
   function handleClick() {
-    if (!currentLanguage) return;
+    if (!currentLanguage || languages.length === 1) return;
     if (languages.length === 2) {
       switchLanguage(
         languages[0].locale === currentLanguage.locale
@@ -29,6 +29,8 @@ export default () => {
     setExpanded((e) => !e);
   }
 
+  if (!currentLanguage || languages.length === 1) return null;
+
   return (
     <div>
       <div

package/client/theme-doc/Layout.tsx

@@ -20,7 +20,8 @@ export default (props: any) => {
 
     function updateBlur() {
       if (!offset || !blur) return;
-      blur.backgroundPosition = `0px ` + `${-window.scrollY + 100}px`;
+      blur.backgroundPosition =
+        `0px ` + `calc(var(--anchor-offset) + ${-window.scrollY + 64}px)`;
     }
 
     document.addEventListener('scroll', updateBlur, false), updateBlur();
@@ -42,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

@@ -102,6 +102,7 @@ export default () => {
             <components.Link
               to={(isFromPath ? currentLanguage?.locale : '') + r.href}
               key={i}
+              onClick={() => (document.activeElement as HTMLElement)?.blur()}
               className="group outline-none search-result"
               onFocus={() => setIsFocused(true)}
               onBlur={() => setIsFocused(false)}

package/client/theme-doc/components/Announcement.tsx

@@ -6,6 +6,7 @@ function Announcement() {
   const { themeConfig } = useThemeContext()!;
 
   if (!themeConfig.announcement) {
+    document.documentElement.style.setProperty('--anchor-offset', '0px');
     return null;
   }
 

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/firefox-polyfill.css

@@ -12,9 +12,9 @@
   .g-glossy-firefox-cover {
     display: block;
     position: fixed;
-    top: var(--anchor-offset);
+    top: 0;
     width: 100%;
-    height: 72px;
+    height: calc(var(--anchor-offset) + 72px);
     z-index: 22;
     background-color: white;
   }
@@ -23,8 +23,8 @@
     display: block;
     position: fixed;
     width: 100%;
-    top: var(--anchor-offset);
-    height: 72px;
+    top: 0;
+    height: calc(var(--anchor-offset) + 72px);
     z-index: 24;
     background: -moz-element(#article-body) no-repeat top;
     filter: blur(10px);

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;
@@ -57,7 +56,13 @@ function useLanguage(): useLanguageResult {
   }
 
   function render(key: string) {
-    if (!currentLanguage || !themeConfig.locales) return key;
+    if (!themeConfig.locales || Object.keys(themeConfig.locales).length === 0)
+      return key;
+    if (!currentLanguage) {
+      return (
+        themeConfig.locales[Object.keys(themeConfig.locales)[0]].key || key
+      );
+    }
     if (!themeConfig.locales[currentLanguage.locale]) return key;
     return themeConfig.locales[currentLanguage.locale][key] || key;
   }

package/dist/compiler.d.ts

@@ -1,5 +1,6 @@
 export declare function compile(opts: {
     content: string;
+    fileName: string;
 }): Promise<{
     result: string;
 }>;

package/dist/compiler.js

@@ -1,19 +1,11 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compile = void 0;
 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
@@ -41,14 +33,14 @@ const rehypePrettyCodeOptions = {
         node.properties.className = ['word'];
     },
 };
-function compile(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const compiler = (0, mdx_1.createProcessor)({
-            jsx: true,
-            remarkPlugins: [remark_gfm_1.default],
-            rehypePlugins: [rehype_slug_1.default, [rehype_pretty_code_1.default, rehypePrettyCodeOptions]],
-        });
-        let result = String(yield compiler.process(opts.content));
+async function compile(opts) {
+    const compiler = (0, mdx_1.createProcessor)({
+        jsx: true,
+        remarkPlugins: [remark_gfm_1.default],
+        rehypePlugins: [rehype_slug_1.default, [rehype_pretty_code_1.default, rehypePrettyCodeOptions]],
+    });
+    try {
+        let result = String(await compiler.process(opts.content));
         result = result.replace('function MDXContent(props = {}) {', `
 import { useEffect } from 'react';
 
@@ -56,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);
     }
@@ -69,6 +64,16 @@ function MDXContent(props = {}) {
 
 `);
         return { result };
-    });
+    }
+    catch (e) {
+        plugin_utils_1.logger.error(e.reason);
+        plugin_utils_1.logger.error(`Above error occurred in ${opts.fileName} at line ${e.line}`);
+        plugin_utils_1.logger.error(opts.content
+            .split('\n')
+            .filter((_, i) => i == e.line - 1)
+            .join('\n'));
+        plugin_utils_1.logger.error(' '.repeat(e.column - 1) + '^');
+        return { result: '' };
+    }
 }
 exports.compile = compile;

package/dist/index.js

@@ -44,7 +44,10 @@ exports.default = (api) => {
         });
     }
     api.modifyDefaultConfig((memo) => {
-        memo.conventionRoutes = Object.assign(Object.assign({}, memo.conventionRoutes), { base: (0, path_1.join)(api.cwd, 'docs') });
+        memo.conventionRoutes = {
+            ...memo.conventionRoutes,
+            base: (0, path_1.join)(api.cwd, 'docs'),
+        };
         memo.mdx = {
             loader: require.resolve('./loader'),
             loaderOptions: {},
@@ -84,7 +87,10 @@ exports.default = (api) => {
             const defaultLangFile = r[route].file.replace(/(.[a-z]{2}-[A-Z]{2})?.md$/, '');
             Object.keys(locales).map((l) => {
                 if (r[defaultLangFile] && !r[defaultLangFile + '.' + l]) {
-                    r[defaultLangFile + '.' + l] = Object.assign(Object.assign({}, r[defaultLangFile]), { path: `/${l}/${r[defaultLangFile].path}` });
+                    r[defaultLangFile + '.' + l] = {
+                        ...r[defaultLangFile],
+                        path: `/${l}/${r[defaultLangFile].path}`,
+                    };
                 }
             });
         }
@@ -119,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}'`
@@ -132,7 +138,7 @@ 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/loader.js

@@ -1,32 +1,22 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const compiler_1 = require("./compiler");
-function default_1(content) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // @ts-ignore
-        const filename = this.resourcePath;
-        // @ts-ignore
-        const callback = this.async();
-        try {
-            const { result } = yield (0, compiler_1.compile)({
-                content,
-            });
-            return callback(null, result);
-        }
-        catch (e) {
-            const err = e;
-            e.message = `${filename}: ${e.message}`;
-            throw err;
-        }
-    });
+async function default_1(content) {
+    // @ts-ignore
+    const filename = this.resourcePath;
+    // @ts-ignore
+    const callback = this.async();
+    try {
+        const { result } = await (0, compiler_1.compile)({
+            content,
+            fileName: filename,
+        });
+        return callback(null, result);
+    }
+    catch (e) {
+        const err = e;
+        e.message = `${filename}: ${e.message}`;
+        throw err;
+    }
 }
 exports.default = default_1;

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.14",
+  "version": "4.0.0-rc.17",
   "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",
@@ -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.14"
+    "tailwindcss": "^3.0.24",
+    "umi": "4.0.0-rc.17"
   },
   "publishConfig": {
     "access": "public"