Skip to content

Commit b08e866

Browse files
authored
Merge pull request #242 from vuejs-id/master
[pull] indonesian from master
2 parents 92974b3 + bde5ac0 commit b08e866

16 files changed

+46
-38
lines changed

src/.vuepress/theme/components/PageEdit.vue

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,20 @@
44
<p>
55
Deployed on
66
<a href="https://url.netlify.com/HJ8X2mxP8">Netlify</a>.
7-
<span v-if="editLink" class="edit-link">
7+
<template v-if="editLink">
8+
<br />
9+
<span class="edit-link">
810
Caught a mistake or want to contribute to the documentation?
9-
<a
10-
:href="editLink"
11-
target="_blank"
12-
rel="noopener noreferrer"
13-
>
14-
{{ editLinkText }}
15-
<OutboundLink />
16-
</a>
17-
</span>
11+
<a
12+
:href="editLink"
13+
target="_blank"
14+
rel="noopener noreferrer"
15+
>
16+
{{ editLinkText }}
17+
<OutboundLink />
18+
</a>
19+
</span>
20+
</template>
1821
<template v-if="lastUpdated" class="last-updated">
1922
<br />
2023
<span class="prefix">{{ lastUpdatedText }}:</span>

src/api/refs-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ count.value++
1616
console.log(count.value) // 1
1717
```
1818

19-
If an object is assigned as a ref's value, the object is made deeply reactive by the [reactive](./basic-reactivity.html#reactive) method.
19+
If an object is assigned as a ref's value, the object is made deeply reactive by the [reactive](./basic-reactivity.html#reactive) function.
2020

2121
**Typing:**
2222

src/api/sfc-style.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ A `<style module>` tag is compiled as [CSS Modules](https://github.com/css-modul
126126

127127
The resulting classes are hashed to avoid collision, achieving the same effect of scoping the CSS to the current component only.
128128

129-
Refer to the [CSS Modules spec](https://github.com/css-modules/css-modules) for mode details such as [global exceptions](https://github.com/css-modules/css-modules#exceptions) and [composition](https://github.com/css-modules/css-modules#composition).
129+
Refer to the [CSS Modules spec](https://github.com/css-modules/css-modules) for more details such as [global exceptions](https://github.com/css-modules/css-modules#exceptions) and [composition](https://github.com/css-modules/css-modules#composition).
130130

131131
### Custom Inject Name
132132

src/guide/component-attrs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ app.component('date-picker', {
1818
})
1919
```
2020

21-
In the event we need to define the status of the date-picker component via a `data-status` property, it will be applied to the root node (i.e., `div.date-picker`).
21+
In the event we need to define the status of the date-picker component via a `data-status` attribute, it will be applied to the root node (i.e., `div.date-picker`).
2222

2323
```html
2424
<!-- Date-picker component with a non-prop attribute -->

src/guide/component-registration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ You can see other recommendations for component names in the [Style Guide](../st
2727

2828
### Name Casing
2929

30-
When defining components in a string template or a single-file component, you have two options when defining component names:
30+
When defining components in a string template or a single-file component, you have two options for naming them:
3131

3232
#### With kebab-case
3333

src/guide/installation.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,12 @@ Proyek Vue dapat diatur secara cepat dengan Vite dengan menjalankan perintah ber
9797
Dengan npm:
9898

9999
```bash
100-
$ npm init vite <project-name> -- --template vue
100+
# npm 6.x
101+
$ npm init vite@latest <project-name> --template vue
102+
103+
# npm 7+, extra double-dash is needed:
104+
$ npm init vite@latest <project-name> -- --template vue
105+
101106
$ cd <project-name>
102107
$ npm install
103108
$ npm run dev

