dumi 2.1.14 → 2.1.15

package/dist/features/derivative.js

@@ -140,6 +140,10 @@ var derivative_default = (api) => {
       });
       const umiPath = import_path.default.join(api.paths.absTmpPath, "umi.ts");
       import_plugin_utils.fsExtra.writeFileSync(umiPath, import_plugin_utils.fsExtra.readFileSync(umiPath, "utf-8").replace("'@/loading'", "'../loading'"));
+      if (api.config.ssr && import_plugin_utils.semver.subset(api.appData.umi.version, "4.0.54 - 4.0.55")) {
+        const helmetPath = import_path.default.join(api.paths.absTmpPath, "core/helmet.ts");
+        import_plugin_utils.fsExtra.writeFileSync(helmetPath, import_plugin_utils.fsExtra.readFileSync(helmetPath, "utf-8").replace(/(return )(React\.createElement)/, "$1typeof window === 'undefined' ? container : $2"));
+      }
     }
   });
   api.registerPlugins([require.resolve("../../compiled/@umijs/plugins")]);

package/dist/features/routes.js

@@ -26,8 +26,9 @@ __export(routes_exports, {
 });
 module.exports = __toCommonJS(routes_exports);
 var import_constants = require("../constants");
+var import_utils = require("../utils");
 var import_core = require("@umijs/core");
-var import_utils = require("@umijs/core/dist/route/utils");
+var import_utils2 = require("@umijs/core/dist/route/utils");
 var import_path = __toESM(require("path"));
 var import_pluralize = require("pluralize");
 var import_plugin_utils = require("umi/plugin-utils");
@@ -61,18 +62,6 @@ function flatRoute(route, docLayoutId) {
     route.path = route.path === "*" ? route.path : route.absPath.slice(1);
   }
 }
