Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuejs/router
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.1.2
Choose a base ref
...
head repository: vuejs/router
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.1.3
Choose a head ref
  • 20 commits
  • 31 files changed
  • 7 contributors

Commits on Jul 13, 2022

  1. docs: incorrect reference links (#1470)

    The content points to "optional params", but the link goes to "repeatable params".
    Fixed links to point to "optional params".
    niceplugin authored Jul 13, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    pquentin Quentin Pradet
    Copy the full SHA
    66fd987 View commit details
  2. fix: allow overriding replace in guards

    Fix #1471
    posva committed Jul 13, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    f0f448a View commit details
  3. chore: up deps

    posva committed Jul 13, 2022
    Copy the full SHA
    a77cd6b View commit details

Commits on Jul 18, 2022

  1. chore: no type warn

    posva committed Jul 18, 2022
    Copy the full SHA
    434139c View commit details

Commits on Jul 19, 2022

  1. test: update types

    posva committed Jul 19, 2022
    Copy the full SHA
    9030279 View commit details
  2. Copy the full SHA
    4d5182a View commit details
  3. fix(types): allow redirect with children

    Fix #1476
    posva committed Jul 19, 2022
    Copy the full SHA
    9f0d999 View commit details
  4. refactor: better type inference

    posva committed Jul 19, 2022
    Copy the full SHA
    900a661 View commit details
  5. chore: minors updates

    posva committed Jul 19, 2022
    Copy the full SHA
    26712b9 View commit details
  6. chore: up api docs

    posva committed Jul 19, 2022
    Copy the full SHA
    e50dd16 View commit details

Commits on Jul 20, 2022

  1. docs: add a blank line (#1474)

    Add a line to make the document look more harmonious
    Qiang authored Jul 20, 2022
    Copy the full SHA
    0cc066b View commit details

Commits on Jul 21, 2022

  1. Copy the full SHA
    583e77d View commit details

Commits on Jul 22, 2022

  1. docs: Router-Example typo fix. (#1481)

    Docs-API: Links with typos. `(#addroute-2)` → `(#addroute)`
    Router-Ex: Works fine, but typo in alpha value in css color. `rgb` → `rgba`
    niceplugin authored Jul 22, 2022
    Copy the full SHA
    de65a3f View commit details
  2. Copy the full SHA
    2ed41a1 View commit details

Commits on Jul 23, 2022

  1. docs: edit link not exist (#1484)

    * fix: edit link not exist
    
    * Update config.ts
    likui628 authored Jul 23, 2022
    Copy the full SHA
    cfe45da View commit details
  2. Copy the full SHA
    9ce152c View commit details

Commits on Jul 25, 2022

  1. Copy the full SHA
    247cf9d View commit details

Commits on Jul 27, 2022

  1. chore: up deps

    posva committed Jul 27, 2022
    Copy the full SHA
    301b52c View commit details
  2. Copy the full SHA
    66491c1 View commit details
  3. release: vue-router@4.1.3

    posva committed Jul 27, 2022
    Copy the full SHA
    7963824 View commit details
22 changes: 11 additions & 11 deletions .github/contributing.md
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ Hi! I'm really excited that you are interested in contributing to Vue Router. Be

- If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `update entities encoding/decoding (fix #3899)`.
- Provide a detailed description of the bug in the PR. Live demo preferred.
- Add appropriate test coverage if applicable. You can check the coverage of your code addition by running `yarn test --coverage`.
- Add appropriate test coverage if applicable. You can check the coverage of your code addition by running `pnpm test --coverage`.

- It's OK to have multiple small commits as you work on the PR - GitHub can automatically squash them before merging.

@@ -40,12 +40,12 @@ Hi! I'm really excited that you are interested in contributing to Vue Router. Be

## Development Setup

You will need [Node.js](http://nodejs.org) **version 10+**, and [Yarn](https://classic.yarnpkg.com/en/docs/install).
You will need [Node.js](http://nodejs.org) **version 10+**, and [Pnpm](https://pnpm.io/installation).

After cloning the repo, run:

```bash
$ yarn # install the dependencies of the project
$ pnpm install # install the dependencies of the project
```

A high level overview of tools used:
@@ -57,21 +57,21 @@ A high level overview of tools used:

## Scripts

### `yarn build`
### `pnpm build`

The `build` script builds vue-router

### `yarn dev`
### `pnpm play`

The `dev` scripts starts a playground project located at `playground/` that allows you to test things on a browser.
The `play` scripts starts a playground project located at `playground/` that allows you to test things on a browser.

```bash
$ yarn dev
$ pnpm play
```

### `yarn test`
### `pnpm test`

The `yarn test` script runs all checks:
The `pnpm test` script runs all checks:

- _Typings_: `test:types`
- _Linting_: `test:lint`
@@ -80,10 +80,10 @@ The `yarn test` script runs all checks:

```bash
# run all tests
$ yarn test
$ pnpm test

# run unit tests in watch mode
$ yarn jest --watch
$ pnpm jest --watch
```

## Project Structure
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
shamefully-hoist=true
detect_chromedriver_version=true

strict-peer-dependencies=false
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -76,6 +76,7 @@ Get started with the [documentation](https://router.vuejs.org).
- Via CDN: `<script src="https://unpkg.com/vue-router@4"></script>`
- In-browser playground on [CodeSandbox](https://codesandbox.io/s/vue-router-4-reproduction-hb9lh)
- Add it to an existing Vue Project:

```bash
npm install vue-router@4
```
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -27,13 +27,13 @@
"chalk": "^4.1.2",
"enquirer": "^2.3.6",
"execa": "^6.1.0",
"globby": "^13.1.1",
"lint-staged": "^13.0.0",
"globby": "^13.1.2",
"lint-staged": "^13.0.3",
"minimist": "^1.2.6",
"p-series": "^3.0.0",
"prettier": "^2.4.1",
"prettier": "^2.7.1",
"semver": "^7.3.7",
"typescript": "~4.7.2",
"typescript": "~4.7.4",
"yorkie": "^2.0.0"
},
"gitHooks": {
55 changes: 55 additions & 0 deletions packages/docs/.vitepress/components/VueSchool/BannerCountdown.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<template>
<ClientOnly>
<VueCountdown
v-if="remaining"
:time="remaining"
v-slot="data">
<span
v-for="part in ['days', 'hours', 'minutes', 'seconds']"
:key="part">
{{ data[part] }}{{ part[0].toLowerCase() }}
<span
v-if="part !== 'seconds'"
class="px-1 text-xl font-bold">
:
</span>
</span>
</VueCountdown>
</ClientOnly>
</template>

<script>
import VueCountdown from '@chenfengyuan/vue-countdown'
const countdownTransform = (props) => {
Object.entries(props).forEach(([key, value]) => {
const digits = value < 10 ? `0${value}` : value
props[key] = digits
})
return props
}
export default {
components: {
VueCountdown
},
props: {
remaining: {
type: Number,
default: 0
}
},
computed: {
isVisible () {
return this.remaining > 0
}
}
}
</script>

<style scoped>
span {
color: #ff5338;
font-weight: bold;
}
</style>
Loading