Skip to content

Commit b9dcd92

Browse files
mikenewbonmikenewbon
authored
Merge branch 'v4' into v4
2 parents 09574c7 + 886f5fb commit b9dcd92

44 files changed

Lines changed: 1388 additions & 1375 deletions

Some content is hidden

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

‎.github/workflows/follow-up.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,11 @@ jobs:
181181
}
182182
183183
// No author follow-up since maintainer reply
184+
if (issueLabels.includes(FLAG_LABEL.toLowerCase())) {
185+
skipped++;
186+
continue;
187+
}
188+
184189
const elapsedDays = Math.floor((now - lastMaintainerAt) / (1000 * 60 * 60 * 24));
185190
if (elapsedDays >= DAYS_WAIT) {
186191
await ensureLabel(number);

‎.github/workflows/module.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090

9191
- name: Store commit SHA
9292
run: |
93-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
93+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
9494
9595
- name: Install pnpm
9696
uses: pnpm/action-setup@v4
@@ -135,7 +135,7 @@ jobs:
135135

136136
- name: Store commit SHA
137137
run: |
138-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
138+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
139139
140140
- name: Install pnpm
141141
uses: pnpm/action-setup@v4
@@ -180,7 +180,7 @@ jobs:
180180

181181
- name: Store commit SHA
182182
run: |
183-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
183+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
184184
185185
- name: Install pnpm
186186
uses: pnpm/action-setup@v4
@@ -225,7 +225,7 @@ jobs:
225225

226226
- name: Store commit SHA
227227
run: |
228-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
228+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
229229
230230
- name: Install pnpm
231231
uses: pnpm/action-setup@v4
@@ -270,7 +270,7 @@ jobs:
270270

271271
- name: Store commit SHA
272272
run: |
273-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
273+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
274274
275275
- name: Install pnpm
276276
uses: pnpm/action-setup@v4
@@ -315,7 +315,7 @@ jobs:
315315

316316
- name: Store commit SHA
317317
run: |
318-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
318+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
319319
320320
- name: Install pnpm
321321
uses: pnpm/action-setup@v4
@@ -360,7 +360,7 @@ jobs:
360360

361361
- name: Store commit SHA
362362
run: |
363-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
363+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
364364
365365
- name: Install pnpm
366366
uses: pnpm/action-setup@v4
@@ -405,7 +405,7 @@ jobs:
405405

406406
- name: Store commit SHA
407407
run: |
408-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
408+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
409409
410410
- name: Install pnpm
411411
uses: pnpm/action-setup@v4
@@ -450,7 +450,7 @@ jobs:
450450

451451
- name: Store commit SHA
452452
run: |
453-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
453+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
454454
455455
- name: Install pnpm
456456
uses: pnpm/action-setup@v4
@@ -495,7 +495,7 @@ jobs:
495495

496496
- name: Store commit SHA
497497
run: |
498-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
498+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
499499
500500
- name: Install pnpm
501501
uses: pnpm/action-setup@v4
@@ -540,7 +540,7 @@ jobs:
540540

541541
- name: Store commit SHA
542542
run: |
543-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
543+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
544544
545545
- name: Install pnpm
546546
uses: pnpm/action-setup@v4
@@ -585,7 +585,7 @@ jobs:
585585

586586
- name: Store commit SHA
587587
run: |
588-
echo "COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
588+
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.head.sha || github.sha }} | cut -c1-7)" >> $GITHUB_ENV
589589
590590
- name: Install pnpm
591591
uses: pnpm/action-setup@v4

‎.github/workflows/reproduction.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: reproduction
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '30 1 * * *'
6+
- cron: '0 2 * * *'
77

