dumi 2.2.0-alpha.2 → 2.2.0-rc.0

package/README.md

@@ -10,13 +10,9 @@ dumi is a static site generator for component library development.
 
 To view more online examples and docs, please visit [dumi official site](https://d.umijs.org).
 
-## Development
+## Contributing
 
-```bash
-$ pnpm install
-$ pnpm dev
-$ pnpm docs:dev
-```
+See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## Badge
 

package/compiled/_internal/searchWorker.min.js

@@ -1 +1 @@
-"use strict";(()=>{var P=Object.create;var k=Object.defineProperty;var z=Object.getOwnPropertyDescriptor;var D=Object.getOwnPropertyNames,R=Object.getOwnPropertySymbols,B=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty,L=Object.prototype.propertyIsEnumerable;var O=(i,e,n)=>e in i?k(i,e,{enumerable:!0,configurable:!0,writable:!0,value:n}):i[e]=n,I=(i,e)=>{for(var n in e||(e={}))E.call(e,n)&&O(i,n,e[n]);if(R)for(var n of R(e))L.call(e,n)&&O(i,n,e[n]);return i};var N=(i,e)=>()=>(e||i((e={exports:{}}).exports,e),e.exports);var F=(i,e,n,u)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of D(e))!E.call(i,r)&&r!==n&&k(i,r,{get:()=>e[r],enumerable:!(u=z(e,r))||u.enumerable});return i};var W=(i,e,n)=>(n=i!=null?P(B(i)):{},F(e||!i||!i.__esModule?k(n,"default",{value:i,enumerable:!0}):n,i));var j=N((K,w)=>{w.exports=function(i){var e={};function n(u){if(e[u])return e[u].exports;var r=e[u]={exports:{},id:u,loaded:!1};return i[u].call(r.exports,r,r.exports,n),r.loaded=!0,r.exports}return n.m=i,n.c=e,n.p="",n(0)}([function(i,e,n){i.exports=n(1)},function(i,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var u=n(2);Object.defineProperty(e,"combineChunks",{enumerable:!0,get:function(){return u.combineChunks}}),Object.defineProperty(e,"fillInChunks",{enumerable:!0,get:function(){return u.fillInChunks}}),Object.defineProperty(e,"findAll",{enumerable:!0,get:function(){return u.findAll}}),Object.defineProperty(e,"findChunks",{enumerable:!0,get:function(){return u.findChunks}})},function(i,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=e.findAll=function(t){var g=t.autoEscape,c=t.caseSensitive,f=c===void 0?!1:c,d=t.findChunks,o=d===void 0?r:d,h=t.sanitize,v=t.searchWords,T=t.textToHighlight;return l({chunksToHighlight:u({chunks:o({autoEscape:g,caseSensitive:f,sanitize:h,searchWords:v,textToHighlight:T})}),totalLength:T?T.length:0})},u=e.combineChunks=function(t){var g=t.chunks;return g=g.sort(function(c,f){return c.start-f.start}).reduce(function(c,f){if(c.length===0)return[f];var d=c.pop();if(f.start<=d.end){var o=Math.max(d.end,f.end);c.push({highlight:!1,start:d.start,end:o})}else c.push(d,f);return c},[]),g},r=function(t){var g=t.autoEscape,c=t.caseSensitive,f=t.sanitize,d=f===void 0?p:f,o=t.searchWords,h=t.textToHighlight;return h=d(h),o.filter(function(v){return v}).reduce(function(v,T){T=d(T),g&&(T=a(T));for(var m=new RegExp(T,c?"g":"gi"),y=void 0;y=m.exec(h);){var S=y.index,$=m.lastIndex;$>S&&v.push({highlight:!1,start:S,end:$}),y.index===m.lastIndex&&m.lastIndex++}return v},[])};e.findChunks=r;var l=e.fillInChunks=function(t){var g=t.chunksToHighlight,c=t.totalLength,f=[],d=function(v,T,m){T-v>0&&f.push({start:v,end:T,highlight:m})};if(g.length===0)d(0,c,!1);else{var o=0;g.forEach(function(h){d(o,h.start,!1),d(h.start,h.end,!0),o=h.end}),d(o,c,!1)}return f};function p(s){return s}function a(s){return s.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")}}])});var C=W(j()),H="tab";function M(i,e,n,u,r){let l=r!==void 0,p=u.reduce((a,s)=>(s.tocIndex===r&&(a[s.paraId]=(a[s.paraId]||"").concat(s.value)),a),[]).filter(Boolean);return Boolean(p.length)||l?{rawTitle:i,title:e,link:n,paragraphs:u.reduce((a,s)=>{var t,g;return s.tocIndex===r&&((g=a[t=s.paraId])!=null||(a[t]=""),a[s.paraId]+=s.value),a},[]).filter(Boolean)}:null}function x(i){return[i.title,i.subtitle].filter(Boolean).join(" ")}function _(i,e,n){let u=[],r=Object.values(e).reduce((l,p)=>{var a,s;return p.asset&&((s=l[a=p.routeId])!=null||(l[a]=[]),l[p.routeId].push(p)),l},{});return Object.values(i).forEach(l=>{var p;if("meta"in l&&!("isLayout"in l)){let a=l.meta,s=l.path.replace(/^([^/])/,"/$1")||"/",t=n.find(o=>s===o.link||s.startsWith(`${o.activePath}/`)),g=(r[l.id]||[]).map(o=>{var h;return(h=o.asset)==null?void 0:h.id}),c=M("",x(a.frontmatter),s,a.texts),f=a.toc.reduce((o,h,v)=>(!g.includes(h.id)&&h.depth>1&&o.push(M(h.title,`${x(a.frontmatter)} - ${h.title}`,`${s}#${h.id}`,a.texts,v)),o),[]),d=(a.tabs||[]).reduce((o,{key:h,meta:v})=>{let T=M("",`${x(a.frontmatter)} - ${v.frontmatter.title}`,`${s}?${H}=${h}`,v.texts);return T&&o.push(T),o.push(...v.toc.map((m,y)=>M(m.title,`${x(a.frontmatter)} - ${v.frontmatter.title} - ${m.title}`,`${s}?${H}=${h}#${m.id}`,v.texts,y))),o},[]);u.push({navTitle:t==null?void 0:t.title,navOrder:t?n.indexOf(t):1/0,title:x(a.frontmatter),link:s,sections:[...c?[c]:[],...f,...d],demos:((p=r[l.id])==null?void 0:p.map(o=>({link:`${s}#${o.asset.id}`,rawTitle:o.asset.title||"",title:o.asset.title||x(a.frontmatter),description:o.asset.description||"",keywords:o.asset.keywords||[]})))||[]})}}),u}function b(i="",e,n=1){let u=(0,C.findAll)({textToHighlight:i,searchWords:e,autoEscape:!0}),r={};return[u.map(({start:l,end:p,highlight:a},s)=>{let t={text:i.slice(l,p)};return s===0&&!a&&u.length>1&&t.text.length>20&&(t.text=`...${t.text.slice(-20)}`),a&&(t.highlighted=!0,r[e.find(g=>t.text.includes(g))]=n),t}),r]}function Y(i,e){let n=e.split(" "),u=new RegExp(e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(" ","|"),"gi"),r={};return i.forEach(l=>{var a,s;let p=[];if(l.sections.forEach(t=>{for(let g of t.paragraphs)if(u.test(g)){let[c,f]=b(t.title,n,10),[d,o]=b(g,n);p.push({type:"content",link:t.link,priority:Object.values(I(I({},o),f)).reduce((h,v)=>h+v,0),highlightTitleTexts:c,highlightTexts:d});return}if(u.test(t.rawTitle)){let[g,c]=b(t.title,n,10);p.push({type:"title",link:t.link,priority:Object.values(c).reduce((f,d)=>f+d,0),highlightTitleTexts:g,highlightTexts:b(t.paragraphs[0]||"",n)[0]})}}),l.demos.forEach(t=>{if(u.test(t.rawTitle)||u.test(t.description)){let[g,c]=b(t.title,n,10),[f,d]=b(t.description,n);p.push({type:"demo",link:t.link,priority:Object.values(I(I({},d),c)).reduce((o,h)=>o+h,0),highlightTitleTexts:g,highlightTexts:f})}}),u.test(l.title)){let[t,g]=b(l.title,n,100);p.push({type:"page",link:l.link,priority:Object.values(g).reduce((c,f)=>c+f,0),highlightTitleTexts:t,highlightTexts:b(((a=l.sections[0])==null?void 0:a.paragraphs[0])||"",n)[0]})}if(p.length){let t=l.navTitle||"$ROOT";(s=r[t])!=null||(r[t]={title:l.navTitle,priority:l.navOrder*1e3,hints:[]}),r[t].hints.push(...p)}}),Object.values(r).forEach(({hints:l})=>{l.sort((p,a)=>a.priority-p.priority)}),Object.values(r).sort((l,p)=>p.priority-l.priority)}var A;self.onmessage=({data:i})=>{switch(i.action){case"generate-metadata":A=_(i.args.routes,i.args.demos,i.args.nav);break;case"get-search-result":self.postMessage(Y(A,i.args.keywords));break;default:}};})();
+"use strict";(()=>{var P=Object.create;var I=Object.defineProperty;var z=Object.getOwnPropertyDescriptor;var D=Object.getOwnPropertyNames,R=Object.getOwnPropertySymbols,B=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty,L=Object.prototype.propertyIsEnumerable;var O=(e,t,i)=>t in e?I(e,t,{enumerable:!0,configurable:!0,writable:!0,value:i}):e[t]=i,M=(e,t)=>{for(var i in t||(t={}))E.call(t,i)&&O(e,i,t[i]);if(R)for(var i of R(t))L.call(t,i)&&O(e,i,t[i]);return e};var F=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var N=(e,t,i,h)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of D(t))!E.call(e,a)&&a!==i&&I(e,a,{get:()=>t[a],enumerable:!(h=z(t,a))||h.enumerable});return e};var W=(e,t,i)=>(i=e!=null?P(B(e)):{},N(t||!e||!e.__esModule?I(i,"default",{value:e,enumerable:!0}):i,e));var j=F((K,w)=>{w.exports=function(e){var t={};function i(h){if(t[h])return t[h].exports;var a=t[h]={exports:{},id:h,loaded:!1};return e[h].call(a.exports,a,a.exports,i),a.loaded=!0,a.exports}return i.m=e,i.c=t,i.p="",i(0)}([function(e,t,i){e.exports=i(1)},function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var h=i(2);Object.defineProperty(t,"combineChunks",{enumerable:!0,get:function(){return h.combineChunks}}),Object.defineProperty(t,"fillInChunks",{enumerable:!0,get:function(){return h.fillInChunks}}),Object.defineProperty(t,"findAll",{enumerable:!0,get:function(){return h.findAll}}),Object.defineProperty(t,"findChunks",{enumerable:!0,get:function(){return h.findChunks}})},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=t.findAll=function(s){var n=s.autoEscape,c=s.caseSensitive,f=c===void 0?!1:c,p=s.findChunks,u=p===void 0?a:p,g=s.sanitize,v=s.searchWords,T=s.textToHighlight;return o({chunksToHighlight:h({chunks:u({autoEscape:n,caseSensitive:f,sanitize:g,searchWords:v,textToHighlight:T})}),totalLength:T?T.length:0})},h=t.combineChunks=function(s){var n=s.chunks;return n=n.sort(function(c,f){return c.start-f.start}).reduce(function(c,f){if(c.length===0)return[f];var p=c.pop();if(f.start<=p.end){var u=Math.max(p.end,f.end);c.push({highlight:!1,start:p.start,end:u})}else c.push(p,f);return c},[]),n},a=function(s){var n=s.autoEscape,c=s.caseSensitive,f=s.sanitize,p=f===void 0?d:f,u=s.searchWords,g=s.textToHighlight;return g=p(g),u.filter(function(v){return v}).reduce(function(v,T){T=p(T),n&&(T=r(T));for(var m=new RegExp(T,c?"g":"gi"),x=void 0;x=m.exec(g);){var S=x.index,$=m.lastIndex;$>S&&v.push({highlight:!1,start:S,end:$}),x.index===m.lastIndex&&m.lastIndex++}return v},[])};t.findChunks=a;var o=t.fillInChunks=function(s){var n=s.chunksToHighlight,c=s.totalLength,f=[],p=function(v,T,m){T-v>0&&f.push({start:v,end:T,highlight:m})};if(n.length===0)p(0,c,!1);else{var u=0;n.forEach(function(g){p(u,g.start,!1),p(g.start,g.end,!0),u=g.end}),p(u,c,!1)}return f};function d(l){return l}function r(l){return l.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")}}])});var C=W(j());var H="tab";function k(e,t,i,h,a){let o=a!==void 0,d=h.reduce((r,l)=>(l.tocIndex===a&&(r[l.paraId]=(r[l.paraId]||"").concat(l.value)),r),[]).filter(Boolean);return Boolean(d.length)||o?{rawTitle:e,title:t,link:i,paragraphs:h.reduce((r,l)=>{var s,n;return l.tocIndex===a&&((n=r[s=l.paraId])!=null||(r[s]=""),r[l.paraId]+=l.value),r},[]).filter(Boolean)}:null}function y(e){return[e.title,e.subtitle].filter(Boolean).join(" ")}function _(e,t,i){let h=[],a=Object.values(t).reduce((o,d)=>{var r,l;return d.asset&&((l=o[r=d.routeId])!=null||(o[r]=[]),o[d.routeId].push(d)),o},{});return Object.values(e).forEach(o=>{var d;if("meta"in o&&!("isLayout"in o)){let r=o.meta,l=o.path.replace(/^([^/])/,"/$1")||"/",s=i.find(u=>l===u.link||l.startsWith(`${u.activePath}/`)),n=(a[o.id]||[]).map(u=>{var g;return(g=u.asset)==null?void 0:g.id}),c=k("",y(r.frontmatter),l,r.texts),f=r.toc.reduce((u,g,v)=>(!n.includes(g.id)&&g.depth>1&&u.push(k(g.title,`${y(r.frontmatter)} - ${g.title}`,`${l}#${g.id}`,r.texts,v)),u),[]),p=(r.tabs||[]).reduce((u,{key:g,meta:v})=>{let T=k("",`${y(r.frontmatter)} - ${v.frontmatter.title}`,`${l}?${H}=${g}`,v.texts);return T&&u.push(T),u.push(...v.toc.map((m,x)=>k(m.title,`${y(r.frontmatter)} - ${v.frontmatter.title} - ${m.title}`,`${l}?${H}=${g}#${m.id}`,v.texts,x))),u},[]);h.push({navTitle:s==null?void 0:s.title,navOrder:s?i.indexOf(s):1/0,title:y(r.frontmatter),link:l,sections:[...c?[c]:[],...f,...p],demos:((d=a[o.id])==null?void 0:d.map(u=>({link:`${l}#${u.asset.id}`,rawTitle:u.asset.title||"",title:u.asset.title||y(r.frontmatter),description:u.asset.description||"",keywords:u.asset.keywords||[]})))||[]})}}),h}function b(e="",t,i=1){let h=(0,C.findAll)({textToHighlight:e,searchWords:t,autoEscape:!0}),a={};return[h.map(({start:o,end:d,highlight:r},l)=>{let s={text:e.slice(o,d)};return l===0&&!r&&h.length>1&&s.text.length>20&&(s.text=`...${s.text.slice(-20)}`),r&&(s.highlighted=!0,a[t.find(n=>s.text.includes(n))]=i),s}),a]}function Y(e,t){let i=t.split(" "),h=new RegExp(t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(" ","|"),"i"),a={};return e.forEach(o=>{var l,s;let d=o.title,r=[];if(o.sections.forEach(n=>{for(let c of n.paragraphs)if(h.test(c)){let[f,p]=b(n.title,i,10),[u,g]=b(c,i);r.push({type:"content",link:n.link,priority:Object.values(M(M({},g),p)).reduce((v,T)=>v+T,0),highlightTitleTexts:f,highlightTexts:u,pageTitle:d});return}if(h.test(n.rawTitle)){let[c,f]=b(n.title,i,10);r.push({type:"title",link:n.link,priority:Object.values(f).reduce((p,u)=>p+u,0),highlightTitleTexts:c,highlightTexts:b(n.paragraphs[0]||"",i)[0],pageTitle:d})}}),o.demos.forEach(n=>{if(h.test(n.rawTitle)||h.test(n.description)){let[c,f]=b(n.title,i,10),[p,u]=b(n.description,i);r.push({type:"demo",link:n.link,priority:Object.values(M(M({},u),f)).reduce((g,v)=>g+v,0),highlightTitleTexts:c,highlightTexts:p,pageTitle:d})}}),h.test(o.title)){let[n,c]=b(o.title,i,100);r.push({type:"page",link:o.link,priority:Object.values(c).reduce((f,p)=>f+p,0),highlightTitleTexts:n,highlightTexts:b(((l=o.sections[0])==null?void 0:l.paragraphs[0])||"",i)[0],pageTitle:d})}if(r.length){let n=o.navTitle||"$ROOT";(s=a[n])!=null||(a[n]={title:o.navTitle,priority:o.navOrder*1e3,hints:[]}),a[n].hints.push(...r)}}),Object.values(a).forEach(({hints:o})=>{o.sort((d,r)=>r.priority-d.priority)}),Object.values(a).sort((o,d)=>d.priority-o.priority)}var A;self.onmessage=({data:e})=>{switch(e.action){case"generate-metadata":A=_(e.args.routes,e.args.demos,e.args.nav);break;case"get-search-result":self.postMessage(Y(A,e.args.keywords));break;default:}};})();

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,19 +129,9 @@ 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));
+          this.unresolvedFiles.push(import_path.default.join(this.watchArgs.options.cwd, 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/client/theme-api/DumiDemoGrid.js

@@ -59,10 +59,11 @@ export var DumiDemoGrid = function DumiDemoGrid(props) {
     };
 
     window.addEventListener('resize', handler);
+    handler();
     return function () {
       return window.removeEventListener('resize', handler);
     };
-  }, []);
+  }, [props.items, fm.demo]);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',

package/dist/client/theme-api/DumiPage.js

@@ -12,6 +12,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useRouteMeta, useSiteData } from 'dumi';
 import ContentTabs from 'dumi/theme/slots/ContentTabs';
+import nprogress from 'nprogress';
 import React, { useEffect, useState } from 'react';
 import { useTabQueryState } from "./useTabMeta";
 export var DumiPage = function DumiPage(props) {
@@ -39,6 +40,7 @@ export var DumiPage = function DumiPage(props) {
 
   useEffect(function () {
     setLoading(false);
+    nprogress.done();
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ContentTabs, {
     tabs: tabs,

package/dist/client/theme-api/types.d.ts

@@ -59,6 +59,7 @@ export interface IRouteMeta {
         nav?: string | {
             title?: string;
             order?: number;
+            parent?: Omit<IRouteMeta['frontmatter']['nav'], 'parent'>;
         };
         group?: string | {
             title?: string;
@@ -147,7 +148,7 @@ export declare type ILocale = (IBasicLocale & {
 export declare type ILocalesConfig = ILocale[];
 export interface INavItem {
     title: string;
-    link: string;
+    link?: string;
     order?: number;
     activePath?: string;
     [key: string]: any;
@@ -192,10 +193,12 @@ export interface IThemeConfig {
     nav?: IUserNavValue | NavWithMode<IUserNavValue>;
     sidebar?: Record<string, ISidebarGroup[]>;
     footer?: string | false;
+    showLineNum?: boolean;
     prefersColor: {
         default: 'light' | 'dark' | 'auto';
         switch: boolean;
     };
+    nprogress?: boolean;
     socialLinks: {
         [key in SocialTypes]: string;
     };

package/dist/client/theme-api/useNavData.js

@@ -18,13 +18,30 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 import { useFullSidebarData, useLocale, useSiteData } from 'dumi';
 import { useState } from 'react';
 import { getLocaleNav, pickRouteSortMeta, useLocaleDocRoutes, useRouteDataComparer } from "./utils";
+
+function genNavItem(meta, groups, activePath, link) {
+  return _objectSpread({
+    title: meta.title || groups[0].title || groups[0].children[0].title,
+    order: meta.order || 0,
+    activePath: activePath
+  }, link ? {
+    link: link
+  } : {});
+}
 /**
  * hook for get nav data
  */
 
+
 export var useNavData = function useNavData() {
   var locale = useLocale();
   var routes = useLocaleDocRoutes();
@@ -54,28 +71,73 @@ export var useNavData = function useNavData() {
     } // fallback to generate nav data from sidebar data
 
 
-    var data = Object.entries(sidebar).map(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-          link = _ref2[0],
-          groups = _ref2[1];
+    var data = Object.values(Object.entries(sidebar) // make sure shallow nav item before deep
+    .sort(function (_ref, _ref2) {
+      var _ref3 = _slicedToArray(_ref, 1),
+          a = _ref3[0];
+
+      var _ref4 = _slicedToArray(_ref2, 1),
+          b = _ref4[0];
+
+      return a.split('/').length - b.split('/').length;
+    }) // convert sidebar data to nav data
+    .reduce(function (ret, _ref5) {
+      var _ref6 = _slicedToArray(_ref5, 2),
+          link = _ref6[0],
+          groups = _ref6[1];
 
-      var meta = Object.values(routes).reduce(function (ret, route) {
+      var _ref7 = link.match(/^(\/[^/]+)([^]+)?$/),
+          _ref8 = _slicedToArray(_ref7, 3),
+          parentPath = _ref8[1],
+          restPath = _ref8[2];
+
+      var isNestedNav = Boolean(restPath);
+
+      var _Object$values$reduce = Object.values(routes).reduce(function (ret, route) {
         // find routes which within the nav path
         if (route.path.startsWith(link.slice(1))) {
-          pickRouteSortMeta(ret, 'nav', route.meta.frontmatter);
+          pickRouteSortMeta(ret[0], 'nav', route.meta.frontmatter); // generate parent meta for nested nav
+
+          if (isNestedNav) pickRouteSortMeta(ret[1], 'nav.parent', route.meta.frontmatter);
         }
 
         return ret;
-      }, {});
-      return {
-        title: meta.title || groups[0].title || groups[0].children[0].title,
-        order: meta.order || 0,
-        link: groups[0].children[0].link,
-        activePath: link
-      };
-    });
-    data.sort(sidebarDataComparer); // TODO: 2-level nav data
+      }, [{}, {}]),
+          _Object$values$reduce2 = _slicedToArray(_Object$values$reduce, 2),
+          rootMeta = _Object$values$reduce2[0],
+          parentMeta = _Object$values$reduce2[1];
+
+      if (isNestedNav) {
+        var _parentMeta$title, _ret$parentPath, _parent$children;
+
+        // fallback to use parent path as title
+        (_parentMeta$title = parentMeta.title) !== null && _parentMeta$title !== void 0 ? _parentMeta$title : parentMeta.title = parentPath.slice(1).replace(/^[a-z]/, function (s) {
+          return s.toUpperCase();
+        }); // handle nested nav item as parent children
+
+        var parent = (_ret$parentPath = ret[parentPath]) !== null && _ret$parentPath !== void 0 ? _ret$parentPath : ret[parentPath] = genNavItem(parentMeta, groups, parentPath);
+        (_parent$children = parent.children) !== null && _parent$children !== void 0 ? _parent$children : parent.children = [];
+        ret[parentPath].children.push(genNavItem(rootMeta, groups, link, groups[0].children[0].link));
+      } else {
+        // handle root nav item
+        ret[link] = genNavItem(rootMeta, groups, link, groups[0].children[0].link);
+      }
+
+      return ret;
+    }, {}));
+    data.forEach(function (item, i) {
+      var _item$children;
+
+      if (!item.link && ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) === 1) {
+        // hoist nav item if only one child
+        data[i] = item.children[0];
+      } else if (item.children) {
+        // sort nav item children by order or title
+        item.children.sort(sidebarDataComparer);
+      }
+    }); // sort nav items by order or title
 
+    data.sort(sidebarDataComparer);
     if (mode === 'prepend') data.unshift.apply(data, _toConsumableArray(userNavValue));else if (mode === 'append') data.push.apply(data, _toConsumableArray(userNavValue));
     return data;
   }),

package/dist/client/theme-api/useSidebarData.js

@@ -26,7 +26,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { useLocale, useLocation, useSiteData } from 'dumi';
+import { useLocale, useLocation, useRouteMeta, useSiteData } from 'dumi';
 import { useState } from 'react';
 import { pickRouteSortMeta, useLocaleDocRoutes, useRouteDataComparer } from "./utils";
 var DEFAULT_GROUP_STUB_TITLE = '$default-group-title';
@@ -34,6 +34,19 @@ var DEFAULT_GROUP_STUB_TITLE = '$default-group-title';
 var getLocaleClearPath = function getLocaleClearPath(routePath, locale) {
   return 'base' in locale ? routePath.replace(locale.base.slice(1), '').replace(/^\//, '') : routePath;
 };
+/**
+ * get parent path from route path
+ */
+
+
+function getRouteParentPath(path, isIndexRoute) {
+  var paths = path.split('/');
+  var sliceEnd = Math.min(Math.max( // increase 1 level if route file is index.md
+  isIndexRoute ? paths.length : paths.length - 1, // least 1-level
+  1), // up to 2-level
+  2);
+  return paths.slice(0, sliceEnd).join('/');
+}
 /**
  * hook for get sidebar data for all nav
  */
@@ -57,12 +70,18 @@ export var useFullSidebarData = function useFullSidebarData() {
         var _ret$parentPath, _ret$parentPath$title, _ret$parentPath$title2;
 
         // extract parent path from route path
-        // a => /a
-        // en-US/a => /en-US/a
-        // a/b => /a
-        // en-US/a/b => /en-US/a
+        // normal examples:
+        //   a => /a
+        //   en-US/a => /en-US/a
+        //   a/b => /a
+        //   en-US/a/b => /en-US/a
+        // convention 2-level navs examples:
+        //   a/b => /a/b (if route file is a/b/index.md)
+        //   a/b/c => /a/b
         var parentPath = "/".concat(route.path.replace(clearPath, function (s) {
-          return s.replace(/\/[^/]+$/, '');
+          var _frontmatter$filename;
+
+          return getRouteParentPath(s, (_frontmatter$filename = route.meta.frontmatter.filename) === null || _frontmatter$filename === void 0 ? void 0 : _frontmatter$filename.endsWith('index.md'));
         }));
 
         var _pickRouteSortMeta = pickRouteSortMeta({
@@ -220,6 +239,9 @@ export var useSidebarData = function useSidebarData() {
   var _useLocation = useLocation(),
       pathname = _useLocation.pathname;
 
+  var _useRouteMeta = useRouteMeta(),
+      frontmatter = _useRouteMeta.frontmatter;
+
   var clearPath = getLocaleClearPath(pathname.slice(1), locale); // extract parent path from location pathname
   // /a => /a
   // /a/b => /a
@@ -228,7 +250,9 @@ export var useSidebarData = function useSidebarData() {
   // /en-US/a/b/ => /en-US/a (also strip trailing /)
 
   var parentPath = clearPath ? pathname.replace(clearPath, function (s) {
-    return s.replace(/([^/]+)(\/[^/]+\/?)$/, '$1');
+    var _frontmatter$filename2;
+
+    return getRouteParentPath(s, (_frontmatter$filename2 = frontmatter.filename) === null || _frontmatter$filename2 === void 0 ? void 0 : _frontmatter$filename2.endsWith('index.md'));
   }) : pathname;
   return parentPath ? sidebar[parentPath] : [];
 };

package/dist/client/theme-api/useSiteSearch/index.d.ts

@@ -9,6 +9,7 @@ export interface ISearchNavResult {
         type: 'page' | 'title' | 'demo' | 'content';
         link: string;
         priority: number;
+        pageTitle: string;
         highlightTitleTexts: IHighlightText[];
         highlightTexts: IHighlightText[];
     }[];

package/dist/client/theme-api/utils.d.ts

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useLayoutEffect } from 'react';
 import type { ILocale, INav, INavItem, IRouteMeta, IRoutesById, IUserNavValue } from './types';
 export declare const useLocaleDocRoutes: () => IRoutesById;
 /**
@@ -7,7 +7,7 @@ export declare const useLocaleDocRoutes: () => IRoutesById;
  * @returns code string
  */
 export declare const genReactRenderCode: (version: string) => string;
-export declare const useIsomorphicLayoutEffect: typeof useEffect;
+export declare const useIsomorphicLayoutEffect: typeof useLayoutEffect;
 /**
  * common comparer for sidebar/nav items
  */
@@ -20,5 +20,5 @@ export declare const useRouteDataComparer: <T extends {
 /**
  * common util for pick meta to sort sidebar/nav items
  */
-export declare const pickRouteSortMeta: (original: Partial<Pick<INavItem, 'order' | 'title'>>, field: 'nav' | 'group', fm: IRouteMeta['frontmatter']) => Partial<Pick<INavItem, "title" | "order">>;
+export declare const pickRouteSortMeta: (original: Partial<Pick<INavItem, 'order' | 'title'>>, field: 'nav' | 'nav.parent' | 'group', fm: IRouteMeta['frontmatter']) => Partial<Pick<INavItem, "title" | "order">>;
 export declare function getLocaleNav(nav: IUserNavValue | INav, locale: ILocale): import("./types").IUserNavItems;

package/dist/client/theme-api/utils.js

@@ -83,7 +83,7 @@ export var useRouteDataComparer = function useRouteDataComparer() {
 export var pickRouteSortMeta = function pickRouteSortMeta(original, field, fm) {
   var _sub$order;
 
-  var sub = fm[field];
+  var sub = field === 'nav.parent' ? _typeof(fm.nav) === 'object' ? fm.nav.parent : {} : fm[field];
 
   switch (_typeof(sub)) {
     case 'object':

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/configPlugins/index.js

@@ -33,7 +33,8 @@ var configPlugins_default = (api) => {
     },
     themeConfig: {
       footer: `Copyright \xA9 ${new Date().getFullYear()} | Powered by <a href="https://d.umijs.org" target="_blank" rel="noreferrer">dumi</a>`,
-      prefersColor: { default: "light", switch: true }
+      prefersColor: { default: "light", switch: true },
+      nprogress: true
     }
   };
   const schemas = (0, import_schema.getSchemas)();

package/dist/features/configPlugins/schema.js

@@ -30,7 +30,6 @@ function getSchemas() {
     resolve: (Joi) => Joi.object({
       docDirs: Joi.array().items(Joi.alternatives(Joi.string(), Joi.object({ dir: Joi.string(), type: Joi.string().optional() }))).optional(),
       atomDirs: Joi.array().items(Joi.object({ type: Joi.string(), dir: Joi.string() })).optional(),
-      entityDirs: Joi.forbidden().error(new Error("`entityDirs` is already deprecated, please rename it to `atomDirs` in `.dumirc.ts`")),
       codeBlockMode: Joi.string().valid("active", "passive").optional(),
       entryFile: Joi.string().optional(),
       forceKebabCaseRouting: Joi.bool().optional()

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;