Skip to content

Commit d3c9c8a

Browse files
authored
Merge branch 'v4' into bin/feat_chatmessages_slot
2 parents 6fcc070 + 41e5a18 commit d3c9c8a

File tree

84 files changed

+1346
-1285
lines changed

Some content is hidden

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

84 files changed

+1346
-1285
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ body:
4141
- v4.x
4242
- v3.x
4343
- v2.x
44-
default: 1
44+
default: 0
4545
validations:
4646
required: true
4747
- type: input

.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body:
1414
- v4.x
1515
- v3.x
1616
- v2.x
17-
default: 1
17+
default: 0
1818
validations:
1919
required: true
2020
- type: textarea

.github/ISSUE_TEMPLATE/question.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body:
1414
- v4.x
1515
- v3.x
1616
- v2.x
17-
default: 1
17+
default: 0
1818
validations:
1919
required: true
2020
- type: textarea

.github/workflows/module.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ jobs:
5252
- name: Test
5353
run: pnpm run test run
5454

55-
- name: Test (vue)
56-
run: pnpm run test:vue run
57-
5855
- name: Build
5956
run: pnpm run build
6057

.github/workflows/priority.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
const TRIAGE = "triage";
2727
const QUESTION = "question";
2828
const RELEASE = "release";
29+
const DOCUMENTATION = "documentation";
2930
const PRIORITIES = ["p0-critical","p1-high","p2-medium","p3-low"];
3031
const WORD_TO_LABEL = { critical:"p0-critical", high:"p1-high", medium:"p2-medium", low:"p3-low" };
3132
const NUM_TO_LABEL = ["p0-critical","p1-high","p2-medium","p3-low"];
@@ -87,6 +88,7 @@ jobs:
8788
const hasTriage = labelsNow.includes(TRIAGE);
8889
const hasQuestion = labelsNow.includes(QUESTION);
8990
const hasRelease = labelsNow.includes(RELEASE);
91+
const hasDocumentation = labelsNow.includes(DOCUMENTATION);
9092
// Check if the issue was created by a bot
9193
const isBot = issue.user?.type === "Bot" || issue.user?.login?.endsWith("[bot]");
9294
// Check if the issue has upstream-related labels
@@ -96,4 +98,4 @@ jobs:
9698
if (hasPriority && hasTriage) await removeLabel(TRIAGE);
9799
98100
// no priority & no triage & not a question & not a release & not created by bot & no upstream labels → add triage (so your stale job still sees it)
99-
if (!hasPriority && !hasTriage && !hasQuestion && !hasRelease && !isBot && !hasUpstream && issue.state === "open") await addLabels([TRIAGE]);
101+
if (!hasPriority && !hasTriage && !hasQuestion && !hasRelease && !hasDocumentation && !isBot && !hasUpstream && issue.state === "open") await addLabels([TRIAGE]);

.github/workflows/release.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ jobs:
4545
- name: Test
4646
run: pnpm run test run
4747

48-
- name: Test (vue)
49-
run: pnpm run test:vue run
50-
5148
- name: Publish
5249
run: ./scripts/release.sh
5350
env:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,5 @@ Licensed under the [MIT license](https://github.com/nuxt/ui/blob/v4/LICENSE.md).
152152
[license-src]: https://img.shields.io/github/license/nuxt/ui.svg?style=flat&colorA=18181B&colorB=28CF8D
153153
[license-href]: https://github.com/nuxt/ui/blob/v4/LICENSE.md
154154

155-
[nuxt-src]: https://img.shields.io/badge/Nuxt-18181B?logo=nuxt.js
155+
[nuxt-src]: https://img.shields.io/badge/Nuxt-18181B?logo=nuxt
156156
[nuxt-href]: https://nuxt.com

docs/app/components/content/SupportedLanguages.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ function getEmojiFlag(locale: string): string {
2929
ko: 'kr', // Korean -> South Korea
3030
ky: 'kg', // Kyrgyz -> Kyrgyzstan
3131
lb: 'lu', // Luxembourgish -> Luxembourg
32+
lo: 'la', // Lao -> Laos
3233
ms: 'my', // Malay -> Malaysia
3334
nb: 'no', // Norwegian Bokmål -> Norway
3435
sl: 'si', // Slovenian -> Slovenia

docs/app/components/content/examples/table/TablePaginationExample.vue

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,24 @@ const pagination = ref({
147147
pageIndex: 0,
148148
pageSize: 5
149149
})
150+
151+
const globalFilter = ref('')
150152
</script>
151153

152154
<template>
153155
<div class="w-full space-y-4 pb-4">
156+
<div class="flex px-4 py-3.5 border-b border-accented">
157+
<UInput
158+
v-model="globalFilter"
159+
class="max-w-sm"
160+
placeholder="Filter..."
161+
/>
162+
</div>
163+
154164
<UTable
155165
ref="table"
156166
v-model:pagination="pagination"
167+
v-model:global-filter="globalFilter"
157168
:data="data"
158169
:columns="columns"
159170
:pagination-options="{
@@ -162,9 +173,9 @@ const pagination = ref({
162173
class="flex-1"
163174
/>
164175

165-
<div class="flex justify-center border-t border-default pt-4">
176+
<div class="flex justify-end border-t border-default pt-4 px-4">
166177
<UPagination
167-
:default-page="(table?.tableApi?.getState().pagination.pageIndex || 0) + 1"
178+
:page="(table?.tableApi?.getState().pagination.pageIndex || 0) + 1"
168179
:items-per-page="table?.tableApi?.getState().pagination.pageSize"
169180
:total="table?.tableApi?.getFilteredRowModel().rows.length"
170181
@update:page="(p) => table?.tableApi?.setPageIndex(p - 1)"

docs/content/docs/1.getting-started/7.ai/1.mcp.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,27 @@ Or manually create/update `.cursor/mcp.json` in your project root:
135135
}
136136
```
137137

138+
### Google Antigravity
139+
140+
#### Setup Instructions:
141+
142+
1. Open the MCP store via the "..." dropdown at the top of the editor's agent panel.
143+
2. Click on "Manage MCP Servers"
144+
3. Click on "View raw config"
145+
4. Modify the `mcp_config.json` with your custom MCP server configuration:
146+
147+
```json
148+
{
149+
"mcpServers": {
150+
"nuxt-ui": {
151+
"serverUrl": "https://ui.nuxt.com/mcp"
152+
}
153+
}
154+
}
155+
```
156+
157+
5. Return to the "Manage MCP Servers" tab and click "Refresh". The Nuxt UI MCP server should now appear.
158+
138159
### Le Chat Mistral
139160

140161
#### Setup Instructions:

0 commit comments

Comments
 (0)