Skip to content

Commit 1885046

Browse files
authored
Merge pull request #2415 from vuejs/feat/new-matcher
2 parents b6fbdab + 6481cf6 commit 1885046

File tree

108 files changed

+11091
-1974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+11091
-1974
lines changed

.git-crypt/.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Do not edit this file. To specify the files to encrypt, create your own
2+
# .gitattributes file in the directory where your files are.
3+
* !filter !diff
4+
*.gpg binary
304 Bytes
Binary file not shown.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/CLAUDE.md filter=git-crypt diff=git-crypt

.github/workflows/pkg.pr.new.yml

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,39 @@ on:
44
pull_request:
55
branches: main
66
paths-ignore:
7-
- 'packages/docs/**'
8-
- 'packages/playground/**'
7+
- 'packages/docs/**'
8+
- 'packages/playground/**'
99

1010
push:
1111
branches:
12-
- '**'
12+
- '**'
1313
tags:
14-
- '!**'
14+
- '!**'
1515
paths-ignore:
16-
- 'packages/docs/**'
17-
- 'packages/playground/**'
16+
- 'packages/docs/**'
17+
- 'packages/playground/**'
1818

1919
jobs:
2020
build:
2121
if: github.repository == 'vuejs/router'
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- name: Checkout code
26-
uses: actions/checkout@v4
27-
with:
28-
fetch-depth: 0
29-
- uses: pnpm/action-setup@v4
30-
- uses: actions/setup-node@v4
31-
with:
32-
node-version: lts/*
33-
cache: pnpm
34-
35-
- name: Install
36-
run: pnpm install --frozen-lockfile
37-
38-
- name: Build
39-
run: pnpm -C packages/router build
40-
41-
- name: Build DTS
42-
run: pnpm -C packages/router build:dts
43-
44-
- name: Release
45-
run: pnpm dlx pkg-pr-new publish --compact --pnpm './packages/*'
25+
- name: Checkout code
26+
uses: actions/checkout@v4
27+
with:
28+
fetch-depth: 0
29+
- uses: pnpm/action-setup@v4
30+
- uses: actions/setup-node@v4
31+
with:
32+
node-version: lts/*
33+
cache: pnpm
34+
35+
- name: Install
36+
run: pnpm install --frozen-lockfile
37+
38+
- name: Build
39+
run: pnpm -C packages/router build
40+
41+
- name: Release
42+
run: pnpm dlx pkg-pr-new publish --compact --pnpm './packages/*'

.github/workflows/test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- uses: pnpm/action-setup@v4
2424
- uses: actions/setup-node@v4
2525
with:
@@ -36,7 +36,6 @@ jobs:
3636
- run: pnpm install
3737
- run: pnpm run lint
3838
- run: pnpm run -r build
39-
- run: pnpm run -r build:dts
4039
- run: pnpm run -r test:types
4140
- run: pnpm run -r test:unit
4241

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ local.log
1717
_selenium-server.log
1818
packages/*/LICENSE
1919
tracing_output
20+
tsconfig.vitest-temp.json
21+
.claude/settings.local.json

CLAUDE.md

4.02 KB
Binary file not shown.

package.json

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vue/router-root",
33
"private": true,
4-
"packageManager": "pnpm@9.10.0",
4+
"packageManager": "pnpm@10.15.0",
55
"type": "module",
66
"engines": {
77
"node": ">=20.9.0"
@@ -13,7 +13,6 @@
1313
"release": "node scripts/release.mjs",
1414
"size": "node scripts/check-size.mjs",
1515
"build": "pnpm run -r build",
16-
"build:dts": "pnpm run -r build:dts",
1716
"docs": "pnpm run --filter ./packages/docs -r docs",
1817
"docs:api": "pnpm run --filter ./packages/docs -r docs:api",
1918
"docs:translation:compare": "pnpm run --filter ./packages/docs -r docs:translation:compare",
@@ -34,19 +33,19 @@
3433
"@vitest/coverage-v8": "^2.1.9",
3534
"@vitest/ui": "^2.1.9",
3635
"brotli": "^1.3.3",
37-
"chalk": "^5.4.1",
36+
"chalk": "^5.6.0",
3837
"enquirer": "^2.4.1",
39-
"execa": "^9.5.2",
38+
"execa": "^9.6.0",
4039
"globby": "^14.1.0",
41-
"lint-staged": "^15.5.1",
40+
"lint-staged": "^15.5.2",
4241
"minimist": "^1.2.8",
4342
"p-series": "^3.0.0",
4443
"prettier": "^3.5.3",
45-
"semver": "^7.7.1",
46-
"simple-git-hooks": "^2.13.0",
47-
"typedoc": "^0.26.11",
48-
"typedoc-plugin-markdown": "^4.2.10",
49-
"typescript": "~5.6.3",
44+
"semver": "^7.7.2",
45+
"simple-git-hooks": "^2.13.1",
46+
"typedoc": "^0.28.7",
47+
"typedoc-plugin-markdown": "^4.7.0",
48+
"typescript": "~5.8.3",
5049
"vitest": "^2.1.9"
5150
},
5251
"simple-git-hooks": {
@@ -71,9 +70,14 @@
7170
"@types/react",
7271
"react-dom"
7372
]
74-
}
73+
},
74+
"onlyBuiltDependencies": [
75+
"chromedriver",
76+
"esbuild",
77+
"geckodriver"
78+
]
7579
},
7680
"volta": {
77-
"node": "20.11.1"
81+
"node": "24.7.0"
7882
}
7983
}

packages/docs/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.vitepress/cache
2+
api

packages/docs/.vitepress/config/en.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { DefaultTheme, LocaleSpecificConfig } from 'vitepress'
2+
import typedocSidebar from '../../api/typedoc-sidebar.json'
23

34
export const META_URL = 'https://router.vuejs.org'
45
export const META_TITLE = 'Vue Router'
@@ -53,6 +54,12 @@ export const enConfig: LocaleSpecificConfig<DefaultTheme.Config> = {
5354
],
5455

5556
sidebar: {
57+
'/api/': [
58+
{
59+
text: 'API',
60+
items: typedocSidebar,
61+
},
62+
],
5663
// catch-all fallback
5764
'/': [
5865
{
@@ -179,13 +186,6 @@ export const enConfig: LocaleSpecificConfig<DefaultTheme.Config> = {
179186
],
180187
},
181188
],
182-
183-
'/api/': [
184-
{
185-
text: 'packages',
186-
items: [{ text: 'vue-router', link: '/api/' }],
187-
},
188-
],
189189
},
190190
},
191191
}

0 commit comments

Comments
 (0)