Merge branch 'main' into main

package.json

@@ -93,18 +93,18 @@
     "@docsearch/css": "^3.5.2",
     "@docsearch/js": "^3.5.2",
     "@types/markdown-it": "^13.0.7",
-    "@vitejs/plugin-vue": "^4.5.2",
+    "@vitejs/plugin-vue": "^5.0.0",
     "@vue/devtools-api": "^6.5.1",
     "@vueuse/core": "^10.7.0",
     "@vueuse/integrations": "^10.7.0",
     "focus-trap": "^7.5.4",
     "mark.js": "8.11.1",
     "minisearch": "^6.3.0",
-    "mrmime": "^1.0.1",
+    "mrmime": "^2.0.0",
-    "shikiji": "^0.9.7",
+    "shikiji": "^0.9.12",
-    "shikiji-transformers": "^0.9.7",
+    "shikiji-transformers": "^0.9.12",
     "vite": "^5.0.10",
-    "vue": "^3.3.12"
+    "vue": "^3.4.0-beta.4"
   },
   "peerDependencies": {
     "markdown-it-mathjax3": "^4.3.2",
@@ -144,16 +144,16 @@
     "@types/markdown-it-emoji": "^2.0.4",
     "@types/micromatch": "^4.0.6",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.10.4",
+    "@types/node": "^20.10.5",
     "@types/postcss-prefix-selector": "^1.16.3",
     "@types/prompts": "^2.4.9",
-    "@vue/shared": "^3.3.12",
+    "@vue/shared": "^3.3.13",
     "chokidar": "^3.5.3",
     "compression": "^1.7.4",
     "conventional-changelog-cli": "^4.1.0",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
-    "esbuild": "^0.19.9",
+    "esbuild": "^0.19.10",
     "escape-html": "^1.0.3",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
@@ -173,7 +173,7 @@
     "minimist": "^1.2.8",
     "nanoid": "^5.0.4",
     "npm-run-all": "^4.1.5",
-    "ora": "^7.0.1",
+    "ora": "^8.0.1",
     "path-to-regexp": "^6.2.1",
     "picocolors": "^1.0.0",
     "pkg-dir": "^8.0.0",
@@ -184,18 +184,18 @@
     "prompts": "^2.4.2",
     "punycode": "^2.3.1",
     "rimraf": "^5.0.5",
-    "rollup": "^4.9.0",
+    "rollup": "^4.9.1",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
     "semver": "^7.5.4",
-    "shikiji-core": "^0.9.7",
+    "shikiji-core": "^0.9.12",
     "simple-git-hooks": "^2.9.0",
-    "sirv": "^2.0.3",
+    "sirv": "^2.0.4",
     "sitemap": "^7.1.1",
     "supports-color": "^9.4.0",
     "typescript": "^5.3.3",
-    "vitest": "^1.0.4",
+    "vitest": "^1.1.0",
-    "vue-tsc": "^1.8.25",
+    "vue-tsc": "^1.8.26",
     "wait-on": "^7.2.0"
   },
   "simple-git-hooks": {

src/client/theme-default/components/VPAlgoliaSearchBox.vue

@@ -42,7 +42,11 @@ async function update() {
 }
 
 function initialize(userOptions: DefaultTheme.AlgoliaSearchOptions) {
-  const options = Object.assign<{}, {}, DocSearchProps>({}, userOptions, {
+  const options = Object.assign<
+    {},
+    DefaultTheme.AlgoliaSearchOptions,
+    Partial<DocSearchProps>
+  >({}, userOptions, {
     container: '#docsearch',
 
     navigator: {
@@ -69,7 +73,6 @@ function initialize(userOptions: DefaultTheme.AlgoliaSearchOptions) {
       })
     },
 
-    // @ts-expect-error vue-tsc thinks this should return Vue JSX but it returns the required React one
     hitComponent({ hit, children }) {
       return {
         __v: null,
@@ -80,7 +83,7 @@ function initialize(userOptions: DefaultTheme.AlgoliaSearchOptions) {
         props: { href: hit.url, children }
       }
     }
-  })
+  }) as DocSearchProps
 
   docsearch(options)
 }

src/node/plugin.ts

@@ -152,7 +152,8 @@ export async function createVitePressPlugin(
             site.themeConfig?.search?.provider === 'algolia' ||
             !!site.themeConfig?.algolia, // legacy
           __CARBON__: !!site.themeConfig?.carbonAds,
-          __ASSETS_DIR__: JSON.stringify(siteConfig.assetsDir)
+          __ASSETS_DIR__: JSON.stringify(siteConfig.assetsDir),
+          __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: !!process.env.DEBUG
         },
         optimizeDeps: {
           // force include vue to avoid duplicated copies when linked + optimized