stringify in user config always wins

tw-in-js · Oct 20, 2022 · 0705e41 · 0705e41
1 parent f1c81c9
commit 0705e41
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.changeset/shaggy-chefs-attack.md b/.changeset/shaggy-chefs-attack.md
@@ -0,0 +1,5 @@
+---
+'twind': patch
+---
+
+stringify in user config always wins
diff --git a/packages/twind/src/define-config.ts b/packages/twind/src/define-config.ts
@@ -34,6 +34,7 @@ export function defineConfig<Theme = BaseTheme, Presets extends Preset<any>[] =
       darkColor: userConfig.darkColor,
       preflight: userConfig.preflight !== false && asArray(userConfig.preflight),
       theme: userConfig.theme as TwindConfig<BaseTheme & ExtractThemes<Theme, Presets>>['theme'],
+      stringify: userConfig.stringify,
     } as TwindPresetConfig<Theme>,
   ])) {
     const {

diff --git a/packages/twind/src/sheets.ts b/packages/twind/src/sheets.ts
@@ -1,3 +1,4 @@
+import { warn } from './internal/warn'
 import type { Sheet, SheetRule } from './types'
 import { asArray, noop } from './utils'
 
@@ -59,7 +60,7 @@ export function cssom(element?: CSSStyleSheet | Element | null | false): Sheet<C
         // ::-moz-focus-inner
         // :-moz-focusring
         if (!/:-[mwo]/.test(cssText)) {
-          console.warn(error, cssText)
+          warn((error as Error).message, 'TWIND_INVALID_CSS', cssText)
         }
       }
     },