Skip to content

Commit

Permalink
Merge branch 'main' into auto-link
Browse files Browse the repository at this point in the history
  • Loading branch information
Mister-Hope committed May 14, 2024
2 parents eed348d + ef172d4 commit f5f8964
Show file tree
Hide file tree
Showing 14 changed files with 901 additions and 793 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node: ['18', '20']
node: ['18', '20', '22']

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node: ['18', '20']
node: ['18', '20', '22']
bundler: ['webpack', 'vite']

runs-on: ${{ matrix.os }}
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# VuePress

[![check](https://github.com/vuepress/core/workflows/check/badge.svg)](https://github.com/vuepress/core/actions/workflows/check.yml?query=workflow%3Acheck)
[![check](https://github.com/vuepress/core/actions/workflows/check.yml/badge.svg?branch=main)](https://github.com/vuepress/core/actions/workflows/check.yml)
[![e2e](https://github.com/vuepress/core/actions/workflows/e2e.yml/badge.svg?branch=main)](https://github.com/vuepress/core/actions/workflows/e2e.yml)
[![npm](https://badgen.net/npm/v/vuepress/next)](https://www.npmjs.com/package/vuepress)
[![coverage](https://coveralls.io/repos/github/vuepress/core/badge.svg?branch=main)](https://coveralls.io/github/vuepress/core?branch=main)
[![license](https://badgen.net/github/license/vuepress/core)](https://github.com/vuepress/core/blob/main/LICENSE)
Expand Down
6 changes: 3 additions & 3 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"@vuepress-e2e/conditional-exports": "file:./modules/conditional-exports",
"@vuepress/bundler-vite": "workspace:*",
"@vuepress/bundler-webpack": "workspace:*",
"sass": "^1.75.0",
"sass": "^1.77.1",
"sass-loader": "^14.2.1",
"vue": "^3.4.23",
"vue": "^3.4.27",
"vuepress": "workspace:*"
},
"devDependencies": {
"@playwright/test": "^1.43.1",
"@playwright/test": "^1.44.0",
"anywhere": "^1.6.0",
"cross-env": "^7.0.3"
}
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,30 @@
},
"prettier": "prettier-config-vuepress",
"devDependencies": {
"@commitlint/cli": "^19.2.2",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@commitlint/types": "^19.0.3",
"@types/node": "^20.12.7",
"@types/webpack-env": "^1.18.4",
"@vitest/coverage-istanbul": "^1.5.0",
"bumpp": "^9.4.0",
"conventional-changelog-cli": "^4.1.0",
"@types/node": "^20.12.11",
"@types/webpack-env": "^1.18.5",
"@vitest/coverage-istanbul": "^1.6.0",
"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",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"prettier-config-vuepress": "^4.4.0",
"rimraf": "^5.0.5",
"rimraf": "^5.0.7",
"sort-package-json": "^2.10.0",
"tsconfig-vuepress": "^4.5.0",
"tsup": "^8.0.2",
"typescript": "^5.4.5",
"vite": "~5.2.10",
"vitest": "^1.5.0"
"vite": "~5.2.11",
"vitest": "^1.6.0"
},
"packageManager": "pnpm@9.0.4",
"packageManager": "pnpm@9.1.1",
"engines": {
"node": ">=18.16.0"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/bundler-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"autoprefixer": "^10.4.19",
"connect-history-api-fallback": "^2.0.0",
"postcss": "^8.4.38",
"postcss-load-config": "^5.0.3",
"rollup": "^4.16.0",
"vite": "~5.2.10",
"vue": "^3.4.23",
"postcss-load-config": "^5.1.0",
"rollup": "^4.17.2",
"vite": "~5.2.11",
"vue": "^3.4.27",
"vue-router": "^4.3.2"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/bundler-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@types/express": "^4.17.21",
"@types/webpack-env": "^1.18.4",
"@types/webpack-env": "^1.18.5",
"@vuepress/client": "workspace:*",
"@vuepress/core": "workspace:*",
"@vuepress/shared": "workspace:*",
Expand All @@ -54,7 +54,7 @@
"postcss-csso": "^6.0.1",
"postcss-loader": "^8.1.1",
"style-loader": "^4.0.0",
"vue": "^3.4.23",
"vue": "^3.4.27",
"vue-loader": "^17.4.2",
"vue-router": "^4.3.2",
"webpack": "^5.91.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@vuepress/utils": "workspace:*",
"cac": "^6.7.14",
"chokidar": "^3.6.0",
"envinfo": "^7.12.0",
"envinfo": "^7.13.0",
"esbuild": "~0.20.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"dependencies": {
"@vue/devtools-api": "^6.6.1",
"@vuepress/shared": "workspace:*",
"vue": "^3.4.23",
"vue": "^3.4.27",
"vue-router": "^4.3.2"
},
"publishConfig": {
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.23"
"vue": "^3.4.27"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/markdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"@mdit-vue/plugin-toc": "^2.1.2",
"@mdit-vue/shared": "^2.1.2",
"@mdit-vue/types": "^2.1.0",
"@types/markdown-it": "^14.0.1",
"@types/markdown-it-emoji": "^2.0.5",
"@types/markdown-it": "^14.1.1",
"@types/markdown-it-emoji": "^3.0.1",
"@vuepress/shared": "workspace:*",
"@vuepress/utils": "workspace:*",
"markdown-it": "^14.1.0",
Expand All @@ -49,7 +49,7 @@
"mdurl": "^2.0.0"
},
"devDependencies": {
"@types/mdurl": "^1.0.5"
"@types/mdurl": "^2.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
12 changes: 0 additions & 12 deletions packages/markdown/src/plugins/markdown-it-emoji.d.ts

This file was deleted.

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.23"
"vue": "^3.4.27"
},
"peerDependencies": {
"@vuepress/bundler-vite": "workspace:*",
Expand Down

0 comments on commit f5f8964

Please sign in to comment.