fix: put back app.config for hmr

nuxt · May 4, 2023 · 626409e · 626409e
1 parent f5c0030
commit 626409e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 29 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -4,7 +4,7 @@ import { iconsPlugin, getIconCollections } from '@egoist/tailwindcss-icons'
 import { defu } from 'defu'
 import { name, version } from '../package.json'
 import { colorsAsRegex, excludeColors } from './runtime/utils/colors'
-import { ui as preset } from './preset'
+import appConfig from './runtime/app.config'
 import type { DeepPartial } from './runtime/types'
 
 // @ts-ignore
@@ -24,7 +24,7 @@ declare module 'nuxt/schema' {
       primary?: string
       gray?: string
       colors?: string[]
-    } & DeepPartial<typeof preset>
+    } & DeepPartial<typeof appConfig.ui>
   }
 }
 
@@ -65,7 +65,11 @@ export default defineNuxtModule<ModuleOptions>({
 
     nuxt.options.css.push(resolve(runtimeDir, 'ui.css'))
 
-    nuxt.options.appConfig.ui = defu(nuxt.options.appConfig.ui, preset)
+    nuxt.options.appConfig.ui = defu(nuxt.options.appConfig.ui, appConfig.ui)
+
+    nuxt.hook('app:resolve', (app) => {
+      app.configs.push(resolve(runtimeDir, 'app.config'))
+    })
 
     // @ts-ignore
     nuxt.hook('tailwindcss:config', function (tailwindConfig: TailwindConfig) {

diff --git a/src/preset.ts → src/runtime/app.config.ts b/src/preset.ts → src/runtime/app.config.ts
@@ -677,30 +677,32 @@ const notifications = {
   container: 'px-4 sm:px-6 py-6 space-y-3 overflow-y-auto'
 }
 
-export const ui = {
-  avatar,
-  avatarGroup,
-  badge,
-  button,
-  buttonGroup,
-  dropdown,
-  input,
-  inputGroup,
-  textarea,
-  select,
-  selectMenu,
-  checkbox,
-  radio,
-  toggle,
-  card,
-  container,
-  verticalNavigation,
-  commandPalette,
-  modal,
-  slideover,
-  popover,
-  tooltip,
-  contextMenu,
-  notification,
-  notifications
+export default {
+  ui: {
+    avatar,
+    avatarGroup,
+    badge,
+    button,
+    buttonGroup,
+    dropdown,
+    input,
+    inputGroup,
+    textarea,
+    select,
+    selectMenu,
+    checkbox,
+    radio,
+    toggle,
+    card,
+    container,
+    verticalNavigation,
+    commandPalette,
+    modal,
+    slideover,
+    popover,
+    tooltip,
+    contextMenu,
+    notification,
+    notifications
+  }
 }