@unocss/preset-wind 0.39.2 → 0.41.0

package/README.md

@@ -2,6 +2,9 @@
 
 Tailwind / Windi CSS compact preset for [UnoCSS](https://github.com/unocss/unocss).
 
+> This preset inherits
+> - [@unocss/preset-mini](https://github.com/antfu/unocss/tree/main/packages/preset-mini)
+
 ## Installation
 
 ```bash
@@ -18,6 +21,24 @@ Unocss({
 })
 ```
 
+## Differences from Windi CSS
+
+### `<sm` `@lg` Variants
+
+- `<sm:p-1` -> `lt-sm:p-1`
+- `@lg:p-1` -> `at-lg:p-1`
+- `>xl:p-1` -> `gt-lg:p-1`
+
+to have more consistent naming.
+
+### Bracket Syntax Spaces
+
+This preset uses `_` instead of `,` for respecting space in bracket syntax.
+
+- `grid-cols-[1fr,10px,max-content]` -> `grid-cols-[1fr_10px_max-content]`
+
+since some CSS rules require `,` as parts of the value, e.g. `grid-cols-[repeat(3,auto)]`
+
 ## License
 
 MIT License &copy; 2021-PRESENT [Anthony Fu](https://github.com/antfu)

package/dist/index.cjs

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const presetMini = require('@unocss/preset-mini');
-const core = require('@unocss/core');
 const utils = require('@unocss/preset-mini/utils');
 const rules$1 = require('@unocss/preset-mini/rules');
 const theme$1 = require('@unocss/preset-mini/theme');
@@ -134,11 +133,11 @@ const backgroundStyles = [
   }],
   [/^(?:bg-gradient-)?stops-(\[.+\])$/, ([, s]) => ({ "--un-gradient-stops": utils.handler.bracket(s) })],
   [/^(?:bg-gradient-)?from-(.+)$/, bgGradientColorResolver("from")],
-  [/^(?:bg-gradient-)?to-(.+)$/, bgGradientColorResolver("to")],
   [/^(?:bg-gradient-)?via-(.+)$/, bgGradientColorResolver("via")],
+  [/^(?:bg-gradient-)?to-(.+)$/, bgGradientColorResolver("to")],
   [/^(?:bg-gradient-)?from-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-from-opacity": utils.handler.bracket.percent(opacity) })],
-  [/^(?:bg-gradient-)?to-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-to-opacity": utils.handler.bracket.percent(opacity) })],
   [/^(?:bg-gradient-)?via-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-via-opacity": utils.handler.bracket.percent(opacity) })],
+  [/^(?:bg-gradient-)?to-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-to-opacity": utils.handler.bracket.percent(opacity) })],
   [/^bg-gradient-((?:repeating-)?(?:linear|radial|conic))$/, ([, s]) => ({
     "background-image": `${s}-gradient(var(--un-gradient, var(--un-gradient-stops, rgba(255, 255, 255, 0))))`
   }), { autocomplete: ["bg-gradient-repeating", "bg-gradient-(linear|radial|conic)", "bg-gradient-repeating-(linear|radial|conic)"] }],
@@ -279,7 +278,7 @@ const container = [
     (m, { variantHandlers }) => {
       let width = "100%";
       for (const v of variantHandlers) {
-        const query = core.toArray(v.parent || [])[0];
+        const query = v.handle?.({}, (x) => x)?.parent;
         if (typeof query === "string") {
           const match = query.match(queryMatcher)?.[1];
           if (match)
@@ -1040,12 +1039,12 @@ const theme = {
 };
 
 const variantCombinators = [
-  utils.variantMatcher("svg", (input) => `${input} svg`)
+  utils.variantMatcher("svg", (input) => ({ selector: `${input.selector} svg` }))
 ];
 
 const variantColorsScheme = [
-  utils.variantMatcher(".dark", (input) => `.dark $$ ${input}`),
-  utils.variantMatcher(".light", (input) => `.light $$ ${input}`),
+  utils.variantMatcher(".dark", (input) => ({ prefix: `.dark $$ ${input.prefix}` })),
+  utils.variantMatcher(".light", (input) => ({ prefix: `.light $$ ${input.prefix}` })),
   utils.variantParentMatcher("@dark", "@media (prefers-color-scheme: dark)"),
   utils.variantParentMatcher("@light", "@media (prefers-color-scheme: light)")
 ];

package/dist/index.mjs

@@ -1,6 +1,5 @@
 import { preflights } from '@unocss/preset-mini';
 export { colors, preflights } from '@unocss/preset-mini';
-import { toArray } from '@unocss/core';
 import { handler, positionMap, parseColor, colorToString, colorOpacityToString, colorResolver, resolveBreakpoints, colorableShadows, directionMap, directionSize, variantMatcher, variantParentMatcher, hasParseableColor } from '@unocss/preset-mini/utils';
 import { varEmpty, cssVariables as cssVariables$1, cssProperty, pointerEvents, appearances, positions, insets, zIndexes, orders, grids, floats, margins, boxSizing, displays, aspectRatio, sizes, flex, transforms, cursors, userSelects, resizes, appearance, placements, alignments, justifies, gaps, overflows, textOverflows, whitespaces, breaks, borders, bgColors, svgUtilities, paddings, textAligns, textIndents, verticalAligns, fonts, textTransforms as textTransforms$1, fontStyles, textColors, textDecorations, fontSmoothings, tabSizes, textStrokes, textShadows, opacity, boxShadows, outline, rings, transitions, willChange, contents, questionMark, transformBase, boxShadowsBase, ringBase } from '@unocss/preset-mini/rules';
 import { theme as theme$1 } from '@unocss/preset-mini/theme';
@@ -131,11 +130,11 @@ const backgroundStyles = [
   }],
   [/^(?:bg-gradient-)?stops-(\[.+\])$/, ([, s]) => ({ "--un-gradient-stops": handler.bracket(s) })],
   [/^(?:bg-gradient-)?from-(.+)$/, bgGradientColorResolver("from")],
-  [/^(?:bg-gradient-)?to-(.+)$/, bgGradientColorResolver("to")],
   [/^(?:bg-gradient-)?via-(.+)$/, bgGradientColorResolver("via")],
+  [/^(?:bg-gradient-)?to-(.+)$/, bgGradientColorResolver("to")],
   [/^(?:bg-gradient-)?from-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-from-opacity": handler.bracket.percent(opacity) })],
-  [/^(?:bg-gradient-)?to-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-to-opacity": handler.bracket.percent(opacity) })],
   [/^(?:bg-gradient-)?via-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-via-opacity": handler.bracket.percent(opacity) })],
+  [/^(?:bg-gradient-)?to-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-to-opacity": handler.bracket.percent(opacity) })],
   [/^bg-gradient-((?:repeating-)?(?:linear|radial|conic))$/, ([, s]) => ({
     "background-image": `${s}-gradient(var(--un-gradient, var(--un-gradient-stops, rgba(255, 255, 255, 0))))`
   }), { autocomplete: ["bg-gradient-repeating", "bg-gradient-(linear|radial|conic)", "bg-gradient-repeating-(linear|radial|conic)"] }],
@@ -276,7 +275,7 @@ const container = [
     (m, { variantHandlers }) => {
       let width = "100%";
       for (const v of variantHandlers) {
-        const query = toArray(v.parent || [])[0];
+        const query = v.handle?.({}, (x) => x)?.parent;
         if (typeof query === "string") {
           const match = query.match(queryMatcher)?.[1];
           if (match)
@@ -1037,12 +1036,12 @@ const theme = {
 };
 
 const variantCombinators = [
-  variantMatcher("svg", (input) => `${input} svg`)
+  variantMatcher("svg", (input) => ({ selector: `${input.selector} svg` }))
 ];
 
 const variantColorsScheme = [
-  variantMatcher(".dark", (input) => `.dark $$ ${input}`),
-  variantMatcher(".light", (input) => `.light $$ ${input}`),
+  variantMatcher(".dark", (input) => ({ prefix: `.dark $$ ${input.prefix}` })),
+  variantMatcher(".light", (input) => ({ prefix: `.light $$ ${input.prefix}` })),
   variantParentMatcher("@dark", "@media (prefers-color-scheme: dark)"),
   variantParentMatcher("@light", "@media (prefers-color-scheme: light)")
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-wind",
-  "version": "0.39.2",
+  "version": "0.41.0",
   "description": "Tailwind / Windi CSS compact preset for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -35,8 +35,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.39.2",
-    "@unocss/preset-mini": "0.39.2"
+    "@unocss/core": "0.41.0",
+    "@unocss/preset-mini": "0.41.0"
   },
   "scripts": {
     "build": "unbuild",