Skip to content

Commit 4429b73

Browse files
Migrate changes from master to main (#1545)
1 parent 1fe88c4 commit 4429b73

File tree

9 files changed

+14
-10
lines changed

9 files changed

+14
-10
lines changed

Diff for: src/api/built-in-special-attributes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
The `key` special attribute is primarily used as a hint for Vue's virtual DOM algorithm to identify vnodes when diffing the new list of nodes against the old list.
66

7-
- **Expects:** `number | string`
7+
- **Expects:** `number | string | symbol`
88

99
- **Details**
1010

Diff for: src/api/sfc-spec.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default {
3636

3737
### `<template>`
3838

39-
- Each `*.vue` file can contain at most one `<template>` block at a time.
39+
- Each `*.vue` file can contain at most one top-level `<template>` block at a time.
4040

4141
- Contents will be extracted and passed on to `@vue/compiler-dom`, pre-compiled into JavaScript render functions, and attached to the exported component as its `render` option.
4242

Diff for: src/ecosystem/themes/themes.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
},
128128
{
129129
"name": "PrimeVue",
130-
"description": "The open-source UI component library [PrimeVue](https://www.primefaces.org/primevue/#/?af_id=4218) offers over 80 flexible components to build your apps with! They have a ton of different component themes and Vue-CLI application templates available to get the look&feel that suits you best.`",
130+
"description": "The open-source UI component library [PrimeVue](https://www.primefaces.org/primevue/#/?af_id=4218) offers over 80 flexible components to build your apps with! They have a ton of different component themes and Vue-CLI application templates available to get the look & feel that suits you best.`",
131131
"seeMoreUrl": "https://www.primefaces.org/primevue/#/?af_id=4218",
132132
"products": [
133133
{
@@ -218,7 +218,7 @@
218218
},
219219
{
220220
"name": "Flatlogic",
221-
"description": "Check the admin dashboards templates built by our partners from [Flatlogic](https://flatlogic.com/templates?ref=x-fdkuTAVW). With these themes you can see how real applications is built. Additionally these templates will help you to start a new application and save you time and money.`",
221+
"description": "Check out the admin dashboard templates built by our partners from [Flatlogic](https://flatlogic.com/templates?ref=x-fdkuTAVW). With these themes you can see how real applications are built. Additionally, these templates will help you to start a new application and save you time and money.`",
222222
"seeMoreUrl": "https://flatlogic.com/templates?ref=x-fdkuTAVW",
223223
"products": [
224224
{

Diff for: src/guide/essentials/forms.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,9 @@ If you want user input to be automatically typecast as a number, you can add the
434434
<input v-model.number="age" />
435435
```
436436

437-
This is often useful, because even with `<input type="number">`, the value of HTML input elements always returns a string. If the value cannot be parsed with `parseFloat()`, then the original value is used.
437+
If the value cannot be parsed with `parseFloat()`, then the original value is used instead.
438+
439+
The `number` modifier is applied automatically if the input has `type="number"`.
438440

439441
### `.trim`
440442

Diff for: src/guide/extras/web-components.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module.exports = {
5252
.rule('vue')
5353
.use('vue-loader')
5454
.tap(options => ({
55-
...options
55+
...options,
5656
compilerOptions: {
5757
// treat any tag that starts with ion- as custom elements
5858
isCustomElement: tag => tag.startsWith('ion-')
@@ -208,7 +208,7 @@ It is recommended to export the individual element constructors to give your use
208208
```js
209209
import { defineCustomElement } from 'vue'
210210
import Foo from './MyFoo.ce.vue'
211-
import Bar from './MyBar.ce.bar'
211+
import Bar from './MyBar.ce.vue'
212212

213213
const MyFoo = defineCustomElement(Foo)
214214
const MyBar = defineCustomElement(Bar)

Diff for: src/guide/scaling-up/sfc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ SFC is a defining feature of Vue as a framework, and is the recommended approach
4848
- Static Site Generation (SSG)
4949
- Any non-trivial frontend where a build step can be justified for better development experience (DX).
5050

51-
That said, we do realize there are scenarios where SFCs can feel like overkill. This is why Vue can still be used via plain JavaScript without a build step. If you are just looking for enhancing largely static HTML with light interactions, you can also check out [petite-vue](https://github.com/vuejs/petite-vue), a 5kb subset of Vue optimized for progressive enhancement.
51+
That said, we do realize there are scenarios where SFCs can feel like overkill. This is why Vue can still be used via plain JavaScript without a build step. If you are just looking for enhancing largely static HTML with light interactions, you can also check out [petite-vue](https://github.com/vuejs/petite-vue), a 6kb subset of Vue optimized for progressive enhancement.
5252

5353
## How It Works
5454

Diff for: src/guide/scaling-up/tooling.md

+2
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,7 @@ The official loader that provides Vue SFC support in webpack. If you are using V
152152
- [Vue + Vite on Repl.it](https://replit.com/@templates/VueJS-with-Vite)
153153
- [Vue on CodeSandbox](https://codesandbox.io/s/vue-3)
154154
- [Vue on Codepen](https://codepen.io/pen/editor/vue)
155+
- [Vue on Components.studio](https://components.studio/create/vue3)
156+
- [Vue on WebComponents.dev](https://webcomponents.dev/create/cevue)
155157

156158
<!-- TODO ## Backend Framework Integrations -->

Diff for: src/guide/typescript/overview.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ With a Vite-based setup, the dev server and the bundler are transpilation-only a
3636

3737
- [TypeScript Vue Plugin](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.vscode-typescript-vue-plugin) is also needed to get type support for `*.vue` imports in TS files.
3838

39-
- [WebStorm](https://www.jetbrains.com/webstorm/) also provides out-of-the-box support for both TypeScript and Vue.
39+
- [WebStorm](https://www.jetbrains.com/webstorm/) also provides out-of-the-box support for both TypeScript and Vue. Other JetBrains IDEs support them too, either out of the box or via [a free plugin](https://plugins.jetbrains.com/plugin/9442-vue-js).
4040

4141
### Configuring `tsconfig.json`
4242

Diff for: src/style-guide/rules-use-with-caution.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Prefer class selectors over element selectors in `scoped` styles, because large
1111
::: details Detailed Explanation
1212
To scope styles, Vue adds a unique attribute to component elements, such as `data-v-f3f3eg9`. Then selectors are modified so that only matching elements with this attribute are selected (e.g. `button[data-v-f3f3eg9]`).
1313

14-
The problem is that large numbers of [element-attribute selectors](http://stevesouders.com/efws/css-selectors/csscreate.php?n=1000&sel=a%5Bhref%5D&body=background%3A+%23CFD&ne=1000) (e.g. `button[data-v-f3f3eg9]`) will be considerably slower than [class-attribute selectors](http://stevesouders.com/efws/css-selectors/csscreate.php?n=1000&sel=.class%5Bhref%5D&body=background%3A+%23CFD&ne=1000) (e.g. `.btn-close[data-v-f3f3eg9]`), so class selectors should be preferred whenever possible.
14+
The problem is that large numbers of element-attribute selectors (e.g. `button[data-v-f3f3eg9]`) will be considerably slower than class-attribute selectors (e.g. `.btn-close[data-v-f3f3eg9]`), so class selectors should be preferred whenever possible.
1515
:::
1616

1717
<div class="style-example style-example-bad">

0 commit comments

Comments
 (0)