8000 refactor mixins into a new component composition page · vuejs/v2.vuejs.org@29f957a · GitHub
[go: up one dir, main page]
Skip to content

Commit 29f957a

Browse files
chrisvfritzchrisvfritz
committed
refactor mixins into a new component composition page
1 parent 8fd22cd commit 29f957a

File tree

5 files changed

+554
-147
lines changed

5 files changed

+554
-147
lines changed

‎_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ alias:
164164
guide/migration-vue-router.html: v2/guide/migration-vue-router.html
165165
guide/migration-vuex.html: v2/guide/migration-vuex.html
166166
guide/migration.html: v2/guide/migration.html
167-
guide/mixins.html: v2/guide/mixins.html
167+
guide/mixins.html: v2/guide/composition.html
168+
v2/guide/mixins.html: v2/guide/composition.html
168169
guide/plugins.html: v2/guide/plugins.html
169170
guide/reactivity.html: v2/guide/reactivity.html
170171
guide/render-function.html: v2/guide/render-function.html

‎src/v2/api/index.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type: api
4444

4545
The merge strategy receives the value of that option defined on the parent and child instances as the first and second arguments, respectively. The context Vue instance is passed as the third argument.
4646

47-
- **See also:** [Custom Option Merging Strategies](../guide/mixins.html#Custom-Option-Merge-Strategies)
47+
- **See also:** [Custom Merge Strategies](../guide/composition.html#Custom-Merge-Strategies)
4848

4949
### devtools
5050

@@ -366,7 +366,7 @@ type: api
366366

367367
Apply a mixin globally, which affects every Vue instance created afterwards. This can be used by plugin authors to inject custom behavior into components. **Not recommended in application code**.
368368

369-
- **See also:** [Global Mixin](../guide/mixins.html#Global-Mixin)
369+
- **See also:** [Global Mixins](../guide/composition.html#Global-Mixins)
370370

371371
<h3 id="Vue-compile">Vue.compile( template )</h3>
372372

@@ -950,7 +950,7 @@ type: api
950950
// => 2
951951
```
952952
953-
- **See also:** [Mixins](../guide/mixins.html)
953+
- **See also:** [Mixins](../guide/composition.html#Mixins)
954954
955955
### extends
956956
@@ -974,6 +974,8 @@ type: api
974974
}
975975
```
976976
977+
- **See also:** [Extension](../guide/composition.html#Extension)
978+
977979
### provide / inject
978980
979981
> New in 2.2.0+

0 commit comments

Comments
 (0)
0