88
jobs:
99
reproduction:
@@ -16,13 +16,13 @@ jobs:
1616
steps:
1717
- uses: actions/stale@v10
1818
with:
19-
days-before-stale: -1 # Issues and PR will never be flagged stale automatically.
20-
stale-issue-label: 'needs reproduction' # Label that flags an issue as stale.
21-
only-labels: 'needs reproduction' # Only process these issues
19+
days-before-stale: -1
20+
stale-issue-label: 'needs reproduction'
21+
only-labels: 'needs reproduction'
2222
days-before-issue-close: 7
2323
ignore-updates: true
2424
remove-stale-when-updated: false
2525
close-issue-message: |
2626
Hi! 👋 This issue was closed because it was open for 7 days without a reproduction.
2727
close-issue-label: 'closed-by-bot'
28-
operations-per-run: 300 #default 30
28+
operations-per-run: 300

‎.github/workflows/stale.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ jobs:
1414
issues: write
1515

1616
steps:
17-
- uses: actions/stale@4c023f01d613e60293d8004f251a18bfb9bbd71d
17+
- uses: actions/stale@v10
1818
with:
1919
days-before-pr-stale: -1
2020
days-before-stale: 60
2121
days-before-close: 7
2222
any-of-labels: 'triage,question'
23+
exempt-issue-labels: 'needs reproduction'
2324
stale-issue-label: 'stale'
2425
stale-issue-message: |
2526
Hi! 👋 This issue has been open for 60 days without activity and will be closed in 7 days. Please comment if it's still relevant.

