dumi 2.0.8 → 2.0.10

package/dist/assetParsers/block.js

@@ -63,9 +63,10 @@ async function parseBlockAsset(opts) {
                 cwd: resolved
               });
               if (pkgJsonPath) {
-                asset.dependencies[args.path] = {
+                const pkg = require(pkgJsonPath);
+                asset.dependencies[pkg.name] = {
                   type: "NPM",
-                  value: require(pkgJsonPath).version
+                  value: pkg.version
                 };
               }
               return { path: args.path, external: true };
@@ -87,7 +88,7 @@ async function parseBlockAsset(opts) {
               ".json"
             ].includes(ext);
             const isEntryPoint = args.pluginData.kind === "entry-point";
-            const filename = isEntryPoint ? `index${ext}` : (0, import_plugin_utils.winPath)(import_path.default.relative(import_path.default.dirname(opts.fileAbsPath), args.path));
+            const filename = isEntryPoint ? `index${ext}` : (0, import_plugin_utils.winPath)(import_path.default.relative(import_path.default.dirname(opts.fileAbsPath), args.path)).replace(/^(\.?\.\/)+/g, "");
             if (isModule || isPlainText) {
               asset.dependencies[filename] = {
                 type: "FILE",

package/dist/features/assets.js

@@ -50,7 +50,7 @@ var assets_default = (api) => {
       fn: resolve
     });
     api.register({
-      key: "onCompileDone",
+      key: "onBuildComplete",
       stage: -Infinity,
       fn: resolve
     });
@@ -69,7 +69,7 @@ var assets_default = (api) => {
       return await api.applyPlugins({
         key: "modifyAssetsMetadata",
         initialValue: {
-          name: api.config.themeConfig.title || api.pkg.name,
+          name: api.config.themeConfig.name || api.pkg.name,
           npmPackageName: api.pkg.name,
           version: api.pkg.version,
           description: api.pkg.description,

package/dist/features/theme/index.js

@@ -164,12 +164,13 @@ export default function DumiContextWrapper() {
 
   useEffect(() => {
     return history.listen((next) => {
-      // mark loading when route change, page component will set false when loaded
-      setLoading(true);
-
-      // scroll to top when route changed
       if (next.location.pathname !== prev.current) {
         prev.current = next.location.pathname;
+
+        // mark loading when route change, page component will set false when loaded
+        setLoading(true);
+
+        // scroll to top when route changed
         document.documentElement.scrollTo(0, 0);
       }
     });

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

@@ -141,7 +141,7 @@ function rehypeDemo(opts) {
             if (codeType === "external") {
               const chunkName = [vFile.data.frontmatter.atomId, "demos"].filter(Boolean).join("__");
               parseOpts.fileAbsPath = codeNode.properties.src;
-              parseOpts.id = getCodeId(opts.cwd, opts.fileAbsPath, import_path.default.parse(parseOpts.fileAbsPath).name, vFile.data.frontmatter.atomId);
+              parseOpts.id = getCodeId(opts.cwd, opts.fileAbsPath, import_path.default.parse(parseOpts.fileAbsPath.replace(/\/index\.(j|t)sx?$/, "")).name, 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;

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

@@ -29,6 +29,7 @@ var import_utils = require("../../../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 EMBED_OPEN_TAG = "<embed ";
 var EMBED_CLOSE_TAG = "</embed>";
@@ -46,6 +47,31 @@ var visit;
   ({ default: remarkDirective } = await import("remark-directive"));
   ({ default: remarkGfm } = await import("remark-gfm"));
 })();
+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 (ast) => {
+    visit(ast, ["html", "image", "link"], (node) => {
+      switch (node.type) {
+        case "html":
+          if (/^<(code|img|a)[^>]+(src|href)=('|")\.\.?\//.test(node.value)) {
+            node.value = node.value.replace(/(src|href)=("|')([^]+?)\2/, (_, tag, quote, value) => `${tag}=${quote}${getEmbedRltPath(value)}${quote}`);
+          }
+          break;
+        case "image":
+        case "link":
+          if (/^\.\.?\//.test(node.url)) {
+            node.url = getEmbedRltPath(node.url);
+          }
+          break;
+        default:
+      }
+    });
+  };
+}
 function remarkRawAST() {
   this.Compiler = function Compiler(ast) {
     visit(ast, "yaml", (node, ancestors) => {
@@ -83,7 +109,10 @@ function remarkEmbed(opts) {
           const {
             result: mdast,
             data: { embeds }
-          } = unified().use(remarkParse).use(remarkEmbed, { ...opts, fileAbsPath: absPath }).use(remarkFrontmatter).use(remarkDirective).use(remarkGfm).use(remarkRawAST).processSync(content);
+          } = unified().use(remarkParse).use(remarkEmbed, { ...opts, fileAbsPath: absPath }).use(remarkFrontmatter).use(remarkDirective).use(remarkGfm).use(remarkReplaceSrc, {
+            fileAbsPath: absPath,
+            parentAbsPath: opts.fileAbsPath
+          }).use(remarkRawAST).processSync(content);
           if (!node.value.endsWith(EMBED_CLOSE_TAG)) {
             for (let j = i; j < parent.children.length; j++) {
               const sibling = parent.children[j];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",