Skip to content

Commit 534fb5e

Browse files
committed
chore: Merge remote-tracking branch 'zmj/main' into vapor
2 parents d5f389c + 30f8674 commit 534fb5e

File tree

6 files changed

+518
-264
lines changed

6 files changed

+518
-264
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818

1919
jobs:
2020
build:
21+
if: github.repository == 'vuejs/router'
2122
runs-on: ubuntu-latest
2223

2324
steps:

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: 'BrowserStack Env Setup'
2929
uses: 'browserstack/github-actions/setup-env@master'
3030
# forks do not have access to secrets so just skip this
31-
if: ${{ !github.event.pull_request.head.repo.fork }}
31+
if: ${{ github.repository == 'vuejs/router' && !github.event.pull_request.head.repo.fork }}
3232
with:
3333
username: ${{ secrets.BROWSERSTACK_USERNAME }}
3434
access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@
3131
"postinstall": "simple-git-hooks"
3232
},
3333
"devDependencies": {
34-
"@vitest/coverage-v8": "^2.1.5",
35-
"@vitest/ui": "^2.1.5",
34+
"@vitest/coverage-v8": "^2.1.9",
35+
"@vitest/ui": "^2.1.9",
3636
"brotli": "^1.3.3",
37-
"chalk": "^5.3.0",
37+
"chalk": "^5.4.1",
3838
"enquirer": "^2.4.1",
39-
"execa": "^9.5.1",
40-
"globby": "^14.0.2",
41-
"lint-staged": "^15.2.10",
39+
"execa": "^9.5.2",
40+
"globby": "^14.1.0",
41+
"lint-staged": "^15.5.1",
4242
"minimist": "^1.2.8",
4343
"p-series": "^3.0.0",
44-
"prettier": "^3.5.2",
45-
"semver": "^7.6.3",
46-
"simple-git-hooks": "^2.11.1",
44+
"prettier": "^3.5.3",
45+
"semver": "^7.7.1",
46+
"simple-git-hooks": "^2.13.0",
4747
"typedoc": "^0.26.11",
4848
"typedoc-plugin-markdown": "^4.2.10",
4949
"typescript": "~5.6.3",
50-
"vitest": "^2.1.5"
50+
"vitest": "^2.1.9"
5151
},
5252
"simple-git-hooks": {
5353
"pre-commit": "pnpm lint-staged",

packages/playground/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"vue": "~3.5.13"
1313
},
1414
"devDependencies": {
15-
"@types/node": "^20.17.7",
16-
"@vitejs/plugin-vue": "^5.2.0",
15+
"@types/node": "^20.17.31",
16+
"@vitejs/plugin-vue": "^5.2.3",
1717
"@vue/compiler-sfc": "~3.5.13",
1818
"@vue/tsconfig": "^0.6.0",
19-
"vite": "^5.4.11",
19+
"vite": "^5.4.18",
2020
"vue-router": "workspace:*",
21-
"vue-tsc": "^2.1.10"
21+
"vue-tsc": "^2.2.10"
2222
}
2323
}

packages/router/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"bugs": {
7777
"url": "https://github.com/vuejs/router/issues"
7878
},
79-
"homepage": "https://github.com/vuejs/router#readme",
79+
"homepage": "https://router.vuejs.org",
8080
"files": [
8181
"index.js",
8282
"dist/*.{js,cjs,mjs}",
@@ -120,30 +120,30 @@
120120
"@microsoft/api-extractor": "^7.48.0",
121121
"@rollup/plugin-alias": "^5.1.1",
122122
"@rollup/plugin-commonjs": "^25.0.8",
123-
"@rollup/plugin-node-resolve": "^15.3.0",
123+
"@rollup/plugin-node-resolve": "^15.3.1",
124124
"@rollup/plugin-replace": "^5.0.7",
125125
"@rollup/plugin-terser": "^0.4.4",
126126
"@types/jsdom": "^21.1.7",
127127
"@types/nightwatch": "^2.3.32",
128-
"@vitejs/plugin-vue": "^5.2.0",
128+
"@vitejs/plugin-vue": "^5.2.3",
129129
"@vue/compiler-sfc": "~3.5.13",
130130
"@vue/server-renderer": "~3.5.13",
131131
"@vue/test-utils": "^2.4.6",
132-
"browserstack-local": "^1.5.5",
133-
"chromedriver": "^131.0.1",
132+
"browserstack-local": "^1.5.6",
133+
"chromedriver": "^131.0.5",
134134
"connect-history-api-fallback": "^1.6.0",
135135
"conventional-changelog-cli": "^2.2.2",
136-
"dotenv": "^16.4.5",
136+
"dotenv": "^16.5.0",
137137
"faked-promise": "^2.2.2",
138138
"geckodriver": "^4.5.1",
139-
"happy-dom": "^15.11.6",
139+
"happy-dom": "^15.11.7",
140140
"nightwatch": "^2.6.25",
141141
"nightwatch-helpers": "^1.2.0",
142142
"rimraf": "^6.0.1",
143143
"rollup": "^3.29.5",
144144
"rollup-plugin-analyzer": "^4.0.0",
145145
"rollup-plugin-typescript2": "^0.36.0",
146-
"vite": "^5.4.11",
147-
"vue": "~3.5.13"
146+
"vite": "^5.4.18",
147+
"vue": "https://pkg.pr.new/vue@280bc48"
148148
}
149149
}

0 commit comments

Comments
 (0)