arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-26 09:50:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix preset resolve

Browse Source
This commit is contained in:
Benjamin Canac
2021-11-26 17:20:35 +01:00
parent 07b767c1d2
commit 804575a53e
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/index.ts
View File

@@ -1,8 +1,9 @@
import { resolve } from 'pathe'
import { defineNuxtModule, installModule, addComponentsDir, addTemplate } from '@nuxt/kit'
import { defineNuxtModule, installModule, addComponentsDir, addTemplate, resolveModule } from '@nuxt/kit'
import { colors } from '@unocss/preset-uno'
import defu from 'defu'
import type { UnocssNuxtOptions } from '@unocss/nuxt'
import { presetsDir } from './dirs'
export interface UiColorsOptions {
/**
@@ -165,14 +166,15 @@ export default defineNuxtModule<UiOptions>({
let ui: object = {}
try {
if (typeof preset === 'object') {
ui = await import(resolve(__dirname, `./presets/${defaults.preset}`))
ui = await import(resolveModule(`./${defaults.preset}`, { paths: presetsDir }))
ui = defu(preset, ui)
} else {
ui = await import(resolve(__dirname, `./presets/${preset}`))
// @ts-ignore
ui = await import(resolveModule(`./${preset}`, { paths: presetsDir }))
}
} catch (e) {
ui = await import(resolve(__dirname, `./presets/${defaults.preset}`))
ui = await import(resolveModule(`./${defaults.preset}`, { paths: presetsDir }))
}
addTemplate({