-function getClientPageFile(file, cwd) {
-  let clientFile;
-  try {
-    clientFile = import_plugin_utils.resolve.sync(`dumi/dist/${file}`, {
-      basedir: cwd,
-      preserveSymlinks: false
-    });
-  } catch {
-    clientFile = require.resolve(`../${file}`);
-  }
-  return (0, import_plugin_utils.winPath)(clientFile);
-}
 var routes_default = (api) => {
   var _a, _b, _c;
   const extraWatchPaths = [
@@ -159,7 +148,7 @@ var routes_default = (api) => {
       atomFiles.forEach((file) => {
         const routeFile = (0, import_plugin_utils.winPath)(import_path.default.join((0, import_pluralize.plural)(type), file));
         const routePath = routeFile.replace(/(\/index|\/README)?\.md$/, "").replace(/\./g, "/");
-        const routeId = (0, import_utils.createRouteId)(routeFile);
+        const routeId = (0, import_utils2.createRouteId)(routeFile);
         routes[routeId] = {
           id: routeId,
           path: routePath,
@@ -184,7 +173,7 @@ var routes_default = (api) => {
         path: "*",
         absPath: "/*",
         parentId: docLayoutId,
-        file: getClientPageFile("client/pages/404", api.cwd)
+        file: (0, import_utils.getClientDistFile)("dist/client/pages/404", api.cwd)
       };
     }
     routes["demo-render"] = {
@@ -192,7 +181,7 @@ 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: (0, import_utils.getClientDistFile)("dist/client/pages/Demo", api.cwd),
       prerender: false
     };
     return routes;

package/dist/features/theme/index.js

@@ -26,13 +26,13 @@ __export(theme_exports, {
 });
 module.exports = __toCommonJS(theme_exports);
 var import_constants = require("../../constants");
+var import_utils = require("../../utils");
 var import_bundler_utils = require("@umijs/bundler-utils");
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 var import_derivative = require("../derivative");
 var import_loader = __toESM(require("./loader"));
-var DEFAULT_THEME_PATH = import_path.default.join(__dirname, "../../../theme-default");
 function getPkgThemeName(api) {
   const validDeps = Object.assign({}, api.pkg.dependencies, api.pkg.devDependencies);
   const pkgThemeName = Object.keys(validDeps).find((pkg) => pkg.split("/").pop().startsWith(import_constants.THEME_PREFIX));
@@ -40,7 +40,10 @@ function getPkgThemeName(api) {
 }
 function getPkgThemePath(api) {
   const pkgThemeName = getPkgThemeName(api);
-  return pkgThemeName && import_path.default.dirname(require.resolve(`${pkgThemeName}/package.json`, { paths: [api.cwd] }));
+  return pkgThemeName && import_path.default.dirname(import_plugin_utils.resolve.sync(`${pkgThemeName}/package.json`, {
+    basedir: api.cwd,
+    preserveSymlinks: true
+  }));
 }
 function getModuleExports(modulePath) {
   return (0, import_bundler_utils.parseModuleSync)({
@@ -49,6 +52,7 @@ function getModuleExports(modulePath) {
   })[1];
 }
 var theme_default = (api) => {
+  const DEFAULT_THEME_PATH = import_path.default.join((0, import_utils.getClientDistFile)("package.json", api.cwd), "../theme-default");
   const defaultThemeData = (0, import_loader.default)(DEFAULT_THEME_PATH);
   const pkgThemePath = getPkgThemePath(api);
   const pkgThemeData = (0, import_plugin_utils.deepmerge)(defaultThemeData, pkgThemePath ? (0, import_loader.default)(import_path.default.join(pkgThemePath, "dist")) : {});

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

@@ -79,6 +79,7 @@ function tryMarkDemoNode(node, opts) {
 function rehypeDemo(opts) {
   return async (tree, vFile) => {
     const deferrers = [];
+    const demoIds = [];
     const replaceNodes = [];
     let index = 0;
     visit(tree, "element", (node) => {
@@ -129,7 +130,7 @@ function rehypeDemo(opts) {
       if (isElement(node, "p") && ((_a = node.data) == null ? void 0 : _a[DEMO_NODE_CONTAINER])) {
         const demosPropData = [];
         node.children.forEach((codeNode) => {
-          var _a2;
+          var _a2, _b;
           if (isElement(codeNode, "code")) {
             const codeType = codeNode.data.type;
             const techStack = codeNode.data.techStack;
@@ -146,11 +147,12 @@ function rehypeDemo(opts) {
             if (codeType === "external") {
               const chunkName = [vFile.data.frontmatter.atomId, "demos"].filter(Boolean).join("__");
               parseOpts.fileAbsPath = (0, import_plugin_utils.winPath)(codeNode.properties.src);
-              parseOpts.id = getCodeId(opts.cwd, opts.fileAbsPath, import_path.default.parse(parseOpts.fileAbsPath.replace(/\/index\.(j|t)sx?$/, "")).name, vFile.data.frontmatter.atomId);
+              let localId = ((_a2 = codeNode.properties) == null ? void 0 : _a2.id) ?? import_path.default.parse(parseOpts.fileAbsPath.replace(/\/index\.(j|t)sx?$/, "")).name;
+              parseOpts.id = getCodeId(opts.cwd, opts.fileAbsPath, localId, vFile.data.frontmatter.atomId);
               component = `React.lazy(() => import( /* webpackChunkName: "${chunkName}" */ '${(0, import_plugin_utils.winPath)(parseOpts.fileAbsPath)}?techStack=${techStack.name}'))`;
               if (codeValue)
                 codeNode.properties.title = codeValue;
-              (_a2 = codeNode.properties).filename ?? (_a2.filename = (0, import_plugin_utils.winPath)(import_path.default.relative(opts.cwd, parseOpts.fileAbsPath)));
+              (_b = codeNode.properties).filename ?? (_b.filename = (0, import_plugin_utils.winPath)(import_path.default.relative(opts.cwd, parseOpts.fileAbsPath)));
             } else {
               parseOpts.fileAbsPath = opts.fileAbsPath.replace(".md", ".tsx");
               parseOpts.id = getCodeId(opts.cwd, opts.fileAbsPath, String(index++), vFile.data.frontmatter.atomId);
@@ -160,8 +162,15 @@ function rehypeDemo(opts) {
               });
             }
             const propDemo = { id: parseOpts.id };
+            demoIds.push(parseOpts.id);
             deferrers.push((0, import_block.default)(parseOpts).then(async ({ asset, sources, frontmatter }) => {
-              var _a3, _b;
+              var _a3, _b2, _c;
+              if (demoIds.indexOf(parseOpts.id) !== demoIds.lastIndexOf(parseOpts.id)) {
+                const startLine = (_a3 = node.position) == null ? void 0 : _a3.start.line;
+                const suffix = startLine ? `:${startLine}` : "";
+                import_plugin_utils.logger.warn(`Duplicate demo id found due to filename conflicts, please consider adding a unique id to code tag to resolve this.
+        at ${opts.fileAbsPath}${suffix}`);
+              }
               const { src, className, ...restAttrs } = codeNode.properties || {};
               const validAssetAttrs = [
                 "title",
@@ -183,14 +192,14 @@ function rehypeDemo(opts) {
                 if (originalProps[key])
                   asset[key] = originalProps[key];
               });
-              if (/ inline/.test(String((_a3 = codeNode.data) == null ? void 0 : _a3.meta)) || originalProps.inline) {
+              if (/ inline/.test(String((_b2 = codeNode.data) == null ? void 0 : _b2.meta)) || originalProps.inline) {
                 propDemo.inline = true;
                 return {
                   id: asset.id,
                   component
                 };
               }
-              Object.assign(previewerProps, await ((_b = techStack.generatePreviewerProps) == null ? void 0 : _b.call(techStack, originalProps, techStackOpts)) || originalProps);
+              Object.assign(previewerProps, await ((_c = techStack.generatePreviewerProps) == null ? void 0 : _c.call(techStack, originalProps, techStackOpts)) || originalProps);
               if (previewerProps.description) {
                 const { unified } = await import("unified");
                 const { default: remarkParse } = await import("remark-parse");

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

@@ -37,12 +37,12 @@ var SKIP;
 function rehypeLink(opts) {
   return (tree) => {
     visit(tree, "element", (node, i, parent) => {
-      var _a;
-      if (node.tagName === "a" && typeof ((_a = node.properties) == null ? void 0 : _a.href) === "string") {
+      var _a, _b, _c;
+      if (node.tagName === "a" && typeof ((_a = node.properties) == null ? void 0 : _a.href) === "string" && !((_b = node.properties) == null ? void 0 : _b.target) && !((_c = node.properties) == null ? void 0 : _c.download)) {
         const href = node.properties.href;
         const parsedUrl = import_url.default.parse(href);
         const hostAbsPath = (0, import_tabs.getHostForTabRouteFile)(opts.fileAbsPath);
-        if (parsedUrl.hostname)
+        if (parsedUrl.protocol || href.startsWith("//"))
           return SKIP;
         if (/\.md$/i.test(parsedUrl.pathname)) {
           const { routes } = opts;
@@ -52,7 +52,7 @@ function rehypeLink(opts) {
               parsedUrl.pathname = routes[key].absPath;
             }
           });
-        } else if (/^\.?\.\//.test(parsedUrl.pathname) || /^(\w+:)?\/\//.test(parsedUrl.pathname)) {
+        } else if (parsedUrl.pathname && /^[^/]+/.test(parsedUrl.pathname)) {
           const routes = Object.values(opts.routes);
           const basePath = routes.find((route) => route.file === hostAbsPath).absPath;
           const htmlTargetPath = import_url.default.resolve(basePath, parsedUrl.pathname);

package/dist/utils.d.ts

@@ -34,4 +34,8 @@ export declare function tryFatherBuildConfigs(cwd: string): Promise<any[]>;
  * get root dir for monorepo project
  */
 export declare function getProjectRoot(cwd: string): string;
+/**
+ * get dumi client dist file and preserve symlink(pnpm, tnpm & etc.) to make chunk name clean
+ */
+export declare function getClientDistFile(file: string, cwd: string): string;
 export {};

package/dist/utils.js

@@ -23,6 +23,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   getCache: () => getCache,
+  getClientDistFile: () => getClientDistFile,
   getFileContentByRegExp: () => getFileContentByRegExp,
   getFileRangeLines: () => getFileRangeLines,
   getProjectRoot: () => getProjectRoot,
@@ -117,9 +118,22 @@ function getProjectRoot(cwd) {
   }
   return (0, import_plugin_utils.winPath)(cwd);
 }
+function getClientDistFile(file, cwd) {
+  let clientFile;
+  try {
+    clientFile = import_plugin_utils.resolve.sync(`dumi/${file}`, {
+      basedir: cwd,
+      preserveSymlinks: true
+    });
+  } catch {
+    clientFile = require.resolve(`../${file}`);
+  }
+  return (0, import_plugin_utils.winPath)(clientFile);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getCache,
+  getClientDistFile,
   getFileContentByRegExp,
   getFileRangeLines,
   getProjectRoot,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "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.53",
-    "@umijs/core": "^4.0.53",
+    "@umijs/bundler-utils": "^4.0.55",
+    "@umijs/core": "^4.0.55",
     "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.53",
+    "umi": "^4.0.55",
     "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.53",
+    "@umijs/lint": "^4.0.55",
     "@umijs/plugins": "4.0.32",
     "dumi-theme-mobile": "workspace:*",
     "eslint": "^8.20.0",

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

@@ -1,13 +1,18 @@
-import { useSidebarData } from 'dumi';
+import { useSidebarData, useSiteData } from 'dumi';
 import React from 'react';
 import "./heti.scss";
 import "./index.less";
 
 var Content = function Content(props) {
   var sidebar = useSidebarData();
+
+  var _useSiteData = useSiteData(),
+      themeConfig = _useSiteData.themeConfig;
+
   return /*#__PURE__*/React.createElement("div", {
     className: "dumi-default-content",
-    "data-no-sidebar": !sidebar || undefined
+    "data-no-sidebar": !sidebar || undefined,
+    "data-no-footer": themeConfig.footer === false || undefined
   }, props.children);
 };
 

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

@@ -51,6 +51,7 @@
   // table
   table {
     width: 100%;
+    table-layout: auto;
   }
 
   th {
@@ -157,12 +158,20 @@
       background-color: lighten(@c-site-bg-dark, 3%);
     }
 
+    &[data-no-footer] {
+      padding-bottom: @s-content-padding;
+    }
+
     @media @mobile {
       max-width: initial;
       margin: 0 -24px;
       padding: 24px 24px 0;
       border-radius: 0;
       box-shadow: none;
+
+      &[data-no-footer] {
+        padding: 24px;
+      }
     }
   }
 
@@ -174,4 +183,12 @@
       min-height: calc(100vh - @s-header-height-m);
     }
   }
+
+  &[data-no-sidebar][data-no-footer] {
+    margin-bottom: @s-content-padding;
+
+    @media @mobile {
+      margin-bottom: 24px;
+    }
+  }
 }

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

@@ -13,7 +13,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { Scrollspy as ScrollSpy } from '@makotot/ghostui/src/Scrollspy';
-import { Link, useLocation, useRouteMeta, useSiteData } from 'dumi';
+import { Link, useLocation, useRouteMeta, useSiteData, useTabMeta } from 'dumi';
 import React, { useEffect, useRef, useState } from 'react';
 import "./index.less";
 
@@ -23,6 +23,7 @@ var Toc = function Toc() {
       search = _useLocation.search;
 
   var meta = useRouteMeta();
+  var tabMeta = useTabMeta();
 
   var _useSiteData = useSiteData(),
       loading = _useSiteData.loading;
@@ -32,18 +33,26 @@ var Toc = function Toc() {
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       sectionRefs = _useState2[0],
-      setSectionRefs = _useState2[1]; // only render h2 ~ h4
+      setSectionRefs = _useState2[1];
 
+  var memoToc = React.useMemo(function () {
+    var toc = meta.toc;
 
-  var toc = meta.toc.filter(function (_ref) {
-    var depth = _ref.depth;
-    return depth > 1 && depth < 4;
-  });
+    if (tabMeta) {
+      toc = tabMeta.toc;
+    } // only render h2 ~ h4
+
+
+    return toc.filter(function (_ref) {
+      var depth = _ref.depth;
+      return depth > 1 && depth < 4;
+    });
+  }, [meta, tabMeta]);
   useEffect(function () {
     // wait for page component ready (DOM ready)
     if (!loading) {
       // find all valid headings as ref elements
-      var refs = toc.map(function (_ref2) {
+      var refs = memoToc.map(function (_ref2) {
         var id = _ref2.id;
         return {
           current: document.getElementById(id)
@@ -60,11 +69,11 @@ var Toc = function Toc() {
     if (currentElementIndexInViewport > -1) prevIndexRef.current = currentElementIndexInViewport;
     return /*#__PURE__*/React.createElement("ul", {
       className: "dumi-default-toc"
-    }, toc.filter(function (_ref4) {
+    }, memoToc.filter(function (_ref4) {
       var depth = _ref4.depth;
       return depth > 1 && depth < 4;
     }).map(function (item, i) {
-      var link = "#".concat(encodeURIComponent(item.id));
+      var link = "".concat(search, "#").concat(encodeURIComponent(item.id));
       var activeIndex = currentElementIndexInViewport > -1 ? currentElementIndexInViewport : prevIndexRef.current;
       return /*#__PURE__*/React.createElement("li", {
         key: item.id,