dumi 2.1.19 → 2.1.21

package/dist/assetParsers/atom.d.ts

@@ -9,6 +9,7 @@ declare class AtomAssetsParser {
     private watcher;
     private cbs;
     private resolveFilter;
+    private watchArgs;
     constructor(opts: {
         entryFile: string;
         resolveDir: string;
@@ -23,6 +24,7 @@ declare class AtomAssetsParser {
     }>;
     watch(cb: AtomAssetsParser['cbs'][number]): void;
     unwatch(cb: AtomAssetsParser['cbs'][number]): void;
+    patchWatchArgs(handler: (args: AtomAssetsParser['watchArgs']) => AtomAssetsParser['watchArgs']): void;
     destroyWorker(): void;
 }
 export default AtomAssetsParser;

package/dist/assetParsers/atom.js

@@ -47,6 +47,20 @@ var AtomAssetsParser = class {
       mode: "worker",
       parseOptions: opts.parseOptions
     });
+    this.watchArgs = {
+      paths: this.entryDir,
+      options: {
+        cwd: this.resolveDir,
+        ignored: [
+          "**/.*",
+          "**/.*/**",
+          "**/_*",
+          "**/_*/**",
+          "**/*.{md,less,scss,sass,styl,css}"
+        ],
+        ignoreInitial: true
+      }
+    };
   }
   async parse() {
     if (!this.parseDeferrer || this.unresolvedFiles.length && !this.isParsing) {
@@ -115,17 +129,7 @@ var AtomAssetsParser = class {
       const lazyParse = import_plugin_utils.lodash.debounce(() => {
         this.parse().then((data) => this.cbs.forEach((cb2) => cb2(data)));
       }, 100);
-      this.watcher = import_plugin_utils.chokidar.watch(this.entryDir, {
-        cwd: this.resolveDir,
-        ignored: [
-          "**/.*",
-          "**/.*/**",
-          "**/_*",
-          "**/_*/**",
-          "**/*.{md,less,scss,sass,styl,css}"
-        ],
-        ignoreInitial: true
-      }).on("all", (ev, file) => {
+      this.watcher = import_plugin_utils.chokidar.watch(this.watchArgs.paths, this.watchArgs.options).on("all", (ev, file) => {
         if (["add", "change"].includes(ev) && /((?<!\.d)\.ts|\.(jsx?|tsx))$/.test(file)) {
           this.unresolvedFiles.push(import_path.default.join(this.resolveDir, file));
           lazyParse();
@@ -137,6 +141,9 @@ var AtomAssetsParser = class {
   unwatch(cb) {
     this.cbs.splice(this.cbs.indexOf(cb), 1);
   }
+  patchWatchArgs(handler) {
+    this.watchArgs = handler(this.watchArgs);
+  }
   destroyWorker() {
     if (this.parseDeferrer) {
       this.parseDeferrer.finally(() => this.parser.$$destroyWorker());

package/dist/features/autoAlias.js

@@ -29,7 +29,6 @@ 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: {
@@ -37,33 +36,31 @@ var autoAlias_default = (api) => {
     },
     enableBy: () => !!api.pkg.name
   });
-  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");
-    }
-    memo.fatherConfigs = await (0, import_utils.tryFatherBuildConfigs)(api.cwd);
-    return memo;
-  });
-  api.chainWebpack((memo) => {
-    const fatherConfigs = api.appData.fatherConfigs;
+  api.modifyConfig(async (memo) => {
+    var _a, _b, _c;
+    const fatherConfigs = await api.applyPlugins({
+      key: "dumi.modifyFatherConfigs",
+      type: api.ApplyPluginsType.modify,
+      initialValue: await (0, import_utils.tryFatherBuildConfigs)(api.cwd)
+    });
     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;
+      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 _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));
-      }
+      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));
     });
-    if (entryDir && !memo.resolve.alias.has(api.pkg.name)) {
-      memo.resolve.alias.set(api.pkg.name, entryDir);
+    let entryDir = "";
+    if ((_a = memo.resolve) == null ? void 0 : _a.entryFile) {
+      entryDir = import_path.default.resolve(api.cwd, memo.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) {
+      (_b = memo.alias)[_c = api.pkg.name] ?? (_b[_c] = entryDir);
     }
     return memo;
   });

package/dist/features/derivative.js

@@ -59,7 +59,6 @@ var derivative_default = (api) => {
       "icons",
       "mdx",
       "mpa",
-      "monorepoRedirect",
       "reactRouter5Compat",
       "verifyCommit"
     ].forEach((key) => {

package/dist/features/locales.js

@@ -98,7 +98,8 @@ const LocalesContainer: FC<{ children: ReactNode }> = (props) => {
         // suffix mode
         ? history.location.pathname.replace(/([^/])\\/$/, '$1').endsWith(locale.suffix)
         // base mode
-        : history.location.pathname.replace(/([^/])\\/$/, '$1').startsWith(locale.base)
+        : history.location.pathname.replace(/([^/])\\/$/, '$1')
+          .startsWith("${api.config.base.replace(/\/$/, "")}" + locale.base)
     ));
     const locale = matched ? matched.id : locales[0].id;
 

package/dist/features/routes.js

@@ -26,13 +26,15 @@ __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_utils2 = require("@umijs/core/dist/route/utils");
+var import_utils = 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");
 var CTX_LAYOUT_ID = "dumi-context-layout";
+var ALIAS_THEME_TMP = "@/dumi__theme";
+var ALIAS_LAYOUTS_LOCAL = "@/dumi__theme__layouts";
+var ALIAS_INTERNAL_PAGES = "@/dumi__pages";
 function normalizeDocDir(docDir) {
   return typeof docDir === "object" ? docDir : { dir: docDir };
 }
@@ -62,6 +64,13 @@ function flatRoute(route, docLayoutId) {
     route.path = route.path === "*" ? route.path : route.absPath.slice(1);
   }
 }
+function getAliasLayoutFile({
+  source,
+  specifier
+}) {
+  const alias = source.includes("/.dumi/theme/layouts/") ? ALIAS_LAYOUTS_LOCAL : `${ALIAS_THEME_TMP}/layouts`;
+  return `${alias}/${specifier}`;
+}
 var routes_default = (api) => {
   var _a, _b, _c;
   const extraWatchPaths = [
@@ -81,6 +90,9 @@ var routes_default = (api) => {
           memo.resolve[key] = [];
       });
     }
+    memo.alias[ALIAS_THEME_TMP] = (0, import_plugin_utils.winPath)(import_path.default.join(api.paths.absTmpPath, "dumi/theme"));
+    memo.alias[ALIAS_LAYOUTS_LOCAL] = (0, import_plugin_utils.winPath)(import_path.default.join(api.cwd, import_constants.LOCAL_THEME_DIR, "layouts"));
+    memo.alias[ALIAS_INTERNAL_PAGES] = (0, import_plugin_utils.winPath)(import_path.default.join(__dirname, "../client/pages"));
     return memo;
   });
   api.modifyRoutes((oRoutes) => {
@@ -104,7 +116,7 @@ var routes_default = (api) => {
       routes[DocLayout.specifier] = {
         id: DocLayout.specifier,
         path: "/",
-        file: DocLayout.source,
+        file: getAliasLayoutFile(DocLayout),
         parentId: lastLayoutId,
         absPath: "/",
         isLayout: true
@@ -115,7 +127,7 @@ var routes_default = (api) => {
       routes[DemoLayout.specifier] = {
         id: DemoLayout.specifier,
         path: "/",
-        file: DemoLayout.source,
+        file: getAliasLayoutFile(DemoLayout),
         parentId: lastLayoutId,
         absPath: "/",
         isLayout: true
@@ -148,7 +160,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_utils2.createRouteId)(routeFile);
+        const routeId = (0, import_utils.createRouteId)(routeFile);
         routes[routeId] = {
           id: routeId,
           path: routePath,
@@ -173,7 +185,7 @@ var routes_default = (api) => {
         path: "*",
         absPath: "/*",
         parentId: docLayoutId,
-        file: (0, import_utils.getClientDistFile)("dist/client/pages/404", api.cwd)
+        file: `${ALIAS_INTERNAL_PAGES}/404`
       };
     }
     routes["demo-render"] = {
@@ -181,7 +193,7 @@ var routes_default = (api) => {
       path: `${import_constants.SP_ROUTE_PREFIX}demos/:id`,
       absPath: `/${import_constants.SP_ROUTE_PREFIX}demos/:id`,
       parentId: demoLayoutId,
-      file: (0, import_utils.getClientDistFile)("dist/client/pages/Demo", api.cwd)
+      file: `${ALIAS_INTERNAL_PAGES}/Demo`
     };
     return routes;
   });
@@ -189,14 +201,14 @@ var routes_default = (api) => {
     const layouts = [
       {
         id: CTX_LAYOUT_ID,
-        file: `${api.paths.absTmpPath}/dumi/theme/ContextWrapper.tsx`
+        file: `${ALIAS_THEME_TMP}/ContextWrapper`
       }
     ];
     const { GlobalLayout } = api.service.themeData.layouts;
     if (GlobalLayout) {
       layouts.unshift({
         id: GlobalLayout.specifier,
-        file: GlobalLayout.source
+        file: getAliasLayoutFile(GlobalLayout)
       });
     }
     return layouts;

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));
@@ -52,7 +52,6 @@ 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

@@ -34,6 +34,7 @@ var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 var visit;
 var SKIP;
+var EXIT;
 var toString;
 var isElement;
 var DEMO_NODE_CONTAINER = "$demo-container";
@@ -41,7 +42,7 @@ var DEMO_PROP_VALUE_KEY = "$demo-prop-value-key";
 var DUMI_DEMO_TAG = "DumiDemo";
 var DUMI_DEMO_GRID_TAG = "DumiDemoGrid";
 (async () => {
-  ({ visit, SKIP } = await import("unist-util-visit"));
+  ({ visit, SKIP, EXIT } = await import("unist-util-visit"));
   ({ toString } = await import("hast-util-to-string"));
   ({ isElement } = await import("hast-util-is-element"));
 })();
@@ -125,13 +126,35 @@ function rehypeDemo(opts) {
         }
       }
     });
+    let hasOnlySign = false;
+    let hasSkipSign = false;
     visit(tree, "element", (node) => {
       var _a;
+      if (isElement(node, "p") && ((_a = node.data) == null ? void 0 : _a[DEMO_NODE_CONTAINER])) {
+        for (const codeNode of node.children) {
+          if (isElement(codeNode, "code")) {
+            hasSkipSign || (hasSkipSign = "skip" in codeNode.properties);
+            if ("only" in codeNode.properties) {
+              hasOnlySign = true;
+              return EXIT;
+            }
+          }
+        }
+      }
+    });
+    if (process.env.NODE_ENV === "production" && (hasOnlySign || hasSkipSign)) {
+      import_plugin_utils.logger.warn(`The 'only' or 'skip' mark is not supported in production environment, please remove it. at ${vFile.data.frontmatter.filename}`);
+    }
+    visit(tree, "element", (node) => {
+      var _a, _b, _c;
       if (isElement(node, "p") && ((_a = node.data) == null ? void 0 : _a[DEMO_NODE_CONTAINER])) {
         const demosPropData = [];
-        node.children.forEach((codeNode) => {
-          var _a2, _b;
+        for (const codeNode of node.children) {
           if (isElement(codeNode, "code")) {
+            const shouldSkipNonOnlyDemos = hasOnlySign && !("only" in codeNode.properties);
+            if (process.env.NODE_ENV !== "production" && ("skip" in codeNode.properties || shouldSkipNonOnlyDemos)) {
+              continue;
+            }
             const codeType = codeNode.data.type;
             const techStack = codeNode.data.techStack;
             const codeValue = toString(codeNode).trim();
@@ -147,12 +170,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);
-              let localId = ((_a2 = codeNode.properties) == null ? void 0 : _a2.id) ?? import_path.default.parse(parseOpts.fileAbsPath.replace(/\/index\.(j|t)sx?$/, "")).name;
+              let localId = ((_b = codeNode.properties) == null ? void 0 : _b.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;
-              (_b = codeNode.properties).filename ?? (_b.filename = (0, import_plugin_utils.winPath)(import_path.default.relative(opts.cwd, parseOpts.fileAbsPath)));
+              (_c = codeNode.properties).filename ?? (_c.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);
@@ -164,9 +187,9 @@ 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, _b2, _c;
+              var _a2, _b2, _c2;
               if (demoIds.indexOf(parseOpts.id) !== demoIds.lastIndexOf(parseOpts.id)) {
-                const startLine = (_a3 = node.position) == null ? void 0 : _a3.start.line;
+                const startLine = (_a2 = node.position) == null ? void 0 : _a2.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}`);
@@ -199,7 +222,7 @@ function rehypeDemo(opts) {
                   component
                 };
               }
-              Object.assign(previewerProps, await ((_c = techStack.generatePreviewerProps) == null ? void 0 : _c.call(techStack, originalProps, techStackOpts)) || originalProps);
+              Object.assign(previewerProps, await ((_c2 = techStack.generatePreviewerProps) == null ? void 0 : _c2.call(techStack, originalProps, techStackOpts)) || originalProps);
               if (previewerProps.description) {
                 const { unified } = await import("unified");
                 const { default: remarkParse } = await import("remark-parse");
@@ -224,8 +247,11 @@ function rehypeDemo(opts) {
               demo: propDemo,
               previewerProps
             });
+            if (process.env.NODE_ENV !== "production" && "only" in codeNode.properties) {
+              break;
+            }
           }
-        });
+        }
         replaceNodes.push(node);
         node.children = [];
         if (demosPropData.length === 1) {

package/dist/utils.d.ts

@@ -34,8 +34,4 @@ 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,7 +23,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   getCache: () => getCache,
-  getClientDistFile: () => getClientDistFile,
   getFileContentByRegExp: () => getFileContentByRegExp,
   getFileRangeLines: () => getFileRangeLines,
   getProjectRoot: () => getProjectRoot,
@@ -118,22 +117,9 @@ 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.19",
+  "version": "2.1.21",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -147,6 +147,7 @@
     "@umijs/plugins": "4.0.32",
     "dumi-theme-mobile": "workspace:*",
     "eslint": "^8.20.0",
+    "fast-glob": "^3.2.12",
     "father": "^4.1.0",
     "highlight-words-core": "^1.2.2",
     "husky": "^8.0.1",