Skip to content

Commit

Permalink
Merge branch 'main' into sass
Browse files Browse the repository at this point in the history
  • Loading branch information
meteorlxy committed Jul 25, 2024
2 parents 081472e + ddcb9db commit 14dffdb
Show file tree
Hide file tree
Showing 12 changed files with 1,613 additions and 1,145 deletions.
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pnpm commitlint --edit $1
commitlint --edit $1
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pnpm lint-staged
lint-staged
9 changes: 5 additions & 4 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
"@vuepress-e2e/style-exports": "file:./modules/style-exports",
"@vuepress/bundler-vite": "workspace:*",
"@vuepress/bundler-webpack": "workspace:*",
"sass": "^1.77.6",
"sass-loader": "^14.2.1",
"vue": "^3.4.29",
"sass": "^1.77.8",
"sass-embedded": "^1.77.8",
"sass-loader": "^15.0.0",
"vue": "^3.4.34",
"vuepress": "workspace:*"
},
"devDependencies": {
"@playwright/test": "^1.44.1",
"@playwright/test": "^1.45.3",
"anywhere": "^1.6.0",
"cross-env": "^7.0.3"
}
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,28 @@
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@commitlint/types": "^19.0.3",
"@types/node": "^20.14.7",
"@types/node": "^20.14.12",
"@types/webpack-env": "^1.18.5",
"@vitest/coverage-istanbul": "^1.6.0",
"@vitest/coverage-istanbul": "^2.0.4",
"bumpp": "^9.4.1",
"conventional-changelog-cli": "^5.0.0",
"eslint": "^8.57.0",
"eslint-config-vuepress": "^4.10.1",
"eslint-config-vuepress-typescript": "^4.10.1",
"husky": "^9.0.11",
"husky": "^9.1.1",
"lint-staged": "^15.2.7",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"prettier-config-vuepress": "^4.4.0",
"rimraf": "^5.0.7",
"rimraf": "^6.0.1",
"sort-package-json": "^2.10.0",
"tsconfig-vuepress": "^4.5.0",
"tsup": "^8.1.0",
"typescript": "^5.5.2",
"vite": "~5.3.1",
"vitest": "^1.6.0",
"vue-tsc": "^2.0.21"
"tsup": "^8.2.3",
"typescript": "^5.5.4",
"vite": "~5.3.5",
"vitest": "^2.0.4",
"vue-tsc": "^2.0.29"
},
"packageManager": "pnpm@9.4.0",
"packageManager": "pnpm@9.6.0",
"engines": {
"node": ">=18.16.0"
}
Expand Down
12 changes: 6 additions & 6 deletions packages/bundler-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
"clean": "rimraf dist"
},
"dependencies": {
"@vitejs/plugin-vue": "^5.0.5",
"@vitejs/plugin-vue": "^5.1.0",
"@vuepress/client": "workspace:*",
"@vuepress/core": "workspace:*",
"@vuepress/shared": "workspace:*",
"@vuepress/utils": "workspace:*",
"autoprefixer": "^10.4.19",
"connect-history-api-fallback": "^2.0.0",
"postcss": "^8.4.38",
"postcss": "^8.4.40",
"postcss-load-config": "^6.0.1",
"rollup": "^4.18.0",
"vite": "~5.3.1",
"vue": "^3.4.29",
"vue-router": "^4.3.3"
"rollup": "^4.19.0",
"vite": "~5.3.5",
"vue": "^3.4.34",
"vue-router": "^4.4.0"
},
"publishConfig": {
"access": "public"
Expand Down
12 changes: 6 additions & 6 deletions packages/bundler-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,21 @@
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^7.1.2",
"css-minimizer-webpack-plugin": "^7.0.0",
"esbuild-loader": "~4.2.0",
"esbuild-loader": "~4.2.2",
"express": "^4.19.2",
"html-webpack-plugin": "^5.6.0",
"lightningcss": "^1.25.1",
"mini-css-extract-plugin": "^2.9.0",
"postcss": "^8.4.38",
"postcss": "^8.4.40",
"postcss-loader": "^8.1.1",
"style-loader": "^4.0.0",
"vue": "^3.4.29",
"vue": "^3.4.34",
"vue-loader": "^17.4.2",
"vue-router": "^4.3.3",
"webpack": "^5.92.1",
"vue-router": "^4.4.0",
"webpack": "^5.93.0",
"webpack-5-chain": "^8.0.2",
"webpack-dev-server": "^5.0.4",
"webpack-merge": "^5.10.0"
"webpack-merge": "^6.0.1"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"dependencies": {
"@vue/devtools-api": "^6.6.3",
"@vuepress/shared": "workspace:*",
"vue": "^3.4.29",
"vue-router": "^4.3.3"
"vue": "^3.4.34",
"vue-router": "^4.4.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@vuepress/markdown": "workspace:*",
"@vuepress/shared": "workspace:*",
"@vuepress/utils": "workspace:*",
"vue": "^3.4.29"
"vue": "^3.4.34"
},
"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
Expand Up @@ -39,7 +39,7 @@
"@mdit-vue/plugin-toc": "^2.1.3",
"@mdit-vue/shared": "^2.1.3",
"@mdit-vue/types": "^2.1.0",
"@types/markdown-it": "^14.1.1",
"@types/markdown-it": "^14.1.2",
"@types/markdown-it-emoji": "^3.0.1",
"@vuepress/shared": "workspace:*",
"@vuepress/utils": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@vuepress/shared": "workspace:*",
"debug": "^4.3.5",
"fs-extra": "^11.2.0",
"globby": "^14.0.1",
"globby": "^14.0.2",
"hash-sum": "^2.0.0",
"ora": "^8.0.1",
"picocolors": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/vuepress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@vuepress/markdown": "workspace:*",
"@vuepress/shared": "workspace:*",
"@vuepress/utils": "workspace:*",
"vue": "^3.4.29"
"vue": "^3.4.34"
},
"peerDependencies": {
"@vuepress/bundler-vite": "workspace:*",
Expand Down
Loading

0 comments on commit 14dffdb

Please sign in to comment.