‎docs/app/layouts/docs.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script setup lang="ts">
2-
import { useFilter } from 'reka-ui'
2+
import { useFilter } from '@nuxt/ui/composables'
33
import type { ContentNavigationItem } from '@nuxt/content'
44
55
const navigation = inject<Ref<ContentNavigationItem[]>>('navigation')
66
77
const route = useRoute()
8-
const { contains } = useFilter({ sensitivity: 'base' })
8+
const { scoreItem } = useFilter()
99
const { navigationByCategory } = useNavigation(navigation!)
1010
1111
const filteredNavigation = computed(() => {
@@ -15,7 +15,7 @@ const filteredNavigation = computed(() => {
1515
1616
return navigationByCategory.value.map(item => ({
1717
...item,
18-
children: item.children?.filter(child => contains(child.title as string, cleanedSearchTerm.value) || contains(child.description as string, cleanedSearchTerm.value))
18+
children: item.children?.filter(child => scoreItem(child, cleanedSearchTerm.value, ['title', 'description']) !== null)
1919
})).filter(item => item.children && item.children.length > 0)
2020
})
2121

‎docs/content/docs/1.getting-started/6.integrations/4.i18n/2.vue.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You can create your own locale using the [defineLocale](/docs/composables/define
4242
```vue [App.vue]
4343
<script setup lang="ts">
4444
import type { Messages } from '@nuxt/ui'
45-
import { defineLocale } from '@nuxt/ui/composables/defineLocale'
45+
import { defineLocale } from '@nuxt/ui/composables'
4646
4747
const locale = defineLocale<Messages>({
4848
name: 'My custom locale',
@@ -76,7 +76,7 @@ You can customize an existing locale by overriding its `messages` or `code` usin
7676
```vue [App.vue]
7777
<script setup lang="ts">
7878
import { en } from '@nuxt/ui/locale'
79-
import { extendLocale } from '@nuxt/ui/composables/defineLocale'
79+
import { extendLocale } from '@nuxt/ui/composables'
8080
8181
const locale = extendLocale(en, {
8282
code: 'en-AU',

‎docs/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"@ai-sdk/mcp": "^1.0.25",
1515
"@ai-sdk/vue": "^3.0.116",
1616
"@iconify-json/logos": "^1.2.10",
17-
"@iconify-json/lucide": "^1.2.96",
18-
"@iconify-json/simple-icons": "^1.2.72",
19-
"@iconify-json/vscode-icons": "^1.2.44",
17+
"@iconify-json/lucide": "^1.2.98",
18+
"@iconify-json/simple-icons": "^1.2.74",
19+
"@iconify-json/vscode-icons": "^1.2.45",
2020
"@modelcontextprotocol/sdk": "^1.27.1",
2121
"@nuxt/a11y": "1.0.0-alpha.1",
2222
"@nuxt/content": "^3.12.0",
@@ -25,22 +25,22 @@
2525
"@nuxtjs/mcp-toolkit": "^0.7.0",
2626
"@nuxtjs/mdc": "^0.20.2",
2727
"@octokit/rest": "^22.0.1",
28-
"@regle/core": "^1.20.2",
29-
"@regle/rules": "^1.20.2",
30-
"@tiptap/extension-emoji": "^3.20.0",
31-
"@tiptap/extension-text-align": "^3.20.0",
32-
"@vercel/analytics": "^2.0.0",
28+
"@regle/core": "^1.20.3",
29+
"@regle/rules": "^1.20.3",
30+
"@tiptap/extension-emoji": "^3.20.2",
31+
"@tiptap/extension-text-align": "^3.20.2",
32+
"@vercel/analytics": "^2.0.1",
3333
"@vercel/speed-insights": "^2.0.0",
3434
"@vueuse/integrations": "^14.2.1",
3535
"@vueuse/nuxt": "^14.2.1",
3636
"ai": "^6.0.116",
37-
"better-sqlite3": "^12.6.2",
37+
"better-sqlite3": "^12.8.0",
3838
"capture-website": "^5.1.0",
3939
"joi": "^18.0.2",
4040
"json5": "^2.2.3",
4141
"maska": "^3.2.0",
4242
"minimark": "^0.2.0",
43-
"motion-v": "^1.10.3",
43+
"motion-v": "^2.0.1",
4444
"nuxt": "^4.4.2",
4545
"nuxt-component-meta": "^0.17.2",
4646
"nuxt-llms": "^0.2.0",
@@ -49,7 +49,7 @@
4949
"shiki": "^3.23.0",
5050
"shiki-stream": "^0.1.4",
5151
"shiki-transformer-color-highlight": "^1.1.0",
52-
"simple-git": "^3.32.3",
52+
"simple-git": "^3.33.0",
5353
"sortablejs": "^1.15.7",
5454
"superstruct": "^2.0.2",
5555
"tailwindcss": "^4.2.1",

‎package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@nuxt/ui",
33
"description": "A UI Library for Modern Web Apps, powered by Vue & Tailwind CSS.",
44
"version": "4.5.1",
5-
"packageManager": "pnpm@10.31.0",
5+
"packageManager": "pnpm@10.32.1",
66
"repository": {
77
"type": "git",
88
"url": "git+https://github.com/nuxt/ui.git"
@@ -136,25 +136,25 @@
136136
"@tailwindcss/postcss": "^4.2.1",
137137
"@tailwindcss/vite": "^4.2.1",
138138
"@tanstack/vue-table": "^8.21.3",
139-
"@tanstack/vue-virtual": "^3.13.21",
140-
"@tiptap/core": "^3.20.0",
141-
"@tiptap/extension-bubble-menu": "^3.20.0",
142-
"@tiptap/extension-code": "^3.20.0",
143-
"@tiptap/extension-collaboration": "^3.20.0",
144-
"@tiptap/extension-drag-handle": "^3.20.0",
145-
"@tiptap/extension-drag-handle-vue-3": "^3.20.0",
146-
"@tiptap/extension-floating-menu": "^3.20.0",
147-
"@tiptap/extension-horizontal-rule": "^3.20.0",
148-
"@tiptap/extension-image": "^3.20.0",
149-
"@tiptap/extension-mention": "^3.20.0",
150-
"@tiptap/extension-node-range": "^3.20.0",
151-
"@tiptap/extension-placeholder": "^3.20.0",
152-
"@tiptap/markdown": "^3.20.0",
153-
"@tiptap/pm": "^3.20.0",
154-
"@tiptap/starter-kit": "^3.20.0",
155-
"@tiptap/suggestion": "^3.20.0",
156-
"@tiptap/vue-3": "^3.20.0",
157-
"@unhead/vue": "^2.1.10",
139+
"@tanstack/vue-virtual": "^3.13.22",
140+
"@tiptap/core": "^3.20.2",
141+
"@tiptap/extension-bubble-menu": "^3.20.2",
142+
"@tiptap/extension-code": "^3.20.2",
143+
"@tiptap/extension-collaboration": "^3.20.2",
144+
"@tiptap/extension-drag-handle": "^3.20.2",
145+
"@tiptap/extension-drag-handle-vue-3": "^3.20.2",
146+
"@tiptap/extension-floating-menu": "^3.20.2",
147+
"@tiptap/extension-horizontal-rule": "^3.20.2",
148+
"@tiptap/extension-image": "^3.20.2",
149+
"@tiptap/extension-mention": "^3.20.2",
150+
"@tiptap/extension-node-range": "^3.20.2",
151+
"@tiptap/extension-placeholder": "^3.20.2",
152+
"@tiptap/markdown": "^3.20.2",
153+
"@tiptap/pm": "^3.20.2",
154+
"@tiptap/starter-kit": "^3.20.2",
155+
"@tiptap/suggestion": "^3.20.2",
156+
"@tiptap/vue-3": "^3.20.2",
157+
"@unhead/vue": "^2.1.12",
158158
"@vueuse/core": "^14.2.1",
159159
"@vueuse/integrations": "^14.2.1",
160160
"@vueuse/shared": "^14.2.1",
@@ -169,14 +169,14 @@
169169
"embla-carousel-vue": "^8.6.0",
170170
"embla-carousel-wheel-gestures": "^8.1.0",
171171
"fuse.js": "^7.1.0",
172-
"hookable": "^6.0.1",
172+
"hookable": "^6.1.0",
173173
"knitwork": "^1.3.0",
174174
"magic-string": "^0.30.21",
175175
"mlly": "^1.8.1",
176-
"motion-v": "^1.10.3",
176+
"motion-v": "^2.0.1",
177177
"ohash": "^2.0.11",
178178
"pathe": "^2.0.3",
179-
"reka-ui": "2.9.0",
179+
"reka-ui": "2.9.2",
180180
"scule": "^1.3.0",
181181
"tailwind-merge": "^3.5.0",
182182
"tailwind-variants": "^3.2.2",
@@ -193,18 +193,18 @@
193193
"@nuxt/eslint-config": "^1.15.2",
194194
"@nuxt/module-builder": "^1.0.2",
195195
"@nuxt/test-utils": "^4.0.0",
196-
"@release-it/conventional-changelog": "^10.0.5",
196+
"@release-it/conventional-changelog": "^10.0.6",
197197
"@tanstack/table-core": "^8.21.3",
198198
"@vitejs/plugin-vue": "^6.0.5",
199199
"@vue/test-utils": "^2.4.6",
200200
"ai": "^6.0.116",
201201
"embla-carousel": "^8.6.0",
202202
"eslint": "^10.0.3",
203-
"happy-dom": "^20.8.3",
203+
"happy-dom": "^20.8.4",
204204
"nuxt": "^4.4.2",
205205
"release-it": "^19.2.4",
206206
"unbuild": "^3.6.1",
207-
"vitest": "^4.0.18",
207+
"vitest": "^4.1.0",
208208
"vitest-axe": "^0.1.0",
209209
"vitest-environment-nuxt": "^1.0.1",
210210
"vue": "^3.5.30",

‎playgrounds/nuxt/app/pages/components/kbd.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import theme from '#build/ui/kbd'
3-
import { kbdKeysMap } from '@nuxt/ui/composables/useKbd'
3+
import { kbdKeysMap } from '@nuxt/ui/composables'
44
55
const sizes = Object.keys(theme.variants.size)
66
const variants = Object.keys(theme.variants.variant)

‎playgrounds/nuxt/app/pages/components/shortcuts.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import type { ShortcutsConfig } from '@nuxt/ui/composables/defineShortcuts'
2+
import type { ShortcutsConfig } from '@nuxt/ui/composables'
33
44
const logs = ref<string[]>([])
55

0 commit comments

Comments
 (0)