Skip to content

Commit ffe25c8

Browse files
Mister-HopeMister-Hope
committed
Merge branch 'main' into markdown-links
2 parents 1227d20 + 8eb722f commit ffe25c8

File tree

19 files changed

+970
-884
lines changed

19 files changed

+970
-884
lines changed

‎.github/workflows/check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
os: [ubuntu-latest, windows-latest, macos-latest]
18-
node: ['18', '20']
18+
node: ['18', '20', '22']
1919

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

‎.github/workflows/e2e.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
os: [ubuntu-latest, windows-latest, macos-latest]
18-
node: ['18', '20']
18+
node: ['18', '20', '22']
1919
bundler: ['webpack', 'vite']
2020

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

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# VuePress
22

3-
[![check](https://github.com/vuepress/core/workflows/check/badge.svg)](https://github.com/vuepress/core/actions/workflows/check.yml?query=workflow%3Acheck)
3+
[![check](https://github.com/vuepress/core/actions/workflows/check.yml/badge.svg?branch=main)](https://github.com/vuepress/core/actions/workflows/check.yml)
4+
[![e2e](https://github.com/vuepress/core/actions/workflows/e2e.yml/badge.svg?branch=main)](https://github.com/vuepress/core/actions/workflows/e2e.yml)
45
[![npm](https://badgen.net/npm/v/vuepress/next)](https://www.npmjs.com/package/vuepress)
56
[![coverage](https://coveralls.io/repos/github/vuepress/core/badge.svg?branch=main)](https://coveralls.io/github/vuepress/core?branch=main)
67
[![license](https://badgen.net/github/license/vuepress/core)](https://github.com/vuepress/core/blob/main/LICENSE)

‎e2e/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
"@vuepress-e2e/conditional-exports": "file:./modules/conditional-exports",
2020
"@vuepress/bundler-vite": "workspace:*",
2121
"@vuepress/bundler-webpack": "workspace:*",
22-
"sass": "^1.75.0",
22+
"sass": "^1.77.1",
2323
"sass-loader": "^14.2.1",
24-
"vue": "^3.4.23",
24+
"vue": "^3.4.27",
2525
"vuepress": "workspace:*"
2626
},
2727
"devDependencies": {
28-
"@playwright/test": "^1.43.1",
28+
"@playwright/test": "^1.44.0",
2929
"anywhere": "^1.6.0",
3030
"cross-env": "^7.0.3"
3131
}

‎e2e/tests/components/auto-link.spec.ts‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,33 @@ test.beforeEach(async ({ page }) => {
66
})
77

88
test('should render route-link correctly', async ({ page }) => {
9-
for (const el of await page
10-
.locator('.e2e-theme-content #route-link a')
11-
.all()) {
9+
const locator = page.locator('.e2e-theme-content #route-link a')
10+
11+
for (const el of await locator.all()) {
1212
await expect(el).toHaveAttribute('class', /route-link/)
1313
}
1414
})
1515

1616
test('should render external-link correctly', async ({ page }) => {
17-
for (const el of await page
18-
.locator('.e2e-theme-content #external-link a')
19-
.all()) {
17+
const locator = page.locator('.e2e-theme-content #external-link a')
18+
19+
for (const el of await locator.all()) {
2020
await expect(el).toHaveAttribute('class', /external-link/)
2121
}
2222
})
2323

2424
test('should render config correctly', async ({ page }) => {
2525
const locator = page.locator('.e2e-theme-content #config a')
2626

27-
await expect(await locator.nth(0)).toHaveText('text1')
28-
await expect(await locator.nth(0)).toHaveAttribute('href', BASE)
29-
await expect(await locator.nth(0)).toHaveAttribute('aria-label', 'label')
27+
await expect(locator.nth(0)).toHaveText('text1')
28+
await expect(locator.nth(0)).toHaveAttribute('href', BASE)
29+
await expect(locator.nth(0)).toHaveAttribute('aria-label', 'label')
3030

31-
await expect(await locator.nth(1)).toHaveText('text2')
32-
await expect(await locator.nth(1)).toHaveAttribute(
31+
await expect(locator.nth(1)).toHaveText('text2')
32+
await expect(locator.nth(1)).toHaveAttribute(
3333
'href',
3434
'https://example.com/test/',
3535
)
36-
await expect(await locator.nth(1)).toHaveAttribute('target', '_blank')
37-
await expect(await locator.nth(1)).toHaveAttribute(
38-
'rel',
39-
'noopener noreferrer',
40-
)
36+
await expect(locator.nth(1)).toHaveAttribute('target', '_blank')
37+
await expect(locator.nth(1)).toHaveAttribute('rel', 'noopener noreferrer')
4138
})

‎package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,30 @@
3030
},
3131
"prettier": "prettier-config-vuepress",
3232
"devDependencies": {
33-
"@commitlint/cli": "^19.2.2",
33+
"@commitlint/cli": "^19.3.0",
3434
"@commitlint/config-conventional": "^19.2.2",
3535
"@commitlint/types": "^19.0.3",
36-
"@types/node": "^20.12.7",
37-
"@types/webpack-env": "^1.18.4",
38-
"@vitest/coverage-istanbul": "^1.5.0",
39-
"bumpp": "^9.4.0",
40-
"conventional-changelog-cli": "^4.1.0",
36+
"@types/node": "^20.12.11",
37+
"@types/webpack-env": "^1.18.5",
38+
"@vitest/coverage-istanbul": "^1.6.0",
39+
"bumpp": "^9.4.1",
40+
"conventional-changelog-cli": "^5.0.0",
4141
"eslint": "^8.57.0",
4242
"eslint-config-vuepress": "^4.10.1",
4343
"eslint-config-vuepress-typescript": "^4.10.1",
4444
"husky": "^9.0.11",
4545
"lint-staged": "^15.2.2",
4646
"prettier": "^3.2.5",
4747
"prettier-config-vuepress": "^4.4.0",
48-
"rimraf": "^5.0.5",
48+
"rimraf": "^5.0.7",
4949
"sort-package-json": "^2.10.0",
5050
"tsconfig-vuepress": "^4.5.0",
5151
"tsup": "^8.0.2",
5252
"typescript": "^5.4.5",
53-
"vite": "~5.2.10",
54-
"vitest": "^1.5.0"
53+
"vite": "~5.2.11",
54+
"vitest": "^1.6.0"
5555
},
56-
"packageManager": "pnpm@9.0.4",
56+
"packageManager": "pnpm@9.1.1",
5757
"engines": {
5858
"node": ">=18.16.0"
5959
}

‎packages/bundler-vite/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
"autoprefixer": "^10.4.19",
4242
"connect-history-api-fallback": "^2.0.0",
4343
"postcss": "^8.4.38",
44-
"postcss-load-config": "^5.0.3",
45-
"rollup": "^4.16.0",
46-
"vite": "~5.2.10",
47-
"vue": "^3.4.23",
44+
"postcss-load-config": "^5.1.0",
45+
"rollup": "^4.17.2",
46+
"vite": "~5.2.11",
47+
"vue": "^3.4.27",
4848
"vue-router": "^4.3.2"
4949
},
5050
"publishConfig": {

‎packages/bundler-webpack/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"dependencies": {
3939
"@types/express": "^4.17.21",
40-
"@types/webpack-env": "^1.18.4",
40+
"@types/webpack-env": "^1.18.5",
4141
"@vuepress/client": "workspace:*",
4242
"@vuepress/core": "workspace:*",
4343
"@vuepress/shared": "workspace:*",
@@ -54,7 +54,7 @@
5454
"postcss-csso": "^6.0.1",
5555
"postcss-loader": "^8.1.1",
5656
"style-loader": "^4.0.0",
57-
"vue": "^3.4.23",
57+
"vue": "^3.4.27",
5858
"vue-loader": "^17.4.2",
5959
"vue-router": "^4.3.2",
6060
"webpack": "^5.91.0",

‎packages/cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@vuepress/utils": "workspace:*",
4242
"cac": "^6.7.14",
4343
"chokidar": "^3.6.0",
44-
"envinfo": "^7.12.0",
44+
"envinfo": "^7.13.0",
4545
"esbuild": "~0.20.2"
4646
},
4747
"devDependencies": {

‎packages/client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"dependencies": {
4040
"@vue/devtools-api": "^6.6.1",
4141
"@vuepress/shared": "workspace:*",
42-
"vue": "^3.4.23",
42+
"vue": "^3.4.27",
4343
"vue-router": "^4.3.2"
4444
},
4545
"publishConfig": {

0 commit comments

Comments
 (0)