dumi 2.4.51 → 2.4.53

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

@@ -32,17 +32,31 @@ __export(rehypeLink_exports, {
   default: () => rehypeLink
 });
 module.exports = __toCommonJS(rehypeLink_exports);
-var import_tabs = require("../../../features/tabs");
+var import_utils = require("../../../features/tabs/utils");
+var import_utils2 = require("@umijs/utils");
 var import_path = __toESM(require("path"));
-var import_plugin_utils = require("umi/plugin-utils");
 var import_url = __toESM(require("url"));
 var visit;
 var SKIP;
 (async () => {
   ({ visit, SKIP } = await import("unist-util-visit"));
 })();
+function createRouteInfo(routes, hostAbsPath) {
+  const pathsByFile = /* @__PURE__ */ new Map();
+  const absPaths = /* @__PURE__ */ new Set();
+  let currentRoute;
+  Object.values(routes).forEach((route) => {
+    pathsByFile.set(route.file, route.absPath);
+    absPaths.add(route.absPath);
+    if (!currentRoute && route.file === hostAbsPath)
+      currentRoute = route;
+  });
+  return { pathsByFile, absPaths, currentRoute };
+}
 function rehypeLink(opts) {
   return (tree) => {
+    const hostAbsPath = (0, import_utils.getHostForTabRouteFile)(opts.fileAbsPath);
+    let routeInfo;
     visit(tree, "element", (node, i, parent) => {
       var _a, _b, _c;
       if (node.tagName === "a" && typeof ((_a = node.properties) == null ? void 0 : _a.href) === "string" && // skip target specified link
@@ -50,35 +64,35 @@ function rehypeLink(opts) {
       !((_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.protocol || href.startsWith("//"))
           return SKIP;
         if (/\.md$/i.test(parsedUrl.pathname)) {
-          const { routes } = opts;
-          const absPath = (0, import_plugin_utils.winPath)(
+          const { pathsByFile } = routeInfo ?? (routeInfo = createRouteInfo(
+            opts.routes,
+            hostAbsPath
+          ));
+          const absPath = (0, import_utils2.winPath)(
             import_path.default.resolve(hostAbsPath, "..", parsedUrl.pathname)
           );
-          Object.keys(routes).forEach((key) => {
-            if (routes[key].file === absPath) {
-              parsedUrl.pathname = routes[key].absPath;
-            }
-          });
+          if (pathsByFile.has(absPath)) {
+            parsedUrl.pathname = pathsByFile.get(absPath);
+          }
         } else if (parsedUrl.pathname && /^[^/]+/.test(parsedUrl.pathname)) {
-          const routes = Object.values(opts.routes);
-          const currentRoute = routes.find(
-            (route) => route.file === hostAbsPath
-          );
+          const { currentRoute, absPaths } = routeInfo ?? (routeInfo = createRouteInfo(
+            opts.routes,
+            hostAbsPath
+          ));
           if (!currentRoute)
             return;
           const basePath = currentRoute.absPath;
           const htmlTargetPath = import_url.default.resolve(basePath, parsedUrl.pathname);
-          const rr6TargetPath = (0, import_plugin_utils.winPath)(
+          const rr6TargetPath = (0, import_utils2.winPath)(
             import_path.default.resolve(basePath, parsedUrl.pathname)
           );
           parsedUrl.pathname = htmlTargetPath;
-          if (routes.every((route) => route.absPath !== htmlTargetPath) && routes.some((route) => route.absPath === rr6TargetPath)) {
+          if (!absPaths.has(htmlTargetPath) && absPaths.has(rr6TargetPath)) {
             parsedUrl.pathname = rr6TargetPath;
-            import_plugin_utils.logger.warn(
+            import_utils2.logger.warn(
               `Detected ambiguous link \`${href}\` in \`${opts.fileAbsPath}\`, please use \`./xxx.md\` file path instead of normal relative path, dumi will deprecate this behavior in the future.
         See more: https://github.com/umijs/dumi/pull/1491`
             );
@@ -89,7 +103,7 @@ function rehypeLink(opts) {
           tagName: "Link",
           children: node.children,
           properties: {
-            ...import_plugin_utils.lodash.omit(node.properties, ["href"]),
+            ...import_utils2.lodash.omit(node.properties, ["href"]),
             to: import_url.default.format(parsedUrl)
           }
         });

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

@@ -32,7 +32,7 @@ __export(rehypeRaw_exports, {
   default: () => rehypeRaw
 });
 module.exports = __toCommonJS(rehypeRaw_exports);
-var import_plugin_utils = require("umi/plugin-utils");
+var import_utils = require("@umijs/utils");
 var raw;
 var visit;
 var COMPONENT_NAME_REGEX = /(<)([A-Z][a-zA-Z\d]*)([\s|>])/g;
@@ -71,7 +71,7 @@ function rehypeRaw(opts) {
         node.properties[CODE_META_STUB_ATTR] = node.data.meta;
       }
       if (node.type === "raw" && /<code[^>]*src=[^>]*\/>/.test(node.value)) {
-        import_plugin_utils.logger.warn(`<code /> is not supported, please use <code></code> instead.
+        import_utils.logger.warn(`<code /> is not supported, please use <code></code> instead.
 File: ${opts.fileAbsPath}`);
       }
     });

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,12 @@ __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 visit;
 var toString;
 (async () => {
@@ -46,12 +46,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 +64,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 {
@@ -96,16 +96,16 @@ function remarkMeta(opts) {
       },
       // 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.51",
+  "version": "2.4.53",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",