mirror of
https://github.com/ArthurDanjou/ui.git
synced 2026-01-19 06:21:46 +01:00
Compare commits
43 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b830f63c89 | ||
|
|
71dac5e5b0 | ||
|
|
7b81bfa1ae | ||
|
|
bf1c9e7c94 | ||
|
|
23d9b51a58 | ||
|
|
2e6ba71e89 | ||
|
|
ea4007c62d | ||
|
|
69d6997210 | ||
|
|
6565472570 | ||
|
|
ee408e522e | ||
|
|
461e6173a9 | ||
|
|
b824f0682e | ||
|
|
7ce6af4870 | ||
|
|
b4cc9a5ab4 | ||
|
|
06eceff68b | ||
|
|
40f3e3b486 | ||
|
|
a5458765dc | ||
|
|
ac574b239b | ||
|
|
feb716c941 | ||
|
|
15da5cf71e | ||
|
|
125a28190b | ||
|
|
569fa7619b | ||
|
|
0ff2448655 | ||
|
|
a6c3daa363 | ||
|
|
e16eeee8c1 | ||
|
|
53ac62eae5 | ||
|
|
9c36d37b84 | ||
|
|
0462edb84e | ||
|
|
91e77bb09c | ||
|
|
84e35d1a79 | ||
|
|
28f29e98b8 | ||
|
|
81d7ca0cd1 | ||
|
|
89d3766835 | ||
|
|
9104213d35 | ||
|
|
d699558e38 | ||
|
|
7cbc3913d9 | ||
|
|
d2ceeadae7 | ||
|
|
c7f64b64c7 | ||
|
|
72ab47e77d | ||
|
|
5b187d6fbd | ||
|
|
f9e61fc422 | ||
|
|
1291e95e1c | ||
|
|
f943203770 |
17
.github/workflows/ci-dev.yml
vendored
17
.github/workflows/ci-dev.yml
vendored
@@ -37,16 +37,6 @@ jobs:
|
|||||||
node-version: ${{ matrix.node }}
|
node-version: ${{ matrix.node }}
|
||||||
cache: pnpm
|
cache: pnpm
|
||||||
|
|
||||||
- name: Filter changes
|
|
||||||
uses: dorny/paths-filter@v3
|
|
||||||
id: changes
|
|
||||||
with:
|
|
||||||
filters: |
|
|
||||||
src:
|
|
||||||
- 'src/**'
|
|
||||||
- 'package.json'
|
|
||||||
- 'pnpm-lock.yaml'
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install
|
run: pnpm install
|
||||||
|
|
||||||
@@ -65,8 +55,5 @@ jobs:
|
|||||||
- name: Test
|
- name: Test
|
||||||
run: pnpm run test run
|
run: pnpm run test run
|
||||||
|
|
||||||
- name: Release Edge
|
- name: Publish
|
||||||
if: github.event_name == 'push' && steps.changes.outputs.src == 'true'
|
run: pnpx pkg-pr-new publish --compact --no-template --pnpm
|
||||||
run: ./scripts/release-edge.sh
|
|
||||||
env:
|
|
||||||
NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
|
|
||||||
|
|||||||
13
CHANGELOG.md
13
CHANGELOG.md
@@ -1,5 +1,18 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [2.21.1](https://github.com/nuxt/ui/compare/v2.21.0...v2.21.1) (2025-03-08)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **Form:** add standard schema support ([#2880](https://github.com/nuxt/ui/issues/2880)) ([9c36d37](https://github.com/nuxt/ui/commit/9c36d37b847468d1cbd76eea38ac00cbc22549ca))
|
||||||
|
* **module:** add `colorMode` option ([d2ceead](https://github.com/nuxt/ui/commit/d2ceeadae796254128697d94a3e317234bc2ecda)), closes [#3143](https://github.com/nuxt/ui/issues/3143)
|
||||||
|
* **SelectMenu:** add inputTargetForm prop to handle input validation ([#3107](https://github.com/nuxt/ui/issues/3107)) ([feb716c](https://github.com/nuxt/ui/commit/feb716c941f1e7315009b53861a4dc0c2f233052))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **Alert/Notification:** allow description ui override ([125a281](https://github.com/nuxt/ui/commit/125a28190b1a83e2456457e7a4ec618384b2446c)), closes [#2554](https://github.com/nuxt/ui/issues/2554)
|
||||||
|
* **Table:** revert [#2600](https://github.com/nuxt/ui/issues/2600) to fix excessive column data slot re-renders ([#3375](https://github.com/nuxt/ui/issues/3375)) ([23d9b51](https://github.com/nuxt/ui/commit/23d9b51a5861f5d1f32f68a3141a600655a0598a))
|
||||||
|
|
||||||
## [2.21.0](https://github.com/nuxt/ui/compare/v2.20.0...v2.21.0) (2025-01-14)
|
## [2.21.0](https://github.com/nuxt/ui/compare/v2.20.0...v2.21.0) (2025-01-14)
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|||||||
10
README.md
10
README.md
@@ -30,16 +30,6 @@ Read more on [ui.nuxt.com](https://ui.nuxt.com)
|
|||||||
npx nuxi@latest module add ui
|
npx nuxi@latest module add ui
|
||||||
```
|
```
|
||||||
|
|
||||||
If you want latest updates, please use `@nuxt/ui-edge` in your `package.json`:
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"devDependencies": {
|
|
||||||
"@nuxt/ui": "npm:@nuxt/ui-edge@latest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
Visit https://ui.nuxt.com to explore the documentation.
|
Visit https://ui.nuxt.com to explore the documentation.
|
||||||
|
|||||||
15
docs/components/content/examples/InputExampleMaxLength.vue
Normal file
15
docs/components/content/examples/InputExampleMaxLength.vue
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<template>
|
||||||
|
<UInput
|
||||||
|
v-model="name"
|
||||||
|
:maxlength="maxLength"
|
||||||
|
>
|
||||||
|
<template #trailing>
|
||||||
|
<span class="text-xs text-gray-500 dark:text-gray-400">{{ name.length }}/{{ maxLength }}</span>
|
||||||
|
</template>
|
||||||
|
</UInput>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
const name = ref('')
|
||||||
|
const maxLength = 10
|
||||||
|
</script>
|
||||||
@@ -243,19 +243,21 @@ export default defineNuxtConfig({
|
|||||||
})
|
})
|
||||||
```
|
```
|
||||||
|
|
||||||
## Edge
|
## Continuous Releases
|
||||||
|
|
||||||
To use the latest updates pushed on the [`dev`](https://github.com/nuxt/ui/tree/dev) branch, you can use `@nuxt/ui-edge`.
|
Nuxt UI uses [pkg.pr.new](https://github.com/stackblitz-labs/pkg.pr.new) for continuous preview releases, providing developers with instant access to the latest features and bug fixes without waiting for official releases.
|
||||||
|
|
||||||
Update your `package.json` to the following:
|
Preview releases are automatically generated for every commit to the `dev` branch and pull requests targeting the `dev` branch. To use it into your project, replace the version in your `package.json` with the commit hash or pull request number.
|
||||||
|
|
||||||
```diff [package.json]
|
```diff [package.json]
|
||||||
{
|
{
|
||||||
"devDependencies": {
|
"dependencies": {
|
||||||
- "@nuxt/ui": "^2.11.0"
|
- "@nuxt/ui": "^2.21.0",
|
||||||
+ "@nuxt/ui": "npm:@nuxt/ui-edge@latest"
|
+ "@nuxt/ui": "https://pkg.pr.new/@nuxt/ui@bf1c9e7",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Then run `pnpm install`, `yarn install` or `npm install`.
|
::note
|
||||||
|
**pkg.pr.new** will automatically comment on PRs with the installation URL, making it easy to test changes.
|
||||||
|
::
|
||||||
|
|||||||
@@ -389,6 +389,12 @@ export default defineAppConfig({
|
|||||||
loadingIcon: 'i-octicon-sync-24'
|
loadingIcon: 'i-octicon-sync-24'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
inputMenu: {
|
||||||
|
default: {
|
||||||
|
selectedIcon: 'i-octicon-check-24',
|
||||||
|
trailingIcon: 'i-octicon-chevron-down-24'
|
||||||
|
}
|
||||||
|
},
|
||||||
select: {
|
select: {
|
||||||
default: {
|
default: {
|
||||||
loadingIcon: 'i-octicon-sync-24',
|
loadingIcon: 'i-octicon-sync-24',
|
||||||
@@ -424,6 +430,9 @@ export default defineAppConfig({
|
|||||||
sortButton: {
|
sortButton: {
|
||||||
icon: 'i-octicon-arrow-switch-24'
|
icon: 'i-octicon-arrow-switch-24'
|
||||||
},
|
},
|
||||||
|
expandButton: {
|
||||||
|
icon: 'i-octicon-chevron-down-24'
|
||||||
|
},
|
||||||
loadingState: {
|
loadingState: {
|
||||||
icon: 'i-octicon-sync-24'
|
icon: 'i-octicon-sync-24'
|
||||||
},
|
},
|
||||||
@@ -457,6 +466,21 @@ export default defineAppConfig({
|
|||||||
default: {
|
default: {
|
||||||
divider: 'i-octicon-chevron-right-24'
|
divider: 'i-octicon-chevron-right-24'
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
carousel: {
|
||||||
|
default: {
|
||||||
|
prevButton: {
|
||||||
|
icon: 'i-octicon-chevron-left-24'
|
||||||
|
},
|
||||||
|
nextButton: {
|
||||||
|
icon: 'i-octicon-chevron-right-24'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
toggle: {
|
||||||
|
default: {
|
||||||
|
loadingIcon: 'i-octicon-sync-24'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -49,18 +49,22 @@ defineShortcuts({
|
|||||||
Shortcuts keys are written as the literal keyboard key value. Combinations are made with `_` separator. Chained shortcuts are made with `-` separator.
|
Shortcuts keys are written as the literal keyboard key value. Combinations are made with `_` separator. Chained shortcuts are made with `-` separator.
|
||||||
|
|
||||||
Modifiers are also available:
|
Modifiers are also available:
|
||||||
- `meta`: acts as `Command` for MacOS and `Control` for others
|
| Modifier | Description |
|
||||||
- `ctrl`: acts as `Control`
|
|----------|-------------|
|
||||||
- `shift`: acts as `Shift` and is only necessary for alphabetic keys
|
| `meta` | Acts as `Command (⌘)` on macOS and `Control (Ctrl)` on Windows/Linux. |
|
||||||
|
| `ctrl` | Represents the `Control (Ctrl)` key across all operating systems. |
|
||||||
|
| `shift` | Represents the `Shift` key, only needed for alphabetic keys (e.g., `shift_e`). |
|
||||||
|
|
||||||
Examples of keys:
|
Examples of keys:
|
||||||
- `escape`: will trigger by hitting `Esc`
|
| Shortcut Key | Action |
|
||||||
- `meta_k`: will trigger by hitting `⌘` and `K` at the same time on MacOS, and `Ctrl` and `K` on Windows and Linux
|
|---------------|--------|
|
||||||
- `ctrl_k`: will trigger by hitting `Ctrl` and `K` at the same time on MacOS, Windows and Linux
|
| `escape` | Triggers when `Esc` is pressed |
|
||||||
- `shift_e`: will trigger by hitting `Shift` and `E` at the same time on MacOS, Windows and Linux
|
| `meta_k` | `⌘ + K` on Mac, `Ctrl + K` on Windows/Linux |
|
||||||
- `?`: will trigger by hitting `?` on some keyboard layouts, or for example `Shift` and `/`, which results in `?` on US Mac keyboards
|
| `ctrl_k` | Triggers `Ctrl + K` on all OS |
|
||||||
- `g-d`: will trigger by hitting `g` then `d` with a maximum delay of 800ms by default
|
| `shift_e` | Triggers `Shift + E` on all OS |
|
||||||
- `arrowleft`: will trigger by hitting `←` (also: `arrowright`, `arrowup`, `arrowdown`)
|
| `?` | Triggers `?` (Shift + `/` on US Mac keyboards) |
|
||||||
|
| `g-d` | Triggers when `g` then `d` are pressed within 800ms |
|
||||||
|
| `arrowleft` | Triggers when `←` is pressed (also: `arrowright`, `arrowup`, `arrowdown`) |
|
||||||
|
|
||||||
::callout{icon="i-heroicons-light-bulb"}
|
::callout{icon="i-heroicons-light-bulb"}
|
||||||
For a complete list of available shortcut keys, refer to the [`KeyboardEvent`](https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values) API docs. Note the `KeyboardEvent.key` has to be written in lowercase.
|
For a complete list of available shortcut keys, refer to the [`KeyboardEvent`](https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values) API docs. Note the `KeyboardEvent.key` has to be written in lowercase.
|
||||||
|
|||||||
@@ -173,6 +173,13 @@ baseProps:
|
|||||||
---
|
---
|
||||||
::
|
::
|
||||||
|
|
||||||
|
### Limit
|
||||||
|
|
||||||
|
Use the `maxlength` prop to limit the length of the Input.
|
||||||
|
|
||||||
|
:component-example{component="input-example-max-length"}
|
||||||
|
|
||||||
|
|
||||||
## Slots
|
## Slots
|
||||||
|
|
||||||
### `leading`
|
### `leading`
|
||||||
|
|||||||
@@ -4,28 +4,28 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@iconify-json/heroicons": "^1.2.2",
|
"@iconify-json/heroicons": "^1.2.2",
|
||||||
"@iconify-json/lucide": "^1.2.23",
|
"@iconify-json/lucide": "^1.2.28",
|
||||||
"@iconify-json/simple-icons": "^1.2.19",
|
"@iconify-json/simple-icons": "^1.2.27",
|
||||||
"@iconify-json/vscode-icons": "^1.2.10",
|
"@iconify-json/vscode-icons": "^1.2.16",
|
||||||
"@nuxt/content": "^2.13.4",
|
"@nuxt/content": "^2.13.4",
|
||||||
"@nuxt/fonts": "^0.10.3",
|
"@nuxt/fonts": "^0.10.3",
|
||||||
"@nuxt/image": "^1.9.0",
|
"@nuxt/image": "^1.9.0",
|
||||||
"@nuxt/ui": "latest",
|
"@nuxt/ui": "latest",
|
||||||
"@nuxt/ui-pro": "^1.6.0",
|
"@nuxt/ui-pro": "^1.7.0",
|
||||||
"@nuxtjs/plausible": "^1.2.0",
|
"@nuxtjs/plausible": "^1.2.0",
|
||||||
"@octokit/rest": "^21.1.0",
|
"@octokit/rest": "^21.1.1",
|
||||||
"@vueuse/nuxt": "^12.4.0",
|
"@vueuse/nuxt": "^12.8.2",
|
||||||
"date-fns": "^4.1.0",
|
"date-fns": "^4.1.0",
|
||||||
"joi": "^17.13.3",
|
"joi": "^17.13.3",
|
||||||
"nuxt": "^3.15.1",
|
"nuxt": "^3.16.0",
|
||||||
"nuxt-cloudflare-analytics": "^1.0.8",
|
"nuxt-cloudflare-analytics": "^1.0.8",
|
||||||
"nuxt-component-meta": "^0.9.0",
|
"nuxt-component-meta": "^0.10.0",
|
||||||
"nuxt-og-image": "^4.0.2",
|
"nuxt-og-image": "^4.2.0",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.5.3",
|
||||||
"ufo": "^1.5.4",
|
"ufo": "^1.5.4",
|
||||||
"v-calendar": "^3.1.2",
|
"v-calendar": "^3.1.2",
|
||||||
"valibot": "^0.42.1",
|
"valibot": "^0.42.1",
|
||||||
"yup": "^1.6.1",
|
"yup": "^1.6.1",
|
||||||
"zod": "^3.24.1"
|
"zod": "^3.24.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -423,6 +423,7 @@ const { data: module } = await useFetch<{
|
|||||||
username: string
|
username: string
|
||||||
}[]
|
}[]
|
||||||
}>('https://api.nuxt.com/modules/ui', {
|
}>('https://api.nuxt.com/modules/ui', {
|
||||||
|
key: 'stats',
|
||||||
transform: ({ stats, contributors }) => ({ stats, contributors })
|
transform: ({ stats, contributors }) => ({ stats, contributors })
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ if (!page.value) {
|
|||||||
throw createError({ statusCode: 404, statusMessage: 'Page not found', fatal: true })
|
throw createError({ statusCode: 404, statusMessage: 'Page not found', fatal: true })
|
||||||
}
|
}
|
||||||
|
|
||||||
const { data: releases } = await useFetch('/api/releases.json')
|
const { data: releases } = await useFetch('/api/releases.json', { key: 'releases-list' })
|
||||||
const { data: pulls } = await useLazyFetch('/api/pulls.json', { default: () => [] })
|
const { data: pulls } = await useLazyFetch('/api/pulls.json', { default: () => [], key: 'pulls-list' })
|
||||||
|
|
||||||
const dates = computed(() => {
|
const dates = computed(() => {
|
||||||
const first = releases.value[releases.value.length - 1]
|
const first = releases.value[releases.value.length - 1]
|
||||||
|
|||||||
37
package.json
37
package.json
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"name": "@nuxt/ui",
|
"name": "@nuxt/ui",
|
||||||
"description": "A UI Library for Modern Web Apps, powered by Vue & Tailwind CSS.",
|
"description": "A UI Library for Modern Web Apps, powered by Vue & Tailwind CSS.",
|
||||||
"version": "2.21.0",
|
"version": "2.21.1",
|
||||||
"packageManager": "pnpm@9.15.3",
|
"packageManager": "pnpm@10.6.1",
|
||||||
"repository": "nuxt/ui",
|
"repository": "nuxt/ui",
|
||||||
"homepage": "https://ui.nuxt.com",
|
"homepage": "https://ui.nuxt.com",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -32,11 +32,11 @@
|
|||||||
"test": "vitest"
|
"test": "vitest"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@headlessui/tailwindcss": "^0.2.1",
|
"@headlessui/tailwindcss": "^0.2.2",
|
||||||
"@headlessui/vue": "^1.7.23",
|
"@headlessui/vue": "^1.7.23",
|
||||||
"@iconify-json/heroicons": "^1.2.2",
|
"@iconify-json/heroicons": "^1.2.2",
|
||||||
"@nuxt/icon": "^1.10.3",
|
"@nuxt/icon": "^1.10.3",
|
||||||
"@nuxt/kit": "^3.15.1",
|
"@nuxt/kit": "^3.16.0",
|
||||||
"@nuxtjs/color-mode": "^3.5.2",
|
"@nuxtjs/color-mode": "^3.5.2",
|
||||||
"@nuxtjs/tailwindcss": "^6.13.1",
|
"@nuxtjs/tailwindcss": "^6.13.1",
|
||||||
"@popperjs/core": "^2.11.8",
|
"@popperjs/core": "^2.11.8",
|
||||||
@@ -44,38 +44,39 @@
|
|||||||
"@tailwindcss/container-queries": "^0.1.1",
|
"@tailwindcss/container-queries": "^0.1.1",
|
||||||
"@tailwindcss/forms": "^0.5.10",
|
"@tailwindcss/forms": "^0.5.10",
|
||||||
"@tailwindcss/typography": "^0.5.16",
|
"@tailwindcss/typography": "^0.5.16",
|
||||||
"@vueuse/core": "^12.4.0",
|
"@vueuse/core": "^12.8.2",
|
||||||
"@vueuse/integrations": "^12.4.0",
|
"@vueuse/integrations": "^12.8.2",
|
||||||
"@vueuse/math": "^12.4.0",
|
"@vueuse/math": "^12.8.2",
|
||||||
"defu": "^6.1.4",
|
"defu": "^6.1.4",
|
||||||
"fuse.js": "^7.0.0",
|
"fuse.js": "^7.1.0",
|
||||||
"ohash": "^1.1.4",
|
"ohash": "^2.0.11",
|
||||||
"pathe": "^2.0.1",
|
"pathe": "^2.0.3",
|
||||||
"scule": "^1.3.0",
|
"scule": "^1.3.0",
|
||||||
"tailwind-merge": "^2.6.0",
|
"tailwind-merge": "^2.6.0",
|
||||||
"tailwindcss": "^3.4.17"
|
"tailwindcss": "^3.4.17"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nuxt/eslint-config": "^0.7.5",
|
"@nuxt/eslint-config": "^1.1.0",
|
||||||
"@nuxt/module-builder": "^0.8.4",
|
"@nuxt/module-builder": "^0.8.4",
|
||||||
"@nuxt/test-utils": "^3.15.4",
|
"@standard-schema/spec": "^1.0.0",
|
||||||
|
"@nuxt/test-utils": "^3.17.1",
|
||||||
"@release-it/conventional-changelog": "^10.0.0",
|
"@release-it/conventional-changelog": "^10.0.0",
|
||||||
"@vue/test-utils": "^2.4.6",
|
"@vue/test-utils": "^2.4.6",
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.22.0",
|
||||||
"happy-dom": "^14.12.3",
|
"happy-dom": "^17.1.8",
|
||||||
"joi": "^17.13.3",
|
"joi": "^17.13.3",
|
||||||
"nuxt": "^3.15.1",
|
"nuxt": "^3.16.0",
|
||||||
"release-it": "^18.1.1",
|
"release-it": "^18.1.2",
|
||||||
"superstruct": "^2.0.2",
|
"superstruct": "^2.0.2",
|
||||||
"typescript": "^5.6.3",
|
"typescript": "^5.6.3",
|
||||||
"valibot": "^0.42.1",
|
"valibot": "^0.42.1",
|
||||||
"valibot30": "npm:valibot@0.30.0",
|
"valibot30": "npm:valibot@0.30.0",
|
||||||
"valibot31": "npm:valibot@0.31.0",
|
"valibot31": "npm:valibot@0.31.0",
|
||||||
"vitest": "^2.1.8",
|
"vitest": "^3.0.8",
|
||||||
"vitest-environment-nuxt": "^1.0.1",
|
"vitest-environment-nuxt": "^1.0.1",
|
||||||
"vue-tsc": "^2.1.10",
|
"vue-tsc": "^2.1.10",
|
||||||
"yup": "^1.6.1",
|
"yup": "^1.6.1",
|
||||||
"zod": "^3.24.1"
|
"zod": "^3.24.2"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"@nuxt/ui": "workspace:*",
|
"@nuxt/ui": "workspace:*",
|
||||||
|
|||||||
@@ -9,6 +9,6 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nuxt/ui": "latest",
|
"@nuxt/ui": "latest",
|
||||||
"nuxt": "^3.15.1"
|
"nuxt": "^3.16.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
6047
pnpm-lock.yaml
generated
6047
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -6,7 +6,6 @@
|
|||||||
"enabled": true
|
"enabled": true
|
||||||
},
|
},
|
||||||
"ignoreDeps": [
|
"ignoreDeps": [
|
||||||
"happy-dom",
|
|
||||||
"valibot30",
|
"valibot30",
|
||||||
"valibot31"
|
"valibot31"
|
||||||
],
|
],
|
||||||
@@ -24,5 +23,6 @@
|
|||||||
}, {
|
}, {
|
||||||
"matchDepTypes": ["resolutions"],
|
"matchDepTypes": ["resolutions"],
|
||||||
"enabled": false
|
"enabled": false
|
||||||
}]
|
}],
|
||||||
|
"postUpdateOptions": ["pnpmDedupe"]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
import { promises as fsp } from 'node:fs'
|
|
||||||
import { resolve } from 'node:path'
|
|
||||||
import { execSync } from 'node:child_process'
|
|
||||||
|
|
||||||
async function loadPackage(dir: string) {
|
|
||||||
const pkgPath = resolve(dir, 'package.json')
|
|
||||||
|
|
||||||
const data = JSON.parse(await fsp.readFile(pkgPath, 'utf-8').catch(() => '{}'))
|
|
||||||
|
|
||||||
const save = () => fsp.writeFile(pkgPath, JSON.stringify(data, null, 2) + '\n')
|
|
||||||
|
|
||||||
return {
|
|
||||||
dir,
|
|
||||||
data,
|
|
||||||
save
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function main() {
|
|
||||||
const pkg = await loadPackage(process.cwd())
|
|
||||||
|
|
||||||
const commit = execSync('git rev-parse --short HEAD').toString('utf-8').trim()
|
|
||||||
|
|
||||||
const date = Math.round(Date.now() / (1000 * 60))
|
|
||||||
|
|
||||||
pkg.data.name = `${pkg.data.name}-edge`
|
|
||||||
|
|
||||||
pkg.data.version = `${pkg.data.version}-${date}.${commit}`
|
|
||||||
|
|
||||||
pkg.save()
|
|
||||||
}
|
|
||||||
|
|
||||||
main().catch((err) => {
|
|
||||||
console.error(err)
|
|
||||||
process.exit(1)
|
|
||||||
})
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Restore all git changes
|
|
||||||
git restore -s@ -SW -- .
|
|
||||||
|
|
||||||
# Bump versions to edge
|
|
||||||
pnpm jiti ./scripts/bump-edge
|
|
||||||
|
|
||||||
# Update token
|
|
||||||
if [[ ! -z ${NODE_AUTH_TOKEN} ]] ; then
|
|
||||||
echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
|
|
||||||
echo "registry=https://registry.npmjs.org/" >> ~/.npmrc
|
|
||||||
echo "always-auth=true" >> ~/.npmrc
|
|
||||||
npm whoami
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Release package
|
|
||||||
echo "Publishing @nuxt/ui"
|
|
||||||
npm publish -q --access public
|
|
||||||
@@ -43,6 +43,11 @@ export interface ModuleOptions {
|
|||||||
*/
|
*/
|
||||||
global?: boolean
|
global?: boolean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @default true
|
||||||
|
*/
|
||||||
|
colorMode?: boolean
|
||||||
|
|
||||||
safelistColors?: string[]
|
safelistColors?: string[]
|
||||||
/**
|
/**
|
||||||
* Disables the global css styles added by the module.
|
* Disables the global css styles added by the module.
|
||||||
@@ -61,6 +66,7 @@ export default defineNuxtModule<ModuleOptions>({
|
|||||||
},
|
},
|
||||||
defaults: {
|
defaults: {
|
||||||
prefix: 'U',
|
prefix: 'U',
|
||||||
|
colorMode: true,
|
||||||
safelistColors: ['primary'],
|
safelistColors: ['primary'],
|
||||||
disableGlobalStyles: false
|
disableGlobalStyles: false
|
||||||
},
|
},
|
||||||
@@ -83,7 +89,9 @@ export default defineNuxtModule<ModuleOptions>({
|
|||||||
// Modules
|
// Modules
|
||||||
|
|
||||||
await installModule('@nuxt/icon')
|
await installModule('@nuxt/icon')
|
||||||
await installModule('@nuxtjs/color-mode', { classSuffix: '' })
|
if (options.colorMode) {
|
||||||
|
await installModule('@nuxtjs/color-mode', { classSuffix: '' })
|
||||||
|
}
|
||||||
await installTailwind(options, nuxt, resolve)
|
await installTailwind(options, nuxt, resolve)
|
||||||
|
|
||||||
// Plugins
|
// Plugins
|
||||||
|
|||||||
@@ -104,7 +104,6 @@
|
|||||||
|
|
||||||
<slot
|
<slot
|
||||||
v-else
|
v-else
|
||||||
:key="retriggerSlot"
|
|
||||||
:name="`${column.key}-data`"
|
:name="`${column.key}-data`"
|
||||||
:column="column"
|
:column="column"
|
||||||
:row="row"
|
:row="row"
|
||||||
@@ -132,12 +131,12 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { computed, defineComponent, ref, toRaw, toRef, watch } from 'vue'
|
import { computed, defineComponent, toRaw, toRef } from 'vue'
|
||||||
import type { PropType, AriaAttributes } from 'vue'
|
import type { PropType, AriaAttributes } from 'vue'
|
||||||
import { upperFirst } from 'scule'
|
import { upperFirst } from 'scule'
|
||||||
import { defu } from 'defu'
|
import { defu } from 'defu'
|
||||||
import { useVModel } from '@vueuse/core'
|
import { useVModel } from '@vueuse/core'
|
||||||
import { isEqual } from 'ohash'
|
import { isEqual } from 'ohash/utils'
|
||||||
import UIcon from '../elements/Icon.vue'
|
import UIcon from '../elements/Icon.vue'
|
||||||
import UButton from '../elements/Button.vue'
|
import UButton from '../elements/Button.vue'
|
||||||
import UProgress from '../elements/Progress.vue'
|
import UProgress from '../elements/Progress.vue'
|
||||||
@@ -307,8 +306,6 @@ export default defineComponent({
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
const retriggerSlot = ref(null)
|
|
||||||
|
|
||||||
const savedSort = { column: sort.value.column, direction: null }
|
const savedSort = { column: sort.value.column, direction: null }
|
||||||
|
|
||||||
const rows = computed(() => {
|
const rows = computed(() => {
|
||||||
@@ -483,12 +480,6 @@ export default defineComponent({
|
|||||||
return undefined
|
return undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
watch(rows, () => {
|
|
||||||
retriggerSlot.value = new Date()
|
|
||||||
}, {
|
|
||||||
deep: true
|
|
||||||
})
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
// eslint-disable-next-line vue/no-dupe-keys
|
// eslint-disable-next-line vue/no-dupe-keys
|
||||||
ui,
|
ui,
|
||||||
@@ -515,8 +506,7 @@ export default defineComponent({
|
|||||||
getRowData,
|
getRowData,
|
||||||
toggleOpened,
|
toggleOpened,
|
||||||
getAriaSort,
|
getAriaSort,
|
||||||
isExpanded,
|
isExpanded
|
||||||
retriggerSlot
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
{{ title }}
|
{{ title }}
|
||||||
</slot>
|
</slot>
|
||||||
</p>
|
</p>
|
||||||
<div v-if="description || $slots.description" :class="twMerge(ui.description, !title && !$slots.title && 'mt-0 leading-5')">
|
<div v-if="description || $slots.description" :class="twMerge(ui.description, !title && !$slots.title && ui.descriptionOnly)">
|
||||||
<slot name="description" :description="description">
|
<slot name="description" :description="description">
|
||||||
{{ description }}
|
{{ description }}
|
||||||
</slot>
|
</slot>
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { isEqual, diff } from 'ohash'
|
import { isEqual, diff } from 'ohash/utils'
|
||||||
import { type PropType, defineComponent } from 'vue'
|
import { type PropType, defineComponent } from 'vue'
|
||||||
import { nuxtLinkProps } from '../../utils'
|
import { nuxtLinkProps } from '../../utils'
|
||||||
|
|
||||||
@@ -74,14 +74,18 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
setup(props) {
|
setup(props) {
|
||||||
function isPartiallyEqual(item1, item2) {
|
function isPartiallyEqual(item1: any, item2: any) {
|
||||||
const diffedKeys = diff(item1, item2).reduce((filtered, q) => {
|
const diffedKeys = diff(item1, item2).reduce((filtered, q) => {
|
||||||
if (q.type === 'added') {
|
if (q.type === 'added') {
|
||||||
filtered.push(q.key)
|
filtered.add(q.key)
|
||||||
}
|
}
|
||||||
return filtered
|
return filtered
|
||||||
}, [])
|
}, new Set<string>())
|
||||||
return isEqual(item1, item2, { excludeKeys: key => diffedKeys.includes(key) })
|
|
||||||
|
const item1Filtered = Object.fromEntries(Object.entries(item1).filter(([key]) => !diffedKeys.has(key)))
|
||||||
|
const item2Filtered = Object.fromEntries(Object.entries(item2).filter(([key]) => !diffedKeys.has(key)))
|
||||||
|
|
||||||
|
return isEqual(item1Filtered, item2Filtered)
|
||||||
}
|
}
|
||||||
|
|
||||||
function resolveLinkClass(route, $route, { isActive, isExactActive }: { isActive: boolean, isExactActive: boolean }) {
|
function resolveLinkClass(route, $route, { isActive, isExactActive }: { isActive: boolean, isExactActive: boolean }) {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import type { ObjectSchema as YupObjectSchema, ValidationError as YupError } fro
|
|||||||
import type { BaseSchema as ValibotSchema30, BaseSchemaAsync as ValibotSchemaAsync30 } from 'valibot30'
|
import type { BaseSchema as ValibotSchema30, BaseSchemaAsync as ValibotSchemaAsync30 } from 'valibot30'
|
||||||
import type { GenericSchema as ValibotSchema31, GenericSchemaAsync as ValibotSchemaAsync31, SafeParser as ValibotSafeParser31, SafeParserAsync as ValibotSafeParserAsync31 } from 'valibot31'
|
import type { GenericSchema as ValibotSchema31, GenericSchemaAsync as ValibotSchemaAsync31, SafeParser as ValibotSafeParser31, SafeParserAsync as ValibotSafeParserAsync31 } from 'valibot31'
|
||||||
import type { GenericSchema as ValibotSchema, GenericSchemaAsync as ValibotSchemaAsync, SafeParser as ValibotSafeParser, SafeParserAsync as ValibotSafeParserAsync } from 'valibot'
|
import type { GenericSchema as ValibotSchema, GenericSchemaAsync as ValibotSchemaAsync, SafeParser as ValibotSafeParser, SafeParserAsync as ValibotSafeParserAsync } from 'valibot'
|
||||||
|
import type { StandardSchemaV1 } from '@standard-schema/spec'
|
||||||
import type { Struct } from 'superstruct'
|
import type { Struct } from 'superstruct'
|
||||||
import type { FormError, FormEvent, FormEventType, FormSubmitEvent, FormErrorEvent, Form, ValidateReturnSchema } from '../../types/form'
|
import type { FormError, FormEvent, FormEventType, FormSubmitEvent, FormErrorEvent, Form, ValidateReturnSchema } from '../../types/form'
|
||||||
import { useId } from '#imports'
|
import { useId } from '#imports'
|
||||||
@@ -33,6 +34,7 @@ type Schema = PropType<ZodSchema>
|
|||||||
| PropType<ValibotSafeParser31<any, any> | ValibotSafeParserAsync31<any, any>>
|
| PropType<ValibotSafeParser31<any, any> | ValibotSafeParserAsync31<any, any>>
|
||||||
| PropType<ValibotSchema | ValibotSchemaAsync>
|
| PropType<ValibotSchema | ValibotSchemaAsync>
|
||||||
| PropType<ValibotSafeParser<any, any> | ValibotSafeParserAsync<any, any>> | PropType<Struct<any, any>>
|
| PropType<ValibotSafeParser<any, any> | ValibotSafeParserAsync<any, any>> | PropType<Struct<any, any>>
|
||||||
|
| PropType<StandardSchemaV1>
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
props: {
|
props: {
|
||||||
@@ -220,6 +222,35 @@ function isZodSchema(schema: any): schema is ZodSchema {
|
|||||||
return schema.parse !== undefined
|
return schema.parse !== undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function isStandardSchema(schema: any): schema is StandardSchemaV1 {
|
||||||
|
return '~standard' in schema
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function validateStandardSchema(
|
||||||
|
state: any,
|
||||||
|
schema: StandardSchemaV1
|
||||||
|
): Promise<ValidateReturnSchema<typeof state>> {
|
||||||
|
const result = await schema['~standard'].validate(state)
|
||||||
|
|
||||||
|
if (!result.issues || result.issues.length === 0) {
|
||||||
|
const output = ('value' in result ? result.value : null)
|
||||||
|
return {
|
||||||
|
errors: null,
|
||||||
|
result: output
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const errors = result.issues.map(issue => ({
|
||||||
|
path: issue.path?.map(item => typeof item === 'object' ? item.key : item).join('.') || '',
|
||||||
|
message: issue.message
|
||||||
|
}))
|
||||||
|
|
||||||
|
return {
|
||||||
|
errors,
|
||||||
|
result: null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function validateValibotSchema(
|
async function validateValibotSchema(
|
||||||
state: any,
|
state: any,
|
||||||
schema: ValibotSchema30 | ValibotSchemaAsync30 | ValibotSchema31 | ValibotSchemaAsync31 | ValibotSafeParser31<any, any> | ValibotSafeParserAsync31<any, any> | ValibotSchema | ValibotSchemaAsync | ValibotSafeParser<any, any> | ValibotSafeParserAsync<any, any>
|
schema: ValibotSchema30 | ValibotSchemaAsync30 | ValibotSchema31 | ValibotSchemaAsync31 | ValibotSafeParser31<any, any> | ValibotSafeParserAsync31<any, any> | ValibotSchema | ValibotSchemaAsync | ValibotSafeParser<any, any> | ValibotSafeParserAsync<any, any>
|
||||||
@@ -346,7 +377,9 @@ async function validateYupSchema(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function parseSchema(state: any, schema: Schema): Promise<ValidateReturnSchema<typeof state>> {
|
function parseSchema(state: any, schema: Schema): Promise<ValidateReturnSchema<typeof state>> {
|
||||||
if (isZodSchema(schema)) {
|
if (isStandardSchema(schema)) {
|
||||||
|
return validateStandardSchema(state, schema)
|
||||||
|
} else if (isZodSchema(schema)) {
|
||||||
return validateZodSchema(state, schema)
|
return validateZodSchema(state, schema)
|
||||||
} else if (isJoiSchema(schema)) {
|
} else if (isJoiSchema(schema)) {
|
||||||
return validateJoiSchema(state, schema)
|
return validateJoiSchema(state, schema)
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ import {
|
|||||||
import { computedAsync, useDebounceFn } from '@vueuse/core'
|
import { computedAsync, useDebounceFn } from '@vueuse/core'
|
||||||
import { defu } from 'defu'
|
import { defu } from 'defu'
|
||||||
import { twJoin } from 'tailwind-merge'
|
import { twJoin } from 'tailwind-merge'
|
||||||
import { isEqual } from 'ohash'
|
import { isEqual } from 'ohash/utils'
|
||||||
import UIcon from '../elements/Icon.vue'
|
import UIcon from '../elements/Icon.vue'
|
||||||
import UAvatar from '../elements/Avatar.vue'
|
import UAvatar from '../elements/Avatar.vue'
|
||||||
import { useUI } from '../../composables/useUI'
|
import { useUI } from '../../composables/useUI'
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
:value="modelValue"
|
:value="modelValue"
|
||||||
:required="required"
|
:required="required"
|
||||||
:class="uiMenu.required"
|
:class="uiMenu.required"
|
||||||
|
:form="inputTargetForm"
|
||||||
tabindex="-1"
|
tabindex="-1"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
>
|
>
|
||||||
@@ -140,7 +141,7 @@ import {
|
|||||||
import { computedAsync, useDebounceFn } from '@vueuse/core'
|
import { computedAsync, useDebounceFn } from '@vueuse/core'
|
||||||
import { defu } from 'defu'
|
import { defu } from 'defu'
|
||||||
import { twJoin } from 'tailwind-merge'
|
import { twJoin } from 'tailwind-merge'
|
||||||
import { isEqual } from 'ohash'
|
import { isEqual } from 'ohash/utils'
|
||||||
import UIcon from '../elements/Icon.vue'
|
import UIcon from '../elements/Icon.vue'
|
||||||
import UAvatar from '../elements/Avatar.vue'
|
import UAvatar from '../elements/Avatar.vue'
|
||||||
import { useUI } from '../../composables/useUI'
|
import { useUI } from '../../composables/useUI'
|
||||||
@@ -314,6 +315,10 @@ export default defineComponent({
|
|||||||
type: Array,
|
type: Array,
|
||||||
default: null
|
default: null
|
||||||
},
|
},
|
||||||
|
inputTargetForm: {
|
||||||
|
type: String,
|
||||||
|
default: null
|
||||||
|
},
|
||||||
popper: {
|
popper: {
|
||||||
type: Object as PropType<PopperOptions>,
|
type: Object as PropType<PopperOptions>,
|
||||||
default: () => ({})
|
default: () => ({})
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
{{ title }}
|
{{ title }}
|
||||||
</slot>
|
</slot>
|
||||||
</p>
|
</p>
|
||||||
<div v-if="(description || $slots.description)" :class="twMerge(ui.description, !title && !$slots.title && 'mt-0 leading-5')">
|
<div v-if="(description || $slots.description)" :class="twMerge(ui.description, !title && !$slots.title && ui.descriptionOnly)">
|
||||||
<slot name="description" :description="description">
|
<slot name="description" :description="description">
|
||||||
{{ description }}
|
{{ description }}
|
||||||
</slot>
|
</slot>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ export default {
|
|||||||
inner: 'w-0 flex-1',
|
inner: 'w-0 flex-1',
|
||||||
title: 'text-sm font-medium',
|
title: 'text-sm font-medium',
|
||||||
description: 'mt-1 text-sm leading-4 opacity-90',
|
description: 'mt-1 text-sm leading-4 opacity-90',
|
||||||
|
descriptionOnly: 'mt-0 leading-5',
|
||||||
actions: 'flex items-center gap-2 mt-3 flex-shrink-0',
|
actions: 'flex items-center gap-2 mt-3 flex-shrink-0',
|
||||||
shadow: '',
|
shadow: '',
|
||||||
rounded: 'rounded-lg',
|
rounded: 'rounded-lg',
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ export default {
|
|||||||
inner: 'w-0 flex-1',
|
inner: 'w-0 flex-1',
|
||||||
title: 'text-sm font-medium text-gray-900 dark:text-white',
|
title: 'text-sm font-medium text-gray-900 dark:text-white',
|
||||||
description: 'mt-1 text-sm leading-4 text-gray-500 dark:text-gray-400',
|
description: 'mt-1 text-sm leading-4 text-gray-500 dark:text-gray-400',
|
||||||
|
descriptionOnly: 'mt-0 leading-5',
|
||||||
actions: 'flex items-center gap-2 mt-3 flex-shrink-0',
|
actions: 'flex items-center gap-2 mt-3 flex-shrink-0',
|
||||||
background: 'bg-white dark:bg-gray-900',
|
background: 'bg-white dark:bg-gray-900',
|
||||||
shadow: 'shadow-lg',
|
shadow: 'shadow-lg',
|
||||||
|
|||||||
Reference in New Issue
Block a user