fix(preset-uno/preset-wind): reorder rules to match v1.14 (#249)

unocss · Dec 10, 2021 · 71500e5 · 71500e5
1 parent 3b11214
commit 71500e5
Show file tree

Hide file tree

Showing 3 changed files with 273 additions and 127 deletions.
diff --git a/packages/preset-wind/src/index.ts b/packages/preset-wind/src/index.ts
@@ -1,5 +1,7 @@
 import { Preset } from '@unocss/core'
-import { presetMini, Theme } from '@unocss/preset-mini'
+import { Theme } from '@unocss/preset-mini'
+import { theme } from '@unocss/preset-mini/theme'
+import { variantColorsClass, variantColorsMedia, variants } from '@unocss/preset-mini/variants'
 import { rules } from './rules'
 import { containerShortcuts } from './rules/container'
 
@@ -14,16 +16,20 @@ export interface UnoOptions {
   dark?: 'class' | 'media'
 }
 
-export const presetWind = (options: UnoOptions = {}): Preset<Theme>[] => ([
-  presetMini(),
-  {
-    name: '@unocss/preset-wind',
-    rules,
-    shortcuts: [
-      ...containerShortcuts,
-    ],
-    options,
-  },
-])
+export const presetWind = (options: UnoOptions = {}): Preset<Theme> => ({
+  name: '@unocss/preset-wind',
+  theme,
+  rules,
+  shortcuts: [
+    ...containerShortcuts,
+  ],
+  variants: [
+    ...variants,
+    ...options.dark === 'media'
+      ? variantColorsMedia
+      : variantColorsClass,
+  ],
+  options,
+})
 
 export default presetWind
diff --git a/packages/preset-wind/src/rules/default.ts b/packages/preset-wind/src/rules/default.ts
@@ -1,4 +1,72 @@
 import { Rule } from '@unocss/core'
+import {
+  alignContents,
+  alignItems,
+  alignSelfs,
+  appearance,
+  appearances,
+  aspectRatio,
+  bgColors,
+  borders,
+  boxShadows,
+  boxSizing,
+  breaks,
+  contents,
+  cursors,
+  displays,
+  fillColors,
+  flex,
+  floats,
+  fontSizes,
+  fontSmoothings,
+  fontStyles,
+  fontWeights,
+  fontsFamilies,
+  gaps,
+  grids,
+  insets,
+  justifies,
+  justifyItems,
+  justifySelfs,
+  leadings,
+  margins,
+  opacity,
+  orders,
+  outline,
+  overflows,
+  paddings,
+  placeContents,
+  placeItems,
+  placeSelfs,
+  placeholder,
+  pointerEvents,
+  positions,
+  questionMark,
+  resizes,
+  rings,
+  sizes,
+  tabSizes,
+  textAligns,
+  textColors,
+  textDecorationColors,
+  textDecorationLengths,
+  textDecorationOffsets,
+  textDecorationStyles,
+  textDecorations,
+  textIndents,
+  textOverflows,
+  textShadows,
+  textStrokeColors,
+  textStrokeWidths,
+  trackings,
+  transforms,
+  transitions,
+  userSelects,
+  verticalAligns,
+  whitespaces,
+  wordSpacings,
+  zIndexes,
+} from '@unocss/preset-mini/rules'
 import { container } from './container'
 import { bgAttachments, bgBlendModes, bgClips, bgGradients, bgImages, bgOrigins, bgPositions, bgSizes, bgRepeats } from './background'
 import { filters } from './filters'
@@ -16,34 +84,102 @@ import { fontVariantNumeric } from './typography'
 export const rules: Rule[] = [
   screenReadersAccess,
   cssVariables,
+  paddings,
+  margins,
   spaces,
   lineClamps,
   isolations,
   container,
+  displays,
+  opacity,
   bgAttachments,
   bgBlendModes,
   bgClips,
+  bgColors,
   bgGradients,
   bgImages,
   bgOrigins,
   bgPositions,
-  bgSizes,
   bgRepeats,
+  bgSizes,
+  fillColors,
+  borders,
   divides,
+  contents,
+  fontsFamilies,
+  fontSizes,
+  fontWeights,
+  tabSizes,
+  textIndents,
+  textOverflows,
+  textDecorations,
+  textDecorationStyles,
+  textDecorationColors,
+  textDecorationLengths,
+  textDecorationOffsets,
+  textStrokeWidths,
+  textStrokeColors,
+  textShadows,
   textTransforms,
+  textAligns,
+  textColors,
+  fontVariantNumeric,
+  fontStyles,
+  fontSmoothings,
   hyphens,
   writingModes,
   writingOrientations,
   mixBlendModes,
+  boxShadows,
+  rings,
+  flex,
+  grids,
+  gaps,
+  sizes,
+  aspectRatio,
+  cursors,
+  appearances,
+  pointerEvents,
+  resizes,
+  verticalAligns,
+  userSelects,
+  whitespaces,
   listStyle,
   caretColors,
   boxDecorationBreaks,
   caretOpacity,
   imageRenderings,
+  breaks,
+  trackings,
+  wordSpacings,
+  leadings,
+  overflows,
+  outline,
+  appearance,
+  placeholder,
   overscrolls,
-  fontVariantNumeric,
-  objectPositions,
+  positions,
+  orders,
+  justifies,
+  justifyItems,
+  justifySelfs,
+  alignContents,
+  alignItems,
+  alignSelfs,
+  placeContents,
+  placeItems,
+  placeSelfs,
   animations,
+  insets,
+  floats,
+  zIndexes,
+  objectPositions,
+  boxSizing,
+  transitions,
   filters,
   tables,
+  transforms,
+
+  // should be the last
+  questionMark,
 ].flat(1)