From 3e8fc40c3621da1ef35645d376dab7765b35bb40 Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Wed, 9 Oct 2024 10:41:20 -0700
Subject: [PATCH 1/7] fix(client): use `usePreferredDark` with `appearance:
 "force-auto"` (#4263)

---
 src/client/app/data.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/client/app/data.ts b/src/client/app/data.ts
index 67fc0942..c99de52f 100644
--- a/src/client/app/data.ts
+++ b/src/client/app/data.ts
@@ -1,5 +1,5 @@
 import siteData from '@siteData'
-import { useDark } from '@vueuse/core'
+import { useDark, usePreferredDark } from '@vueuse/core'
 import {
   computed,
   inject,
@@ -79,13 +79,15 @@ export function initData(route: Route): VitePressData {
   const isDark =
     appearance === 'force-dark'
       ? ref(true)
-      : appearance
-        ? useDark({
-            storageKey: APPEARANCE_KEY,
-            initialValue: () => (appearance === 'dark' ? 'dark' : 'auto'),
-            ...(typeof appearance === 'object' ? appearance : {})
-          })
-        : ref(false)
+      : appearance === 'force-auto'
+        ? usePreferredDark()
+        : appearance
+          ? useDark({
+              storageKey: APPEARANCE_KEY,
+              initialValue: () => (appearance === 'dark' ? 'dark' : 'auto'),
+              ...(typeof appearance === 'object' ? appearance : {})
+            })
+          : ref(false)
 
   const hashRef = ref(inBrowser ? location.hash : '')
 

From b46d6d3a204f5ce347647bfd1ab8073bf313afd6 Mon Sep 17 00:00:00 2001
From: Heptazhou <zhou@0h7z.com>
Date: Sat, 12 Oct 2024 09:21:30 +0000
Subject: [PATCH 2/7] fix: broken rewrites on windows (#4268)

---
 src/node/markdownToVue.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/node/markdownToVue.ts b/src/node/markdownToVue.ts
index 458837c0..21ea491b 100644
--- a/src/node/markdownToVue.ts
+++ b/src/node/markdownToVue.ts
@@ -63,14 +63,14 @@ export async function createMarkdownToVueRenderFn(
   const dynamicRoutes = new Map(
     siteConfig?.dynamicRoutes?.routes.map((r) => [
       r.fullPath,
-      path.join(srcDir, r.route)
+      slash(path.join(srcDir, r.route))
     ]) || []
   )
 
   const rewrites = new Map(
     Object.entries(siteConfig?.rewrites.map || {}).map(([key, value]) => [
-      path.join(srcDir, key),
-      path.join(srcDir, value!)
+      slash(path.join(srcDir, key)),
+      slash(path.join(srcDir, value!))
     ]) || []
   )
 

From 461a5b001d29f95169f60fe28bc610e3f6e8fd66 Mon Sep 17 00:00:00 2001
From: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
Date: Sat, 12 Oct 2024 17:15:11 +0530
Subject: [PATCH 3/7] fix(client): wrong script async check

---
 src/client/app/composables/head.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/composables/head.ts b/src/client/app/composables/head.ts
index 708c16eb..f0296b18 100644
--- a/src/client/app/composables/head.ts
+++ b/src/client/app/composables/head.ts
@@ -87,7 +87,7 @@ function createHeadElement([tag, attrs, innerHTML]: HeadConfig) {
   if (innerHTML) {
     el.innerHTML = innerHTML
   }
-  if (tag === 'script' && !attrs.async) {
+  if (tag === 'script' && attrs.async == null) {
     // async is true by default for dynamically created scripts
     ;(el as HTMLScriptElement).async = false
   }

From 92b92aefcab9fbb28b51da70ee8ab21724098277 Mon Sep 17 00:00:00 2001
From: Gunther Konig <geecu.gee@gmail.com>
Date: Sat, 12 Oct 2024 15:09:36 +0300
Subject: [PATCH 4/7] fix(theme): improve local search input a11y (#4066)

Co-authored-by: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
---
 .../components/VPLocalSearchBox.vue             | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/client/theme-default/components/VPLocalSearchBox.vue b/src/client/theme-default/components/VPLocalSearchBox.vue
index c8aded40..70624e42 100644
--- a/src/client/theme-default/components/VPLocalSearchBox.vue
+++ b/src/client/theme-default/components/VPLocalSearchBox.vue
@@ -440,10 +440,20 @@ function formMarkRegex(terms: Set<string>) {
           <input
             ref="searchInput"
             v-model="filterText"
-            :placeholder="buttonText"
-            id="localsearch-input"
+            :aria-activedescendant="selectedIndex > -1 ? ('localsearch-item-' + selectedIndex) : undefined"
+            aria-autocomplete="both"
+            :aria-controls="results?.length ? 'localsearch-list' : undefined"
             aria-labelledby="localsearch-label"
+            autocapitalize="off"
+            autocomplete="off"
+            autocorrect="off"
             class="search-input"
+            id="localsearch-input"
+            enterkeyhint="go"
+            maxlength="64"
+            :placeholder="buttonText"
+            spellcheck="false"
+            type="search"
           />
           <div class="search-actions">
             <button
@@ -482,8 +492,9 @@ function formMarkRegex(terms: Set<string>) {
           <li
             v-for="(p, index) in results"
             :key="p.id"
-            role="option"
+            :id="'localsearch-item-' + index"
             :aria-selected="selectedIndex === index ? 'true' : 'false'"
+            role="option"
           >
             <a
               :href="p.id"

From 8436472c7874cb16caf9432660b395ca9ba68f9d Mon Sep 17 00:00:00 2001
From: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
Date: Sat, 12 Oct 2024 20:51:31 +0530
Subject: [PATCH 5/7] feat(experimental): support passing function for rewrites
 (#4274)

---
 docs/en/guide/routing.md           | 44 ++++++++++++++++++++----------
 src/node/plugins/rewritesPlugin.ts | 39 +++++++++++++++++---------
 src/node/siteConfig.ts             |  2 +-
 3 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/docs/en/guide/routing.md b/docs/en/guide/routing.md
index 945e63c0..55b3cd4c 100644
--- a/docs/en/guide/routing.md
+++ b/docs/en/guide/routing.md
@@ -156,22 +156,24 @@ You can customize the mapping between the source directory structure and the gen
 
 ```
 .
-├─ packages
-│  ├─ pkg-a
-│  │  └─ src
-│  │      ├─ pkg-a-code.ts
-│  │      └─ pkg-a-docs.md
-│  └─ pkg-b
-│     └─ src
-│         ├─ pkg-b-code.ts
-│         └─ pkg-b-docs.md
+└─ packages
+   ├─ pkg-a
+   │  └─ src
+   │     ├─ foo.md
+   │     └─ index.md
+   └─ pkg-b
+      └─ src
+         ├─ bar.md
+         └─ index.md
 ```
 
 And you want the VitePress pages to be generated like this:
 
 ```
-packages/pkg-a/src/pkg-a-docs.md  -->  /pkg-a/index.html
-packages/pkg-b/src/pkg-b-docs.md  -->  /pkg-b/index.html
+packages/pkg-a/src/index.md  -->  /pkg-a/index.html
+packages/pkg-a/src/foo.md    -->  /pkg-a/foo.html
+packages/pkg-b/src/index.md  -->  /pkg-b/index.html
+packages/pkg-b/src/bar.md    -->  /pkg-b/bar.html
 ```
 
 You can achieve this by configuring the [`rewrites`](../reference/site-config#rewrites) option like this:
@@ -180,8 +182,10 @@ You can achieve this by configuring the [`rewrites`](../reference/site-config#re
 // .vitepress/config.js
 export default {
   rewrites: {
-    'packages/pkg-a/src/pkg-a-docs.md': 'pkg-a/index.md',
-    'packages/pkg-b/src/pkg-b-docs.md': 'pkg-b/index.md'
+    'packages/pkg-a/src/index.md': 'pkg-a/index.md',
+    'packages/pkg-a/src/foo.md': 'pkg-a/foo.md',
+    'packages/pkg-b/src/index.md': 'pkg-b/index.md',
+    'packages/pkg-b/src/bar.md': 'pkg-b/bar.md'
   }
 }
 ```
@@ -191,12 +195,22 @@ The `rewrites` option also supports dynamic route parameters. In the above examp
 ```ts
 export default {
   rewrites: {
-    'packages/:pkg/src/(.*)': ':pkg/index.md'
+    'packages/:pkg/src/:slug*': ':pkg/:slug*'
   }
 }
 ```
 
-The rewrite paths are compiled using the `path-to-regexp` package - consult [its documentation](https://github.com/pillarjs/path-to-regexp#parameters) for more advanced syntax.
+The rewrite paths are compiled using the `path-to-regexp` package - consult [its documentation](https://github.com/pillarjs/path-to-regexp/tree/6.x#parameters) for more advanced syntax.
+
+`rewrites` can also be a function that receives the original path and returns the new path:
+
+```ts
+export default {
+  rewrites(id) {
+    return id.replace(/^packages\/([^/]+)\/src\//, '$1/')
+  }
+}
+```
 
 ::: warning Relative Links with Rewrites
 
diff --git a/src/node/plugins/rewritesPlugin.ts b/src/node/plugins/rewritesPlugin.ts
index 51794a1d..236973f1 100644
--- a/src/node/plugins/rewritesPlugin.ts
+++ b/src/node/plugins/rewritesPlugin.ts
@@ -6,22 +6,35 @@ export function resolveRewrites(
   pages: string[],
   userRewrites: UserConfig['rewrites']
 ) {
-  const rewriteRules = Object.entries(userRewrites || {}).map(([from, to]) => ({
-    toPath: compile(`/${to}`, { validate: false }),
-    matchUrl: match(from.startsWith('^') ? new RegExp(from) : from)
-  }))
-
   const pageToRewrite: Record<string, string> = {}
   const rewriteToPage: Record<string, string> = {}
-  if (rewriteRules.length) {
+
+  if (typeof userRewrites === 'function') {
     for (const page of pages) {
-      for (const { matchUrl, toPath } of rewriteRules) {
-        const res = matchUrl(page)
-        if (res) {
-          const dest = toPath(res.params).slice(1)
-          pageToRewrite[page] = dest
-          rewriteToPage[dest] = page
-          break
+      const dest = userRewrites(page)
+      if (dest && dest !== page) {
+        pageToRewrite[page] = dest
+        rewriteToPage[dest] = page
+      }
+    }
+  } else if (typeof userRewrites === 'object') {
+    const rewriteRules = Object.entries(userRewrites || {}).map(
+      ([from, to]) => ({
+        toPath: compile(`/${to}`, { validate: false }),
+        matchUrl: match(from.startsWith('^') ? new RegExp(from) : from)
+      })
+    )
+
+    if (rewriteRules.length) {
+      for (const page of pages) {
+        for (const { matchUrl, toPath } of rewriteRules) {
+          const res = matchUrl(page)
+          if (res) {
+            const dest = toPath(res.params).slice(1)
+            pageToRewrite[page] = dest
+            rewriteToPage[dest] = page
+            break
+          }
         }
       }
     }
diff --git a/src/node/siteConfig.ts b/src/node/siteConfig.ts
index aac3545d..ebd99096 100644
--- a/src/node/siteConfig.ts
+++ b/src/node/siteConfig.ts
@@ -162,7 +162,7 @@ export interface UserConfig<ThemeConfig = any>
    *
    * source -> destination
    */
-  rewrites?: Record<string, string>
+  rewrites?: Record<string, string> | ((id: string) => string)
 
   /**
    * @experimental

From 0db71aec83b78d0040ef123aca80c25cd069dac8 Mon Sep 17 00:00:00 2001
From: Christian Georgi <chgeo@users.noreply.github.com>
Date: Sat, 12 Oct 2024 17:40:29 +0200
Subject: [PATCH 6/7] docs: add info about the `{open}` attr for `details`
 container (#4067)

Co-authored-by: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
---
 docs/en/guide/markdown.md | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/docs/en/guide/markdown.md b/docs/en/guide/markdown.md
index 9eb4c0e7..dd577fe1 100644
--- a/docs/en/guide/markdown.md
+++ b/docs/en/guide/markdown.md
@@ -187,7 +187,7 @@ You may set custom title by appending the text right after the "type" of the con
 Danger zone, do not proceed
 :::
 
-::: details Click me to view the code
+::: details Click me to toggle the code
 ```js
 console.log('Hello, VitePress!')
 ```
@@ -200,7 +200,7 @@ console.log('Hello, VitePress!')
 Danger zone, do not proceed
 :::
 
-::: details Click me to view the code
+::: details Click me to toggle the code
 ```js
 console.log('Hello, VitePress!')
 ```
@@ -225,6 +225,28 @@ export default defineConfig({
 })
 ```
 
+### Additional Attributes
+
+You can add additional attributes to the custom containers. We use [markdown-it-attrs](https://github.com/arve0/markdown-it-attrs) for this feature, and it is supported on almost all markdown elements. For example, you can set the `open` attribute to make the details block open by default:
+
+**Input**
+
+````md
+::: details Click me to toggle the code {open}
+```js
+console.log('Hello, VitePress!')
+```
+:::
+````
+
+**Output**
+
+::: details Click me to toggle the code {open}
+```js
+console.log('Hello, VitePress!')
+```
+:::
+
 ### `raw`
 
 This is a special container that can be used to prevent style and router conflicts with VitePress. This is especially useful when you're documenting component libraries. You might also wanna check out [whyframe](https://whyframe.dev/docs/integrations/vitepress) for better isolation.

From 39236c5899ff43c1b8dfe52764ead70ed715a394 Mon Sep 17 00:00:00 2001
From: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
Date: Sat, 12 Oct 2024 22:13:19 +0530
Subject: [PATCH 7/7] docs: redirect /guide to /guide/getting-started (#4276)

---
 docs/public/_headers   |  6 ------
 docs/public/_redirects |  1 -
 netlify.toml           | 21 +++++++++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)
 delete mode 100644 docs/public/_headers
 delete mode 100644 docs/public/_redirects

diff --git a/docs/public/_headers b/docs/public/_headers
deleted file mode 100644
index 5d2850dd..00000000
--- a/docs/public/_headers
+++ /dev/null
@@ -1,6 +0,0 @@
-/assets/*
-  cache-control: max-age=31536000
-  cache-control: immutable
-
-/_translations/*
-  x-robots-tag: noindex
diff --git a/docs/public/_redirects b/docs/public/_redirects
deleted file mode 100644
index 45c59465..00000000
--- a/docs/public/_redirects
+++ /dev/null
@@ -1 +0,0 @@
-https://vitepress.vuejs.org/* https://vitepress.dev/:splat 301!
diff --git a/netlify.toml b/netlify.toml
index 801b84fc..c90c283b 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,3 +4,24 @@
 [build]
   publish = "docs/.vitepress/dist"
   command = "pnpm docs:build && pnpm docs:lunaria:build"
+
+[[headers]]
+  for = "/assets/*"
+  [headers.values]
+    cache-control = '''
+    max-age=31536000,
+    immutable'''
+
+[[headers]]
+  for = "/_translations/*"
+  [headers.values]
+    x-robots-tag = "noindex"
+
+[[redirects]]
+  from = "https://vitepress.vuejs.org/*"
+  to = "https://vitepress.dev/:splat"
+  force = true
+
+[[redirects]]
+  from = "/guide/"
+  to = "/guide/getting-started"