dumi 2.4.52 → 2.4.54

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

@@ -30,9 +30,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var rehypeSlug_exports = {};
 __export(rehypeSlug_exports, {
   HEADING_TAGS: () => HEADING_TAGS,
-  default: () => rehypeSlug
+  default: () => rehypeSlug,
+  stripCustomAnchorMarker: () => stripCustomAnchorMarker
 });
 module.exports = __toCommonJS(rehypeSlug_exports);
+var import_utils = require("@umijs/utils");
 var import_github_slugger = __toESM(require("github-slugger"));
 var import_rehypeDemo = require("./rehypeDemo");
 var visit;
@@ -42,13 +44,91 @@ var toString;
   ({ toString } = await import("hast-util-to-string"));
 })();
 var HEADING_TAGS = ["h1", "h2", "h3", "h4", "h5", "h6"];
+var CUSTOM_ANCHOR_RE = /\s*\{#([^}]+)\}\s*$/;
+function getCustomAnchorId(text) {
+  var _a;
+  return ((_a = text.match(CUSTOM_ANCHOR_RE)) == null ? void 0 : _a[1].trim()) || void 0;
+}
+function stripCustomAnchorMarker(text) {
+  return getCustomAnchorId(text) ? text.replace(CUSTOM_ANCHOR_RE, "") : text;
+}
+function extractCustomAnchor(node) {
+  const lastChild = node.children[node.children.length - 1];
+  if ((lastChild == null ? void 0 : lastChild.type) !== "text" || !lastChild.value.includes("{#"))
+    return;
+  const rawId = getCustomAnchorId(lastChild.value);
+  if (!rawId)
+    return;
+  lastChild.value = stripCustomAnchorMarker(lastChild.value);
+  if (!lastChild.value)
+    node.children.pop();
+  return rawId;
+}
 function rehypeSlug() {
   return async (tree, vFile) => {
+    var _a;
     const slugger = new import_github_slugger.default();
+    const customAnchors = /* @__PURE__ */ new Map();
+    const reservedIds = /* @__PURE__ */ new Set();
+    const demoIds = /* @__PURE__ */ new Set();
+    const filename = (_a = vFile.data.frontmatter) == null ? void 0 : _a.filename;
+    visit(tree, "element", (node) => {
+      var _a2, _b;
+      if (![import_rehypeDemo.DUMI_DEMO_TAG, import_rehypeDemo.DUMI_DEMO_GRID_TAG].includes(node.tagName) || !((_a2 = node.data) == null ? void 0 : _a2[import_rehypeDemo.DEMO_PROP_VALUE_KEY])) {
+        return;
+      }
+      const demos = [].concat(
+        (_b = node.data) == null ? void 0 : _b[import_rehypeDemo.DEMO_PROP_VALUE_KEY]
+      );
+      demos.forEach(({ demo }) => {
+        if (demo.inline)
+          return;
+        demoIds.add(demo.id);
+        slugger.slug(demo.id);
+      });
+    });
+    const existingIds = /* @__PURE__ */ new Set();
+    const markedHeadings = [];
+    visit(tree, "element", (node) => {
+      var _a2;
+      if (!HEADING_TAGS.includes(node.tagName))
+        return;
+      const existingId = (_a2 = node.properties) == null ? void 0 : _a2.id;
+      const rawId = extractCustomAnchor(node);
+      if (rawId) {
+        markedHeadings.push({ node, rawId, existingId });
+      } else if (existingId) {
+        existingIds.add(existingId);
+        reservedIds.add(existingId);
+      }
+    });
+    markedHeadings.forEach(({ node, rawId, existingId }) => {
+      let id = rawId;
+      let suffix = 1;
+      while (reservedIds.has(id) || demoIds.has(id)) {
+        id = `${rawId}-${suffix++}`;
+      }
+      if (id !== rawId) {
+        const reason = demoIds.has(rawId) ? "conflicts with demo id" : existingIds.has(rawId) ? "conflicts with an existing heading id" : "is duplicated";
+        import_utils.logger.warn(
+          `Custom anchor "${rawId}" ${reason}, fallback to "${id}" instead. at ${filename}`
+        );
+      }
+      if (existingId && existingId !== id) {
+        import_utils.logger.warn(
+          `Custom anchor "${id}" overrides the existing id "${existingId}" of heading "${toString(
+            node
+          )}". at ${filename}`
+        );
+      }
+      reservedIds.add(id);
+      customAnchors.set(node, id);
+    });
     vFile.data.toc = [];
     visit(tree, "element", (node) => {
-      var _a, _b, _c;
+      var _a2, _b;
       if (HEADING_TAGS.includes(node.tagName)) {
+        const customAnchor = customAnchors.get(node);
         const title = toString({
           type: "element",
           tagName: node.tagName,
@@ -59,22 +139,37 @@ function rehypeSlug() {
         }).trim();
         const depth = Number(node.tagName.slice(1));
         node.properties ?? (node.properties = {});
-        (_a = node.properties).id ?? (_a.id = slugger.slug(title));
+        if (customAnchor) {
+          node.properties.id = customAnchor;
+        } else if (!node.properties.id) {
+          let id = slugger.slug(title);
+          const conflictedId = id;
+          while (reservedIds.has(id)) {
+            id = slugger.slug(title);
+          }
+          if (id !== conflictedId) {
+            import_utils.logger.warn(
+              `Heading "${title}" conflicts with the anchor "${conflictedId}", fallback to "${id}" instead. at ${filename}`
+            );
+          }
+          node.properties.id = id;
+        }
         vFile.data.toc.push({
           id: node.properties.id,
           depth,
           title
         });
-      } else if ([import_rehypeDemo.DUMI_DEMO_TAG, import_rehypeDemo.DUMI_DEMO_GRID_TAG].includes(node.tagName) && ((_b = node.data) == null ? void 0 : _b[import_rehypeDemo.DEMO_PROP_VALUE_KEY])) {
+      } else if ([import_rehypeDemo.DUMI_DEMO_TAG, import_rehypeDemo.DUMI_DEMO_GRID_TAG].includes(node.tagName) && ((_a2 = node.data) == null ? void 0 : _a2[import_rehypeDemo.DEMO_PROP_VALUE_KEY])) {
         const demos = [].concat(
-          (_c = node.data) == null ? void 0 : _c[import_rehypeDemo.DEMO_PROP_VALUE_KEY]
+          (_b = node.data) == null ? void 0 : _b[import_rehypeDemo.DEMO_PROP_VALUE_KEY]
         );
         demos.forEach(({ demo, previewerProps }) => {
-          var _a2, _b2;
+          var _a3, _b2;
           if (!demo.inline && previewerProps.title) {
             vFile.data.toc.push({
-              id: slugger.slug(demo.id),
-              depth: ((_b2 = (_a2 = vFile.data.frontmatter) == null ? void 0 : _a2.demo) == null ? void 0 : _b2.tocDepth) || 3,
+              // must keep the same id as previewer rendered anchor
+              id: demo.id,
+              depth: ((_b2 = (_a3 = vFile.data.frontmatter) == null ? void 0 : _a3.demo) == null ? void 0 : _b2.tocDepth) || 3,
               title: previewerProps.title,
               // put debug flag to control hide/show in toc
               ...previewerProps.debug ? { _debug_demo: true } : {}
@@ -87,5 +182,6 @@ function rehypeSlug() {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  HEADING_TAGS
+  HEADING_TAGS,
+  stripCustomAnchorMarker
 });

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

@@ -1,4 +1,5 @@
+import { CONTENT_TEXTS_OBJ_NAME } from '../../constants';
 import type { Root } from 'hast';
 import type { Transformer } from 'unified';
-export declare const CONTENT_TEXTS_OBJ_NAME = "$$contentTexts";
+export { CONTENT_TEXTS_OBJ_NAME };
 export default function rehypeText(): Transformer<Root>;

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

@@ -29,13 +29,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/loaders/markdown/transformer/rehypeText.ts
 var rehypeText_exports = {};
 __export(rehypeText_exports, {
-  CONTENT_TEXTS_OBJ_NAME: () => CONTENT_TEXTS_OBJ_NAME,
+  CONTENT_TEXTS_OBJ_NAME: () => import_constants.CONTENT_TEXTS_OBJ_NAME,
   default: () => rehypeText
 });
 module.exports = __toCommonJS(rehypeText_exports);
+var import_constants = require("../../constants");
 var import_rehypeIsolation = require("./rehypeIsolation");
 var import_rehypeSlug = require("./rehypeSlug");
-var CONTENT_TEXTS_OBJ_NAME = "$$contentTexts";
 var visit;
 (async () => {
   ({ visitParents: visit } = await import("unist-util-visit-parents"));
@@ -92,7 +92,7 @@ function rehypeText() {
               computed: true,
               object: {
                 type: "Identifier",
-                name: CONTENT_TEXTS_OBJ_NAME
+                name: import_constants.CONTENT_TEXTS_OBJ_NAME
               },
               property: {
                 type: "Literal",

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

@@ -32,7 +32,7 @@ __export(remarkBreaks_exports, {
   default: () => remarkBreaks
 });
 module.exports = __toCommonJS(remarkBreaks_exports);
-var import_plugin_utils = require("umi/plugin-utils");
+var import_utils = require("@umijs/utils");
 var findAndReplace;
 (async () => {
   ({ findAndReplace } = await import("mdast-util-find-and-replace"));
@@ -42,13 +42,13 @@ function logDeprecationWarning(fileAbsPath) {
   if (warningLock.get(fileAbsPath))
     return;
   warningLock.set(fileAbsPath, true);
-  import_plugin_utils.logger.warn(
+  import_utils.logger.warn(
     "Detected that you are using soft breaks, dumi will transform them into spaces after the declaration",
     "version greater than or equal to `2.2.0`, however, they are still being transformed as line breaks now, please",
     "migrate them to hard breaks before upgrading the declaration version for dumi.\n",
-    import_plugin_utils.chalk.grey(`  at ${fileAbsPath}
+    import_utils.chalk.grey(`  at ${fileAbsPath}
 `),
-    import_plugin_utils.chalk.grey("  see also: https://github.com/umijs/dumi/issues/1683\n")
+    import_utils.chalk.grey("  see also: https://github.com/umijs/dumi/issues/1683\n")
   );
 }
 function remarkBreaks(opts) {

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

@@ -33,10 +33,10 @@ __export(remarkEmbed_exports, {
 });
 module.exports = __toCommonJS(remarkEmbed_exports);
 var import_utils = require("../../../utils");
+var import_utils2 = require("@umijs/utils");
 var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
-var import_plugin_utils = require("umi/plugin-utils");
 var import_url = __toESM(require("url"));
 var import_remarkContainer = __toESM(require("./remarkContainer"));
 var EMBED_OPEN_TAG = "<embed ";
@@ -59,7 +59,7 @@ function remarkReplaceSrc(opts) {
   function getEmbedRltPath(value) {
     const { fileAbsPath, parentAbsPath } = opts;
     const absPath = import_path.default.resolve(fileAbsPath, "..", value);
-    return (0, import_plugin_utils.winPath)(import_path.default.relative(import_path.default.dirname(parentAbsPath), absPath)).replace(/^([^.])/, "./$1");
+    return (0, import_utils2.winPath)(import_path.default.relative(import_path.default.dirname(parentAbsPath), absPath)).replace(/^([^.])/, "./$1");
   }
   return (ast) => {
     visit(

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

@@ -32,12 +32,13 @@ __export(remarkMeta_exports, {
   default: () => remarkMeta
 });
 module.exports = __toCommonJS(remarkMeta_exports);
-var import_tabs = require("../../../features/tabs");
+var import_utils = require("../../../features/tabs/utils");
+var import_utils2 = require("@umijs/utils");
 var import_child_process = require("child_process");
 var import_fs = __toESM(require("fs"));
 var import_js_yaml = __toESM(require("js-yaml"));
 var import_path = __toESM(require("path"));
-var import_plugin_utils = require("umi/plugin-utils");
+var import_rehypeSlug = require("./rehypeSlug");
 var visit;
 var toString;
 (async () => {
@@ -46,12 +47,12 @@ var toString;
 })();
 function getGuessAtomId(opts) {
   const parsed = import_path.default.parse(opts.fileLocaleLessPath);
-  const clearFileName = (0, import_tabs.getHostForTabRouteFile)(parsed.name);
+  const clearFileName = (0, import_utils.getHostForTabRouteFile)(parsed.name);
   const atomFile = [".tsx", ".jsx"].map((ext) => import_path.default.join(parsed.dir, `${clearFileName}${ext}`)).find(import_fs.default.existsSync);
   if (atomFile) {
     const atomAbsDir = opts.resolve.atomDirs.map(({ dir }) => import_path.default.resolve(opts.cwd, dir)).sort((a, b) => b.split("/").length - a.split("/").length).find((dir) => atomFile.startsWith(dir));
     if (atomAbsDir) {
-      return (0, import_plugin_utils.winPath)(import_path.default.relative(atomAbsDir, atomFile)).replace(
+      return (0, import_utils2.winPath)(import_path.default.relative(atomAbsDir, atomFile)).replace(
         /((^|\/)index)?\.\w+$/,
         ""
       );
@@ -64,7 +65,7 @@ function remarkMeta(opts) {
     vFile.data.frontmatter = {
       title: "",
       toc: "menu",
-      filename: (0, import_plugin_utils.winPath)(import_path.default.relative(opts.cwd, opts.fileAbsPath)),
+      filename: (0, import_utils2.winPath)(import_path.default.relative(opts.cwd, opts.fileAbsPath)),
       ...guessAtomId && { atomId: guessAtomId }
     };
     try {
@@ -90,22 +91,24 @@ function remarkMeta(opts) {
       () => {
         visit(tree, "heading", (node) => {
           if (node.depth === 1) {
-            vFile.data.frontmatter.title = toString(node.children);
+            vFile.data.frontmatter.title = (0, import_rehypeSlug.stripCustomAnchorMarker)(
+              toString(node.children)
+            );
           }
         });
       },
       // use filename as title
       () => {
-        if ((0, import_tabs.isTabRouteFile)(opts.fileAbsPath)) {
-          vFile.data.frontmatter.title = import_plugin_utils.lodash.startCase(
-            (0, import_tabs.getTabKeyFromFile)(opts.fileAbsPath)
+        if ((0, import_utils.isTabRouteFile)(opts.fileAbsPath)) {
+          vFile.data.frontmatter.title = import_utils2.lodash.startCase(
+            (0, import_utils.getTabKeyFromFile)(opts.fileAbsPath)
           );
         } else {
           const pathWithoutIndex = opts.fileAbsPath.replace(
             /(\/index([^/]+)?)?\.md$/,
             ""
           );
-          vFile.data.frontmatter.title = import_plugin_utils.lodash.startCase(
+          vFile.data.frontmatter.title = import_utils2.lodash.startCase(
             import_path.default.basename(pathWithoutIndex)
           );
         }

package/dist/techStacks/utils.js

@@ -39,7 +39,6 @@ __export(utils_exports, {
   wrapDemoWithFn: () => wrapDemoWithFn
 });
 module.exports = __toCommonJS(utils_exports);
-var import_core = require("@swc/core");
 var import_types = require("../types");
 function extractScript(htmlLike) {
   const htmlScriptReg = /<script\b(?:\s[^>]*>|>)(.*?)<\/script>/gims;
@@ -84,7 +83,8 @@ function wrapDemoWithFn(code, opts) {
     parserConfig,
     plugins: babelPlugins
   }) : code;
-  const result = (0, import_core.transformSync)(source, {
+  const { transformSync } = require("@swc/core");
+  const result = transformSync(source, {
     filename,
     jsc: {
       parser: parserConfig,

package/dist/utils.d.ts

@@ -1,6 +1,7 @@
 import type { Range, RangeOptions } from '@umijs/utils/compiled/semver';
-import Cache from 'file-system-cache';
+import type CreateCache from '../compiled/file-system-cache';
 import type { RunLoaderOption as InternalRunLoaderOption, RunLoaderResult } from '../compiled/loader-runner';
+declare const Cache: typeof CreateCache;
 export type * from '../compiled/loader-runner';
 export { getContext } from '../compiled/loader-runner';
 /**

package/dist/utils.js

@@ -46,18 +46,18 @@ __export(utils_exports, {
   tryFatherBuildConfigs: () => tryFatherBuildConfigs
 });
 module.exports = __toCommonJS(utils_exports);
+var import_utils = require("@umijs/utils");
 var import_crypto = require("crypto");
-var import_file_system_cache = __toESM(require("file-system-cache"));
 var import_fs = __toESM(require("fs"));
 var import_js_yaml = __toESM(require("js-yaml"));
 var import_path = __toESM(require("path"));
-var import_plugin_utils = require("umi/plugin-utils");
 var import_util = require("util");
 var import_loader_runner = require("../compiled/loader-runner");
 var import_constants = require("./constants");
 var import_loader_runner2 = require("../compiled/loader-runner");
+var Cache = require("../compiled/file-system-cache").default;
 function getFileIdFromFsPath(fsPath) {
-  return import_plugin_utils.lodash.kebabCase((0, import_plugin_utils.winPath)(fsPath).replace(/((\/|^)index)?\.\w+$/g, ""));
+  return import_utils.lodash.kebabCase((0, import_utils.winPath)(fsPath).replace(/((\/|^)index)?\.\w+$/g, ""));
 }
 var getFileRangeLines = (content2, range) => {
   const [, start, end] = (range == null ? void 0 : range.match(/^L(\d+)(?:-L(\d+))?$/)) || [];
@@ -72,7 +72,7 @@ var getFileContentByRegExp = (content, regexp, filePath) => {
   try {
     return content.match(eval(regexp))[0];
   } catch (err) {
-    import_plugin_utils.logger.error(`Extract markdown content failed, use the full content.
+    import_utils.logger.error(`Extract markdown content failed, use the full content.
 RegExp: ${regexp}
 File: ${filePath}
 Error: ${err}`);
@@ -102,7 +102,7 @@ function getCache(ns) {
     }, getSync() {
     } };
   }
-  return caches[ns] ?? (caches[ns] = (0, import_file_system_cache.default)({ basePath: import_path.default.resolve(cacheDir, ns) }));
+  return caches[ns] ?? (caches[ns] = Cache({ basePath: import_path.default.resolve(cacheDir, ns) }));
 }
 async function tryFatherBuildConfigs(cwd) {
   let configs = [];
@@ -128,7 +128,7 @@ async function tryFatherBuildConfigs(cwd) {
   return configs;
 }
 function getProjectRoot(cwd) {
-  const splittedCwd = (0, import_plugin_utils.winPath)(cwd).split("/");
+  const splittedCwd = (0, import_utils.winPath)(cwd).split("/");
   for (let level = -1; level >= -3; level -= 1) {
     const rootCwd = splittedCwd.slice(0, level).join("/");
     if (!rootCwd)
@@ -137,20 +137,20 @@ function getProjectRoot(cwd) {
     if (import_fs.default.existsSync(pkgPath) && (["pnpm-workspace.yaml", "lerna.json"].some(
       (f) => import_fs.default.existsSync(import_path.default.join(rootCwd, f))
     ) || require(pkgPath).workspace)) {
-      return (0, import_plugin_utils.winPath)(rootCwd);
+      return (0, import_utils.winPath)(rootCwd);
     }
   }
-  return (0, import_plugin_utils.winPath)(cwd);
+  return (0, import_utils.winPath)(cwd);
 }
 function lastSlash(str) {
   return str[str.length - 1] === "/" ? str : `${str}/`;
 }
 function componentToChunkName(component, cwdPath = "/") {
-  const cwd = (0, import_plugin_utils.winPath)(cwdPath);
-  return typeof component === "string" ? (0, import_plugin_utils.winPath)(component).replace(
+  const cwd = (0, import_utils.winPath)(cwdPath);
+  return typeof component === "string" ? (0, import_utils.winPath)(component).replace(
     new RegExp(
       `^(${// match app cwd first
-      import_plugin_utils.lodash.escapeRegExp(lastSlash(cwd))})`
+      import_utils.lodash.escapeRegExp(lastSlash(cwd))})`
     ),
     ""
   ).replace(/^.(\/|\\)/, "").replace(/(\/|\\)/g, "__").replace(/^src__/, "").replace(/\.\.__/g, "").replace(/^pages__/, "p__") : "";
@@ -174,11 +174,11 @@ function runLoaders(options, callback) {
   return promisifyRunLoaders(options);
 }
 function isVersionInRange(version, range, options = { includePrerelease: true }) {
-  if (import_plugin_utils.semver.valid(version)) {
-    return import_plugin_utils.semver.satisfies(version, range, options);
+  if (import_utils.semver.valid(version)) {
+    return import_utils.semver.satisfies(version, range, options);
   }
-  if (import_plugin_utils.semver.validRange(version)) {
-    return import_plugin_utils.semver.subset(version, range, options);
+  if (import_utils.semver.validRange(version)) {
+    return import_utils.semver.subset(version, range, options);
   }
   return false;
 }
@@ -187,7 +187,7 @@ function toImportSpecifier(source) {
     return source;
   if (/^(?:node|data|file):/.test(source))
     return source;
-  return (0, import_plugin_utils.winPath)(source);
+  return (0, import_utils.winPath)(source);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.52",
+  "version": "2.4.54",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -54,11 +54,11 @@
       "prettier --cache --write"
     ],
     "*.{js,jsx}": [
-      "eslint --fix",
+      "utoo-lint --fix",
       "prettier --cache --write"
     ],
     "*.{ts,tsx}": [
-      "eslint --fix",
+      "utoo-lint --fix",
       "prettier --cache --parser=typescript --write"
     ]
   },
@@ -148,9 +148,9 @@
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "^18.2.7",
     "@typescript/native-preview": "7.0.0-dev.20260623.1",
-    "@umijs/lint": "^4.7.4",
+    "@umijs/lint": "^4.7.28",
     "@umijs/plugins": "4.7.4",
-    "eslint": "^8.46.0",
+    "@utoo/lint": "^0.4.12",
     "esno": "^4.7.0",
     "fast-glob": "^3.3.1",
     "father": "^4.6.23",
@@ -193,7 +193,7 @@
     "format": "prettier --cache --write .",
     "lint": "npm run lint:es && npm run lint:css",
     "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "lint:es": "utoo-lint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
     "release": "esno scripts/release.ts",
     "release:publish": "esno scripts/releasePublish.ts",
     "test": "vitest run",