Merge branch 'main' into meteorlxy-markdown-to-vue

Author: Mister-Hope

.vscode/settings.json

@@ -10,9 +10,6 @@
   "[markdown]": {
     "files.trimTrailingWhitespace": false
   },
-  "eslint.options": {
-    "flags": ["unstable_ts_config"]
-  },
   "eslint.validate": [
     "javascript",
     "javascriptreact",

CHANGELOG.md

@@ -1,3 +1,12 @@
+# [2.0.0-rc.19](https://github.com/vuepress/core/compare/v2.0.0-rc.18...v2.0.0-rc.19) (2024-12-11)
+
+
+### Features
+
+* **bundler-vite:** upgrade vite to v6 ([faddbe6](https://github.com/vuepress/core/commit/faddbe64e4c71a115bf300b4fc831118dbf3eca7))
+
+
+
 # [2.0.0-rc.18](https://github.com/vuepress/core/compare/v2.0.0-rc.17...v2.0.0-rc.18) (2024-10-10)
 
 

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/e2e",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "private": true,
   "type": "module",
   "scripts": {
@@ -20,14 +20,14 @@
     "@vuepress-e2e/style-exports": "file:./modules/style-exports",
     "@vuepress/bundler-vite": "workspace:*",
     "@vuepress/bundler-webpack": "workspace:*",
-    "sass": "^1.79.4",
-    "sass-embedded": "^1.79.4",
-    "sass-loader": "^16.0.2",
-    "vue": "^3.5.11",
+    "sass": "^1.85.0",
+    "sass-embedded": "^1.85.0",
+    "sass-loader": "^16.0.5",
+    "vue": "^3.5.13",
     "vuepress": "workspace:*"
   },
   "devDependencies": {
-    "@playwright/test": "^1.48.0",
+    "@playwright/test": "^1.50.1",
     "anywhere": "^1.6.0",
     "cross-env": "^7.0.3"
   }

package.json

@@ -1,15 +1,15 @@
 {
   "name": "@vuepress/monorepo",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "private": true,
   "type": "module",
   "scripts": {
     "build": "pnpm -r --workspace-concurrency=1 --stream build",
     "check-types": "vue-tsc --noEmit",
     "clean": "pnpm --parallel --stream clean",
     "format": "prettier --write .",
-    "lint": "eslint --flag unstable_ts_config . && prettier --check .",
-    "lint:fix": "eslint --flag unstable_ts_config --fix . && prettier --write .",
+    "lint": "eslint . && prettier --check .",
+    "lint:fix": "eslint --fix . && prettier --write .",
     "prepare": "husky",
     "release": "pnpm release:check && pnpm release:version && pnpm release:publish",
     "release:changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
@@ -25,37 +25,43 @@
   "lint-staged": {
     "*.!(cjs|js|ts|vue)": "prettier --write --ignore-unknown",
     "*.(cjs|js|ts|vue)": [
-      "eslint --flag unstable_ts_config --fix",
+      "eslint --fix",
       "prettier --write"
     ],
     "package.json": "sort-package-json"
   },
   "prettier": "prettier-config-vuepress",
   "devDependencies": {
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
+    "@commitlint/cli": "^19.7.1",
+    "@commitlint/config-conventional": "^19.7.1",
     "@commitlint/types": "^19.5.0",
-    "@types/node": "^22.7.5",
-    "@types/webpack-env": "^1.18.5",
-    "@vitest/coverage-istanbul": "^2.1.2",
-    "bumpp": "^9.7.1",
+    "@types/node": "^22.13.4",
+    "@types/webpack-env": "^1.18.8",
+    "@vitest/coverage-istanbul": "^3.0.6",
+    "bumpp": "^10.0.3",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.12.0",
-    "eslint-config-vuepress": "^5.2.0",
-    "husky": "^9.1.6",
-    "jiti": "^2.3.3",
-    "lint-staged": "^15.2.10",
-    "prettier": "^3.3.3",
+    "eslint": "^9.20.1",
+    "eslint-config-vuepress": "^5.2.4",
+    "husky": "^9.1.7",
+    "jiti": "^2.4.2",
+    "lint-staged": "^15.4.3",
+    "prettier": "^3.5.1",
     "prettier-config-vuepress": "^5.0.0",
     "rimraf": "^6.0.1",
-    "sort-package-json": "^2.10.1",
-    "taze": "^0.17.2",
-    "tsconfig-vuepress": "^5.2.0",
-    "tsup": "^8.3.0",
-    "typescript": "^5.6.3",
-    "vite": "~5.4.8",
-    "vitest": "^2.1.2",
-    "vue-tsc": "^2.1.6"
+    "sort-package-json": "^2.14.0",
+    "taze": "^18.6.0",
+    "tsconfig-vuepress": "^5.2.1",
+    "tsup": "^8.3.6",
+    "typescript": "~5.7.3",
+    "vite": "~6.1.0",
+    "vitest": "^3.0.6",
+    "vue-tsc": "^2.2.2"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "@parcel/watcher",
+      "esbuild"
+    ]
+  }
 }

packages/bundler-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/bundler-vite",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "description": "Bundler vite package of VuePress",
   "keywords": [
     "vuepress-bundler",
@@ -35,20 +35,20 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@vitejs/plugin-vue": "^5.1.4",
+    "@vitejs/plugin-vue": "^5.2.1",
     "@vuepress/bundlerutils": "workspace:*",
     "@vuepress/client": "workspace:*",
     "@vuepress/core": "workspace:*",
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
     "autoprefixer": "^10.4.20",
     "connect-history-api-fallback": "^2.0.0",
-    "postcss": "^8.4.47",
+    "postcss": "^8.5.2",
     "postcss-load-config": "^6.0.1",
-    "rollup": "^4.24.0",
-    "vite": "~5.4.8",
-    "vue": "^3.5.11",
-    "vue-router": "^4.4.5"
+    "rollup": "^4.34.8",
+    "vite": "~6.1.0",
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.5.4"

packages/bundler-vite/src/plugins/vuepressConfigPlugin.ts

@@ -151,8 +151,6 @@ export const vuepressConfigPlugin = ({
         host: app.options.host,
         port: app.options.port,
         open: app.options.open,
-        // ref: https://github.com/vitejs/vite/issues/15784#issuecomment-1923683823
-        fs: { cachedChecks: false },
       },
       build: {
         ssr: isServer,

packages/bundler-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/bundler-webpack",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "description": "Bundler webpack package of VuePress",
   "keywords": [
     "vuepress-bundler",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@types/express": "^4.17.21",
-    "@types/webpack-env": "^1.18.5",
+    "@types/webpack-env": "^1.18.8",
     "@vuepress/bundlerutils": "workspace:*",
     "@vuepress/client": "workspace:*",
     "@vuepress/core": "workspace:*",
@@ -49,20 +49,20 @@
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
-    "esbuild-loader": "~4.2.2",
-    "express": "^4.21.1",
-    "html-webpack-plugin": "^5.6.0",
-    "lightningcss": "^1.27.0",
-    "mini-css-extract-plugin": "^2.9.1",
-    "postcss": "^8.4.47",
+    "esbuild-loader": "~4.3.0",
+    "express": "^4.21.2",
+    "html-webpack-plugin": "^5.6.3",
+    "lightningcss": "^1.29.1",
+    "mini-css-extract-plugin": "^2.9.2",
+    "postcss": "^8.5.2",
     "postcss-loader": "^8.1.1",
     "style-loader": "^4.0.0",
-    "vue": "^3.5.11",
+    "vue": "^3.5.13",
     "vue-loader": "^17.4.2",
-    "vue-router": "^4.4.5",
-    "webpack": "^5.95.0",
+    "vue-router": "^4.5.0",
+    "webpack": "^5.98.0",
     "webpack-5-chain": "^8.0.2",
-    "webpack-dev-server": "^5.1.0",
+    "webpack-dev-server": "^5.2.0",
     "webpack-merge": "^6.0.1"
   },
   "publishConfig": {

packages/bundler-webpack/tsup.config.ts

@@ -1,3 +1,4 @@
+import type { Options } from 'tsup'
 import { defineConfig } from 'tsup'
 
 const shared = defineConfig({
@@ -6,7 +7,7 @@ const shared = defineConfig({
   sourcemap: false,
   target: 'es2022',
   tsconfig: '../tsconfig.dts.json',
-})
+}) as Options
 
 export default defineConfig([
   {

packages/bundlerutils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/bundlerutils",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "description": "Utils package of VuePress bundler",
   "keywords": [
     "bundler",
@@ -36,8 +36,8 @@
     "@vuepress/core": "workspace:*",
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
-    "vue": "^3.5.11",
-    "vue-router": "^4.4.5"
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.0"
   },
   "publishConfig": {
     "access": "public"

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/cli",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "description": "CLI package of VuePress",
   "keywords": [
     "vuepress",
@@ -42,7 +42,7 @@
     "cac": "^6.7.14",
     "chokidar": "^3.6.0",
     "envinfo": "^7.14.0",
-    "esbuild": "~0.21.5"
+    "esbuild": "^0.24.2"
   },
   "devDependencies": {
     "@types/envinfo": "^7.8.4"

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -37,10 +37,10 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@vue/devtools-api": "^7.4.6",
+    "@vue/devtools-api": "^7.7.2",
     "@vuepress/shared": "workspace:*",
-    "vue": "^3.5.11",
-    "vue-router": "^4.4.5"
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.0"
   },
   "publishConfig": {
     "access": "public"

packages/client/src/composables/clientData.ts

@@ -12,8 +12,11 @@ export const clientDataSymbol: InjectionKey<ClientData> = Symbol(
 /**
  * Returns client data
  */
-export const useClientData = (): ClientData => {
-  const clientData = inject(clientDataSymbol)
+export const useClientData = <
+  Frontmatter extends Record<string, unknown> = Record<string, unknown>,
+  Data extends Record<string, unknown> = Record<string, unknown>,
+>(): ClientData<Frontmatter, Data> => {
+  const clientData = inject<ClientData<Frontmatter, Data>>(clientDataSymbol)
   if (!clientData) {
     throw new Error('useClientData() is called without provider.')
   }

packages/client/src/composables/clientDataUtils.ts

@@ -22,12 +22,11 @@ export const usePageComponent = (): PageComponentRef =>
 
 export const usePageData = <
   T extends Record<string, unknown> = Record<string, unknown>,
->(): PageDataRef<T> => useClientData().pageData as PageDataRef<T>
+>(): PageDataRef<T> => useClientData<Record<string, unknown>, T>().pageData
 
 export const usePageFrontmatter = <
   T extends Record<string, unknown> = Record<string, unknown>,
->(): PageFrontmatterRef<T> =>
-  useClientData().pageFrontmatter as PageFrontmatterRef<T>
+>(): PageFrontmatterRef<T> => useClientData<T>().pageFrontmatter
 
 export const usePageHead = (): PageHeadRef => useClientData().pageHead
 

packages/client/src/types/clientData.ts

@@ -54,11 +54,14 @@ export type RoutesRef = Ref<Routes>
 export type SiteDataRef = Ref<SiteData>
 export type SiteLocaleDataRef = ComputedRef<SiteLocaleData>
 
-export interface ClientData {
+export interface ClientData<
+  Frontmatter extends Record<string, unknown> = Record<string, unknown>,
+  Data extends Record<string, unknown> = Record<string, unknown>,
+> {
   layouts: LayoutsRef
   pageComponent: PageComponentRef
-  pageData: PageDataRef
-  pageFrontmatter: PageFrontmatterRef
+  pageData: PageDataRef<Data>
+  pageFrontmatter: PageFrontmatterRef<Frontmatter>
   pageHead: PageHeadRef
   pageHeadTitle: PageHeadTitleRef
   pageLang: PageLangRef

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -35,7 +35,7 @@
     "@vuepress/markdown": "workspace:*",
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
-    "vue": "^3.5.11"
+    "vue": "^3.5.13"
   },
   "publishConfig": {
     "access": "public"

packages/core/src/app/createBaseApp.ts

@@ -20,7 +20,9 @@ import { resolveAppWriteTemp } from './resolveAppWriteTemp.js'
  *
  * Notice that the base app could not be used for dev nor build.
  *
- * It would be used for creating dev app or build app, or for testing.
+ * It would be used for creating dev app or build app internally.
+ *
+ * @internal
  */
 export const createBaseApp = (config: AppConfig): App => {
   const options = resolveAppOptions(config)

packages/markdown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",

packages/shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/shared",
-  "version": "2.0.0-rc.18",
+  "version": "2.0.0-rc.19",
   "description": "Utils that shared between VuePress node and client",
   "keywords": [
     "vuepress",