fix(nuxt): avoid preset duplication, close #1054

unocss · Jun 4, 2022 · 91b2f08 · 91b2f08
1 parent 2c9627e
commit 91b2f08
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -545,6 +545,7 @@ export interface ResolvedConfig extends Omit<
 RequiredByKey<UserConfig, 'mergeSelectors' | 'theme' | 'rules' | 'variants' | 'layers' | 'extractors' | 'blocklist' | 'safelist' | 'preflights' | 'sortLayers'>,
 'rules' | 'shortcuts' | 'autocomplete'
 > {
+  presets: Preset[]
   shortcuts: Shortcut[]
   variants: VariantObject[]
   preprocess: Preprocessor[]

diff --git a/packages/nuxt/src/index.ts b/packages/nuxt/src/index.ts
@@ -55,12 +55,12 @@ export default defineNuxtModule<UnocssNuxtOptions>({
 
     extendViteConfig((config) => {
       config.plugins = config.plugins || []
-      config.plugins.unshift(...VitePlugin(options))
+      config.plugins.unshift(...VitePlugin({}, options))
     })
 
     extendWebpackConfig((config) => {
       config.plugins = config.plugins || []
-      config.plugins.unshift(WebpackPlugin(options))
+      config.plugins.unshift(WebpackPlugin({}, options))
     })
   },
 })

diff --git a/packages/shared-integration/src/context.ts b/packages/shared-integration/src/context.ts
@@ -39,6 +39,17 @@ export function createContext<Config extends UserConfig<any> = UserConfig<any>>(
     await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)))
     invalidate()
 
+    // check preset duplication
+    const presets = new Set<string>()
+    uno.config.presets.forEach((i) => {
+      if (!i.name)
+        return
+      if (presets.has(i.name))
+        console.warn(`[unocss] duplication of preset ${i.name} found, there might be something wrong with your config.`)
+      else
+        presets.add(i.name)
+    })
+
     return result
   }