Skip to content

Commit e4baa59

Browse files
authored
Merge branch 'vuejs:main' into main
2 parents 8d98ec0 + 7ae2dac commit e4baa59

File tree

9 files changed

+403
-279
lines changed

9 files changed

+403
-279
lines changed

.vitepress/theme/components/Home.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,16 +162,21 @@ html:not(.dark) .accent,
162162
linear-gradient(45deg, #42d392, #647eff) border-box;
163163
border: 2px solid transparent;
164164
}
165+
165166
.actions .security:hover {
166167
background: linear-gradient(var(--vt-c-gray-light-4), var(--vt-c-gray-light-4)) padding-box,
167168
linear-gradient(45deg, #42d392, #647eff) border-box;
168169
}
169170
171+
.dark .actions .security:hover {
172+
background: linear-gradient(var(--vt-c-gray-dark-3), var(--vt-c-gray-dark-3)) padding-box,
173+
linear-gradient(45deg, #42d392, #647eff) border-box;
174+
}
175+
170176
.actions .security .icon {
171177
width: 12px;
172178
height: 12px;
173179
margin-left: 4px;
174-
175180
}
176181
177182
.actions .get-started,

.vitepress/theme/components/SecurityUpdateBtn.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
linear-gradient(45deg, #42d392, #647eff) border-box;
4444
transition-duration: 0.2s;
4545
}
46+
.dark .container .security:hover {
47+
background: linear-gradient(var(--vt-c-gray-dark-3), var(--vt-c-gray-dark-3)) padding-box,
48+
linear-gradient(45deg, #42d392, #647eff) border-box;
49+
}
4650
.container .security .icon {
4751
width: 12px;
4852
height: 12px;

pnpm-lock.yaml

Lines changed: 327 additions & 269 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/about/team/members-partner.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,10 @@
349349
},
350350
{
351351
"name": "Erick Petrucelli",
352-
"title": "Software Engineer & Architect, UX Specialist, Consultant, Educator, Writer",
353-
"company": "Freelance",
354-
"location": "João Pessoa, Brazil",
352+
"title": "Lead Software Engineer, UI/UX Specialist, Manager, Teacher, Speaker, Writer",
353+
"company": "LawnStarter",
354+
"companyLink": "https://www.lawnstarter.com/",
355+
"location": "Campinas, Brazil",
355356
"languages": ["Portuguese", "English"],
356357
"projects": [
357358
{

src/api/render-function.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ For adding built-in [`v-on` modifiers](/guide/essentials/event-handling#event-mo
305305
- **Type**
306306

307307
```ts
308-
function withModifiers(fn: Function, modifiers: string[]): Function
308+
function withModifiers(fn: Function, modifiers: ModifierGuardsKeys[]): Function
309309
```
310310

311311
- **Example**

src/api/sfc-script-setup.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,10 @@ const props = withDefaults(defineProps<Props>(), {
227227

228228
This will be compiled to equivalent runtime props `default` options. In addition, the `withDefaults` helper provides type checks for the default values, and ensures the returned `props` type has the optional flags removed for properties that do have default values declared.
229229

230+
:::info
231+
Note that default values for mutable reference types (like arrays or objects) should be wrapped in functions to avoid accidental modification and external side effects. This ensures each component instance gets its own copy of the default value.
232+
:::
233+
230234
## defineModel() <sup class="vt-badge" data-text="3.4+" /> {#definemodel}
231235

232236
This macro can be used to declare a two-way binding prop that can be consumed via `v-model` from the parent component. Example usage is also discussed in the [Component `v-model`](/guide/components/v-model) guide.

src/ecosystem/themes/themes.json

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@
197197
},
198198
{
199199
"name": "WrapPixel",
200-
"description": "Check out developer friendly vue js admin dashboard templates built by our partners from [WrapPixel](https://wrappixel.com). Download them to start building your real time web application quickly to save hundreds of hours in development and design.",
201-
"seeMoreUrl": "https://www.wrappixel.com/templates/category/vuejs-templates/",
200+
"description": "Check out top [dashboard templates](https://www.wrappixel.com/templates/category/admin-dashboard-templates/?ref=320) built by our partners from [WrapPixel](https://www.wrappixel.com/?ref=320). Download highly customizable vue templates (https://www.wrappixel.com/templates/category/vuejs-templates/?ref=320) to start building your real time web application quickly to save hundreds of hours in development and design.",
201+
"seeMoreUrl": "https://www.wrappixel.com/templates/category/vuejs-templates/?ref=320",
202202
"products": [
203203
{
204204
"name": "Spike Free VueJs Admin Template",
@@ -341,5 +341,54 @@
341341
"image": "https://cdn.themeselection.com/ts-assets/materio/materio-vuetify-nuxtjs-admin-template/banner/banner.png"
342342
}
343343
]
344-
}
345-
]
344+
},
345+
{
346+
"name": "AdminMart",
347+
"description": "Check out top [vue dashboard templates](https://adminmart.com/templates/vuejs-admin/?ref=34) built by our partners from [AdminMart](https://adminmart.com/?ref=34). Download them to speed up your web development process and build top class web applications.",
348+
"seeMoreUrl": "https://adminmart.com/templates/vuejs-admin/?ref=34",
349+
"products": [
350+
{
351+
"name": "Matdash Free Vuejs Admin Dashboard",
352+
"price": 0,
353+
"description": "Free & Open Source VueJs Admin Template",
354+
"url": "https://adminmart.com/product/matdash-free-vuejs-admin-dashboard/?ref=34",
355+
"image": "https://adminmart.com/wp-content/uploads/2024/05/matdash-vuetifi-vuejs-2.png"
356+
},
357+
{
358+
"name": "Matdash Vuejs Admin Dashboard",
359+
"price": 49,
360+
"description": "Empowering Developers with Unmatched Flexibility and Power",
361+
"url": "https://adminmart.com/product/matdash-vuejs-admin-dashboard/?ref=34",
362+
"image": "https://adminmart.com/wp-content/uploads/2024/05/matdash-vuetify-vuejs-admin-dashboard.png"
363+
},
364+
{
365+
"name": "Modernize Vuetify 3 & Vue 3 Admin Dashboard",
366+
"price": 49,
367+
"description": "Developer Friendly & Most Powerful Vue Admin Dashboard Template",
368+
"url": "https://adminmart.com/product/modernize-vuetify-vue-admin-dashboard/?ref=34",
369+
"image": "https://adminmart.com/wp-content/uploads/2023/02/modernize-vuetify-admin-dashboard-min.png"
370+
},
371+
{
372+
"name": "Modernize Free Vuetify + Vue js Admin Dashboard",
373+
"price": 0,
374+
"description": "Free & Open Source VueJs Admin Template",
375+
"url": "https://adminmart.com/product/modernize-free-vuetify-vue-js-admin-dashboard/?ref=34",
376+
"image": "https://adminmart.com/wp-content/uploads/2023/02/modernize-free-vuetify-admin-dashboard-am-min1.png"
377+
},
378+
{
379+
"name": "Modernize Free NuxtJs Admin Dashboard Template",
380+
"price": 0,
381+
"description": "Free NuxtJs Dashboard Template",
382+
"url": "https://adminmart.com/product/modernize-free-vuetify-vue-js-admin-dashboard/?ref=34",
383+
"image": "https://adminmart.com/wp-content/uploads/2023/02/modernize-free-nuxt-admin-dashboard-am-min.png"
384+
},
385+
{
386+
"name": "Modernize Nuxt Js Admin Dashboard",
387+
"price": 49,
388+
"description": "Rapidly Build Powerful Dashboards with NuxtJs - Vuetify: A Developer's Dream",
389+
"url": "https://adminmart.com/product/modernize-nuxt-js-admin-dashboard/?ref=34",
390+
"image": "https://adminmart.com/wp-content/uploads/2023/02/modernize-nuxt-js-admin-dashboard.png"
391+
}
392+
]
393+
},
394+
]

src/guide/scaling-up/tooling.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ The official loader that provides Vue SFC support in webpack. If you are using V
194194
- [Vue + Vite on Repl.it](https://replit.com/@templates/VueJS-with-Vite)
195195
- [Vue on CodeSandbox](https://codesandbox.io/p/devbox/github/codesandbox/sandbox-templates/tree/main/vue-vite)
196196
- [Vue on Codepen](https://codepen.io/pen/editor/vue)
197-
- [Vue on Components.studio](https://components.studio/create/vue3)
198197
- [Vue on WebComponents.dev](https://webcomponents.dev/create/cevue)
199198

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

src/guide/typescript/composition-api.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ const props = withDefaults(defineProps<Props>(), {
8484

8585
This will be compiled to equivalent runtime props `default` options. In addition, the `withDefaults` helper provides type checks for the default values, and ensures the returned `props` type has the optional flags removed for properties that do have default values declared.
8686

87+
:::info
88+
Note that default values for mutable reference types (like arrays or objects) should be wrapped in functions to avoid accidental modification and external side effects. This ensures each component instance gets its own copy of the default value.
89+
:::
90+
8791
### Without `<script setup>` {#without-script-setup}
8892

8993
If not using `<script setup>`, it is necessary to use `defineComponent()` to enable props type inference. The type of the props object passed to `setup()` is inferred from the `props` option.

0 commit comments

Comments
 (0)