src/guide/list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ To give Vue a hint so that it can track each node's identity, and thus reuse and
127127
</div>
128128
```
129129

130-
It is recommended to provide a `key` attribute with `v-for` whenever possible, unless the iterated DOM content is simple, or you are intentionally relying on the default behavior for performance gains.
130+
[It is recommended](/style-guide/#keyed-v-for-essential) to provide a `key` attribute with `v-for` whenever possible, unless the iterated DOM content is simple, or you are intentionally relying on the default behavior for performance gains.
131131

132132
Since it's a generic mechanism for Vue to identify nodes, the `key` also has other uses that are not specifically tied to `v-for`, as we will see later in the guide.
133133

src/guide/migration/custom-elements-interop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ badges:
99

1010
- **MERUSAK:** Pengecekan untuk mengetahui jika _tag_ HTML harus di perlakukan seperti elemen kustom sekarang dilakukan pada saat kompilasi templat, dan harus dilakukan melalui opsi kompiler bukan pada konfigurasi _runtime_
1111
- **MERUSAK** Penggunaan properti khusus `is` dibatasi untuk _tag_ `<component>` saja.
12-
- **BARU** Terdapat _directive_ baru `v-is` untuk mendukung kasus penggunaan pada Vue versi 2.x dimana `is` digunakan pada elemen bawaan untuk mengatasi masalah batasan penguraian pada elemen bawaan HTML.
12+
- **NEW:** To support 2.x use cases where `is` was used on native elements to work around native HTML parsing restrictions, prefix the value with `vue:` to resolve it as a Vue component.
1313

1414
## Elemen Kustom Otonom
1515

src/guide/migration/introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ Beberapa fitur baru yang akan membuat Anda tertarik di Vue 3 termasuk:
5353
- [Fragments](/guide/migration/fragments.html)
5454
- [Emits Component Option](/guide/component-custom-events.html)
5555
- [`createRenderer` API from `@vue/runtime-core`](https://github.com/vuejs/vue-next/tree/master/packages/runtime-core) to create custom renderers
56-
- [SFC Composition API Syntax Sugar (`<script setup>`)](https://github.com/vuejs/rfcs/blob/master/active-rfcs/0040-script-setup.md) <Badge text="experimental" type="warning" />
57-
- [SFC State-driven CSS Variables (`v-bind` in `<style>`)](https://github.com/vuejs/rfcs/blob/master/active-rfcs/0043-sfc-style-variables.md) <Badge text="experimental" type="warning" />
56+
- [SFC Composition API Syntax Sugar (`<script setup>`)](/api/sfc-script-setup.html)
57+
- [SFC State-driven CSS Variables (`v-bind` in `<style>`)](/api/sfc-style.html#state-driven-dynamic-css)
5858
- [SFC `<style scoped>` can now include global rules or rules that target only slotted content](https://github.com/vuejs/rfcs/blob/master/active-rfcs/0023-scoped-styles-changes.md)
5959
- [Suspense](/guide/migration/suspense.html) <Badge text="experimental" type="warning" />
6060

src/guide/migration/v-bind.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ badges:
1212

1313
## Introduction
1414

15-
When dynamically binding attributes on an element, a common scenario involves using both the `v-bind="object"` syntax as well as individual properties in the same element. However, this raises questions as far as the priority of merging.
15+
When dynamically binding attributes on an element, a common scenario involves using both the `v-bind="object"` syntax as well as individual attributes in the same element. However, this raises questions as far as the priority of merging.
1616

1717
## 2.x Syntax
1818

19-
In 2.x, if an element has both `v-bind="object"` and an identical individual property defined, the individual property would always overwrite bindings in the `object`.
19+
In 2.x, if an element has both `v-bind="object"` and an identical individual attribute defined, the individual attribute would always overwrite bindings in the `object`.
2020

2121
```html
2222
<!-- template -->
@@ -27,7 +27,7 @@ In 2.x, if an element has both `v-bind="object"` and an identical individual pro
2727

2828
## 3.x Syntax
2929

30-
In 3x, if an element has both `v-bind="object"` and an identical individual property defined, the order of how the bindings are declared determines how they are merged. In other words, rather than assuming developers want the individual property to always override what is defined in the `object`, developers now have more control over the desired merging behavior.
30+
In 3x, if an element has both `v-bind="object"` and an identical individual attribute defined, the order of how the bindings are declared determines how they are merged. In other words, rather than assuming developers want the individual attribute to always override what is defined in the `object`, developers now have more control over the desired merging behavior.
3131

3232
```html
3333
<!-- template -->
@@ -43,6 +43,6 @@ In 3x, if an element has both `v-bind="object"` and an identical individual prop
4343

4444
## Migration Strategy
4545

46-
If you are relying on this override functionality for `v-bind`, we currently recommend ensuring that your `v-bind` attribute is defined before individual properties.
46+
If you are relying on this override functionality for `v-bind`, we currently recommend ensuring that your `v-bind` attribute is defined before individual attributes.
4747

4848
[Migration build flag: `COMPILER_V_BIND_OBJECT_ORDER`](migration-build.html#compat-configuration)

0 commit comments

Comments
 (0)