Skip to content

Commit

Permalink
Merge branch 'main' into on-content-updated
Browse files Browse the repository at this point in the history
  • Loading branch information
pengzhanbo authored Dec 12, 2024
2 parents a2f17b1 + a5ce1e7 commit 36a2670
Show file tree
Hide file tree
Showing 15 changed files with 1,915 additions and 1,716 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
12 changes: 6 additions & 6 deletions e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/e2e",
"version": "2.0.0-rc.18",
"version": "2.0.0-rc.19",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -20,14 +20,14 @@
"@vuepress-e2e/style-exports": "file:./modules/style-exports",
"@vuepress/bundler-vite": "workspace:*",
"@vuepress/bundler-webpack": "workspace:*",
"sass": "^1.79.5",
"sass-embedded": "^1.79.5",
"sass-loader": "^16.0.2",
"vue": "^3.5.12",
"sass": "^1.82.0",
"sass-embedded": "^1.82.0",
"sass-loader": "^16.0.4",
"vue": "^3.5.13",
"vuepress": "workspace:*"
},
"devDependencies": {
"@playwright/test": "^1.48.0",
"@playwright/test": "^1.49.1",
"anywhere": "^1.6.0",
"cross-env": "^7.0.3"
}
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/monorepo",
"version": "2.0.0-rc.18",
"version": "2.0.0-rc.19",
"private": true,
"type": "module",
"scripts": {
Expand Down Expand Up @@ -32,30 +32,30 @@
},
"prettier": "prettier-config-vuepress",
"devDependencies": {
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@commitlint/cli": "^19.6.0",
"@commitlint/config-conventional": "^19.6.0",
"@commitlint/types": "^19.5.0",
"@types/node": "^22.7.5",
"@types/node": "^22.10.1",
"@types/webpack-env": "^1.18.5",
"@vitest/coverage-istanbul": "^2.1.3",
"bumpp": "^9.7.1",
"@vitest/coverage-istanbul": "^3.0.0-beta.2",
"bumpp": "9.8.1",
"conventional-changelog-cli": "^5.0.0",
"eslint": "^9.12.0",
"eslint-config-vuepress": "^5.2.1",
"husky": "^9.1.6",
"jiti": "^2.3.3",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"eslint": "^9.16.0",
"eslint-config-vuepress": "^5.2.4",
"husky": "^9.1.7",
"jiti": "^2.4.1",
"lint-staged": "^15.2.11",
"prettier": "^3.4.2",
"prettier-config-vuepress": "^5.0.0",
"rimraf": "^6.0.1",
"sort-package-json": "^2.10.1",
"sort-package-json": "^2.12.0",
"taze": "^0.17.2",
"tsconfig-vuepress": "^5.2.1",
"tsup": "^8.3.0",
"typescript": "^5.6.3",
"vite": "~5.4.9",
"vitest": "^2.1.3",
"vue-tsc": "^2.1.6"
"tsup": "^8.3.5",
"typescript": "~5.6.3",
"vite": "~6.0.3",
"vitest": "^3.0.0-beta.2",
"vue-tsc": "^2.1.10"
},
"packageManager": "pnpm@9.12.1"
"packageManager": "pnpm@9.15.0"
}
14 changes: 7 additions & 7 deletions packages/bundler-vite/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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.4.49",
"postcss-load-config": "^6.0.1",
"rollup": "^4.24.0",
"vite": "~5.4.9",
"vue": "^3.5.12",
"vue-router": "^4.4.5"
"rollup": "^4.28.1",
"vite": "~6.0.3",
"vue": "^3.5.13",
"vue-router": "^4.5.0"
},
"devDependencies": {
"@types/connect-history-api-fallback": "^1.5.4"
Expand Down
2 changes: 0 additions & 2 deletions packages/bundler-vite/src/plugins/vuepressConfigPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
18 changes: 9 additions & 9 deletions packages/bundler-webpack/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -49,17 +49,17 @@
"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",
"express": "^4.21.2",
"html-webpack-plugin": "^5.6.3",
"lightningcss": "^1.28.2",
"mini-css-extract-plugin": "^2.9.2",
"postcss": "^8.4.49",
"postcss-loader": "^8.1.1",
"style-loader": "^4.0.0",
"vue": "^3.5.12",
"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.97.1",
"webpack-5-chain": "^8.0.2",
"webpack-dev-server": "^5.1.0",
"webpack-merge": "^6.0.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/bundlerutils/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -36,8 +36,8 @@
"@vuepress/core": "workspace:*",
"@vuepress/shared": "workspace:*",
"@vuepress/utils": "workspace:*",
"vue": "^3.5.12",
"vue-router": "^4.4.5"
"vue": "^3.5.13",
"vue-router": "^4.5.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -37,10 +37,10 @@
"clean": "rimraf dist"
},
"dependencies": {
"@vue/devtools-api": "^7.4.6",
"@vue/devtools-api": "^7.6.7",
"@vuepress/shared": "workspace:*",
"vue": "^3.5.12",
"vue-router": "^4.4.5"
"vue": "^3.5.13",
"vue-router": "^4.5.0"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -35,7 +35,7 @@
"@vuepress/markdown": "workspace:*",
"@vuepress/shared": "workspace:*",
"@vuepress/utils": "workspace:*",
"vue": "^3.5.12"
"vue": "^3.5.13"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuepress/utils",
"version": "2.0.0-rc.18",
"version": "2.0.0-rc.19",
"description": "Utils package of VuePress",
"keywords": [
"vuepress",
Expand Down Expand Up @@ -35,12 +35,12 @@
"@types/fs-extra": "^11.0.4",
"@types/hash-sum": "^1.0.2",
"@vuepress/shared": "workspace:*",
"debug": "^4.3.7",
"debug": "^4.4.0",
"fs-extra": "^11.2.0",
"globby": "^14.0.2",
"hash-sum": "^2.0.0",
"ora": "^8.1.0",
"picocolors": "^1.1.0",
"ora": "^8.1.1",
"picocolors": "^1.1.1",
"upath": "^2.0.1"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/vuepress/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vuepress",
"version": "2.0.0-rc.18",
"version": "2.0.0-rc.19",
"description": "Vue-powered Static Site Generator",
"keywords": [
"documentation",
Expand Down Expand Up @@ -55,7 +55,7 @@
"@vuepress/markdown": "workspace:*",
"@vuepress/shared": "workspace:*",
"@vuepress/utils": "workspace:*",
"vue": "^3.5.12"
"vue": "^3.5.13"
},
"peerDependencies": {
"@vuepress/bundler-vite": "workspace:*",
Expand Down
Loading

0 comments on commit 36a2670

Please sign in to comment.