vitepress 2.0.0-alpha.5 → 2.0.0-alpha.7

package/dist/client/app/composables/copyCode.js

@@ -1,4 +1,6 @@
 import { inBrowser } from 'vitepress';
+const shellRE = /language-(shellscript|shell|bash|sh|zsh)/;
+const ignoredNodes = ['.vp-copy-ignore', '.diff.remove'].join(', ');
 export function useCopyCode() {
     if (inBrowser) {
         const timeoutIdMap = new WeakMap();
@@ -6,17 +8,17 @@ export function useCopyCode() {
             const el = e.target;
             if (el.matches('div[class*="language-"] > button.copy')) {
                 const parent = el.parentElement;
-                const sibling = el.nextElementSibling?.nextElementSibling;
+                const sibling = el.nextElementSibling?.nextElementSibling; // <pre> tag
                 if (!parent || !sibling) {
                     return;
                 }
-                const isShell = /language-(shellscript|shell|bash|sh|zsh)/.test(parent.className);
-                const ignoredNodes = ['.vp-copy-ignore', '.diff.remove'];
+                const isShell = shellRE.test(parent.className);
                 // Clone the node and remove the ignored nodes
                 const clone = sibling.cloneNode(true);
-                clone
-                    .querySelectorAll(ignoredNodes.join(','))
-                    .forEach((node) => node.remove());
+                clone.querySelectorAll(ignoredNodes).forEach((node) => node.remove());
+                // remove extra newlines left after removing ignored nodes (affecting textContent because it is inside `<pre>`)
+                // doesn't affect the newlines already in the code because they are rendered as `\n<span class="line"></span>`
+                clone.innerHTML = clone.innerHTML.replace(/\n+/g, '\n');
                 let text = clone.textContent || '';
                 if (isShell) {
                     text = text.replace(/^ *(\$|>) /gm, '').trim();

package/dist/client/app/router.js

@@ -222,7 +222,7 @@ function normalizeHref(href) {
     }
     return url.pathname + url.search + url.hash;
 }
-async function changeRoute(href, { smoothScroll = false, initialLoad = false } = {}) {
+async function changeRoute(href, { smoothScroll = false, initialLoad = false, replace = false } = {}) {
     const loc = normalizeHref(location.href);
     const nextUrl = new URL(href, location.origin);
     const currentUrl = new URL(loc, location.origin);
@@ -233,9 +233,14 @@ async function changeRoute(href, { smoothScroll = false, initialLoad = false } =
         }
     }
     else {
-        // save scroll position before changing URL
-        history.replaceState({ scrollPosition: window.scrollY }, '');
-        history.pushState({}, '', href);
+        if (replace) {
+            history.replaceState({}, '', href);
+        }
+        else {
+            // save scroll position before changing URL
+            history.replaceState({ scrollPosition: window.scrollY }, '');
+            history.pushState({}, '', href);
+        }
         if (nextUrl.pathname === currentUrl.pathname) {
             // scroll between hash anchors on the same page, avoid duplicate entries
             if (nextUrl.hash !== currentUrl.hash) {

package/dist/client/index.d.ts

@@ -27,6 +27,7 @@ interface Router {
     go: (to: string, options?: {
         initialLoad?: boolean;
         smoothScroll?: boolean;
+        replace?: boolean;
     }) => Promise<void>;
     /**
      * Called before the route changes. Return `false` to cancel the navigation.

package/dist/client/shared.js

@@ -171,7 +171,7 @@ function resolveAdditionalConfig({ additionalConfig }, path) {
     if (additionalConfig === undefined)
         return [];
     if (typeof additionalConfig === 'function')
-        return additionalConfig(path);
+        return additionalConfig(path) ?? [];
     const configs = [];
     const segments = path.split('/').slice(0, -1); // remove file name
     while (segments.length) {

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

@@ -663,6 +663,10 @@ function onMouseMove(e: MouseEvent) {
   width: 100%;
 }
 
+.search-input::-webkit-search-cancel-button {
+  display: none;
+}
+
 @media (max-width: 767px) {
   .search-input {
     padding: 6px 4px;

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

@@ -53,7 +53,7 @@ onMounted(() => {
 
   const handleSearchHotKey = (event: KeyboardEvent) => {
     if (
-      (event.key.toLowerCase() === 'k' && (event.metaKey || event.ctrlKey)) ||
+      (event.key?.toLowerCase() === 'k' && (event.metaKey || event.ctrlKey)) ||
       (!isEditingContent(event) && event.key === '/')
     ) {
       event.preventDefault()

package/dist/client/theme-default/styles/components/vp-doc.css

@@ -317,6 +317,8 @@
   padding: 20px 0;
   background: transparent;
   overflow-x: auto;
+  /*rtl:ignore*/
+  text-align: left;
 }
 
 .vp-doc [class*='language-'] code {