fix(nuxt): apply defaults correctly (#1934)

unocss · Nov 30, 2022 · cd075ae · cd075ae
1 parent 7ece58c
commit cd075ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
@@ -14,7 +14,7 @@ export async function loadConfig<U extends UserConfig>(
 ): Promise<LoadConfigResult<U>> {
   let inlineConfig = {} as U
   if (typeof configOrPath !== 'string') {
-    inlineConfig = Object.assign({}, defaults, configOrPath)
+    inlineConfig = configOrPath
     if (inlineConfig.configFile === false) {
       return {
         config: inlineConfig as U,
@@ -56,7 +56,7 @@ export async function loadConfig<U extends UserConfig>(
   })
 
   const result = await loader.load()
-  result.config = result.config || inlineConfig
+  result.config = Object.assign(defaults, result.config || inlineConfig)
   if (result.config.configDeps) {
     result.sources = [
       ...result.sources,

diff --git a/packages/nuxt/src/index.ts b/packages/nuxt/src/index.ts
@@ -74,7 +74,7 @@ export default defineNuxtModule<UnocssNuxtOptions>({
 
     nuxt.hook('vite:extend', ({ config }) => {
       config.plugins = config.plugins || []
-      config.plugins.unshift(...VitePlugin(unoConfig))
+      config.plugins.unshift(...VitePlugin({}, unoConfig))
     })
 
     // Nuxt 2
@@ -90,7 +90,7 @@ export default defineNuxtModule<UnocssNuxtOptions>({
 
     extendWebpackConfig((config) => {
       config.plugins = config.plugins || []
-      config.plugins.unshift(WebpackPlugin(unoConfig))
+      config.plugins.unshift(WebpackPlugin({}, unoConfig))
     })
   },
 })