Skip to content

Commit d68aa9d

Browse files
emanuelmutschlechneremanuelmutschlechner
authored
Merge branch 'dev' into fix-hash-mode-deep-links
2 parents f12de15 + 99c4436 commit d68aa9d

File tree

44 files changed

+708
-603
lines changed

Some content is hidden

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

44 files changed

+708
-603
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ dist/*.gz
88
dist/*.map
99
explorations
1010
docs/.vuepress/dist
11+
yarn-error.log

‎docs-gitbook/ja/essentials/history-mode.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ history モードを使用する時は、URL は "普通" に見えます e.g. `
3232
</IfModule>
3333
```
3434

35+
`mod_rewrite`の代わりに、[`FallbackResource`](https://httpd.apache.org/docs/2.2/mod/mod_dir.html#fallbackresource) も使用することができます。
36+
3537
#### nginx
3638

3739
```nginx

‎docs/.vuepress/components/Bit.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<template>
2+
<p class="bit-sponsor">
3+
<a href="https://www.bitsrc.io/?utm_source=vue&utm_medium=vue&utm_campaign=vue&utm_term=vue&utm_content=vue" target="_blank">
4+
<span>This project is sponsored by</span>
5+
<img alt="bit" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/bit-wide.png">
6+
</a>
7+
</p>
8+
</template>

‎docs/.vuepress/public/_redirects

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
11
# redirect old urls to root
22

33
/en/essentials/getting-started.html /guide/
4-
/en/essentials/* /guide/essentials/*
5-
/en/advanced/* /guide/advanced/*
4+
/en/essentials/* /guide/essentials/:splat
5+
/en/advanced/* /guide/advanced/:splat
66
/en/api/* /api/
77
/en/* /:splat
88

99
/zh-cn/essentials/getting-started.html /zh/guide/
10-
/zh-cn/essentials/* /zh/guide/essentials/*
11-
/zh-cn/advanced/* /zh/guide/advanced/*
10+
/zh-cn/essentials/* /zh/guide/essentials/:splat
11+
/zh-cn/advanced/* /zh/guide/advanced/:splat
1212
/zh-cn/api/* /zh/api/
1313
/zh-cn/* /zh/:splat
1414

1515
/ru/essentials/getting-started.html /ru/guide/
16-
/ru/essentials/* /ru/guide/essentials/*
17-
/ru/advanced/* /ru/guide/advanced/*
16+
/ru/essentials/* /ru/guide/essentials/:splat
17+
/ru/advanced/* /ru/guide/advanced/:splat
1818
/ru/api/* /ru/api/
1919
/ru/* /ru/:splat
20+
21+
/ja/essentials/getting-started.html /ja/guide/
22+
/ja/essentials/* /ja/guide/essentials/:splat
23+
/ja/advanced/* /ja/guide/advanced/:splat
24+
/ja/api/* /ja/api/
25+
/ja/* /ja/:splat
26+
27+
/kr/essentials/getting-started.html /kr/guide/
28+
/kr/essentials/* /kr/guide/essentials/:splat
29+
/kr/advanced/* /kr/guide/advanced/:splat
30+
/kr/api/* /kr/api/
31+
/kr/* /kr/:splat

‎docs/.vuepress/style.styl

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.bit-sponsor
2+
font-weight 600
3+
background-color #f3f6f8
4+
padding 0.6em 1.2em
5+
border-radius 8px
6+
display inline-block
7+
margin 1em 0 !important
8+
a
9+
color #999
10+
img
11+
height 40px
12+
margin-left 15px
13+
img, span
14+
vertical-align middle

‎docs/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Introduction
22

3+
<Bit/>
4+
35
:::tip VERSION NOTE
46
For TypeScript users, `[email protected]+` requires `[email protected]+`, and vice versa.
57
:::

‎docs/api/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ sidebar: auto
44

55
# API Reference
66

7+
<Bit/>
8+
79
## `<router-link>`
810

911
`<router-link>` is the component for enabling user navigation in a router-enabled app. The target location is specified with the `to` prop. It renders as an `<a>` tag with correct `href` by default, but can be configured with the `tag` prop. In addition, the link automatically gets an active CSS class when the target route is active.

‎docs/guide/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Getting Started
22

3+
<Bit/>
4+
35
::: tip Note
46
We will be using [ES2015](https://github.com/lukehoban/es6features) in the code samples in the guide.
57

‎docs/guide/essentials/dynamic-matching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const User = {
5353
}
5454
```
5555

56-
Or, use the `beforeRouteUpdate` guard introduced in 2.2:
56+
Or, use the `beforeRouteUpdate` [navigation guard](../advanced/navigation-guards.html) introduced in 2.2:
5757

5858
``` js
5959
const User = {

‎docs/ja/api/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,9 @@ name ではないプロパティも描画されるコンポーネントに渡さ
253253
### fallback
254254

255255
- 型: `boolean`
256+
- デフォルト: `true`
256257

257-
ブラウザが `history.pushState` をサポートしないとき、 ルーターが `hash` モードにフォールバックかどうか制御します。デフォルトは `true`
258+
`history.pushState` がサポートされていないブラウザにおいて、モードが `history` に設定されているとき、ルーターを `hash` モードにフォールバックかどうか制御します。
258259

259260
これを `false` に設定すると、本質的に全ての `router-link` ナビゲーションが IE9 においてフルページリフレッシュになります。これは、サーバサイドレンダリングでハッシュモードの URL が機能しないため、IE9 で動作する必要がある場合に便利です。
260261

0 commit comments

Comments
 (0)