vitepress 1.1.4 → 1.2.1

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,55 +1,31 @@
 <script setup lang="ts">
-import { computed, onMounted, ref } from 'vue'
 import { withBase } from 'vitepress'
 import { useData } from './composables/data'
 import { useLangs } from './composables/langs'
 
-const { site } = useData()
-const { localeLinks } = useLangs({ removeCurrent: false })
-
-const locale = ref({
-  link: '/',
-  index: 'root'
-})
-
-onMounted(() => {
-  const path = window.location.pathname
-    .replace(site.value.base, '')
-    .replace(/(^.*?\/).*$/, '/$1')
-  if (localeLinks.value.length) {
-    locale.value =
-      localeLinks.value.find(({ link }) => link.startsWith(path)) ||
-      localeLinks.value[0]
-  }
-})
-
-const notFound = computed(() => ({
-  code: 404,
-  title: 'PAGE NOT FOUND',
-  quote:
-    "But if you don't change your direction, and if you keep looking, you may end up where you are heading.",
-  linkLabel: 'go to home',
-  linkText: 'Take me home',
-  ...(locale.value.index === 'root'
-    ? site.value.themeConfig?.notFound
-    : site.value.locales?.[locale.value.index]?.themeConfig?.notFound)
-}))
+const { theme } = useData()
+const { currentLang } = useLangs()
 </script>
 
 <template>
   <div class="NotFound">
-    <p class="code">{{ notFound.code }}</p>
-    <h1 class="title">{{ notFound.title }}</h1>
+    <p class="code">{{ theme.notFound?.code ?? '404' }}</p>
+    <h1 class="title">{{ theme.notFound?.title ?? 'PAGE NOT FOUND' }}</h1>
     <div class="divider" />
-    <blockquote class="quote">{{ notFound.quote }}</blockquote>
+    <blockquote class="quote">
+      {{
+        theme.notFound?.quote ??
+        "But if you don't change your direction, and if you keep looking, you may end up where you are heading."
+      }}
+    </blockquote>
 
     <div class="action">
       <a
         class="link"
-        :href="withBase(locale.link)"
-        :aria-label="notFound.linkLabel"
+        :href="withBase(currentLang.link)"
+        :aria-label="theme.notFound?.linkLabel ?? 'go to home'"
       >
-        {{ notFound.linkText }}
+        {{ theme.notFound?.linkText ?? 'Take me home' }}
       </a>
     </div>
   </div>

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

@@ -30,7 +30,6 @@ useActiveAnchor(container, marker)
     class="VPDocAsideOutline"
     :class="{ 'has-outline': headers.length > 0 }"
     ref="container"
-    role="navigation"
   >
     <div class="content">
       <div class="outline-marker" ref="marker" />

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/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/composables/langs.js

@@ -1,18 +1,16 @@
 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(() => ({
-        index: localeIndex.value,
         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
         ? []
         : {
-            index: key,
             text: value.label,
             link: normalizeLink(value.link || (key === 'root' ? '/' : `/${key}/`), theme.value.i18nRouting !== false && correspondingLink, page.value.relativePath.slice(currentLang.value.link.length - 1), !site.value.cleanUrls) + hash.value
         }));

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

@@ -268,11 +268,11 @@
   font-optical-sizing: auto;
 }
 
-:root:lang(zh) {
+: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', 'DengXian',
-    'Microsoft YaHei', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-    'Segoe UI Symbol', 'Noto Color Emoji';
+    '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';
 }
 
 /**

package/dist/node/cli.js

@@ -1,4 +1,4 @@
-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-CXVdC751.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-DGS-XFVh.js';
 import { createLogger } from 'vite';
 import 'path';
 import 'shiki';
@@ -12,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';
@@ -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;
@@ -420,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);
@@ -431,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);