arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-14 20:19:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(templates): dont override AppConfig type

Browse Source
This commit is contained in:
Benjamin Canac
2024-03-09 20:29:19 +01:00
parent f9cc5e4f8e
commit e151be4734
6 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/components/Badge.vue
View File

@@ -1,8 +1,11 @@
<script lang="ts">
import { tv, type VariantProps } from 'tailwind-variants'
import appConfig from '#build/app.config'
import _appConfig from '#build/app.config'
import theme from '#build/ui/badge'
import type { LinkProps } from '#ui/components/Link.vue'
import type { AppConfig } from '@nuxt/schema'
const appConfig = _appConfig as AppConfig & { ui: { badge: Partial<typeof theme> } }
const badge = tv({ extend: tv(theme), ...(appConfig.ui?.badge || {}) })

5
src/runtime/components/Button.vue
View File

@@ -1,8 +1,11 @@
<script lang="ts">
import { tv, type VariantProps } from 'tailwind-variants'
import appConfig from '#build/app.config'
import _appConfig from '#build/app.config'
import theme from '#build/ui/button'
import type { LinkProps } from '#ui/components/Link.vue'
import type { AppConfig } from '@nuxt/schema'
const appConfig = _appConfig as AppConfig & { ui: { button: Partial<typeof theme> } }
const button = tv({ extend: tv(theme), ...(appConfig.ui?.button || {}) })

5
src/runtime/components/Collapsible.vue
View File

@@ -1,8 +1,11 @@
<script lang="ts">
import { tv } from 'tailwind-variants'
import type { CollapsibleRootProps, CollapsibleRootEmits } from 'radix-vue'
import appConfig from '#build/app.config'
import _appConfig from '#build/app.config'
import theme from '#build/ui/collapsible'
import type { AppConfig } from '@nuxt/schema'
const appConfig = _appConfig as AppConfig & { ui: { collapsible: Partial<typeof theme> } }
const collapsible = tv({ extend: tv(theme), ...(appConfig.ui?.collapsible || {}) })

5
src/runtime/components/Container.vue
View File

@@ -1,7 +1,10 @@
<script lang="ts">
import { tv } from 'tailwind-variants'
import appConfig from '#build/app.config'
import _appConfig from '#build/app.config'
import theme from '#build/ui/container'
import type { AppConfig } from '@nuxt/schema'
const appConfig = _appConfig as AppConfig & { ui: { container: Partial<typeof theme> } }
const container = tv({ extend: tv(theme), ...(appConfig.ui?.container || {}) })

5
src/runtime/components/Tooltip.vue
View File

@@ -1,8 +1,11 @@
<script lang="ts">
import { tv } from 'tailwind-variants'
import type { TooltipRootProps, TooltipRootEmits, TooltipContentProps } from 'radix-vue'
import appConfig from '#build/app.config'
import _appConfig from '#build/app.config'
import theme from '#build/ui/tooltip'
import type { AppConfig } from '@nuxt/schema'
const appConfig = _appConfig as AppConfig & { ui: { tooltip: Partial<typeof theme> } }
const tooltip = tv({ extend: tv(theme), ...(appConfig.ui?.tooltip || {}) })

21
src/templates.ts
View File

@@ -66,31 +66,22 @@ export default function createTemplates (options: ModuleOptions, nuxt: Nuxt) {
[P in keyof T]: DeepPartial<T[P]> | { [key: string]: string | object }
}>
type AppConfigUI = {
primary: string
gray: string
} & typeof ui
const colors = ${JSON.stringify(options.colors)} as const;
type AppConfigInputUI = {
primary?: string
gray?: string
type UI = {
primary?: typeof colors[number]
gray?: 'slate' | 'cool' | 'zinc' | 'neutral' | 'stone'
[key: string]: any
} & DeepPartial<typeof ui>
declare module 'nuxt/schema' {
interface AppConfig {
ui: AppConfigUI
}
interface AppConfigInput {
ui?: AppConfigInputUI
ui?: UI
}
}
declare module '@nuxt/schema' {
interface AppConfig {
ui: AppConfigUI
}
interface AppConfigInput {
ui?: AppConfigInputUI
ui?: UI
}
}
export {}