vitepress 2.0.0-alpha.3 → 2.0.0-alpha.4

package/dist/node/{chunk-BSCyYv44.js → chunk-BBDUp32J.js}

@@ -32,7 +32,7 @@ import require$$0$1 from 'tty';
 import require$$0$2 from 'constants';
 import require$$5 from 'assert';
 import { transformerNotationDiff, transformerNotationFocus, transformerNotationHighlight, transformerNotationErrorLevel, transformerCompactLineOptions } from '@shikijs/transformers';
-import { createHighlighter, guessEmbeddedLanguages } from 'shiki';
+import { createHighlighter, isSpecialLang, guessEmbeddedLanguages } from 'shiki';
 import MiniSearch from 'minisearch';
 
 const defaultIconDimensions = Object.freeze(
@@ -4569,9 +4569,10 @@ function findUpSync(name, {
 	let directory = path$1.resolve(toPath(cwd) ?? '');
 	const {root} = path$1.parse(directory);
 	stopAt = path$1.resolve(directory, toPath(stopAt) ?? root);
+	const isAbsoluteName = path$1.isAbsolute(name);
 
-	while (directory && directory !== stopAt && directory !== root) {
-		const filePath = path$1.isAbsolute(name) ? name : path$1.join(directory, name);
+	while (directory) {
+		const filePath = isAbsoluteName ? name : path$1.join(directory, name);
 
 		try {
 			const stats = fs__default.statSync(filePath, {throwIfNoEntry: false});
@@ -4580,6 +4581,10 @@ function findUpSync(name, {
 			}
 		} catch {}
 
+		if (directory === stopAt || directory === root) {
+			break;
+		}
+
 		directory = path$1.dirname(directory);
 	}
 }
@@ -17339,7 +17344,11 @@ let moduleGraph = new ModuleGraph();
 function defineRoutes(loader) {
   return loader;
 }
-async function resolvePages(srcDir, userConfig, logger) {
+async function resolvePages(srcDir, userConfig, logger, rebuildCache = false) {
+  if (rebuildCache) {
+    moduleGraph = new ModuleGraph();
+    routeModuleCache.clear();
+  }
   const allMarkdownFiles = (await glob(["**/*.md"], {
     cwd: srcDir,
     ignore: [
@@ -17412,10 +17421,16 @@ const dynamicRoutesPlugin = async (config) => {
         }
       }
       let watchedFileChanged = false;
-      for (const [, route] of routeModuleCache) {
+      for (const [file2, route] of routeModuleCache) {
         if (route.watch && picomatchExports.isMatch(normalizedFile, route.watch)) {
           route.routes = void 0;
           watchedFileChanged = true;
+          for (const id of moduleGraph.delete(file2)) {
+            const mod = this.environment.moduleGraph.getModuleById(id);
+            if (mod) {
+              modules.push(mod);
+            }
+          }
         }
       }
       if (modules.length && !normalizedFile.endsWith(".md") || watchedFileChanged || pathLoaderRE.test(normalizedFile)) {
@@ -17730,7 +17745,7 @@ async function resolveConfig(root = process.cwd(), command = "serve", mode = "de
     userConfig,
     sitemap: userConfig.sitemap,
     buildConcurrency: userConfig.buildConcurrency ?? 64,
-    ...await resolvePages(srcDir, userConfig, logger)
+    ...await resolvePages(srcDir, userConfig, logger, true)
   };
   global.VITEPRESS_CONFIG = config;
   return config;
@@ -23586,6 +23601,8 @@ const tocPlugin = (md, {
   );
 };
 
+var e=false,n={false:"push",true:"unshift",after:"push",before:"unshift"},t={isPermalinkSymbol:true};function r$1(r,a,i,l){var o;if(!e){var c="Using deprecated markdown-it-anchor permalink option, see https://github.com/valeriangalliat/markdown-it-anchor#permalinks";"object"==typeof process&&process&&process.emitWarning?process.emitWarning(c):console.warn(c),e=true;}var s=[Object.assign(new i.Token("link_open","a",1),{attrs:[].concat(a.permalinkClass?[["class",a.permalinkClass]]:[],[["href",a.permalinkHref(r,i)]],Object.entries(a.permalinkAttrs(r,i)))}),Object.assign(new i.Token("html_block","",0),{content:a.permalinkSymbol,meta:t}),new i.Token("link_close","a",-1)];a.permalinkSpace&&i.tokens[l+1].children[n[a.permalinkBefore]](Object.assign(new i.Token("text","",0),{content:" "})),(o=i.tokens[l+1].children)[n[a.permalinkBefore]].apply(o,s);}function a(e){return "#"+e}function i(e){return {}}var l={class:"header-anchor",symbol:"#",renderHref:a,renderAttrs:i};function o$1(e){function n(t){return t=Object.assign({},n.defaults,t),function(n,r,a,i){return e(n,t,r,a,i)}}return n.defaults=Object.assign({},l),n.renderPermalinkImpl=e,n}function c$1(e){var n=[],t=e.filter(function(e){if("class"!==e[0])return  true;n.push(e[1]);});return n.length>0&&t.unshift(["class",n.join(" ")]),t}var s=o$1(function(e,r,a,i,l){var o,s=[Object.assign(new i.Token("link_open","a",1),{attrs:c$1([].concat(r.class?[["class",r.class]]:[],[["href",r.renderHref(e,i)]],r.ariaHidden?[["aria-hidden","true"]]:[],Object.entries(r.renderAttrs(e,i))))}),Object.assign(new i.Token("html_inline","",0),{content:r.symbol,meta:t}),new i.Token("link_close","a",-1)];if(r.space){var u="string"==typeof r.space?r.space:" ";i.tokens[l+1].children[n[r.placement]](Object.assign(new i.Token("string"==typeof r.space?"html_inline":"text","",0),{content:u}));}(o=i.tokens[l+1].children)[n[r.placement]].apply(o,s);});Object.assign(s.defaults,{space:true,placement:"after",ariaHidden:false});var u$1=o$1(s.renderPermalinkImpl);u$1.defaults=Object.assign({},s.defaults,{ariaHidden:true});var d$2=o$1(function(e,n,t,r,a){var i=[Object.assign(new r.Token("link_open","a",1),{attrs:c$1([].concat(n.class?[["class",n.class]]:[],[["href",n.renderHref(e,r)]],Object.entries(n.renderAttrs(e,r))))})].concat(n.safariReaderFix?[new r.Token("span_open","span",1)]:[],r.tokens[a+1].children,n.safariReaderFix?[new r.Token("span_close","span",-1)]:[],[new r.Token("link_close","a",-1)]);r.tokens[a+1]=Object.assign(new r.Token("inline","",0),{children:i});});Object.assign(d$2.defaults,{safariReaderFix:false});var f=o$1(function(e,r,a,i,l){var o;if(!["visually-hidden","aria-label","aria-describedby","aria-labelledby"].includes(r.style))throw new Error("`permalink.linkAfterHeader` called with unknown style option `"+r.style+"`");if(!["aria-describedby","aria-labelledby"].includes(r.style)&&!r.assistiveText)throw new Error("`permalink.linkAfterHeader` called without the `assistiveText` option in `"+r.style+"` style");if("visually-hidden"===r.style&&!r.visuallyHiddenClass)throw new Error("`permalink.linkAfterHeader` called without the `visuallyHiddenClass` option in `visually-hidden` style");var s=i.tokens[l+1].children.filter(function(e){return "text"===e.type||"code_inline"===e.type}).reduce(function(e,n){return e+n.content},""),u=[],d=[];if(r.class&&d.push(["class",r.class]),d.push(["href",r.renderHref(e,i)]),d.push.apply(d,Object.entries(r.renderAttrs(e,i))),"visually-hidden"===r.style){if(u.push(Object.assign(new i.Token("span_open","span",1),{attrs:[["class",r.visuallyHiddenClass]]}),Object.assign(new i.Token("text","",0),{content:r.assistiveText(s)}),new i.Token("span_close","span",-1)),r.space){var f="string"==typeof r.space?r.space:" ";u[n[r.placement]](Object.assign(new i.Token("string"==typeof r.space?"html_inline":"text","",0),{content:f}));}u[n[r.placement]](Object.assign(new i.Token("span_open","span",1),{attrs:[["aria-hidden","true"]]}),Object.assign(new i.Token("html_inline","",0),{content:r.symbol,meta:t}),new i.Token("span_close","span",-1));}else u.push(Object.assign(new i.Token("html_inline","",0),{content:r.symbol,meta:t}));"aria-label"===r.style?d.push(["aria-label",r.assistiveText(s)]):["aria-describedby","aria-labelledby"].includes(r.style)&&d.push([r.style,e]);var p=[Object.assign(new i.Token("link_open","a",1),{attrs:c$1(d)})].concat(u,[new i.Token("link_close","a",-1)]);(o=i.tokens).splice.apply(o,[l+3,0].concat(p)),r.wrapper&&(i.tokens.splice(l,0,Object.assign(new i.Token("html_block","",0),{content:r.wrapper[0]+"\n"})),i.tokens.splice(l+3+p.length+1,0,Object.assign(new i.Token("html_block","",0),{content:r.wrapper[1]+"\n"})));});function p(e,n,t,r){var a=e,i=r;if(t&&Object.prototype.hasOwnProperty.call(n,a))throw new Error("User defined `id` attribute `"+e+"` is not unique. Please fix it in your Markdown to continue.");for(;Object.prototype.hasOwnProperty.call(n,a);)a=e+"-"+i,i+=1;return n[a]=true,a}function b(e,n){n=Object.assign({},b.defaults,n),e.core.ruler.push("anchor",function(e){for(var t,a={},i=e.tokens,l=Array.isArray(n.level)?(t=n.level,function(e){return t.includes(e)}):function(e){return function(n){return n>=e}}(n.level),o=0;o<i.length;o++){var c=i[o];if("heading_open"===c.type&&l(Number(c.tag.substr(1)))){var s=n.getTokensText(i[o+1].children),u=c.attrGet("id");u=null==u?p(u=n.slugifyWithState?n.slugifyWithState(s,e):n.slugify(s),a,false,n.uniqueSlugStartIndex):p(u,a,true,n.uniqueSlugStartIndex),c.attrSet("id",u),false!==n.tabIndex&&c.attrSet("tabindex",""+n.tabIndex),"function"==typeof n.permalink?n.permalink(u,n,e,o):(n.permalink||n.renderPermalink&&n.renderPermalink!==r$1)&&n.renderPermalink(u,n,e,o),o=i.indexOf(c),n.callback&&n.callback(c,{slug:u,title:s});}}});}Object.assign(f.defaults,{style:"visually-hidden",space:true,placement:"after",wrapper:null}),b.permalink={__proto__:null,legacy:r$1,renderHref:a,renderAttrs:i,makePermalink:o$1,linkInsideHeader:s,ariaHidden:u$1,headerLink:d$2,linkAfterHeader:f},b.defaults={level:1,slugify:function(e){return encodeURIComponent(String(e).trim().toLowerCase().replace(/\s+/g,"-"))},uniqueSlugStartIndex:1,tabIndex:"-1",getTokensText:function(e){return e.filter(function(e){return ["text","code_inline"].includes(e.type)}).map(function(e){return e.content}).join("")},permalink:false,renderPermalink:r$1,permalinkClass:u$1.defaults.class,permalinkSpace:u$1.defaults.space,permalinkSymbol:"¶",permalinkBefore:"before"===u$1.defaults.placement,permalinkHref:u$1.defaults.renderHref,permalinkAttrs:u$1.defaults.renderAttrs},b.default=b;
+
 /* eslint-disable no-bitwise */
 
 const decodeCache = {};
@@ -32014,7 +32031,7 @@ function escapeHtml(unsafe) {
 }
 function wrapHightlight(highlight, map) {
   if (!highlight)
-    return undefined;
+    return void 0;
   if (wrappedSet.has(highlight))
     return highlight;
   const wrapped = (str, lang, attrs) => {
@@ -32033,8 +32050,6 @@ function wrapHightlight(highlight, map) {
   return wrapped;
 }
 
-var e=false,n={false:"push",true:"unshift",after:"push",before:"unshift"},t={isPermalinkSymbol:true};function r$1(r,a,i,l){var o;if(!e){var c="Using deprecated markdown-it-anchor permalink option, see https://github.com/valeriangalliat/markdown-it-anchor#permalinks";"object"==typeof process&&process&&process.emitWarning?process.emitWarning(c):console.warn(c),e=true;}var s=[Object.assign(new i.Token("link_open","a",1),{attrs:[].concat(a.permalinkClass?[["class",a.permalinkClass]]:[],[["href",a.permalinkHref(r,i)]],Object.entries(a.permalinkAttrs(r,i)))}),Object.assign(new i.Token("html_block","",0),{content:a.permalinkSymbol,meta:t}),new i.Token("link_close","a",-1)];a.permalinkSpace&&i.tokens[l+1].children[n[a.permalinkBefore]](Object.assign(new i.Token("text","",0),{content:" "})),(o=i.tokens[l+1].children)[n[a.permalinkBefore]].apply(o,s);}function a(e){return "#"+e}function i(e){return {}}var l={class:"header-anchor",symbol:"#",renderHref:a,renderAttrs:i};function o$1(e){function n(t){return t=Object.assign({},n.defaults,t),function(n,r,a,i){return e(n,t,r,a,i)}}return n.defaults=Object.assign({},l),n.renderPermalinkImpl=e,n}function c$1(e){var n=[],t=e.filter(function(e){if("class"!==e[0])return  true;n.push(e[1]);});return n.length>0&&t.unshift(["class",n.join(" ")]),t}var s=o$1(function(e,r,a,i,l){var o,s=[Object.assign(new i.Token("link_open","a",1),{attrs:c$1([].concat(r.class?[["class",r.class]]:[],[["href",r.renderHref(e,i)]],r.ariaHidden?[["aria-hidden","true"]]:[],Object.entries(r.renderAttrs(e,i))))}),Object.assign(new i.Token("html_inline","",0),{content:r.symbol,meta:t}),new i.Token("link_close","a",-1)];if(r.space){var u="string"==typeof r.space?r.space:" ";i.tokens[l+1].children[n[r.placement]](Object.assign(new i.Token("string"==typeof r.space?"html_inline":"text","",0),{content:u}));}(o=i.tokens[l+1].children)[n[r.placement]].apply(o,s);});Object.assign(s.defaults,{space:true,placement:"after",ariaHidden:false});var u$1=o$1(s.renderPermalinkImpl);u$1.defaults=Object.assign({},s.defaults,{ariaHidden:true});var d$2=o$1(function(e,n,t,r,a){var i=[Object.assign(new r.Token("link_open","a",1),{attrs:c$1([].concat(n.class?[["class",n.class]]:[],[["href",n.renderHref(e,r)]],Object.entries(n.renderAttrs(e,r))))})].concat(n.safariReaderFix?[new r.Token("span_open","span",1)]:[],r.tokens[a+1].children,n.safariReaderFix?[new r.Token("span_close","span",-1)]:[],[new r.Token("link_close","a",-1)]);r.tokens[a+1]=Object.assign(new r.Token("inline","",0),{children:i});});Object.assign(d$2.defaults,{safariReaderFix:false});var f=o$1(function(e,r,a,i,l){var o;if(!["visually-hidden","aria-label","aria-describedby","aria-labelledby"].includes(r.style))throw new Error("`permalink.linkAfterHeader` called with unknown style option `"+r.style+"`");if(!["aria-describedby","aria-labelledby"].includes(r.style)&&!r.assistiveText)throw new Error("`permalink.linkAfterHeader` called without the `assistiveText` option in `"+r.style+"` style");if("visually-hidden"===r.style&&!r.visuallyHiddenClass)throw new Error("`permalink.linkAfterHeader` called without the `visuallyHiddenClass` option in `visually-hidden` style");var s=i.tokens[l+1].children.filter(function(e){return "text"===e.type||"code_inline"===e.type}).reduce(function(e,n){return e+n.content},""),u=[],d=[];if(r.class&&d.push(["class",r.class]),d.push(["href",r.renderHref(e,i)]),d.push.apply(d,Object.entries(r.renderAttrs(e,i))),"visually-hidden"===r.style){if(u.push(Object.assign(new i.Token("span_open","span",1),{attrs:[["class",r.visuallyHiddenClass]]}),Object.assign(new i.Token("text","",0),{content:r.assistiveText(s)}),new i.Token("span_close","span",-1)),r.space){var f="string"==typeof r.space?r.space:" ";u[n[r.placement]](Object.assign(new i.Token("string"==typeof r.space?"html_inline":"text","",0),{content:f}));}u[n[r.placement]](Object.assign(new i.Token("span_open","span",1),{attrs:[["aria-hidden","true"]]}),Object.assign(new i.Token("html_inline","",0),{content:r.symbol,meta:t}),new i.Token("span_close","span",-1));}else u.push(Object.assign(new i.Token("html_inline","",0),{content:r.symbol,meta:t}));"aria-label"===r.style?d.push(["aria-label",r.assistiveText(s)]):["aria-describedby","aria-labelledby"].includes(r.style)&&d.push([r.style,e]);var p=[Object.assign(new i.Token("link_open","a",1),{attrs:c$1(d)})].concat(u,[new i.Token("link_close","a",-1)]);(o=i.tokens).splice.apply(o,[l+3,0].concat(p)),r.wrapper&&(i.tokens.splice(l,0,Object.assign(new i.Token("html_block","",0),{content:r.wrapper[0]+"\n"})),i.tokens.splice(l+3+p.length+1,0,Object.assign(new i.Token("html_block","",0),{content:r.wrapper[1]+"\n"})));});function p(e,n,t,r){var a=e,i=r;if(t&&Object.prototype.hasOwnProperty.call(n,a))throw new Error("User defined `id` attribute `"+e+"` is not unique. Please fix it in your Markdown to continue.");for(;Object.prototype.hasOwnProperty.call(n,a);)a=e+"-"+i,i+=1;return n[a]=true,a}function b(e,n){n=Object.assign({},b.defaults,n),e.core.ruler.push("anchor",function(e){for(var t,a={},i=e.tokens,l=Array.isArray(n.level)?(t=n.level,function(e){return t.includes(e)}):function(e){return function(n){return n>=e}}(n.level),o=0;o<i.length;o++){var c=i[o];if("heading_open"===c.type&&l(Number(c.tag.substr(1)))){var s=n.getTokensText(i[o+1].children),u=c.attrGet("id");u=null==u?p(u=n.slugifyWithState?n.slugifyWithState(s,e):n.slugify(s),a,false,n.uniqueSlugStartIndex):p(u,a,true,n.uniqueSlugStartIndex),c.attrSet("id",u),false!==n.tabIndex&&c.attrSet("tabindex",""+n.tabIndex),"function"==typeof n.permalink?n.permalink(u,n,e,o):(n.permalink||n.renderPermalink&&n.renderPermalink!==r$1)&&n.renderPermalink(u,n,e,o),o=i.indexOf(c),n.callback&&n.callback(c,{slug:u,title:s});}}});}Object.assign(f.defaults,{style:"visually-hidden",space:true,placement:"after",wrapper:null}),b.permalink={__proto__:null,legacy:r$1,renderHref:a,renderAttrs:i,makePermalink:o$1,linkInsideHeader:s,ariaHidden:u$1,headerLink:d$2,linkAfterHeader:f},b.defaults={level:1,slugify:function(e){return encodeURIComponent(String(e).trim().toLowerCase().replace(/\s+/g,"-"))},uniqueSlugStartIndex:1,tabIndex:"-1",getTokensText:function(e){return e.filter(function(e){return ["text","code_inline"].includes(e.type)}).map(function(e){return e.content}).join("")},permalink:false,renderPermalink:r$1,permalinkClass:u$1.defaults.class,permalinkSpace:u$1.defaults.space,permalinkSymbol:"¶",permalinkBefore:"before"===u$1.defaults.placement,permalinkHref:u$1.defaults.renderHref,permalinkAttrs:u$1.defaults.renderAttrs},b.default=b;
-
 var utils$1 = {};
 
 /**
@@ -35440,16 +35455,17 @@ function createContainer(klass, defaultTitle, md) {
     {
       render(tokens, idx, _options, env) {
         const token = tokens[idx];
-        const info = token.info.trim().slice(klass.length).trim();
-        const attrs = md.renderer.renderAttrs(token);
         if (token.nesting === 1) {
+          token.attrJoin("class", `${klass} custom-block`);
+          const attrs = md.renderer.renderAttrs(token);
+          const info = token.info.trim().slice(klass.length).trim();
           const title = md.renderInline(info || defaultTitle, {
             references: env.references
           });
           if (klass === "details")
-            return `<details class="${klass} custom-block"${attrs}><summary>${title}</summary>
+            return `<details ${attrs}><summary>${title}</summary>
 `;
-          return `<div class="${klass} custom-block"${attrs}><p class="custom-block-title">${title}</p>
+          return `<div ${attrs}><p class="custom-block-title">${title}</p>
 `;
         } else return klass === "details" ? `</details>
 ` : `</div>
@@ -35643,7 +35659,9 @@ async function highlight(theme, options, logger = console) {
       const vPre = vueRE.test(lang) ? "" : "v-pre";
       lang = lang.replace(lineNoStartRE, "").replace(lineNoRE, "").replace(vueRE, "").toLowerCase() || defaultLang;
       try {
-        await highlighter.loadLanguage(lang);
+        if (!isSpecialLang(lang) && !highlighter.getLoadedLanguages().includes(lang)) {
+          await highlighter.loadLanguage(lang);
+        }
       } catch {
         logger.warn(
           c$2.yellow(
@@ -35907,40 +35925,61 @@ function dedent(text) {
   }
   return text;
 }
-function testLine(line, regexp, regionName, end = false) {
-  const [full, tag, name] = regexp.exec(line.trim()) || [];
-  return full && tag && name === regionName && tag.match(end ? /^[Ee]nd ?[rR]egion$/ : /^[rR]egion$/);
-}
+const markers = [
+  {
+    start: /^\s*\/\/\s*#?region\b\s*(.*?)\s*$/,
+    end: /^\s*\/\/\s*#?endregion\b\s*(.*?)\s*$/
+  },
+  {
+    start: /^\s*<!--\s*#?region\b\s*(.*?)\s*-->/,
+    end: /^\s*<!--\s*#?endregion\b\s*(.*?)\s*-->/
+  },
+  {
+    start: /^\s*\/\*\s*#region\b\s*(.*?)\s*\*\//,
+    end: /^\s*\/\*\s*#endregion\b\s*(.*?)\s*\*\//
+  },
+  {
+    start: /^\s*#[rR]egion\b\s*(.*?)\s*$/,
+    end: /^\s*#[eE]nd ?[rR]egion\b\s*(.*?)\s*$/
+  },
+  {
+    start: /^\s*#\s*#?region\b\s*(.*?)\s*$/,
+    end: /^\s*#\s*#?endregion\b\s*(.*?)\s*$/
+  },
+  {
+    start: /^\s*(?:--|::|@?REM)\s*#region\b\s*(.*?)\s*$/,
+    end: /^\s*(?:--|::|@?REM)\s*#endregion\b\s*(.*?)\s*$/
+  },
+  {
+    start: /^\s*#pragma\s+region\b\s*(.*?)\s*$/,
+    end: /^\s*#pragma\s+endregion\b\s*(.*?)\s*$/
+  },
+  {
+    start: /^\s*\(\*\s*#region\b\s*(.*?)\s*\*\)/,
+    end: /^\s*\(\*\s*#endregion\b\s*(.*?)\s*\*\)/
+  }
+];
 function findRegion(lines, regionName) {
-  const regionRegexps = [
-    /^\/\/ ?#?((?:end)?region) ([\w*-]+)$/,
-    // javascript, typescript, java
-    /^\/\* ?#((?:end)?region) ([\w*-]+) ?\*\/$/,
-    // css, less, scss
-    /^#pragma ((?:end)?region) ([\w*-]+)$/,
-    // C, C++
-    /^<!-- #?((?:end)?region) ([\w*-]+) -->$/,
-    // HTML, markdown
-    /^#((?:End )Region) ([\w*-]+)$/,
-    // Visual Basic
-    /^::#((?:end)region) ([\w*-]+)$/,
-    // Bat
-    /^# ?((?:end)?region) ([\w*-]+)$/
-    // C#, PHP, Powershell, Python, perl & misc
-  ];
-  let regexp = null;
-  let start = -1;
-  for (const [lineId, line] of lines.entries()) {
-    if (regexp === null) {
-      for (const reg of regionRegexps) {
-        if (testLine(line, reg, regionName)) {
-          start = lineId + 1;
-          regexp = reg;
-          break;
-        }
+  let chosen = null;
+  for (let i = 0; i < lines.length; i++) {
+    for (const re of markers) {
+      if (re.start.exec(lines[i])?.[1] === regionName) {
+        chosen = { re, start: i + 1 };
+        break;
       }
-    } else if (testLine(line, regexp, regionName, true)) {
-      return { start, end: lineId, regexp };
+    }
+    if (chosen) break;
+  }
+  if (!chosen) return null;
+  let counter = 1;
+  for (let i = chosen.start; i < lines.length; i++) {
+    if (chosen.re.start.exec(lines[i])?.[1] === regionName) {
+      counter++;
+      continue;
+    }
+    const endRegion = chosen.re.end.exec(lines[i])?.[1];
+    if (endRegion === regionName || endRegion === "") {
+      if (--counter === 0) return { ...chosen, end: i };
     }
   }
   return null;
@@ -35995,7 +36034,7 @@ const snippetPlugin = (md, srcDir) => {
       const region = findRegion(lines, regionName);
       if (region) {
         content = dedent(
-          lines.slice(region.start, region.end).filter((line) => !region.regexp.test(line.trim())).join("\n")
+          lines.slice(region.start, region.end).filter((l) => !(region.re.start.test(l) || region.re.end.test(l))).join("\n")
         );
       }
     }
@@ -36032,8 +36071,11 @@ async function createMarkdownRenderer(srcDir, options = {}, base = "/", logger =
     { target: "_blank", rel: "noreferrer", ...options.externalLinks },
     base
   ).use(lineNumberPlugin, options.lineNumbers);
+  const tableOpen = md.renderer.rules.table_open;
   md.renderer.rules.table_open = function(tokens, idx, options2, env, self) {
-    return '<table tabindex="0">\n';
+    const token = tokens[idx];
+    if (token.attrIndex("tabindex") < 0) token.attrPush(["tabindex", "0"]);
+    return tableOpen ? tableOpen(tokens, idx, options2, env, self) : self.renderToken(tokens, idx, options2);
   };
   if (options.gfmAlerts !== false) {
     md.use(gitHubAlertsPlugin);
@@ -36047,20 +36089,25 @@ async function createMarkdownRenderer(srcDir, options = {}, base = "/", logger =
     getTokensText: (tokens) => {
       return tokens.filter((t) => !["html_inline", "emoji"].includes(t.type)).map((t) => t.content).join("");
     },
-    permalink: b.permalink.linkInsideHeader({
-      symbol: "&ZeroWidthSpace;",
-      renderAttrs: (slug, state) => {
-        const idx = state.tokens.findIndex((token) => {
-          const attrs = token.attrs;
-          const id = attrs?.find((attr) => attr[0] === "id");
-          return id && slug === id[1];
-        });
-        const title = state.tokens[idx + 1].content;
-        return {
-          "aria-label": `Permalink to "${title}"`
-        };
-      }
-    }),
+    permalink: (slug, _, state, idx) => {
+      const title = state.tokens[idx + 1]?.children?.filter((token) => ["text", "code_inline"].includes(token.type)).reduce((acc, t) => acc + t.content, "").trim() || "";
+      const linkTokens = [
+        Object.assign(new state.Token("text", "", 0), { content: " " }),
+        Object.assign(new state.Token("link_open", "a", 1), {
+          attrs: [
+            ["class", "header-anchor"],
+            ["href", `#${slug}`],
+            ["aria-label", `Permalink to \u201C${title}\u201D`]
+          ]
+        }),
+        Object.assign(new state.Token("html_inline", "", 0), {
+          content: "&#8203;",
+          meta: { isPermalinkSymbol: true }
+        }),
+        new state.Token("link_close", "a", -1)
+      ];
+      state.tokens[idx + 1].children?.push(...linkTokens);
+    },
     ...options.anchor
   }).use(frontmatterPlugin, {
     ...options.frontmatter
@@ -36849,9 +36896,9 @@ function getGitTimestamp(file) {
   });
 }
 
-function processIncludes(srcDir, src, file, includes) {
+function processIncludes(md, srcDir, src, file, includes, cleanUrls) {
   const includesRE = /<!--\s*@include:\s*(.*?)\s*-->/g;
-  const regionRE = /(#[\w-]+)/;
+  const regionRE = /(#[^\s\{]+)/;
   const rangeRE = /\{(\d*),(\d*)\}$/;
   return src.replace(includesRE, (m, m1) => {
     if (!m1.length) return m;
@@ -36869,22 +36916,50 @@ function processIncludes(srcDir, src, file, includes) {
       if (region) {
         const [regionName] = region;
         const lines = content.split(/\r?\n/);
-        const regionLines = findRegion(lines, regionName.slice(1));
-        content = lines.slice(regionLines?.start, regionLines?.end).join("\n");
+        let { start, end } = findRegion(lines, regionName.slice(1)) ?? {};
+        if (start === void 0) {
+          const tokens = md.parse(content, {
+            path: includePath,
+            relativePath: slash(path$1.relative(srcDir, includePath)),
+            cleanUrls
+          }).filter((t) => t.type === "heading_open" && t.map);
+          const idx = tokens.findIndex(
+            (t) => t.attrGet("id") === regionName.slice(1)
+          );
+          const token = tokens[idx];
+          if (token) {
+            start = token.map[1];
+            const level = parseInt(token.tag.slice(1));
+            for (let i = idx + 1; i < tokens.length; i++) {
+              if (parseInt(tokens[i].tag.slice(1)) <= level) {
+                end = tokens[i].map[0];
+                break;
+              }
+            }
+          }
+        }
+        content = lines.slice(start, end).join("\n");
       }
       if (range) {
         const [, startLine, endLine] = range;
         const lines = content.split(/\r?\n/);
         content = lines.slice(
-          startLine ? parseInt(startLine, 10) - 1 : void 0,
-          endLine ? parseInt(endLine, 10) : void 0
+          startLine ? parseInt(startLine) - 1 : void 0,
+          endLine ? parseInt(endLine) : void 0
         ).join("\n");
       }
       if (!hasMeta && path$1.extname(includePath) === ".md") {
         content = matter(content).content;
       }
       includes.push(slash(includePath));
-      return processIncludes(srcDir, content, includePath, includes);
+      return processIncludes(
+        md,
+        srcDir,
+        content,
+        includePath,
+        includes,
+        cleanUrls
+      );
     } catch (error) {
       if (process.env.DEBUG) {
         process.stderr.write(c$2.yellow(`
@@ -36974,7 +37049,7 @@ async function createMarkdownToVueRenderFn(srcDir, options = {}, isBuild = false
       }
     );
     let includes = [];
-    src = processIncludes(srcDir, src, fileOrig, includes);
+    src = processIncludes(md, srcDir, src, fileOrig, includes, cleanUrls);
     const localeIndex = getLocaleForPath(siteConfig?.site, relativePath);
     const env = {
       path: file,
@@ -40763,7 +40838,7 @@ async function localSearchPlugin(siteConfig) {
     const relativePath = slash(path$1.relative(srcDir, file));
     const env = { path: file, relativePath, cleanUrls };
     const md_raw = await fs.promises.readFile(file, "utf-8");
-    const md_src = processIncludes(srcDir, md_raw, file, []);
+    const md_src = processIncludes(md, srcDir, md_raw, file, [], cleanUrls);
     if (options._render) {
       return await options._render(md_src, env, md);
     } else {
@@ -41020,7 +41095,7 @@ const staticDataPlugin = {
       const loader = idToLoaderModulesMap[id];
       if (loader && loader.watch && picomatchExports.isMatch(normalizedFile, loader.watch)) {
         const mod = this.environment.moduleGraph.getModuleById(id);
-        if (mod && !modules.includes(mod)) {
+        if (mod) {
           modules.push(mod);
         }
       }
@@ -41131,8 +41206,9 @@ async function createVitePressPlugin(siteConfig, ssr = false, pageToHashMap, cli
           include: [
             "vue",
             "vitepress > @vue/devtools-api",
-            "vitepress > @vueuse/core"
-          ],
+            "vitepress > @vueuse/core",
+            siteConfig.themeDir === DEFAULT_THEME_PATH ? "@theme/index" : void 0
+          ].filter((d) => d != null),
           exclude: ["@docsearch/js", "vitepress"]
         },
         server: {
@@ -45537,7 +45613,7 @@ async function generateSitemap(siteConfig) {
   });
 }
 
-var version = "2.0.0-alpha.3";
+var version = "2.0.0-alpha.4";
 
 async function renderPage(render, config, page, result, appChunk, cssChunk, assets, pageToHashMap, metadataScript, additionalHeadTags, usedIcons) {
   const routePath = `/${page.replace(/\.md$/, "")}`;

package/dist/node/cli.js

@@ -1,4 +1,4 @@
-import { u as getDefaultExportFromCjs, v as c, w as clearCache, o as disposeMdItInstance, n as init, b as build, q as serve, t as createServer, x as version } from './chunk-BSCyYv44.js';
+import { u as getDefaultExportFromCjs, v as c, w as clearCache, o as disposeMdItInstance, n as init, b as build, q as serve, t as createServer, x as version } from './chunk-BBDUp32J.js';
 import { createLogger } from 'vite';
 import 'node:path';
 import '@shikijs/transformers';

package/dist/node/index.d.ts

@@ -2105,15 +2105,15 @@ type ThemeOptions = ThemeRegistrationAny | BuiltinTheme | {
     light: ThemeRegistrationAny | BuiltinTheme;
     dark: ThemeRegistrationAny | BuiltinTheme;
 };
-interface MarkdownOptions extends Options$2 {
+interface MarkdownOptions extends MarkdownItAsyncOptions {
     /**
      * Setup markdown-it instance before applying plugins
      */
-    preConfig?: (md: MarkdownItAsync) => Awaited<void>;
+    preConfig?: (md: MarkdownItAsync) => Awaitable<void>;
     /**
      * Setup markdown-it instance
      */
-    config?: (md: MarkdownItAsync) => Awaited<void>;
+    config?: (md: MarkdownItAsync) => Awaitable<void>;
     /**
      * Disable cache (experimental)
      */
@@ -2277,7 +2277,7 @@ interface RouteModule {
  * Helper for defining routes with type inference
  */
 declare function defineRoutes(loader: RouteModule): RouteModule;
-declare function resolvePages(srcDir: string, userConfig: UserConfig, logger: Logger): Promise<Pick<SiteConfig, 'pages' | 'dynamicRoutes' | 'rewrites'>>;
+declare function resolvePages(srcDir: string, userConfig: UserConfig, logger: Logger, rebuildCache?: boolean): Promise<Pick<SiteConfig, 'pages' | 'dynamicRoutes' | 'rewrites'>>;
 
 type RawConfigExports<ThemeConfig = any> = Awaitable<UserConfig<ThemeConfig>> | (() => Awaitable<UserConfig<ThemeConfig>>);
 interface TransformContext {

package/dist/node/index.js

@@ -1,7 +1,7 @@
 import { normalizePath } from 'vite';
 export { loadEnv } from 'vite';
-import { g as glob, c as createMarkdownRenderer, f as fs, m as matter, p as postcssPrefixSelector } from './chunk-BSCyYv44.js';
-export { S as ScaffoldThemeType, b as build, t as createServer, e as defineConfig, h as defineConfigWithTheme, d as defineLoader, a as defineRoutes, o as disposeMdItInstance, n as init, j as mergeConfig, r as resolveConfig, l as resolvePages, k as resolveSiteData, i as resolveUserConfig, s as scaffold, q as serve } from './chunk-BSCyYv44.js';
+import { g as glob, c as createMarkdownRenderer, f as fs, m as matter, p as postcssPrefixSelector } from './chunk-BBDUp32J.js';
+export { S as ScaffoldThemeType, b as build, t as createServer, e as defineConfig, h as defineConfigWithTheme, d as defineLoader, a as defineRoutes, o as disposeMdItInstance, n as init, j as mergeConfig, r as resolveConfig, l as resolvePages, k as resolveSiteData, i as resolveUserConfig, s as scaffold, q as serve } from './chunk-BBDUp32J.js';
 import path from 'node:path';
 import 'node:crypto';
 import 'node:module';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "description": "Vite & Vue powered static site generator",
   "keywords": [
     "vite",
@@ -59,20 +59,20 @@
   "dependencies": {
     "@docsearch/css": "^3.9.0",
     "@docsearch/js": "^3.9.0",
-    "@iconify-json/simple-icons": "^1.2.26",
-    "@shikijs/core": "^3.0.0",
-    "@shikijs/transformers": "^3.0.0",
-    "@shikijs/types": "^3.0.0",
+    "@iconify-json/simple-icons": "^1.2.27",
+    "@shikijs/core": "^3.1.0",
+    "@shikijs/transformers": "^3.1.0",
+    "@shikijs/types": "^3.1.0",
     "@vitejs/plugin-vue": "^5.2.1",
     "@vue/devtools-api": "^7.7.2",
     "@vue/shared": "^3.5.13",
-    "@vueuse/core": "^12.7.0",
-    "@vueuse/integrations": "^12.7.0",
+    "@vueuse/core": "^12.8.2",
+    "@vueuse/integrations": "^12.8.2",
     "focus-trap": "^7.6.4",
     "mark.js": "8.11.1",
     "minisearch": "^7.1.2",
-    "shiki": "^3.0.0",
-    "vite": "^6.1.1",
+    "shiki": "^3.1.0",
+    "vite": "^6.2.1",
     "vue": "^3.5.13"
   },
   "devDependencies": {
@@ -87,7 +87,7 @@
     "@mdit-vue/shared": "^2.1.3",
     "@polka/compression": "^1.0.0-next.28",
     "@rollup/plugin-alias": "^5.1.1",
-    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-replace": "^6.0.2",
@@ -101,7 +101,7 @@
     "@types/markdown-it-container": "^2.0.10",
     "@types/markdown-it-emoji": "^3.0.1",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^22.13.5",
+    "@types/node": "^22.13.9",
     "@types/picomatch": "^3.0.2",
     "@types/postcss-prefix-selector": "^1.16.3",
     "@types/prompts": "^2.4.9",
@@ -119,37 +119,37 @@
     "lru-cache": "^11.0.2",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^9.2.0",
-    "markdown-it-async": "^2.0.0",
+    "markdown-it-async": "^2.2.0",
     "markdown-it-attrs": "^4.3.1",
     "markdown-it-container": "^4.0.0",
     "markdown-it-emoji": "^3.0.0",
     "markdown-it-mathjax3": "^4.3.2",
     "minimist": "^1.2.8",
-    "nanoid": "^5.1.2",
+    "nanoid": "^5.1.3",
     "ora": "^8.2.0",
     "p-map": "^7.0.3",
     "path-to-regexp": "^6.3.0",
     "picocolors": "^1.1.1",
     "picomatch": "^4.0.2",
     "pkg-dir": "^8.0.0",
-    "playwright-chromium": "^1.50.1",
+    "playwright-chromium": "^1.51.0",
     "polka": "^1.0.0-next.28",
     "postcss-prefix-selector": "^2.1.0",
-    "prettier": "^3.5.2",
+    "prettier": "^3.5.3",
     "prompts": "^2.4.2",
     "punycode": "^2.3.1",
     "rimraf": "^6.0.1",
-    "rollup": "^4.34.8",
+    "rollup": "^4.34.9",
     "rollup-plugin-dts": "^6.1.1",
-    "rollup-plugin-esbuild": "^6.2.0",
+    "rollup-plugin-esbuild": "^6.2.1",
     "semver": "^7.7.1",
     "simple-git-hooks": "^2.11.1",
     "sirv": "^3.0.1",
     "sitemap": "^8.0.0",
     "tinyglobby": "^0.2.12",
-    "typescript": "^5.7.3",
-    "vitest": "^3.0.7",
-    "vue-tsc": "2.2.0",
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.8",
+    "vue-tsc": "^2.2.8",
     "wait-on": "^8.0.2"
   },
   "peerDependencies": {