vitepress 1.1.3 → 1.2.0

package/dist/client/app/index.js

@@ -108,8 +108,21 @@ function newRouter() {
             if (isInitialPageLoad || initialPath === pageFilePath) {
                 pageFilePath = pageFilePath.replace(/\.js$/, '.lean.js');
             }
-            if (import.meta.env.SSR) {
-                pageModule = import(/*@vite-ignore*/ pageFilePath + '?t=' + Date.now());
+            if (import.meta.env.DEV) {
+                pageModule = import(/*@vite-ignore*/ pageFilePath).catch(() => {
+                    // try with/without trailing slash
+                    // in prod this is handled in src/client/app/utils.ts#pathToFile
+                    const url = new URL(pageFilePath, 'http://a.com');
+                    const path = (url.pathname.endsWith('/index.md')
+                        ? url.pathname.slice(0, -9) + '.md'
+                        : url.pathname.slice(0, -3) + '/index.md') +
+                        url.search +
+                        url.hash;
+                    return import(/*@vite-ignore*/ path);
+                });
+            }
+            else if (import.meta.env.SSR) {
+                pageModule = import(/*@vite-ignore*/ `${pageFilePath}?t=${Date.now()}`);
             }
             else {
                 pageModule = import(/*@vite-ignore*/ pageFilePath);

package/dist/client/app/router.js

@@ -102,7 +102,13 @@ export function createRouter(loadPageModule, fallbackComponent) {
                 latestPendingPath = null;
                 route.path = inBrowser ? pendingPath : withBase(pendingPath);
                 route.component = fallbackComponent ? markRaw(fallbackComponent) : null;
-                route.data = notFoundPageData;
+                const relativePath = inBrowser
+                    ? pendingPath
+                        .replace(/(^|\/)$/, '$1index')
+                        .replace(/(\.html)?$/, '.md')
+                        .replace(/^\//, '')
+                    : '404.md';
+                route.data = { ...notFoundPageData, relativePath };
             }
         }
     }

package/dist/client/shared.js

@@ -5,7 +5,7 @@ const HASH_OR_QUERY_RE = /[?#].*$/;
 const INDEX_OR_EXT_RE = /(?:(^|\/)index)?\.(?:md|html)$/;
 export const inBrowser = typeof document !== 'undefined';
 export const notFoundPageData = {
-    relativePath: '',
+    relativePath: '404.md',
     filePath: '',
     title: '404',
     description: 'Not Found',
@@ -39,13 +39,16 @@ function normalize(path) {
 export function isExternal(path) {
     return EXTERNAL_URL_RE.test(path);
 }
+export function getLocaleForPath(siteData, relativePath) {
+    return (Object.keys(siteData?.locales || {}).find((key) => key !== 'root' &&
+        !isExternal(key) &&
+        isActive(relativePath, `/${key}/`, true)) || 'root');
+}
 /**
  * this merges the locales data to the main data by the route
  */
 export function resolveSiteDataByRoute(siteData, relativePath) {
-    const localeIndex = Object.keys(siteData.locales).find((key) => key !== 'root' &&
-        !isExternal(key) &&
-        isActive(relativePath, `/${key}/`, true)) || 'root';
+    const localeIndex = getLocaleForPath(siteData, relativePath);
     return Object.assign({}, siteData, {
         localeIndex,
         lang: siteData.locales[localeIndex]?.lang ?? siteData.lang,

package/dist/client/theme-default/NotFound.vue

@@ -1,23 +1,10 @@
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
 import { withBase } from 'vitepress'
 import { useData } from './composables/data'
 import { useLangs } from './composables/langs'
 
-const { site, theme } = useData()
-const { localeLinks } = useLangs({ removeCurrent: false })
-
-const root = ref('/')
-onMounted(() => {
-  const path = window.location.pathname
-    .replace(site.value.base, '')
-    .replace(/(^.*?\/).*$/, '/$1')
-  if (localeLinks.value.length) {
-    root.value =
-      localeLinks.value.find(({ link }) => link.startsWith(path))?.link ||
-      localeLinks.value[0].link
-  }
-})
+const { theme } = useData()
+const { currentLang } = useLangs()
 </script>
 
 <template>
@@ -35,7 +22,7 @@ onMounted(() => {
     <div class="action">
       <a
         class="link"
-        :href="withBase(root)"
+        :href="withBase(currentLang.link)"
         :aria-label="theme.notFound?.linkLabel ?? 'go to home'"
       >
         {{ theme.notFound?.linkText ?? 'Take me home' }}

package/dist/client/theme-default/components/VPDocAsideOutline.vue

@@ -25,7 +25,8 @@ useActiveAnchor(container, marker)
 </script>
 
 <template>
-  <div
+  <nav
+    aria-labelledby="doc-outline-aria-label"
     class="VPDocAsideOutline"
     :class="{ 'has-outline': headers.length > 0 }"
     ref="container"
@@ -34,16 +35,18 @@ useActiveAnchor(container, marker)
     <div class="content">
       <div class="outline-marker" ref="marker" />
 
-      <div class="outline-title" role="heading" aria-level="2">{{ resolveTitle(theme) }}</div>
+      <div
+        aria-level="2"
+        class="outline-title"
+        id="doc-outline-aria-label"
+        role="heading"
+      >
+        {{ resolveTitle(theme) }}
+      </div>
 
-      <nav aria-labelledby="doc-outline-aria-label">
-        <span class="visually-hidden" id="doc-outline-aria-label">
-          Table of Contents for current page
-        </span>
-        <VPDocOutlineItem :headers="headers" :root="true" />
-      </nav>
+      <VPDocOutlineItem :headers="headers" :root="true" />
     </div>
-  </div>
+  </nav>
 </template>
 
 <style scoped>

package/dist/client/theme-default/components/VPDocFooter.vue

@@ -39,7 +39,13 @@ const showFooter = computed(() => {
       </div>
     </div>
 
-    <nav v-if="control.prev?.link || control.next?.link" class="prev-next">
+    <nav
+      v-if="control.prev?.link || control.next?.link"
+      class="prev-next"
+      aria-labelledby="doc-footer-aria-label"
+    >
+      <span class="visually-hidden" id="doc-footer-aria-label">Pager</span>
+
       <div class="pager">
         <VPLink v-if="control.prev?.link" class="pager-link prev" :href="control.prev.link">
           <span class="desc" v-html="theme.docFooter?.prev || 'Previous page'"></span>

package/dist/client/theme-default/components/VPHomeContent.vue

@@ -1,7 +1,10 @@
 <script setup lang="ts">
 import { useWindowSize } from '@vueuse/core'
 
-const { width: vw } = useWindowSize({ includeScrollbar: false })
+const { width: vw } = useWindowSize({
+  initialWidth: 0,
+  includeScrollbar: false
+})
 </script>
 
 <template>
@@ -46,7 +49,7 @@ const { width: vw } = useWindowSize({ includeScrollbar: false })
 }
 
 .vp-doc :deep(.VPHomeSponsors a),
-.vp-doc :deep(.VPTeamPage a){
+.vp-doc :deep(.VPTeamPage a) {
   text-decoration: none;
 }
 </style>

package/dist/client/theme-default/components/VPLink.vue

@@ -12,7 +12,11 @@ const props = defineProps<{
 }>()
 
 const tag = computed(() => props.tag ?? (props.href ? 'a' : 'span'))
-const isExternal = computed(() => props.href && EXTERNAL_URL_RE.test(props.href))
+const isExternal = computed(
+  () =>
+    (props.href && EXTERNAL_URL_RE.test(props.href)) ||
+    props.target === '_blank'
+)
 </script>
 
 <template>

package/dist/client/theme-default/components/VPLocalNavOutlineDropdown.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { onClickOutside, onKeyStroke } from '@vueuse/core'
+import { onKeyStroke } from '@vueuse/core'
 import { onContentUpdated } from 'vitepress'
-import { nextTick, ref } from 'vue'
+import { nextTick, ref, watch } from 'vue'
 import { useData } from '../composables/data'
 import { resolveTitle, type MenuItem } from '../composables/outline'
 import VPDocOutlineItem from './VPDocOutlineItem.vue'
@@ -17,8 +17,18 @@ const vh = ref(0)
 const main = ref<HTMLDivElement>()
 const items = ref<HTMLDivElement>()
 
-onClickOutside(main, () => {
-  open.value = false
+function closeOnClickOutside(e: Event) {
+  if (!main.value?.contains(e.target as Node)) {
+    open.value = false
+  }
+}
+
+watch(open, (value) => {
+  if (value) {
+    document.addEventListener('click', closeOnClickOutside)
+    return
+  }
+  document.removeEventListener('click', closeOnClickOutside)
 })
 
 onKeyStroke('Escape', () => {

package/dist/client/theme-default/components/VPLocalSearchBox.vue

@@ -291,11 +291,7 @@ watch(results, (r) => {
 function scrollToSelectedResult() {
   nextTick(() => {
     const selectedEl = document.querySelector('.result.selected')
-    if (selectedEl) {
-      selectedEl.scrollIntoView({
-        block: 'nearest'
-      })
-    }
+    selectedEl?.scrollIntoView({ block: 'nearest' })
   })
 }
 

package/dist/client/theme-default/components/VPNavBarSearchButton.vue

@@ -71,6 +71,11 @@ const translate = createSearchTranslate(defaultTranslations)
   outline: 5px auto -webkit-focus-ring-color;
 }
 
+.DocSearch-Button-Key--pressed {
+  transform: none;
+  box-shadow: none;
+}
+
 .DocSearch-Button:focus:not(:focus-visible) {
   outline: none !important;
 }

package/dist/client/theme-default/composables/langs.js

@@ -1,14 +1,14 @@
 import { computed } from 'vue';
 import { ensureStartingSlash } from '../support/utils';
 import { useData } from './data';
-export function useLangs({ removeCurrent = true, correspondingLink = false } = {}) {
+export function useLangs({ correspondingLink = false } = {}) {
     const { site, localeIndex, page, theme, hash } = useData();
     const currentLang = computed(() => ({
         label: site.value.locales[localeIndex.value]?.label,
         link: site.value.locales[localeIndex.value]?.link ||
             (localeIndex.value === 'root' ? '/' : `/${localeIndex.value}/`)
     }));
-    const localeLinks = computed(() => Object.entries(site.value.locales).flatMap(([key, value]) => removeCurrent && currentLang.value.label === value.label
+    const localeLinks = computed(() => Object.entries(site.value.locales).flatMap(([key, value]) => currentLang.value.label === value.label
         ? []
         : {
             text: value.label,

package/dist/client/theme-default/styles/fonts.css

@@ -146,12 +146,40 @@ html body {
     U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
-/* Chinese quotes rendering fix. 中英文弯引号共享 Unicode 码位，确保引号使用中文字体渲染 */
 @font-face {
-  font-family: 'Chinese Quotes';
-  src: local('PingFang SC Regular'), local('PingFang SC'), local('SimHei'),
-    local('Source Han Sans SC');
-  unicode-range: U+2018, U+2019, U+201C, U+201D; /* 分别是 ‘’“” */
+  font-family: 'Punctuation SC';
+  font-weight: 400;
+  src: local('PingFang SC Regular'), local('Noto Sans CJK SC'),
+    local('Microsoft YaHei');
+  unicode-range: U+201C, U+201D, U+2018, U+2019, U+2E3A, U+2014, U+2013, U+2026,
+    U+00B7, U+007E, U+002F;
+}
+
+@font-face {
+  font-family: 'Punctuation SC';
+  font-weight: 500;
+  src: local('PingFang SC Medium'), local('Noto Sans CJK SC'),
+    local('Microsoft YaHei');
+  unicode-range: U+201C, U+201D, U+2018, U+2019, U+2E3A, U+2014, U+2013, U+2026,
+    U+00B7, U+007E, U+002F;
+}
+
+@font-face {
+  font-family: 'Punctuation SC';
+  font-weight: 600;
+  src: local('PingFang SC Semibold'), local('Noto Sans CJK SC Bold'),
+    local('Microsoft YaHei Bold');
+  unicode-range: U+201C, U+201D, U+2018, U+2019, U+2E3A, U+2014, U+2013, U+2026,
+    U+00B7, U+007E, U+002F;
+}
+
+@font-face {
+  font-family: 'Punctuation SC';
+  font-weight: 700;
+  src: local('PingFang SC Semibold'), local('Noto Sans CJK SC Bold'),
+    local('Microsoft YaHei Bold');
+  unicode-range: U+201C, U+201D, U+2018, U+2019, U+2E3A, U+2014, U+2013, U+2026,
+    U+00B7, U+007E, U+002F;
 }
 
 /* Generate the subsetted fonts using: `pyftsubset <file>.woff2 --unicodes="<range>" --output-file="inter-<style>-<subset>.woff2" --flavor=woff2` */

package/dist/client/theme-default/styles/vars.css

@@ -261,15 +261,20 @@
  * -------------------------------------------------------------------------- */
 
 :root {
-  --vp-font-family-base: 'Chinese Quotes', Inter, ui-sans-serif, system-ui,
-    sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
-    'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
-    'Noto Color Emoji';
-  --vp-font-family-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
+  --vp-font-family-base: 'Inter', ui-sans-serif, system-ui, sans-serif,
+    'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+  --vp-font-family-mono: ui-monospace, 'Menlo', 'Monaco', 'Consolas',
     'Liberation Mono', 'Courier New', monospace;
   font-optical-sizing: auto;
 }
 
+:root:where(:lang(zh)) {
+  --vp-font-family-base: 'Punctuation SC', 'Inter', ui-sans-serif, system-ui,
+    'PingFang SC', 'Noto Sans CJK SC', 'Noto Sans SC', 'Heiti SC',
+    'Microsoft YaHei', 'DengXian', sans-serif, 'Apple Color Emoji',
+    'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+}
+
 /**
  * Shadows
  * -------------------------------------------------------------------------- */

package/dist/node/cli.js

@@ -1,6 +1,8 @@
-import { a as getDefaultExportFromCjs, q as c, t as clearCache, n as init, b as build, o as serve, v as version, p as createServer } from './serve-DrVGLhCg.js';
+import { a as getDefaultExportFromCjs, q as c, t as clearCache, n as init, b as build, o as serve, v as version, p as createServer } from './serve-DF70M2uf.js';
 import { createLogger } from 'vite';
 import 'path';
+import 'shiki';
+import '@shikijs/transformers';
 import 'url';
 import 'crypto';
 import 'module';
@@ -10,16 +12,19 @@ import 'node:fs/promises';
 import 'node:url';
 import 'node:fs';
 import 'fs';
-import 'fs/promises';
-import 'events';
-import 'stream';
-import 'string_decoder';
+import 'node:events';
+import 'node:stream';
+import 'node:string_decoder';
 import 'util';
 import 'os';
 import 'assert';
+import 'events';
+import 'stream';
 import 'readline';
 import 'child_process';
+import 'string_decoder';
 import 'zlib';
+import '@vue/shared';
 import 'node:readline';
 import 'node:tty';
 import 'http';
@@ -27,8 +32,6 @@ import 'querystring';
 import 'tty';
 import 'constants';
 import 'node:crypto';
-import 'shiki';
-import '@shikijs/transformers';
 import 'minisearch';
 
 function hasKey(obj, keys) {
@@ -308,8 +311,7 @@ function bindShortcuts(server, createDevServer) {
       await server.close().finally(() => process.exit(1));
       return;
     }
-    if (actionRunning)
-      return;
+    if (actionRunning) return;
     if (input === "h") {
       server.config.logger.info(
         [
@@ -322,8 +324,7 @@ function bindShortcuts(server, createDevServer) {
       );
     }
     const shortcut = SHORTCUTS.find((shortcut2) => shortcut2.key === input);
-    if (!shortcut)
-      return;
+    if (!shortcut) return;
     actionRunning = true;
     await shortcut.action(server, createDevServer);
     actionRunning = false;
@@ -394,6 +395,7 @@ const root = argv._[command ? 1 : 0];
 if (root) {
   argv.root = root;
 }
+let restartPromise;
 if (!command || command === "dev") {
   if (argv.force) {
     delete argv.force;
@@ -401,8 +403,15 @@ if (!command || command === "dev") {
   }
   const createDevServer = async () => {
     const server = await createServer(root, argv, async () => {
-      await server.close();
-      await createDevServer();
+      if (!restartPromise) {
+        restartPromise = (async () => {
+          await server.close();
+          await createDevServer();
+        })().finally(() => {
+          restartPromise = void 0;
+        });
+      }
+      return restartPromise;
     });
     await server.listen();
     logVersion(server.config.logger);
@@ -412,6 +421,7 @@ if (!command || command === "dev") {
   createDevServer().catch((err) => {
     createLogger().error(
       `${c.red(`failed to start server. error:`)}
+${err.message}
 ${err.stack}`
     );
     process.exit(1);
@@ -423,14 +433,18 @@ ${err.stack}`
   logVersion();
   if (command === "build") {
     build(root, argv).catch((err) => {
-      createLogger().error(`${c.red(`build error:`)}
-${err.stack}`);
+      createLogger().error(
+        `${c.red(`build error:`)}
+${err.message}
+${err.stack}`
+      );
       process.exit(1);
     });
   } else if (command === "serve" || command === "preview") {
     serve(argv).catch((err) => {
       createLogger().error(
         `${c.red(`failed to start server. error:`)}
+${err.message}
 ${err.stack}`
       );
       process.exit(1);