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

.github/workflows/check.yml

@@ -32,8 +32,8 @@ jobs:
       - name: Use Node.js ${{ matrix.node }}
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node }}
           cache: pnpm
+          node-version: ${{ matrix.node }}
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile

.github/workflows/coverage.yml

@@ -20,9 +20,6 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
 
-    env:
-      NODE_VERSION: '18'
-
     steps:
       - uses: actions/checkout@v4
 
@@ -32,8 +29,8 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
+          node-version: lts/*
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile

.github/workflows/release.yml

@@ -1,10 +1,12 @@
 name: release
 
+permissions:
+  contents: write
+
 on:
   push:
     tags:
       - 'v*'
-  workflow_dispatch:
 
 jobs:
   release:
@@ -18,13 +20,13 @@ jobs:
       - name: Push to release branch
         run: git push origin HEAD:release
 
-      - name: Create release
-        if: ${{ github.event_name != 'workflow_dispatch' }}
-        id: release_tag
-        uses: yyx990803/release-tag@master
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          registry-url: https://registry.npmjs.org/
+
+      - name: Create release changelog
+        run: npx changelogithub
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          body: |
-            Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/main/CHANGELOG.md) for details.

CHANGELOG.md

@@ -1,3 +1,34 @@
+# [2.0.0-rc.17](https://github.com/vuepress/core/compare/v2.0.0-rc.16...v2.0.0-rc.17) (2024-09-30)
+
+
+### Bug Fixes
+
+* **shared:** revert unexpected type changes (close [#1610](https://github.com/vuepress/core/issues/1610)) ([d21a934](https://github.com/vuepress/core/commit/d21a934b2c2ad28626f4e59820c53e08ed50f18f))
+
+
+### Features
+
+* **client:** upgrade vue devtools-api to v7 ([7940a3d](https://github.com/vuepress/core/commit/7940a3d79f9281a5ff100ed859d966e15c82c556))
+
+
+
+# [2.0.0-rc.16](https://github.com/vuepress/core/compare/v2.0.0-rc.15...v2.0.0-rc.16) (2024-09-29)
+
+
+### Bug Fixes
+
+* **core:** handle templateBuildRenderer option correctly ([427e3cc](https://github.com/vuepress/core/commit/427e3cc976770ec801605f561ebab3e1629f43be))
+* **core:** make `content` have higher priority than `filePath` in page options ([12dbc67](https://github.com/vuepress/core/commit/12dbc67775c3e0f573793d9d2b01929e58322879))
+* **vuepress:** update required node version ([98a1830](https://github.com/vuepress/core/commit/98a18308260a8476b6b94eb905aeef6f5bedef75))
+
+
+### Features
+
+* **bundlerutils:** add bundlerutils package ([5488138](https://github.com/vuepress/core/commit/548813890385c6d8f54e00eb952452aed2439867))
+* upgrade to vue 3.5 ([d43bf23](https://github.com/vuepress/core/commit/d43bf234fc8f2ba3ffd44811c5d38571e142bc99))
+
+
+
 # [2.0.0-rc.15](https://github.com/vuepress/core/compare/v2.0.0-rc.14...v2.0.0-rc.15) (2024-08-15)
 
 

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/e2e",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.17",
   "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.78.0",
-    "sass-embedded": "^1.78.0",
-    "sass-loader": "^16.0.1",
-    "vue": "^3.5.3",
+    "sass": "^1.79.4",
+    "sass-embedded": "^1.79.4",
+    "sass-loader": "^16.0.2",
+    "vue": "^3.5.10",
     "vuepress": "workspace:*"
   },
   "devDependencies": {
-    "@playwright/test": "^1.47.0",
+    "@playwright/test": "^1.47.2",
     "anywhere": "^1.6.0",
     "cross-env": "^7.0.3"
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/monorepo",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.17",
   "private": true,
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
     "prepare": "husky",
     "release": "pnpm release:check && pnpm release:version && pnpm release:publish",
     "release:changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "release:check": "pnpm lint && pnpm clean && pnpm build && pnpm check-types && pnpm test",
+    "release:check": "pnpm clean && pnpm build && pnpm check-types && pnpm lint && pnpm test",
     "release:publish": "pnpm -r publish --tag next",
     "release:version": "bumpp -r --execute=\"pnpm release:changelog\" --commit \"build: publish v%s\" --all",
     "test": "pnpm test:unit && pnpm test:e2e",
@@ -32,30 +32,30 @@
   },
   "prettier": "prettier-config-vuepress",
   "devDependencies": {
-    "@commitlint/cli": "^19.4.1",
-    "@commitlint/config-conventional": "^19.4.1",
-    "@commitlint/types": "^19.0.3",
-    "@types/node": "^22.5.4",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
+    "@commitlint/types": "^19.5.0",
+    "@types/node": "^22.7.4",
     "@types/webpack-env": "^1.18.5",
-    "@vitest/coverage-istanbul": "^2.0.5",
-    "bumpp": "^9.5.2",
+    "@vitest/coverage-istanbul": "^2.1.1",
+    "bumpp": "^9.6.1",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.10.0",
+    "eslint": "^9.11.1",
     "eslint-config-vuepress": "^5.2.0",
-    "husky": "^9.1.5",
-    "jiti": "^1.21.6",
+    "husky": "^9.1.6",
+    "jiti": "^2.0.0",
     "lint-staged": "^15.2.10",
     "prettier": "^3.3.3",
     "prettier-config-vuepress": "^5.0.0",
     "rimraf": "^6.0.1",
     "sort-package-json": "^2.10.1",
-    "taze": "^0.16.7",
+    "taze": "^0.17.2",
     "tsconfig-vuepress": "^5.2.0",
-    "tsup": "^8.2.4",
+    "tsup": "^8.3.0",
     "typescript": "^5.6.2",
-    "vite": "~5.4.3",
-    "vitest": "^2.0.5",
+    "vite": "~5.4.8",
+    "vitest": "^2.1.1",
     "vue-tsc": "^2.1.6"
   },
-  "packageManager": "pnpm@9.10.0"
+  "packageManager": "pnpm@9.11.0"
 }

packages/bundler-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/bundler-vite",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.17",
   "description": "Bundler vite package of VuePress",
   "keywords": [
     "vuepress-bundler",
@@ -35,20 +35,20 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@vitejs/plugin-vue": "^5.1.3",
+    "@vitejs/plugin-vue": "^5.1.4",
     "@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.45",
+    "postcss": "^8.4.47",
     "postcss-load-config": "^6.0.1",
-    "rollup": "^4.21.2",
-    "vite": "~5.4.3",
-    "vue": "^3.5.3",
-    "vue-router": "^4.4.3"
+    "rollup": "^4.22.5",
+    "vite": "~5.4.8",
+    "vue": "^3.5.10",
+    "vue-router": "^4.4.5"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.5.4"

packages/bundler-vite/src/index.ts

@@ -1,5 +1,5 @@
 import { viteBundler } from './viteBundler.js'
 
-export * from './types.js'
+export type * from './types.js'
 export * from './viteBundler.js'
 export default viteBundler

packages/bundler-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/bundler-webpack",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.17",
   "description": "Bundler webpack package of VuePress",
   "keywords": [
     "vuepress-bundler",
@@ -50,17 +50,17 @@
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
     "esbuild-loader": "~4.2.2",
-    "express": "^4.19.2",
+    "express": "^4.21.0",
     "html-webpack-plugin": "^5.6.0",
-    "lightningcss": "^1.26.0",
+    "lightningcss": "^1.27.0",
     "mini-css-extract-plugin": "^2.9.1",
-    "postcss": "^8.4.45",
+    "postcss": "^8.4.47",
     "postcss-loader": "^8.1.1",
     "style-loader": "^4.0.0",
-    "vue": "^3.5.3",
+    "vue": "^3.5.10",
     "vue-loader": "^17.4.2",
-    "vue-router": "^4.4.3",
-    "webpack": "^5.94.0",
+    "vue-router": "^4.4.5",
+    "webpack": "^5.95.0",
     "webpack-5-chain": "^8.0.2",
     "webpack-dev-server": "^5.1.0",
     "webpack-merge": "^6.0.1"

packages/bundler-webpack/src/index.ts

@@ -1,5 +1,5 @@
 import { webpackBundler } from './webpackBundler.js'
 
-export * from './types.js'
+export type * from './types.js'
 export * from './webpackBundler.js'
 export default webpackBundler

packages/bundlerutils/package.json

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

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/cli",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.17",
   "description": "CLI package of VuePress",
   "keywords": [
     "vuepress",
@@ -41,7 +41,7 @@
     "@vuepress/utils": "workspace:*",
     "cac": "^6.7.14",
     "chokidar": "^3.6.0",
-    "envinfo": "^7.13.0",
+    "envinfo": "^7.14.0",
     "esbuild": "~0.21.5"
   },
   "devDependencies": {

packages/cli/src/commands/build/index.ts

@@ -1,2 +1,2 @@
 export * from './createBuild.js'
-export * from './types.js'
+export type * from './types.js'

packages/cli/src/commands/dev/index.ts

@@ -2,6 +2,6 @@ export * from './createDev.js'
 export * from './handlePageAdd.js'
 export * from './handlePageChange.js'
 export * from './handlePageUnlink.js'
-export * from './types.js'
+export type * from './types.js'
 export * from './watchPageFiles.js'
 export * from './watchUserConfigFile.js'

packages/cli/src/config/index.ts

@@ -5,4 +5,4 @@ export * from './resolveCliAppConfig.js'
 export * from './resolveUserConfigConventionalPath.js'
 export * from './resolveUserConfigPath.js'
 export * from './transformUserConfigToPlugin.js'
-export * from './types.js'
+export type * from './types.js'

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.17",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -37,10 +37,10 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@vue/devtools-api": "^6.6.4",
+    "@vue/devtools-api": "^7.4.6",
     "@vuepress/shared": "workspace:*",
-    "vue": "^3.5.3",
-    "vue-router": "^4.4.3"
+    "vue": "^3.5.10",
+    "vue-router": "^4.4.5"
   },
   "publishConfig": {
     "access": "public"

packages/client/src/index.ts

@@ -2,5 +2,5 @@ export * from './components/index.js'
 export * from './composables/index.js'
 export * from './router/index.js'
 export * from './resolvers.js'
-export * from './types/index.js'
+export type * from './types/index.js'
 export * from './utils/index.js'

packages/client/src/types/index.ts

@@ -1,4 +1,4 @@
-export * from './clientConfig.js'
-export * from './clientData.js'
-export * from './createVueAppFunction.js'
-export * from './routes.js'
+export type * from './clientConfig.js'
+export type * from './clientData.js'
+export type * from './createVueAppFunction.js'
+export type * from './routes.js'

packages/core/package.json

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

packages/core/src/index.ts

@@ -1,4 +1,4 @@
 export * from './app/index.js'
 export * from './page/index.js'
 export * from './pluginApi/index.js'
-export * from './types/index.js'
+export type * from './types/index.js'

packages/core/src/types/app/index.ts

@@ -1,3 +1,3 @@
-export * from './app.js'
-export * from './options.js'
-export * from './utils.js'
+export type * from './app.js'
+export type * from './options.js'
+export type * from './utils.js'