dumi 2.0.7 → 2.0.9

package/README.md

@@ -4,7 +4,7 @@
 
 <img src="https://gw.alipayobjects.com/zos/bmw-prod/d3e3eb39-1cd7-4aa5-827c-877deced6b7e/lalxt4g3_w256_h256.png" width="120">
 
-dumi is an static site generator for component library development.
+dumi is a static site generator for component library development.
 
 ## Usage & Guide
 

package/dist/assetParsers/atom.d.ts

@@ -18,5 +18,6 @@ declare class AtomAssetsParser {
         functions: Record<string, AtomFunctionAsset>;
     }>;
     watch(cb: AtomAssetsParser['cbs'][number]): void;
+    unwatch(cb: AtomAssetsParser['cbs'][number]): void;
 }
 export default AtomAssetsParser;

package/dist/assetParsers/atom.js

@@ -45,7 +45,7 @@ var AtomAssetsParser = class {
   async parse() {
     if (!this.resolverDeferrer || this.unresolvedFiles.length) {
       this.resolverDeferrer = (async () => {
-        await this.parser.patch(this.unresolvedFiles);
+        await this.parser.patch(this.unresolvedFiles.splice(0));
         return new import_parser.SchemaResolver(await this.parser.parse());
       })();
     }
@@ -106,6 +106,9 @@ var AtomAssetsParser = class {
       });
     }
   }
+  unwatch(cb) {
+    this.cbs.splice(this.cbs.indexOf(cb), 1);
+  }
 };
 var atom_default = AtomAssetsParser;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/features/assets.js

@@ -43,30 +43,49 @@ function addAtomMeta(atomId, data) {
   atomsMeta[atomId] = import_plugin_utils.lodash.pick(data, ["title", "keywords", "deprecated"]);
 }
 var assets_default = (api) => {
+  let compileDeferrer = new Promise((resolve) => {
+    api.register({
+      key: "onDevCompileDone",
+      stage: -Infinity,
+      fn: resolve
+    });
+    api.register({
+      key: "onBuildComplete",
+      stage: -Infinity,
+      fn: resolve
+    });
+  });
   api.describe({
     config: {
       schema: (Joi) => Joi.object()
     },
-    enableBy: ({ env }) => env === "production" && Boolean(api.args.assets)
+    enableBy: ({ env }) => env === "development" || Boolean(api.args.assets)
   });
-  api.onBuildComplete(async () => {
-    const { components } = api.service.atomParser ? await api.service.atomParser.parse() : { components: {} };
-    const assets = await api.applyPlugins({
-      key: "modifyAssetsMetadata",
-      initialValue: {
-        name: api.config.themeConfig.title || api.pkg.name,
-        npmPackageName: api.pkg.name,
-        version: api.pkg.version,
-        description: api.pkg.description,
-        logo: api.config.themeConfig.logo,
-        homepage: api.pkg.homepage,
-        repository: api.pkg.repository,
-        assets: {
-          atoms: Object.values(components).map((atom) => Object.assign(atom, atomsMeta[atom.id] || {})),
-          examples: import_plugin_utils.lodash.uniqBy(examples, "id")
+  api.registerMethod({
+    name: "getAssetsMetadata",
+    async fn() {
+      await compileDeferrer;
+      const { components } = api.service.atomParser ? await api.service.atomParser.parse() : { components: {} };
+      return await api.applyPlugins({
+        key: "modifyAssetsMetadata",
+        initialValue: {
+          name: api.config.themeConfig.title || api.pkg.name,
+          npmPackageName: api.pkg.name,
+          version: api.pkg.version,
+          description: api.pkg.description,
+          logo: api.config.themeConfig.logo,
+          homepage: api.pkg.homepage,
+          repository: api.pkg.repository,
+          assets: {
+            atoms: Object.values(components).map((atom) => Object.assign(atom, atomsMeta[atom.id] || {})),
+            examples: import_plugin_utils.lodash.uniqBy(examples, "id")
+          }
         }
-      }
-    });
+      });
+    }
+  });
+  api.onBuildComplete(async () => {
+    const assets = await api.getAssetsMetadata();
     import_fs.default.writeFileSync(import_path.default.join(api.cwd, "assets.json"), JSON.stringify(assets, null, 2), "utf-8");
   });
 };

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/types.d.ts

@@ -94,5 +94,9 @@ export declare type IApi = IUmiApi & {
      * modify assets metadata
      */
     modifyAssetsMetadata: IModify<AssetsPackage, null>;
+    /**
+     * get assets metadata
+     */
+    getAssetsMetadata?: () => Promise<AssetsPackage>;
 };
 export {};

package/dist/utils.js

@@ -98,7 +98,8 @@ async function tryFatherBuildConfigs(cwd) {
     configs = getBuildConfig(svc.config, svc.pkg);
   } catch {
   }
-  process.env.APP_ROOT = APP_ROOT;
+  if (APP_ROOT)
+    process.env.APP_ROOT = APP_ROOT;
   return configs;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

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

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

@@ -19,7 +19,8 @@ import "./index.less";
 
 var Toc = function Toc() {
   var _useLocation = useLocation(),
-      pathname = _useLocation.pathname;
+      pathname = _useLocation.pathname,
+      search = _useLocation.search;
 
   var meta = useRouteMeta();
 
@@ -50,7 +51,7 @@ var Toc = function Toc() {
       });
       setSectionRefs(refs);
     }
-  }, [pathname, loading]);
+  }, [pathname, search, loading]);
   return sectionRefs.length ? /*#__PURE__*/React.createElement(ScrollSpy, {
     sectionRefs: sectionRefs
   }, function (_ref3) {