dumi 2.1.6 → 2.1.8

package/dist/assetParsers/atom.d.ts

@@ -4,7 +4,7 @@ declare class AtomAssetsParser {
     private resolveDir;
     private unresolvedFiles;
     private parser;
-    private resolver;
+    private isParsing;
     private parseDeferrer;
     private watcher;
     private cbs;
@@ -22,6 +22,6 @@ declare class AtomAssetsParser {
     }>;
     watch(cb: AtomAssetsParser['cbs'][number]): void;
     unwatch(cb: AtomAssetsParser['cbs'][number]): void;
-    destroy(): void;
+    destroyWorker(): void;
 }
 export default AtomAssetsParser;

package/dist/assetParsers/atom.js

@@ -33,6 +33,7 @@ var MAX_PARSE_SIZE = 1024 * 512;
 var AtomAssetsParser = class {
   constructor(opts) {
     this.unresolvedFiles = [];
+    this.isParsing = false;
     this.watcher = null;
     this.cbs = [];
     const absEntryFile = import_path.default.resolve(opts.resolveDir, opts.entryFile);
@@ -47,13 +48,13 @@ var AtomAssetsParser = class {
     });
   }
   async parse() {
-    if (!this.parseDeferrer) {
+    if (!this.parseDeferrer || this.unresolvedFiles.length && !this.isParsing) {
+      this.isParsing = true;
       this.parseDeferrer = (async () => {
         await this.parser.patch(this.unresolvedFiles.splice(0));
         const resolver = new import_parser.SchemaResolver(await this.parser.parse(), {
           mode: "worker"
         });
-        this.resolver = resolver;
         const result = {
           components: {},
           functions: {}
@@ -100,14 +101,10 @@ var AtomAssetsParser = class {
             signature
           };
         }
+        resolver.$$destroyWorker();
+        this.isParsing = false;
         return result;
       })();
-      this.parseDeferrer.finally(() => {
-        var _a;
-        (_a = this.resolver) == null ? void 0 : _a.$$destroyWorker();
-        this.resolver = void 0;
-        this.parseDeferrer = void 0;
-      });
     }
     return this.parseDeferrer;
   }
@@ -139,10 +136,12 @@ var AtomAssetsParser = class {
   unwatch(cb) {
     this.cbs.splice(this.cbs.indexOf(cb), 1);
   }
-  destroy() {
-    var _a;
-    (_a = this.resolver) == null ? void 0 : _a.$$destroyWorker();
-    this.parser.$$destroyWorker();
+  destroyWorker() {
+    if (this.parseDeferrer) {
+      this.parseDeferrer.finally(() => this.parser.$$destroyWorker());
+    } else {
+      this.parser.$$destroyWorker();
+    }
   }
 };
 var atom_default = AtomAssetsParser;

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

@@ -159,6 +159,7 @@ export interface ISidebarGroup {
     children: ISidebarItem[];
     [key: string]: any;
 }
+export declare type SocialTypes = 'github' | 'weibo' | 'twitter' | 'gitlab' | 'facebook' | 'zhihu' | 'yuque' | 'linkedin';
 export interface IThemeConfig {
     name?: string;
     logo?: string | false;
@@ -173,6 +174,9 @@ export interface IThemeConfig {
         default: 'light' | 'dark' | 'auto';
         switch: boolean;
     };
+    socialLinks: {
+        [key in SocialTypes]: string;
+    };
     [key: string]: any;
 }
 export declare type IRoutesById = Record<string, {

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

@@ -225,6 +225,8 @@ export var useSidebarData = function useSidebarData() {
   // /en-US/a/b => /en-US/a
   // /en-US/a/b/ => /en-US/a (also strip trailing /)
 
-  var parentPath = clearPath ? pathname.replace(/(\/[^/]+)(\/[^/]+\/?)$/, '$1') : pathname;
+  var parentPath = clearPath ? pathname.replace(clearPath, function (s) {
+    return s.replace(/([^/]+)(\/[^/]+\/?)$/, '$1');
+  }) : pathname;
   return parentPath ? sidebar[parentPath] : [];
 };

package/dist/features/derivative.js

@@ -50,6 +50,7 @@ var derivative_default = (api) => {
     var _a, _b, _c, _d;
     (0, import_assert.default)(!api.config.mpa, "MPA mode is not supported in dumi!");
     (0, import_assert.default)(!api.config.vite, "Vite mode is not supported yet!");
+    (0, import_assert.default)(!api.config.phantomDependency, "PhantomDependency is not supported yet!");
     if (typeof api.config.mfsu === "object") {
       (0, import_assert.default)(api.config.mfsu.strategy !== "eager", "MFSU eager mode is not supported yet!");
       (0, import_assert.default)(api.config.mfsu.esbuild !== true, "MFSU esbuild bundler is not supported yet!");
@@ -135,6 +136,8 @@ var derivative_default = (api) => {
     }
   });
   api.registerPlugins([require.resolve("../../compiled/@umijs/plugins")]);
+  if (api.isPluginEnable("prepare"))
+    api.skipPlugins(["prepare"]);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/exportStatic.js

@@ -23,6 +23,7 @@ __export(exportStatic_exports, {
 });
 module.exports = __toCommonJS(exportStatic_exports);
 var import_constants = require("../constants");
+var import_plugin_utils = require("umi/plugin-utils");
 var import_assets = require("./assets");
 var exportStatic_default = (api) => {
   const prevExtraRoutePaths = [];
@@ -49,10 +50,14 @@ var exportStatic_default = (api) => {
         memo.exportStatic.extraRoutePaths = async () => {
           const examples = (0, import_assets.getExampleAssets)();
           const userExtraPaths = [];
+          const isSupportDisablePrerender = import_plugin_utils.semver.gte(api.appData.umi.version, "4.0.48");
           for (const prev of prevExtraRoutePaths) {
             userExtraPaths.push(...typeof prev === "function" ? await prev() : prev);
           }
-          return userExtraPaths.concat(examples.map(({ id }) => `/${import_constants.SP_ROUTE_PREFIX}demos/${id}`));
+          return userExtraPaths.concat(examples.map(({ id }) => {
+            const demoPath = `/${import_constants.SP_ROUTE_PREFIX}demos/${id}`;
+            return isSupportDisablePrerender ? { path: demoPath, prerender: false } : demoPath;
+          }));
         };
       }
       return memo;

package/dist/features/parser.js

@@ -51,7 +51,7 @@ var parser_default = (api) => {
     (0, import_assert.default)((_a = api.userConfig.resolve) == null ? void 0 : _a.entryFile, "`resolve.entryFile` must be configured when `apiParser` enable");
     return memo;
   });
-  api.onStart(async () => {
+  api.onCheckPkgJSON(async () => {
     const {
       default: AtomAssetsParser
     } = require("../assetParsers/atom");
@@ -73,11 +73,16 @@ var parser_default = (api) => {
   api.onGenerateFiles(async () => {
     if (api.env === "production") {
       writeAtomsMetaFile(await api.service.atomParser.parse());
-      api.service.atomParser.destroy();
     } else if (prevData) {
       writeAtomsMetaFile(prevData);
     }
   });
+  api.onBuildComplete({
+    stage: Infinity,
+    fn() {
+      api.service.atomParser.destroyWorker();
+    }
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/routes.js

@@ -192,7 +192,8 @@ var routes_default = (api) => {
       path: `${import_constants.SP_ROUTE_PREFIX}demos/:id`,
       absPath: `/${import_constants.SP_ROUTE_PREFIX}demos/:id`,
       parentId: demoLayoutId,
-      file: getClientPageFile("client/pages/Demo", api.cwd)
+      file: getClientPageFile("client/pages/Demo", api.cwd),
+      prerender: false
     };
     return routes;
   });

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

@@ -31,7 +31,7 @@ var visit;
   ({ visit } = await import("unist-util-visit"));
 })();
 function isRelativeUrl(url) {
-  return !/^((blob:)?\w+:)?\/\//.test(url) && !import_path.default.isAbsolute(url);
+  return !url.startsWith("data:image") && !/^((blob:)?\w+:)?\/\//.test(url) && !import_path.default.isAbsolute(url);
 }
 function rehypeImg() {
   return (tree) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -80,8 +80,8 @@
     "@swc/core": "^1.2.224",
     "@types/hast": "^2.3.4",
     "@types/mdast": "^3.0.10",
-    "@umijs/bundler-utils": "^4.0.33",
-    "@umijs/core": "^4.0.33",
+    "@umijs/bundler-utils": "^4.0.48",
+    "@umijs/core": "^4.0.48",
     "animated-scroll-to": "^2.3.0",
     "classnames": "2.3.2",
     "codesandbox": "^2.2.3",
@@ -122,7 +122,7 @@
     "remark-rehype": "^10.1.0",
     "sass": "^1.55.0",
     "sitemap": "^7.1.1",
-    "umi": "^4.0.33",
+    "umi": "^4.0.48",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.0",
     "unist-util-visit-parents": "^5.1.1",
@@ -141,7 +141,7 @@
     "@types/pluralize": "^0.0.29",
     "@types/react": "^18.0.16",
     "@types/react-copy-to-clipboard": "^5.0.4",
-    "@umijs/lint": "^4.0.33",
+    "@umijs/lint": "^4.0.48",
     "@umijs/plugins": "4.0.32",
     "dumi-theme-mobile": "workspace:*",
     "eslint": "^8.20.0",

package/theme-default/locales/en-US.json

@@ -3,6 +3,14 @@
   "header.color.mode.light": "Light Mode",
   "header.color.mode.dark": "Dark Mode",
   "header.color.mode.auto": "Follow System",
+  "header.social.github": "GitHub",
+  "header.social.weibo": "Weibo",
+  "header.social.twitter": "Twitter",
+  "header.social.gitlab": "GitLab",
+  "header.social.facebook": "Facebook",
+  "header.social.zhihu": "Zhihu",
+  "header.social.yuque": "Yuque",
+  "header.social.linkedin": "Linkedin",
   "previewer.actions.code.expand": "Show Code",
   "previewer.actions.code.shrink": "Hide Code",
   "previewer.actions.codesandbox": "Open in CodeSandbox",

package/theme-default/locales/zh-CN.json

@@ -3,6 +3,14 @@
   "header.color.mode.light": "亮色模式",
   "header.color.mode.dark": "暗色模式",
   "header.color.mode.auto": "跟随系统",
+  "header.social.github": "GitHub",
+  "header.social.weibo": "微博",
+  "header.social.twitter": "Twitter",
+  "header.social.gitlab": "GitLab",
+  "header.social.facebook": "Facebook",
+  "header.social.zhihu": "知乎",
+  "header.social.yuque": "语雀",
+  "header.social.linkedin": "Linkedin",
   "previewer.actions.code.expand": "展开代码",
   "previewer.actions.code.shrink": "收起代码",
   "previewer.actions.codesandbox": "在 CodeSandbox 中打开",

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

@@ -20,7 +20,8 @@ import Logo from "dumi/theme/slots/Logo";
 import Navbar from "dumi/theme/slots/Navbar";
 import RtlSwitch from "dumi/theme/slots/RtlSwitch";
 import SearchBar from "dumi/theme/slots/SearchBar";
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
+import SocialIcon from "../SocialIcon";
 import "./index.less";
 
 var Header = function Header() {
@@ -35,6 +36,14 @@ var Header = function Header() {
   var _useSiteData = useSiteData(),
       themeConfig = _useSiteData.themeConfig;
 
+  var socialIcons = useMemo(function () {
+    return themeConfig.socialLinks ? Object.keys(themeConfig.socialLinks).slice(0, 5).map(function (key) {
+      return {
+        icon: key,
+        link: themeConfig.socialLinks[key]
+      };
+    }) : [];
+  }, [themeConfig.socialLinks]);
   return /*#__PURE__*/React.createElement("div", {
     className: "dumi-default-header",
     "data-static": Boolean(frontmatter.hero) || undefined,
@@ -50,7 +59,13 @@ var Header = function Header() {
     className: "dumi-default-header-right"
   }, /*#__PURE__*/React.createElement(Navbar, null), /*#__PURE__*/React.createElement("div", {
     className: "dumi-default-header-right-aside"
-  }, /*#__PURE__*/React.createElement(SearchBar, null), /*#__PURE__*/React.createElement(LangSwitch, null), /*#__PURE__*/React.createElement(RtlSwitch, null), themeConfig.prefersColor.switch && /*#__PURE__*/React.createElement(ColorSwitch, null), /*#__PURE__*/React.createElement(HeaderExtra, null))), /*#__PURE__*/React.createElement("button", {
+  }, /*#__PURE__*/React.createElement(SearchBar, null), /*#__PURE__*/React.createElement(LangSwitch, null), /*#__PURE__*/React.createElement(RtlSwitch, null), themeConfig.prefersColor.switch && /*#__PURE__*/React.createElement(ColorSwitch, null), socialIcons.map(function (item) {
+    return /*#__PURE__*/React.createElement(SocialIcon, {
+      icon: item.icon,
+      link: item.link,
+      key: item.link
+    });
+  }), /*#__PURE__*/React.createElement(HeaderExtra, null))), /*#__PURE__*/React.createElement("button", {
     type: "button",
     className: "dumi-default-header-menu-btn",
     onClick: function onClick(ev) {

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

@@ -19,7 +19,8 @@ function getTargetLocalePath(_ref) {
   var pathname = _ref.pathname,
       current = _ref.current,
       target = _ref.target;
-  var clearPath = 'base' in current ? pathname.replace(current.base.replace(/\/$/, ''), '') : pathname.replace(new RegExp("".concat(current.suffix, "$")), '');
+  var clearPath = 'base' in current ? // handle '/en-US/a' => '/a' or '/en-US' => '' => '/'
+  pathname.replace(current.base.replace(/\/$/, ''), '') || '/' : pathname.replace(new RegExp("".concat(current.suffix, "$")), '');
   return 'base' in target ? "".concat( // for `/` base, strip duplicated leading slash
   target.base.replace(/\/$/, '')).concat(clearPath) // for `/` clearPath, strip duplicated ending slash
   .replace(/([^/])\/$/, '$1') : "".concat(clearPath).concat(target.suffix);

package/theme-default/slots/SocialIcon/index.d.ts

@@ -0,0 +1,13 @@
+import { SocialTypes } from "../../../theme-api/types";
+import { FunctionComponent, type FC } from 'react';
+import './index.less';
+export declare type SocialIconProps = {
+    icon: SocialTypes;
+    link: string;
+};
+export declare type PresetSocialIcon = {
+    Icon: FunctionComponent;
+    titleIntlId: string;
+};
+declare const SocialIcon: FC<SocialIconProps>;
+export default SocialIcon;

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

@@ -0,0 +1,45 @@
+import { ReactComponent as IconFacebook } from '@ant-design/icons-svg/inline-svg/outlined/facebook.svg';
+import { ReactComponent as IconGitHub } from '@ant-design/icons-svg/inline-svg/outlined/github.svg';
+import { ReactComponent as IconGitlab } from '@ant-design/icons-svg/inline-svg/outlined/gitlab.svg';
+import { ReactComponent as IconLinkedin } from '@ant-design/icons-svg/inline-svg/outlined/linkedin.svg';
+import { ReactComponent as IconTwitter } from '@ant-design/icons-svg/inline-svg/outlined/twitter.svg';
+import { ReactComponent as IconWeiBo } from '@ant-design/icons-svg/inline-svg/outlined/weibo.svg';
+import { ReactComponent as IconYuque } from '@ant-design/icons-svg/inline-svg/outlined/yuque.svg';
+import { ReactComponent as IconZhihu } from '@ant-design/icons-svg/inline-svg/outlined/zhihu.svg';
+import React, { useMemo } from 'react';
+import { useIntl } from 'react-intl';
+import "./index.less";
+var presetIconMap = {
+  github: IconGitHub,
+  weibo: IconWeiBo,
+  twitter: IconTwitter,
+  gitlab: IconGitlab,
+  facebook: IconFacebook,
+  zhihu: IconZhihu,
+  yuque: IconYuque,
+  linkedin: IconLinkedin
+};
+
+var SocialIcon = function SocialIcon(props) {
+  var icon = props.icon,
+      link = props.link;
+  var intl = useIntl();
+  var preset = useMemo(function () {
+    return {
+      Icon: presetIconMap[icon],
+      link: link
+    };
+  }, [icon, link]);
+  return /*#__PURE__*/React.createElement("a", {
+    className: "dumi-default-icon",
+    "data-dumi-tooltip": intl.formatMessage({
+      id: "header.social.".concat(icon)
+    }),
+    "data-dumi-tooltip-bottom": true,
+    target: "_blank",
+    href: preset.link,
+    rel: "noreferrer"
+  }, /*#__PURE__*/React.createElement(preset.Icon, null));
+};
+
+export default SocialIcon;

package/theme-default/slots/SocialIcon/index.less

@@ -0,0 +1,38 @@
+@import (reference) '../../styles/variables.less';
+
+.@{prefix}-icon {
+  font-size: 0;
+  line-height: 0;
+
+  [class*='-switch'] + & {
+    margin-inline-start: 15px;
+    margin-inline-end: -15px;
+    padding-inline: 15px;
+    border-inline-start: 1px solid @c-border;
+
+    @{dark-selector} & {
+      border-inline-start-color: @c-border-dark;
+    }
+  }
+
+  & + & {
+    margin-inline-start: 18px;
+  }
+
+  > svg {
+    height: 16px;
+    fill: @c-text-secondary;
+
+    @{dark-selector} & {
+      fill: @c-text-secondary-dark;
+    }
+  }
+
+  &:hover svg {
+    fill: @c-primary;
+
+    @{dark-selector} & {
+      fill: @c-primary-dark;
+    }
+  }
+}

package/theme-default/styles/variables.less

@@ -22,7 +22,7 @@
 // @dark-selector be injected by less-loader in feature/theme/index.ts
 @dark-solid-amount: 15%;
 @dark-light-amount: 22%;
-@dark-border-amount: 73%;
+@dark-border-amount: 71%;
 @c-primary-dark: darken(@c-primary, @dark-solid-amount);
 @c-warning-dark: darken(@c-warning, @dark-solid-amount);
 @c-success-dark: darken(@c-success, @dark-solid-amount);