dumi 2.1.14 → 2.1.16

package/dist/assetParsers/atom.d.ts

@@ -15,6 +15,7 @@ declare class AtomAssetsParser {
         resolveFilter?: AtomAssetsParser['resolveFilter'];
         unpkgHost?: string;
         watch?: boolean;
+        parseOptions?: object;
     });
     parse(): Promise<{
         components: Record<string, AtomComponentAsset>;

package/dist/assetParsers/atom.js

@@ -44,7 +44,8 @@ var AtomAssetsParser = class {
       entryPath: absEntryFile,
       basePath: (0, import_utils.getProjectRoot)(opts.resolveDir),
       unPkgHost: opts.unpkgHost ?? "https://unpkg.com",
-      mode: "worker"
+      mode: "worker",
+      parseOptions: opts.parseOptions
     });
   }
   async parse() {

package/dist/client/pages/404.js

@@ -1,2 +1,2 @@
 // allow customize 404 via theme slots
-export { default } from "dumi/theme/slots/NotFound";
+export { default } from 'dumi/theme/slots/NotFound';

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

@@ -2,8 +2,8 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 import { SP_ROUTE_PREFIX } from "../../constants";
 import { useAppData, useSiteData } from 'dumi';
-import Container from "dumi/theme/builtins/Container";
-import Previewer from "dumi/theme/builtins/Previewer";
+import Container from 'dumi/theme/builtins/Container';
+import Previewer from 'dumi/theme/builtins/Previewer';
 import React, { createElement } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 

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

@@ -11,7 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useRouteMeta, useSiteData } from 'dumi';
-import ContentTabs from "dumi/theme/slots/ContentTabs";
+import ContentTabs from 'dumi/theme/slots/ContentTabs';
 import React, { useEffect, useState } from 'react';
 import { useTabQueryState } from "./useTabMeta";
 export var DumiPage = function DumiPage(props) {

package/dist/constants.d.ts

@@ -14,5 +14,4 @@ export declare const PICKED_PKG_FIELDS: {
     author: string;
     authors: string;
 };
-export declare const CLIENT_DEPS: string[];
 export declare const USELESS_TMP_FILES: string[];

package/dist/constants.js

@@ -19,7 +19,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
-  CLIENT_DEPS: () => CLIENT_DEPS,
   LOCAL_DUMI_DIR: () => LOCAL_DUMI_DIR,
   LOCAL_PAGES_DIR: () => LOCAL_PAGES_DIR,
   LOCAL_THEME_DIR: () => LOCAL_THEME_DIR,
@@ -47,21 +46,9 @@ var PICKED_PKG_FIELDS = {
   author: "",
   authors: ""
 };
-var CLIENT_DEPS = [
-  "@ant-design/icons-svg",
-  "@makotot/ghostui",
-  "deepmerge",
-  "lodash.throttle",
-  "prism-react-renderer",
-  "prismjs",
-  "rc-tabs",
-  "react-copy-to-clipboard",
-  "react-intl"
-];
 var USELESS_TMP_FILES = ["tsconfig.json", "typings.d.ts"];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  CLIENT_DEPS,
   LOCAL_DUMI_DIR,
   LOCAL_PAGES_DIR,
   LOCAL_THEME_DIR,

package/dist/features/autoAlias.js

@@ -29,34 +29,41 @@ var import_utils = require("../utils");
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var autoAlias_default = (api) => {
+  let entryDir;
   api.describe({
     key: "autoAlias",
     config: {
       schema: (Joi) => Joi.bool()
     },
-    enableBy: ({ userConfig }) => userConfig.autoAlias !== false
+    enableBy: () => !!api.pkg.name
   });
-  api.modifyConfig(async (memo) => {
-    var _a, _b, _c;
-    let entryDir = "";
-    if ((_a = memo.resolve) == null ? void 0 : _a.entryFile) {
-      entryDir = import_path.default.resolve(api.cwd, memo.resolve.entryFile);
+  api.modifyAppData(async (memo) => {
+    var _a;
+    if ((_a = api.config.resolve) == null ? void 0 : _a.entryFile) {
+      entryDir = import_path.default.resolve(api.cwd, api.config.resolve.entryFile);
     } else if (import_fs.default.existsSync(import_path.default.join(api.cwd, "src"))) {
       entryDir = import_path.default.join(api.cwd, "src");
     }
-    if (entryDir && api.pkg.name) {
-      const fatherConfigs = await (0, import_utils.tryFatherBuildConfigs)(api.cwd);
-      fatherConfigs.sort((a, b) => {
-        var _a2, _b2;
-        const aLevel = (((_a2 = a.output) == null ? void 0 : _a2.path) || a.output).split("/").length;
-        const bLevel = (((_b2 = b.output) == null ? void 0 : _b2.path) || b.output).split("/").length;
-        return bLevel - aLevel;
-      });
-      fatherConfigs.forEach((item) => {
-        var _a2, _b2, _c2;
-        (_b2 = memo.alias)[_c2 = `${api.pkg.name}/${((_a2 = item.output) == null ? void 0 : _a2.path) || item.output}`] ?? (_b2[_c2] = import_path.default.join(api.cwd, item.entry || item.input));
-      });
-      (_b = memo.alias)[_c = api.pkg.name] ?? (_b[_c] = entryDir);
+    memo.fatherConfigs = await (0, import_utils.tryFatherBuildConfigs)(api.cwd);
+    return memo;
+  });
+  api.chainWebpack((memo) => {
+    const fatherConfigs = api.appData.fatherConfigs;
+    fatherConfigs.sort((a, b) => {
+      var _a, _b;
+      const aLevel = (((_a = a.output) == null ? void 0 : _a.path) || a.output).split("/").length;
+      const bLevel = (((_b = b.output) == null ? void 0 : _b.path) || b.output).split("/").length;
+      return bLevel - aLevel;
+    });
+    fatherConfigs.forEach((item) => {
+      var _a;
+      const key = `${api.pkg.name}/${((_a = item.output) == null ? void 0 : _a.path) || item.output}`;
+      if (!memo.resolve.alias.has(key)) {
+        memo.resolve.alias.set(key, import_path.default.join(api.cwd, item.entry || item.input));
+      }
+    });
+    if (entryDir && !memo.resolve.alias.has(api.pkg.name)) {
+      memo.resolve.alias.set(api.pkg.name, entryDir);
     }
     return memo;
   });

package/dist/features/derivative.js

@@ -31,11 +31,16 @@ var import_assert = __toESM(require("assert"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
+function isMFSUAvailable(api) {
+  return process.platform !== "win32" && api.userConfig.mfsu !== false;
+}
 function safeExcludeInMFSU(api, excludes) {
-  if (api.userConfig.mfsu !== false) {
-    api.modifyDefaultConfig((memo) => {
+  if (isMFSUAvailable(api)) {
+    api.modifyConfig((memo) => {
       if (memo.mfsu === false)
         return memo;
+      else if (memo.mfsu === true)
+        memo.mfsu = {};
       memo.mfsu ?? (memo.mfsu = {});
       memo.mfsu.exclude = (0, import_plugin_utils.deepmerge)(memo.mfsu.exclude || [], excludes);
       memo.extraBabelIncludes ?? (memo.extraBabelIncludes = []);
@@ -87,20 +92,14 @@ var derivative_default = (api) => {
     new RegExp("compiled/_internal/searchWorker")
   ]);
   api.modifyDefaultConfig((memo) => {
-    if (api.userConfig.mfsu !== false) {
-      if (import_fs.default.existsSync(import_path.default.join(api.cwd, "node_modules", ".pnpm")) || process.platform === "win32") {
-        memo.mfsu = false;
-      } else {
-        memo.mfsu.strategy = "normal";
-        memo.mfsu.shared = {
-          react: { singleton: true },
-          "react-dom": { singleton: true }
-        };
-        import_constants.CLIENT_DEPS.forEach((pkg) => {
-          memo.alias ?? (memo.alias = {});
-          memo.alias[pkg] = (0, import_plugin_utils.winPath)(import_path.default.dirname(require.resolve(`${pkg}/package.json`)));
-        });
-      }
+    if (!isMFSUAvailable(api)) {
+      memo.mfsu = false;
+    } else {
+      memo.mfsu.strategy = "normal";
+      memo.mfsu.shared = {
+        react: { singleton: true },
+        "react-dom": { singleton: true }
+      };
     }
     if (api.userConfig.conventionRoutes !== false) {
       memo.conventionRoutes = {
@@ -117,9 +116,6 @@ var derivative_default = (api) => {
   });
   api.modifyConfig((memo) => {
     var _a;
-    if (api.userConfig.mfsu === true) {
-      memo.mfsu = {};
-    }
     if ((_a = api.userConfig.alias) == null ? void 0 : _a["@"]) {
       memo.alias["@"] = api.userConfig.alias["@"];
     } else {
@@ -140,6 +136,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/exportStatic.js

@@ -23,46 +23,54 @@ __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 NO_PRERENDER_ROUTES = [
+  "demo-render"
+];
 var exportStatic_default = (api) => {
-  const prevExtraRoutePaths = [];
   api.describe({ key: "dumi:exportStatic" });
-  api.register({
-    key: "modifyDefaultConfig",
+  api.modifyRoutes({
     stage: Infinity,
     fn(memo) {
-      if (memo.exportStatic && memo.exportStatic.extraRoutePaths) {
-        prevExtraRoutePaths.push(memo.exportStatic.extraRoutePaths);
-      }
+      NO_PRERENDER_ROUTES.forEach((id) => {
+        if (memo[id])
+          memo[id].prerender = false;
+      });
+      return memo;
     }
   });
-  api.register({
-    key: "modifyConfig",
-    stage: Infinity,
+  api.modifyExportHTMLFiles({
+    before: "exportStatic",
     fn(memo) {
-      var _a;
-      if (memo.exportStatic !== false) {
-        if ((_a = memo.exportStatic) == null ? void 0 : _a.extraRoutePaths) {
-          prevExtraRoutePaths.push(memo.exportStatic.extraRoutePaths);
-        }
-        memo.exportStatic ?? (memo.exportStatic = {});
-        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 }) => {
-            const demoPath = `/${import_constants.SP_ROUTE_PREFIX}demos/${id}`;
-            return isSupportDisablePrerender ? { path: demoPath, prerender: false } : demoPath;
-          }));
-        };
-      }
+      const routePrefix = `${import_constants.SP_ROUTE_PREFIX}demos`;
+      const examples = (0, import_assets.getExampleAssets)();
+      api.appData.exportHtmlData.push(...examples.map(({ id }) => ({
+        route: { path: `/${routePrefix}/${id}` },
+        file: `${routePrefix}/${id}/index.html`,
+        prerender: false
+      })));
       return memo;
     }
   });
+  api.onGenerateFiles(() => {
+    api.writeTmpFile({
+      path: "dumi/exportStaticRuntimePlugin.ts",
+      content: `
+export function modifyClientRenderOpts(memo: any) {
+  const { history, hydrate } = memo;
+
+  return {
+    ...memo,
+    hydrate: hydrate && !history.location.pathname.startsWith('/${import_constants.SP_ROUTE_PREFIX}demos'),
+  };
+}
+      `.trim(),
+      noPluginDir: true
+    });
+  });
+  api.addRuntimePlugin(() => {
+    return [`@@/dumi/exportStaticRuntimePlugin.ts`];
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/parser.js

@@ -42,7 +42,8 @@ var parser_default = (api) => {
     config: {
       schema: (Joi) => Joi.object({
         unpkgHost: Joi.string().uri().optional(),
-        resolveFilter: Joi.function().optional()
+        resolveFilter: Joi.function().optional(),
+        parseOptions: Joi.object().optional()
       })
     }
   });
@@ -59,7 +60,8 @@ var parser_default = (api) => {
       entryFile: api.config.resolve.entryFile,
       resolveDir: api.cwd,
       unpkgHost: api.config.apiParser.unpkgHost,
-      resolveFilter: api.config.apiParser.resolveFilter
+      resolveFilter: api.config.apiParser.resolveFilter,
+      parseOptions: api.config.apiParser.parseOptions
     });
   });
   api.onDevCompileDone(({ isFirstCompile }) => {

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,8 +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),
-      prerender: false
+      file: (0, import_utils.getClientDistFile)("dist/client/pages/Demo", api.cwd)
     };
     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/index.js

@@ -29,6 +29,7 @@ var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
 var import_rehypeDemo = __toESM(require("./rehypeDemo"));
 var import_rehypeDesc = __toESM(require("./rehypeDesc"));
 var import_rehypeEnhancedTag = __toESM(require("./rehypeEnhancedTag"));
+var import_rehypeHighlightLine = __toESM(require("./rehypeHighlightLine"));
 var import_rehypeImg = __toESM(require("./rehypeImg"));
 var import_rehypeIsolation = __toESM(require("./rehypeIsolation"));
 var import_rehypeJsxify = __toESM(require("./rehypeJsxify"));
@@ -73,6 +74,8 @@ var transformer_default = async (raw, opts) => {
   }));
   processor.use(remarkRehype, { allowDangerousHtml: true }).use(import_rehypeRaw.default, {
     fileAbsPath: opts.fileAbsPath
+  }).use(import_rehypeHighlightLine.default, {
+    resolve: opts.resolve
   }).use(rehypeRemoveComments, { removeConditional: true }).use(import_rehypeStrip.default).use(import_rehypeImg.default).use(import_rehypeDemo.default, {
     techStacks: opts.techStacks,
     cwd: opts.cwd,

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/rehypeEnhancedTag.js

@@ -36,14 +36,22 @@ var toString;
 function rehypeEnhancedTag() {
   return async (tree) => {
     visit(tree, "element", (node, i, parent) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       if (node.tagName === "pre" && isElement((_a = node.children) == null ? void 0 : _a[0]) && node.children[0].tagName === "code") {
         const className = ((_b = node.children[0].properties) == null ? void 0 : _b.className) || [];
         const lang = (_c = className.join("").match(/language-(\w+)(?:$| )/)) == null ? void 0 : _c[1];
+        const highlightLines = (_d = node.children[0].data) == null ? void 0 : _d.highlightLines;
         parent.children.splice(i, 1, {
           type: "element",
           tagName: "SourceCode",
           properties: { lang },
+          JSXAttributes: [
+            {
+              type: "JSXAttribute",
+              name: "highlightLines",
+              value: JSON.stringify(highlightLines)
+            }
+          ],
           children: [
             {
               type: "text",

package/dist/loaders/markdown/transformer/rehypeHighlightLine.d.ts

@@ -0,0 +1,4 @@
+import type { Root } from 'hast';
+import type { Transformer } from 'unified';
+declare function rehypeHighlightLine(): Transformer<Root>;
+export default rehypeHighlightLine;

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

@@ -0,0 +1,60 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/loaders/markdown/transformer/rehypeHighlightLine.ts
+var rehypeHighlightLine_exports = {};
+__export(rehypeHighlightLine_exports, {
+  default: () => rehypeHighlightLine_default
+});
+module.exports = __toCommonJS(rehypeHighlightLine_exports);
+var visit;
+var isElement;
+var RE = /{((?:\d+(?:-\d+)?,?)+)}/;
+(async () => {
+  ({ visit } = await import("unist-util-visit"));
+  ({ isElement } = await import("hast-util-is-element"));
+})();
+var attrsToLines = (attrs) => {
+  const result = [];
+  attrs.split(",").map((v) => v.split("-").map((v2) => parseInt(v2, 10))).forEach(([start, end = start]) => {
+    for (let i = start; i <= end; i++) {
+      result.push(i);
+    }
+  });
+  return result;
+};
+function rehypeHighlightLine() {
+  return async (tree) => {
+    visit(tree, "element", (node) => {
+      var _a, _b;
+      if (isElement(node, "code") && typeof ((_a = node.data) == null ? void 0 : _a.meta) === "string") {
+        const lines = (_b = node.data.meta.match(RE)) == null ? void 0 : _b[1];
+        if (lines) {
+          node.data.meta = node.data.meta.replace(lines, "").trim();
+          node.data.highlightLines = attrsToLines(lines);
+        }
+      }
+    });
+  };
+}
+var rehypeHighlightLine_default = rehypeHighlightLine;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

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.16",
   "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.59",
+    "@umijs/core": "^4.0.59",
     "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.59",
     "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.59",
     "@umijs/plugins": "4.0.32",
     "dumi-theme-mobile": "workspace:*",
     "eslint": "^8.20.0",

package/theme-default/builtins/Previewer/index.js

@@ -2,7 +2,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 
 import classnames from 'classnames';
 import { useLocation } from 'dumi';
-import PreviewerActions from "dumi/theme/slots/PreviewerActions";
+import PreviewerActions from 'dumi/theme/slots/PreviewerActions';
 import React from 'react';
 import "./index.less";
 

package/theme-default/builtins/Previewer/index.less

@@ -107,7 +107,7 @@
       display: inline-block;
       font-size: 14px;
       line-height: 1;
-      font-weight: 500;
+      font-weight: bold;
       background: linear-gradient(
           to top,
           rgba(255, 255, 255, 100%),

package/theme-default/builtins/SourceCode/index.d.ts

@@ -2,8 +2,10 @@ import { type Language } from 'prism-react-renderer';
 import 'prism-themes/themes/prism-one-light.css';
 import { type FC } from 'react';
 import './index.less';
-declare const SourceCode: FC<{
+interface SourceCodeProps {
     children: string;
     lang: Language;
-}>;
+    highlightLines?: number[];
+}
+declare const SourceCode: FC<SourceCodeProps>;
 export default SourceCode;

package/theme-default/builtins/SourceCode/index.js

@@ -14,6 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { ReactComponent as IconCheck } from '@ant-design/icons-svg/inline-svg/outlined/check.svg';
 import { ReactComponent as IconCopy } from '@ant-design/icons-svg/inline-svg/outlined/copy.svg';
+import classNames from 'classnames';
 import Highlight, { defaultProps } from 'prism-react-renderer';
 import 'prism-themes/themes/prism-one-light.css';
 import React, { useRef, useState } from 'react';
@@ -28,9 +29,11 @@ var SIMILAR_DSL = {
   axml: 'markup'
 };
 
-var SourceCode = function SourceCode(_ref) {
-  var children = _ref.children,
-      lang = _ref.lang;
+var SourceCode = function SourceCode(props) {
+  var children = props.children,
+      lang = props.lang,
+      _props$highlightLines = props.highlightLines,
+      highlightLines = _props$highlightLines === void 0 ? [] : _props$highlightLines;
   var timer = useRef();
 
   var _useState = useState(false),
@@ -57,12 +60,12 @@ var SourceCode = function SourceCode(_ref) {
     code: children.trim(),
     language: SIMILAR_DSL[lang] || lang,
     theme: undefined
-  }), function (_ref2) {
-    var className = _ref2.className,
-        style = _ref2.style,
-        tokens = _ref2.tokens,
-        getLineProps = _ref2.getLineProps,
-        getTokenProps = _ref2.getTokenProps;
+  }), function (_ref) {
+    var className = _ref.className,
+        style = _ref.style,
+        tokens = _ref.tokens,
+        getLineProps = _ref.getLineProps,
+        getTokenProps = _ref.getTokenProps;
     return /*#__PURE__*/React.createElement("pre", {
       className: className,
       style: style
@@ -71,7 +74,10 @@ var SourceCode = function SourceCode(_ref) {
         key: String(i)
       }, getLineProps({
         line: line,
-        key: i
+        key: i,
+        className: classNames({
+          highlighted: highlightLines.includes(i + 1)
+        })
       })), line.map(function (token, key) {
         return /*#__PURE__*/React.createElement("span", _extends({
           key: String(i)

package/theme-default/builtins/SourceCode/index.less

@@ -38,6 +38,14 @@
     &::after {
       content: none;
     }
+
+    // highlight line
+    & > .highlighted {
+      background-color: shade(@bg-color, 5%);
+      width: calc(100% + 48px);
+      margin-inline-start: -24px;
+      padding-inline-start: 24px;
+    }
   }
 
   &-copy {
@@ -92,5 +100,9 @@
     &-copy {
       background-color: fadeout(@bg-color, 80%);
     }
+
+    & > pre.prism-code > .highlighted {
+      background-color: tint(@bg-color, 10%);
+    }
   }
 }

package/theme-default/layouts/DocLayout/index.js

@@ -13,13 +13,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ReactComponent as IconSidebar } from '@ant-design/icons-svg/inline-svg/outlined/align-left.svg';
 import animateScrollTo from 'animated-scroll-to';
 import { Helmet, useIntl, useLocation, useOutlet, useRouteMeta, useSidebarData, useSiteData } from 'dumi';
-import Content from "dumi/theme/slots/Content";
-import Features from "dumi/theme/slots/Features";
-import Footer from "dumi/theme/slots/Footer";
-import Header from "dumi/theme/slots/Header";
-import Hero from "dumi/theme/slots/Hero";
-import Sidebar from "dumi/theme/slots/Sidebar";
-import Toc from "dumi/theme/slots/Toc";
+import Content from 'dumi/theme/slots/Content';
+import Features from 'dumi/theme/slots/Features';
+import Footer from 'dumi/theme/slots/Footer';
+import Header from 'dumi/theme/slots/Header';
+import Hero from 'dumi/theme/slots/Hero';
+import Sidebar from 'dumi/theme/slots/Sidebar';
+import Toc from 'dumi/theme/slots/Toc';
 import React, { useEffect, useState } from 'react';
 import "./index.less";
 

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/Header/index.js

@@ -14,12 +14,12 @@ import HeaderExtra from "../HeadeExtra";
 import { ReactComponent as IconClose } from '@ant-design/icons-svg/inline-svg/outlined/close.svg';
 import { ReactComponent as IconMenu } from '@ant-design/icons-svg/inline-svg/outlined/menu.svg';
 import { useRouteMeta, useSiteData } from 'dumi';
-import ColorSwitch from "dumi/theme/slots/ColorSwitch";
-import LangSwitch from "dumi/theme/slots/LangSwitch";
-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 ColorSwitch from 'dumi/theme/slots/ColorSwitch';
+import LangSwitch from 'dumi/theme/slots/LangSwitch';
+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, { useMemo, useState } from 'react';
 import SocialIcon from "../SocialIcon";
 import "./index.less";

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

@@ -1,5 +1,5 @@
 import { Link, useRouteMeta } from 'dumi';
-import HeroTitle from "dumi/theme/slots/HeroTitle";
+import HeroTitle from 'dumi/theme/slots/HeroTitle';
 import React from 'react';
 import "./index.less";
 

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

@@ -6,7 +6,7 @@
   color: @c-text;
   font-size: 22px;
   line-height: 1;
-  font-weight: 500;
+  font-weight: bold;
   text-decoration: none;
 
   @{dark-selector} & {

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

@@ -1,7 +1,7 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import { Link, useLocation, useNavData } from 'dumi';
-import NavbarExtra from "dumi/theme/slots/NavbarExtra";
+import NavbarExtra from 'dumi/theme/slots/NavbarExtra';
 import React from 'react';
 import "./index.less";
 

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

@@ -40,7 +40,7 @@
 
       &.active {
         color: @c-text;
-        font-weight: 500;
+        font-weight: bold;
 
         @{dark-selector} & {
           color: @c-text-dark;

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

@@ -14,8 +14,8 @@ import { ReactComponent as IconCodeSandbox } from '@ant-design/icons-svg/inline-
 
 import { ReactComponent as IconStackBlitz } from '@ant-design/icons-svg/inline-svg/outlined/thunderbolt.svg';
 import { openCodeSandbox, openStackBlitz, useIntl } from 'dumi';
-import SourceCode from "dumi/theme/builtins/SourceCode";
-import PreviewerActionsExtra from "dumi/theme/slots/PreviewerActionsExtra";
+import SourceCode from 'dumi/theme/builtins/SourceCode';
+import PreviewerActionsExtra from 'dumi/theme/slots/PreviewerActionsExtra';
 import Tabs from 'rc-tabs';
 import React, { useState } from 'react';
 import "./index.less";

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

@@ -1,5 +1,5 @@
 import { NavLink, useLocation, useRouteMeta, useSidebarData } from 'dumi';
-import Toc from "dumi/theme/slots/Toc";
+import Toc from 'dumi/theme/slots/Toc';
 import React from 'react';
 import "./index.less";
 

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

@@ -46,7 +46,7 @@
       margin: 8px 0;
       color: @c-text;
       font-size: 14px;
-      font-weight: 500;
+      font-weight: bold;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -86,7 +86,7 @@
 
         &.active {
           color: @c-primary;
-          font-weight: 500;
+          font-weight: bold;
 
           @{dark-selector} & {
             color: @c-primary-dark;

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,