vitepress 1.0.2 → 1.1.1

package/dist/client/app/data.js

@@ -1,7 +1,7 @@
 import siteData from '@siteData';
 import { useDark } from '@vueuse/core';
-import { computed, inject, readonly, ref, shallowRef } from 'vue';
-import { APPEARANCE_KEY, createTitle, resolveSiteDataByRoute } from '../shared';
+import { computed, inject, readonly, ref, shallowRef, watch } from 'vue';
+import { APPEARANCE_KEY, createTitle, inBrowser, resolveSiteDataByRoute } from '../shared';
 export const dataSymbol = Symbol();
 // site data is a singleton
 export const siteDataRef = shallowRef((import.meta.env.PROD ? siteData : readonly(siteData)));
@@ -26,6 +26,15 @@ export function initData(route) {
                 ...(typeof appearance === 'object' ? appearance : {})
             })
             : ref(false);
+    const hashRef = ref(inBrowser ? location.hash : '');
+    if (inBrowser) {
+        window.addEventListener('hashchange', () => {
+            hashRef.value = location.hash;
+        });
+    }
+    watch(() => route.data, () => {
+        hashRef.value = inBrowser ? location.hash : '';
+    });
     return {
         site,
         theme: computed(() => site.value.themeConfig),
@@ -37,7 +46,8 @@ export function initData(route) {
         localeIndex: computed(() => site.value.localeIndex || 'root'),
         title: computed(() => createTitle(site.value, route.data)),
         description: computed(() => route.data.description || site.value.description),
-        isDark
+        isDark,
+        hash: computed(() => hashRef.value)
     };
 }
 export function useData() {

package/dist/client/app/router.js

@@ -21,16 +21,10 @@ export function createRouter(loadPageModule, fallbackComponent) {
         href = normalizeHref(href);
         if ((await router.onBeforeRouteChange?.(href)) === false)
             return;
-        if (inBrowser) {
-            const currentUrl = new URL(location.href);
-            if (href !== normalizeHref(currentUrl.href)) {
-                // save scroll position before changing url
-                history.replaceState({ scrollPosition: window.scrollY }, document.title);
-                history.pushState(null, '', href);
-                if (new URL(href, fakeHost).hash !== currentUrl.hash) {
-                    window.dispatchEvent(new Event('hashchange'));
-                }
-            }
+        if (inBrowser && href !== normalizeHref(location.href)) {
+            // save scroll position before changing url
+            history.replaceState({ scrollPosition: window.scrollY }, '');
+            history.pushState({}, '', href);
         }
         await loadPage(href);
         await router.onAfterRouteChanged?.(href);
@@ -67,7 +61,7 @@ export function createRouter(loadPageModule, fallbackComponent) {
                         if (actualPathname !== targetLoc.pathname) {
                             targetLoc.pathname = actualPathname;
                             href = actualPathname + targetLoc.search + targetLoc.hash;
-                            history.replaceState(null, '', href);
+                            history.replaceState({}, '', href);
                         }
                         if (targetLoc.hash && !scrollPosition) {
                             let target = null;
@@ -113,6 +107,9 @@ export function createRouter(loadPageModule, fallbackComponent) {
         }
     }
     if (inBrowser) {
+        if (history.state === null) {
+            history.replaceState({}, '');
+        }
         window.addEventListener('click', (e) => {
             // temporary fix for docsearch action buttons
             const button = e.target.closest('button');
@@ -141,9 +138,12 @@ export function createRouter(loadPageModule, fallbackComponent) {
                         // scroll between hash anchors in the same page
                         // avoid duplicate history entries when the hash is same
                         if (hash !== currentUrl.hash) {
-                            history.pushState(null, '', href);
+                            history.pushState({}, '', href);
                             // still emit the event so we can listen to it in themes
-                            window.dispatchEvent(new Event('hashchange'));
+                            window.dispatchEvent(new HashChangeEvent('hashchange', {
+                                oldURL: currentUrl.href,
+                                newURL: href
+                            }));
                         }
                         if (hash) {
                             // use smooth scroll when clicking on header anchor links
@@ -160,6 +160,9 @@ export function createRouter(loadPageModule, fallbackComponent) {
             }
         }, { capture: true });
         window.addEventListener('popstate', async (e) => {
+            if (e.state === null) {
+                return;
+            }
             await loadPage(normalizeHref(location.href), (e.state && e.state.scrollPosition) || 0);
             router.onAfterRouteChanged?.(location.href);
         });

package/dist/client/index.d.ts

@@ -64,6 +64,10 @@ interface VitePressData<T = any> {
     dir: Ref<string>;
     localeIndex: Ref<string>;
     isDark: Ref<boolean>;
+    /**
+     * Current location hash
+     */
+    hash: Ref<string>;
 }
 declare function useData<T = any>(): VitePressData<T>;
 

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

@@ -59,7 +59,7 @@ function scrollToTop() {
     ref="main"
   >
     <button @click="toggle" :class="{ open }" v-if="headers.length > 0">
-      {{ resolveTitle(theme) }}
+      <span class="menu-text">{{ resolveTitle(theme) }}</span>
       <span class="vpi-chevron-right icon" />
     </button>
     <button @click="scrollToTop" v-else>

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

@@ -1,9 +1,8 @@
 import { computed } from 'vue';
 import { ensureStartingSlash } from '../support/utils';
 import { useData } from './data';
-import { hashRef } from './hash';
 export function useLangs({ removeCurrent = true, correspondingLink = false } = {}) {
-    const { site, localeIndex, page, theme } = useData();
+    const { site, localeIndex, page, theme, hash } = useData();
     const currentLang = computed(() => ({
         label: site.value.locales[localeIndex.value]?.label,
         link: site.value.locales[localeIndex.value]?.link ||
@@ -13,7 +12,7 @@ export function useLangs({ removeCurrent = true, correspondingLink = false } = {
         ? []
         : {
             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) + hashRef.value
+            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
         }));
     return { localeLinks, currentLang };
 }

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

@@ -3,7 +3,6 @@ import { computed, onMounted, onUnmounted, ref, watch, watchEffect, watchPostEff
 import { isActive } from '../../shared';
 import { hasActiveLink as containsActiveLink, getSidebar, getSidebarGroups } from '../support/sidebar';
 import { useData } from './data';
-import { hashRef } from './hash';
 export function useSidebar() {
     const { frontmatter, page, theme } = useData();
     const is960 = useMediaQuery('(min-width: 960px)');
@@ -88,7 +87,7 @@ export function useCloseSidebarOnEscape(isOpen, close) {
     }
 }
 export function useSidebarControl(item) {
-    const { page } = useData();
+    const { page, hash } = useData();
     const collapsed = ref(false);
     const collapsible = computed(() => {
         return item.value.collapsed != null;
@@ -100,7 +99,7 @@ export function useSidebarControl(item) {
     const updateIsActiveLink = () => {
         isActiveLink.value = isActive(page.value.relativePath, item.value.link);
     };
-    watch([page, item, hashRef], updateIsActiveLink);
+    watch([page, item, hash], updateIsActiveLink);
     onMounted(updateIsActiveLink);
     const hasActiveLink = computed(() => {
         if (isActiveLink.value) {

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

@@ -7,153 +7,143 @@ html body {
 /* webfont-marker-end */
 
 @font-face {
-  font-family: 'Inter var';
-  font-weight: 100 900;
-  font-display: swap;
+  font-family: Inter;
   font-style: normal;
-  font-named-instance: 'Regular';
-  src: url('../fonts/inter-roman-cyrillic.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-@font-face {
-  font-family: 'Inter var';
   font-weight: 100 900;
   font-display: swap;
-  font-style: normal;
-  font-named-instance: 'Regular';
   src: url('../fonts/inter-roman-cyrillic-ext.woff2') format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  font-style: normal;
-  font-named-instance: 'Regular';
-  src: url('../fonts/inter-roman-greek.woff2') format('woff2');
-  unicode-range: U+0370-03FF;
+  src: url('../fonts/inter-roman-cyrillic.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  font-style: normal;
-  font-named-instance: 'Regular';
   src: url('../fonts/inter-roman-greek-ext.woff2') format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  font-style: normal;
-  font-named-instance: 'Regular';
-  src: url('../fonts/inter-roman-latin.woff2') format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
-    U+FEFF, U+FFFD;
+  src: url('../fonts/inter-roman-greek.woff2') format('woff2');
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1,
+    U+03A3-03FF;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  font-style: normal;
-  font-named-instance: 'Regular';
-  src: url('../fonts/inter-roman-latin-ext.woff2') format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
-    U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+  src: url('../fonts/inter-roman-vietnamese.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
+    U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
+    U+1EA0-1EF9, U+20AB;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  font-style: normal;
-  font-named-instance: 'Regular';
-  src: url('../fonts/inter-roman-vietnamese.woff2') format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
-    U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+  src: url('../fonts/inter-roman-latin-ext.woff2') format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  font-style: italic;
-  font-named-instance: 'Italic';
-  src: url('../fonts/inter-italic-cyrillic.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+  src: url('../fonts/inter-roman-latin.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: italic;
   font-weight: 100 900;
   font-display: swap;
-  font-style: italic;
-  font-named-instance: 'Italic';
   src: url('../fonts/inter-italic-cyrillic-ext.woff2') format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: italic;
   font-weight: 100 900;
   font-display: swap;
-  font-style: italic;
-  font-named-instance: 'Italic';
-  src: url('../fonts/inter-italic-greek.woff2') format('woff2');
-  unicode-range: U+0370-03FF;
+  src: url('../fonts/inter-italic-cyrillic.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: italic;
   font-weight: 100 900;
   font-display: swap;
-  font-style: italic;
-  font-named-instance: 'Italic';
   src: url('../fonts/inter-italic-greek-ext.woff2') format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: italic;
   font-weight: 100 900;
   font-display: swap;
-  font-style: italic;
-  font-named-instance: 'Italic';
-  src: url('../fonts/inter-italic-latin.woff2') format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
-    U+FEFF, U+FFFD;
+  src: url('../fonts/inter-italic-greek.woff2') format('woff2');
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1,
+    U+03A3-03FF;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: italic;
   font-weight: 100 900;
   font-display: swap;
+  src: url('../fonts/inter-italic-vietnamese.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
+    U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
+    U+1EA0-1EF9, U+20AB;
+}
+
+@font-face {
+  font-family: Inter;
   font-style: italic;
-  font-named-instance: 'Italic';
+  font-weight: 100 900;
+  font-display: swap;
   src: url('../fonts/inter-italic-latin-ext.woff2') format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
-    U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 
 @font-face {
-  font-family: 'Inter var';
+  font-family: Inter;
+  font-style: italic;
   font-weight: 100 900;
   font-display: swap;
-  font-style: italic;
-  font-named-instance: 'Italic';
-  src: url('../fonts/inter-italic-vietnamese.woff2') format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
-    U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+  src: url('../fonts/inter-italic-latin.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 /* Chinese quotes rendering fix. 中英文弯引号共享 Unicode 码位，确保引号使用中文字体渲染 */
@@ -163,3 +153,5 @@ html body {
     local('Source Han Sans SC');
   unicode-range: U+2018, U+2019, U+201C, U+201D; /* 分别是 ‘’“” */
 }
+
+/* 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,12 +261,13 @@
  * -------------------------------------------------------------------------- */
 
 :root {
-  --vp-font-family-base: 'Chinese Quotes', 'Inter var', 'Inter', ui-sans-serif,
-    system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
-    'Helvetica Neue', Helvetica, Arial, 'Noto Sans', sans-serif,
-    'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
-  --vp-font-family-mono: ui-monospace, SFMono-Regular, 'SF Mono', Menlo, Monaco,
-    Consolas, 'Liberation Mono', 'Courier New', monospace;
+  --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,
+    'Liberation Mono', 'Courier New', monospace;
+  font-optical-sizing: auto;
 }
 
 /**

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-CEVH7KNu.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-BOsNJwDZ.js';
 import { createLogger } from 'vite';
 import 'path';
 import 'url';