Merge branch 'main' into perf-releases

# Conflicts:
#	README.md
#	packages/router/CHANGELOG.md
#	packages/router/package.json

Author: skirtles-code

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +1,15 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Help and Question
+  - name: 👨‍💻 Support
+    url: https://cal.com/posva/consultancy
+    about: Get direct help from the author of Vue Router with your project
+  - name: ❓ Help & Questions
     url: https://github.com/vuejs/router/discussions/new?category=help-and-questions
     about: Ask a question or discuss about Vue Router
-  - name: GitHub Sponsors
+  - name: 💡 Ideas
+    url: https://github.com/vuejs/router/discussions/new?category=ideas
+    about: Start a discussion to improve Vue Router
+  - name: 🌟 GitHub Sponsors
     url: https://github.com/sponsors/posva
     about: Like this project? Please consider supporting the author.
   - name: Open Collective

.github/contributing.md

@@ -34,9 +34,9 @@ Hi! I'm really excited that you are interested in contributing to Vue Router. Be
 
 - Make sure tests pass!
 
-- Commit messages must follow the [commit message convention](./commit-convention.md) so that the changelog can be automatically generated. Commit messages are automatically validated before commit (by invoking [Git Hooks](https://git-scm.com/docs/githooks) via [yorkie](https://github.com/yyx990803/yorkie)).
+- Commit messages must follow the [commit message convention](./commit-convention.md) so that the changelog can be automatically generated. Commit messages are automatically validated before commit (by invoking [Git Hooks](https://git-scm.com/docs/githooks) via [simple-git-hooks](https://github.com/toplenboren/simple-git-hooks)).
 
-- No need to worry about code style as long as you have installed the dev dependencies - modified files are automatically formatted with Prettier on commit (by invoking [Git Hooks](https://git-scm.com/docs/githooks) via [yorkie](https://github.com/yyx990803/yorkie)).
+- No need to worry about code style as long as you have installed the dev dependencies - modified files are automatically formatted with Prettier on commit (by invoking [Git Hooks](https://git-scm.com/docs/githooks) via [simple-git-hooks](https://github.com/toplenboren/simple-git-hooks)).
 
 ## Development Setup
 
@@ -52,7 +52,7 @@ A high-level overview of tools used:
 
 - [TypeScript](https://www.typescriptlang.org/) as the development language
 - [Rollup](https://rollupjs.org) for bundling
-- [Jest](https://jestjs.io/) for unit testing
+- [Vitest](https://vitest.dev/) for unit testing
 - [Prettier](https://prettier.io/) for code formatting
 
 ## Scripts
@@ -83,7 +83,7 @@ The `pnpm test` script runs all checks:
 $ pnpm test
 
 # run unit tests in watch mode
-$ pnpm jest --watch
+$ pnpm test:unit --watch
 ```
 
 ## Project Structure
@@ -102,7 +102,7 @@ Vue Router source code can be found in the `src` directory:
 
 ## Contributing Tests
 
-Unit tests are located inside `__tests__`. Consult the [Jest docs](https://jestjs.io/docs/en/using-matchers) and existing test cases for how to write new test specs. Here are some additional guidelines:
+Unit tests are located inside `__tests__`. Consult the [Vitest docs](https://vitest.dev/guide/) and existing test cases for how to write new test specs. Here are some additional guidelines:
 
 - Use the minimal API needed for a test case. For example, if a test can be written without involving the reactivity system or a component, it should be written so. This limits the test's exposure to changes in unrelated parts and makes it more stable.
 - Use the minimal API needed for a test case. For example, if a test concerns the `router-link` component, don't create a router instance, mock the required properties instead.

.prettierignore

@@ -2,3 +2,4 @@ __build__
 dist
 coverage
 tests_output
+packages/docs/.vitepress/cache

package.json

@@ -24,10 +24,11 @@
     "play": "pnpm run -r play",
     "build:size": "pnpm run -r build:size",
     "lint": "pnpm run lint:script && pnpm run lint:html",
-    "lint:script": "prettier -c --parser typescript \"packages/*/{src,__tests__,e2e}/**/*.[jt]s?(x)\"",
+    "lint:script": "prettier -c --parser typescript \"packages/**/*.?(m)[jt]s?(x)\" \"scripts/*.mjs\"",
     "lint:html": "prettier -c --parser html \"packages/**/*.html\"",
     "lint:fix": "pnpm run lint:script --write && pnpm run lint:html --write",
-    "test": "pnpm run -r test"
+    "test": "pnpm run -r test",
+    "postinstall": "simple-git-hooks"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^2.1.5",
@@ -40,24 +41,27 @@
     "lint-staged": "^15.2.10",
     "minimist": "^1.2.8",
     "p-series": "^3.0.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.5.2",
     "semver": "^7.6.3",
+    "simple-git-hooks": "^2.11.1",
     "typedoc": "^0.26.11",
     "typedoc-plugin-markdown": "^4.2.10",
     "typescript": "~5.6.3",
-    "vitest": "^2.1.5",
-    "yorkie": "^2.0.0"
+    "vitest": "^2.1.5"
   },
-  "gitHooks": {
-    "pre-commit": "lint-staged",
+  "simple-git-hooks": {
+    "pre-commit": "pnpm lint-staged",
     "commit-msg": "node scripts/verifyCommit.mjs"
   },
   "lint-staged": {
-    "*.js": [
+    "*.?(m)js": [
       "prettier --write"
     ],
-    "*.ts?(x)": [
+    "*.?(m)ts?(x)": [
       "prettier --parser=typescript --write"
+    ],
+    "*.html": [
+      "prettier --parser=html --write"
     ]
   },
   "pnpm": {

packages/docs/.vitepress/config/index.ts

@@ -10,7 +10,15 @@ export default defineConfig({
     root: { label: 'English', lang: 'en-US', link: '/', ...enConfig },
     zh: { label: '简体中文', lang: 'zh-CN', link: '/zh/', ...zhConfig },
     ko: { label: '한국어', lang: 'ko-KR', link: 'https://router.vuejs.kr/' },
-    pt: { label: 'Português', lang: 'pt-PT', link: 'https://vue-router-docs-pt.netlify.app/' },
-    ru: { label: 'Русский', lang: 'ru-RU', link: 'https://vue-router-ru.netlify.app' },
+    pt: {
+      label: 'Português',
+      lang: 'pt-PT',
+      link: 'https://vue-router-docs-pt.netlify.app/',
+    },
+    ru: {
+      label: 'Русский',
+      lang: 'ru-RU',
+      link: 'https://vue-router-ru.netlify.app',
+    },
   },
 })

packages/docs/.vitepress/config/shared.ts

@@ -135,7 +135,8 @@ export const sharedConfig = defineConfig({
     ],
 
     footer: {
-      copyright: 'Copyright © 2014-present Evan You, Eduardo San Martin Morote',
+      copyright:
+        'Copyright © 2014-present Evan You, Eduardo San Martin Morote',
       message: 'Released under the MIT License.',
     },
 

packages/docs/.vitepress/theme/components/AsideSponsors.vue

@@ -13,19 +13,30 @@ interface Sponsor {
 
 const asideSponsors = computed(() => {
   return [
+    ...(sponsors.platinum.length
+      ? [
+          {
+            items: sponsors.platinum.map((sponsor: Sponsor) => ({
+              name: sponsor.alt,
+              url: sponsor.href,
+              img: sponsor.imgSrcLight,
+            })),
+          },
+        ]
+      : []),
     {
       size: 'mini',
-      items: sponsors.platinum.length ? sponsors.platinum.map((sponsor: Sponsor) => ({
-        name: sponsor.alt,
-        url: sponsor.href,
-        img: sponsor.imgSrcLight,
-      })) : [
-        {
+      items: sponsors.gold
+        .map((sponsor: Sponsor) => ({
+          name: sponsor.alt,
+          url: sponsor.href,
+          img: sponsor.imgSrcLight,
+        }))
+        .concat({
           name: 'Become a sponsor',
           url: 'https://github.com/sponsors/posva',
-          img: '/your-logo-here.svg'
-        }
-      ],
+          img: '/your-logo-here.svg',
+        }),
     },
     {
       size: 'xmini',