@unocss/preset-wind 0.36.0 → 0.37.2

package/dist/index.cjs

@@ -150,10 +150,10 @@ const backgroundStyles = [
   ["bg-fixed", { "background-attachment": "fixed" }],
   ["bg-local", { "background-attachment": "local" }],
   ["bg-scroll", { "background-attachment": "scroll" }],
-  ["bg-clip-border", { "-webkit-background-clip": "border-box", "background-attachment": "border-box" }],
-  ["bg-clip-content", { "-webkit-background-clip": "content-box", "background-attachment": "content-box" }],
-  ["bg-clip-padding", { "-webkit-background-clip": "padding-box", "background-attachment": "padding-box" }],
-  ["bg-clip-text", { "-webkit-background-clip": "text", "background-attachment": "text" }],
+  ["bg-clip-border", { "-webkit-background-clip": "border-box", "background-clip": "border-box" }],
+  ["bg-clip-content", { "-webkit-background-clip": "content-box", "background-clip": "content-box" }],
+  ["bg-clip-padding", { "-webkit-background-clip": "padding-box", "background-clip": "padding-box" }],
+  ["bg-clip-text", { "-webkit-background-clip": "text", "background-clip": "text" }],
   [/^bg-([-\w]{3,})$/, ([, s]) => ({ "background-position": utils.positionMap[s] })],
   ["bg-repeat", { "background-repeat": "repeat" }],
   ["bg-no-repeat", { "background-repeat": "no-repeat" }],
@@ -530,6 +530,10 @@ const mixBlendModes = [
   ["mix-blend-normal", { "mix-blend-mode": "normal" }]
 ];
 
+const borderSpacingBase = {
+  "--un-border-spacing-x": 0,
+  "--un-border-spacing-y": 0
+};
 const tables = [
   ["inline-table", { display: "inline-table" }],
   ["table", { display: "table" }],
@@ -543,7 +547,25 @@ const tables = [
   ["table-row-group", { display: "table-row-group" }],
   ["border-collapse", { "border-collapse": "collapse" }],
   ["border-separate", { "border-collapse": "separate" }],
-  [/^border-spacing-(.+)$/, ([, d], { theme }) => ({ "border-spacing": theme.spacing?.[d] ?? utils.handler.bracket.cssvar.auto.fraction.rem(d) }), { autocomplete: ["border-spacing", "border-spacing-$spacing"] }],
+  [/^border-spacing-(.+)$/, ([, s], { theme }) => {
+    const v = theme.spacing?.[s] ?? utils.handler.bracket.cssvar.global.auto.fraction.rem(s);
+    if (v != null) {
+      return {
+        "--un-border-spacing-x": v,
+        "--un-border-spacing-y": v,
+        "border-spacing": "var(--un-border-spacing-x) var(--un-border-spacing-y)"
+      };
+    }
+  }, { autocomplete: ["border-spacing", "border-spacing-$spacing"] }],
+  [/^border-spacing-([xy])-(.+)$/, ([, d, s], { theme }) => {
+    const v = theme.spacing?.[s] ?? utils.handler.bracket.cssvar.global.auto.fraction.rem(s);
+    if (v != null) {
+      return {
+        [`--un-border-spacing-${d}`]: v,
+        "border-spacing": "var(--un-border-spacing-x) var(--un-border-spacing-y)"
+      };
+    }
+  }, { autocomplete: ["border-spacing-(x|y)", "border-spacing-(x|y)-$spacing"] }],
   ["caption-top", { "caption-side": "top" }],
   ["caption-bottom", { "caption-side": "bottom" }],
   ["table-auto", { "table-layout": "auto" }],
@@ -627,16 +649,12 @@ const fontVariantNumericBase = {
   "--un-numeric-figure": rules$1.varEmpty,
   "--un-numeric-spacing": rules$1.varEmpty,
   "--un-numeric-fraction": rules$1.varEmpty,
-  "--un-font-variant-numeric": "var(--un-ordinal) var(--un-slashed-zero) var(--un-numeric-figure) var(--un-numeric-spacing) var(--un-numeric-fraction)",
-  [core.CONTROL_SHORTCUT_NO_MERGE]: ""
+  "--un-font-variant-numeric": "var(--un-ordinal) var(--un-slashed-zero) var(--un-numeric-figure) var(--un-numeric-spacing) var(--un-numeric-fraction)"
 };
-const toEntries = (entry) => [
-  fontVariantNumericBase,
-  {
-    ...entry,
-    "font-variant-numeric": "var(--un-font-variant-numeric)"
-  }
-];
+const toEntries = (entry) => ({
+  ...entry,
+  "font-variant-numeric": "var(--un-font-variant-numeric)"
+});
 const fontVariantNumeric = [
   [/^ordinal$/, () => toEntries({ "--un-ordinal": "ordinal" }), { autocomplete: "ordinal" }],
   [/^slashed-zero$/, () => toEntries({ "--un-slashed-zero": "slashed-zero" }), { autocomplete: "slashed-zero" }],
@@ -653,46 +671,36 @@ const touchActionBase = {
   "--un-pan-x": rules$1.varEmpty,
   "--un-pan-y": rules$1.varEmpty,
   "--un-pinch-zoom": rules$1.varEmpty,
-  "--un-touch-action": "var(--un-pan-x) var(--un-pan-y) var(--un-pinch-zoom)",
-  [core.CONTROL_SHORTCUT_NO_MERGE]: ""
+  "--un-touch-action": "var(--un-pan-x) var(--un-pan-y) var(--un-pinch-zoom)"
 };
 const touchActions = [
-  [/^touch-pan-(x|left|right)$/, ([, d]) => [
-    touchActionBase,
-    {
-      "--un-pan-x": `pan-${d}`,
-      "touch-action": "var(--un-touch-action)"
-    }
-  ], { autocomplete: ["touch-pan", "touch-pan-(x|left|right|y|up|down)"] }],
-  [/^touch-pan-(y|up|down)$/, ([, d]) => [
-    touchActionBase,
-    {
-      "--un-pan-y": `pan-${d}`,
-      "touch-action": "var(--un-touch-action)"
-    }
-  ]],
-  [/^touch-pinch-zoom$/, () => [
-    touchActionBase,
-    {
-      "--un-pinch-zoom": "pinch-zoom",
-      "touch-action": "var(--un-touch-action)"
-    }
-  ], { autocomplete: ["touch-pinch", "touch-pinch-zoom"] }],
+  [/^touch-pan-(x|left|right)$/, ([, d]) => ({
+    "--un-pan-x": `pan-${d}`,
+    "touch-action": "var(--un-touch-action)"
+  }), { autocomplete: ["touch-pan", "touch-pan-(x|left|right|y|up|down)"] }],
+  [/^touch-pan-(y|up|down)$/, ([, d]) => ({
+    "--un-pan-y": `pan-${d}`,
+    "touch-action": "var(--un-touch-action)"
+  })],
+  ["touch-pinch-zoom", {
+    "--un-pinch-zoom": "pinch-zoom",
+    "touch-action": "var(--un-touch-action)"
+  }],
   ["touch-auto", { "touch-action": "auto" }],
   ["touch-manipulation", { "touch-action": "manipulation" }],
   ["touch-none", { "touch-action": "none" }]
 ];
 
+const scrollSnapTypeBase = {
+  "--un-scroll-snap-strictness": "proximity"
+};
 const scrolls = [
-  [/^snap-(x|y|both)$/, ([, d]) => [
-    {
-      "--un-scroll-snap-strictness": "proximity",
-      [core.CONTROL_SHORTCUT_NO_MERGE]: ""
-    },
-    {
-      "scroll-snap-type": `${d} var(--un-scroll-snap-strictness)`
-    }
-  ], { autocomplete: "snap-(x|y|both)" }],
+  [/^snap-(x|y)$/, ([, d]) => ({
+    "scroll-snap-type": `${d} var(--un-scroll-snap-strictness)`
+  }), { autocomplete: "snap-(x|y|both)" }],
+  [/^snap-both$/, () => ({
+    "scroll-snap-type": "both var(--un-scroll-snap-strictness)"
+  })],
   ["snap-mandatory", { "--un-scroll-snap-strictness": "mandatory" }],
   ["snap-proximity", { "--un-scroll-snap-strictness": "proximity" }],
   ["snap-none", { "scroll-snap-type": "none" }],
@@ -988,6 +996,12 @@ const theme = {
   },
   preflightBase: {
     ...rules$1.transformBase,
+    ...touchActionBase,
+    ...scrollSnapTypeBase,
+    ...fontVariantNumericBase,
+    ...borderSpacingBase,
+    ...rules$1.boxShadowsBase,
+    ...rules$1.ringBase,
     ...filterBase,
     ...backdropFilterBase
   }

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { preflights } from '@unocss/preset-mini';
 export { colors, preflights } from '@unocss/preset-mini';
-import { toArray, CONTROL_SHORTCUT_NO_MERGE } from '@unocss/core';
+import { toArray } from '@unocss/core';
 import { handler, positionMap, parseColor, colorToString, 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 } from '@unocss/preset-mini/rules';
+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';
 import { variants as variants$1 } from '@unocss/preset-mini/variants';
 
@@ -147,10 +147,10 @@ const backgroundStyles = [
   ["bg-fixed", { "background-attachment": "fixed" }],
   ["bg-local", { "background-attachment": "local" }],
   ["bg-scroll", { "background-attachment": "scroll" }],
-  ["bg-clip-border", { "-webkit-background-clip": "border-box", "background-attachment": "border-box" }],
-  ["bg-clip-content", { "-webkit-background-clip": "content-box", "background-attachment": "content-box" }],
-  ["bg-clip-padding", { "-webkit-background-clip": "padding-box", "background-attachment": "padding-box" }],
-  ["bg-clip-text", { "-webkit-background-clip": "text", "background-attachment": "text" }],
+  ["bg-clip-border", { "-webkit-background-clip": "border-box", "background-clip": "border-box" }],
+  ["bg-clip-content", { "-webkit-background-clip": "content-box", "background-clip": "content-box" }],
+  ["bg-clip-padding", { "-webkit-background-clip": "padding-box", "background-clip": "padding-box" }],
+  ["bg-clip-text", { "-webkit-background-clip": "text", "background-clip": "text" }],
   [/^bg-([-\w]{3,})$/, ([, s]) => ({ "background-position": positionMap[s] })],
   ["bg-repeat", { "background-repeat": "repeat" }],
   ["bg-no-repeat", { "background-repeat": "no-repeat" }],
@@ -527,6 +527,10 @@ const mixBlendModes = [
   ["mix-blend-normal", { "mix-blend-mode": "normal" }]
 ];
 
+const borderSpacingBase = {
+  "--un-border-spacing-x": 0,
+  "--un-border-spacing-y": 0
+};
 const tables = [
   ["inline-table", { display: "inline-table" }],
   ["table", { display: "table" }],
@@ -540,7 +544,25 @@ const tables = [
   ["table-row-group", { display: "table-row-group" }],
   ["border-collapse", { "border-collapse": "collapse" }],
   ["border-separate", { "border-collapse": "separate" }],
-  [/^border-spacing-(.+)$/, ([, d], { theme }) => ({ "border-spacing": theme.spacing?.[d] ?? handler.bracket.cssvar.auto.fraction.rem(d) }), { autocomplete: ["border-spacing", "border-spacing-$spacing"] }],
+  [/^border-spacing-(.+)$/, ([, s], { theme }) => {
+    const v = theme.spacing?.[s] ?? handler.bracket.cssvar.global.auto.fraction.rem(s);
+    if (v != null) {
+      return {
+        "--un-border-spacing-x": v,
+        "--un-border-spacing-y": v,
+        "border-spacing": "var(--un-border-spacing-x) var(--un-border-spacing-y)"
+      };
+    }
+  }, { autocomplete: ["border-spacing", "border-spacing-$spacing"] }],
+  [/^border-spacing-([xy])-(.+)$/, ([, d, s], { theme }) => {
+    const v = theme.spacing?.[s] ?? handler.bracket.cssvar.global.auto.fraction.rem(s);
+    if (v != null) {
+      return {
+        [`--un-border-spacing-${d}`]: v,
+        "border-spacing": "var(--un-border-spacing-x) var(--un-border-spacing-y)"
+      };
+    }
+  }, { autocomplete: ["border-spacing-(x|y)", "border-spacing-(x|y)-$spacing"] }],
   ["caption-top", { "caption-side": "top" }],
   ["caption-bottom", { "caption-side": "bottom" }],
   ["table-auto", { "table-layout": "auto" }],
@@ -624,16 +646,12 @@ const fontVariantNumericBase = {
   "--un-numeric-figure": varEmpty,
   "--un-numeric-spacing": varEmpty,
   "--un-numeric-fraction": varEmpty,
-  "--un-font-variant-numeric": "var(--un-ordinal) var(--un-slashed-zero) var(--un-numeric-figure) var(--un-numeric-spacing) var(--un-numeric-fraction)",
-  [CONTROL_SHORTCUT_NO_MERGE]: ""
+  "--un-font-variant-numeric": "var(--un-ordinal) var(--un-slashed-zero) var(--un-numeric-figure) var(--un-numeric-spacing) var(--un-numeric-fraction)"
 };
-const toEntries = (entry) => [
-  fontVariantNumericBase,
-  {
-    ...entry,
-    "font-variant-numeric": "var(--un-font-variant-numeric)"
-  }
-];
+const toEntries = (entry) => ({
+  ...entry,
+  "font-variant-numeric": "var(--un-font-variant-numeric)"
+});
 const fontVariantNumeric = [
   [/^ordinal$/, () => toEntries({ "--un-ordinal": "ordinal" }), { autocomplete: "ordinal" }],
   [/^slashed-zero$/, () => toEntries({ "--un-slashed-zero": "slashed-zero" }), { autocomplete: "slashed-zero" }],
@@ -650,46 +668,36 @@ const touchActionBase = {
   "--un-pan-x": varEmpty,
   "--un-pan-y": varEmpty,
   "--un-pinch-zoom": varEmpty,
-  "--un-touch-action": "var(--un-pan-x) var(--un-pan-y) var(--un-pinch-zoom)",
-  [CONTROL_SHORTCUT_NO_MERGE]: ""
+  "--un-touch-action": "var(--un-pan-x) var(--un-pan-y) var(--un-pinch-zoom)"
 };
 const touchActions = [
-  [/^touch-pan-(x|left|right)$/, ([, d]) => [
-    touchActionBase,
-    {
-      "--un-pan-x": `pan-${d}`,
-      "touch-action": "var(--un-touch-action)"
-    }
-  ], { autocomplete: ["touch-pan", "touch-pan-(x|left|right|y|up|down)"] }],
-  [/^touch-pan-(y|up|down)$/, ([, d]) => [
-    touchActionBase,
-    {
-      "--un-pan-y": `pan-${d}`,
-      "touch-action": "var(--un-touch-action)"
-    }
-  ]],
-  [/^touch-pinch-zoom$/, () => [
-    touchActionBase,
-    {
-      "--un-pinch-zoom": "pinch-zoom",
-      "touch-action": "var(--un-touch-action)"
-    }
-  ], { autocomplete: ["touch-pinch", "touch-pinch-zoom"] }],
+  [/^touch-pan-(x|left|right)$/, ([, d]) => ({
+    "--un-pan-x": `pan-${d}`,
+    "touch-action": "var(--un-touch-action)"
+  }), { autocomplete: ["touch-pan", "touch-pan-(x|left|right|y|up|down)"] }],
+  [/^touch-pan-(y|up|down)$/, ([, d]) => ({
+    "--un-pan-y": `pan-${d}`,
+    "touch-action": "var(--un-touch-action)"
+  })],
+  ["touch-pinch-zoom", {
+    "--un-pinch-zoom": "pinch-zoom",
+    "touch-action": "var(--un-touch-action)"
+  }],
   ["touch-auto", { "touch-action": "auto" }],
   ["touch-manipulation", { "touch-action": "manipulation" }],
   ["touch-none", { "touch-action": "none" }]
 ];
 
+const scrollSnapTypeBase = {
+  "--un-scroll-snap-strictness": "proximity"
+};
 const scrolls = [
-  [/^snap-(x|y|both)$/, ([, d]) => [
-    {
-      "--un-scroll-snap-strictness": "proximity",
-      [CONTROL_SHORTCUT_NO_MERGE]: ""
-    },
-    {
-      "scroll-snap-type": `${d} var(--un-scroll-snap-strictness)`
-    }
-  ], { autocomplete: "snap-(x|y|both)" }],
+  [/^snap-(x|y)$/, ([, d]) => ({
+    "scroll-snap-type": `${d} var(--un-scroll-snap-strictness)`
+  }), { autocomplete: "snap-(x|y|both)" }],
+  [/^snap-both$/, () => ({
+    "scroll-snap-type": "both var(--un-scroll-snap-strictness)"
+  })],
   ["snap-mandatory", { "--un-scroll-snap-strictness": "mandatory" }],
   ["snap-proximity", { "--un-scroll-snap-strictness": "proximity" }],
   ["snap-none", { "scroll-snap-type": "none" }],
@@ -985,6 +993,12 @@ const theme = {
   },
   preflightBase: {
     ...transformBase,
+    ...touchActionBase,
+    ...scrollSnapTypeBase,
+    ...fontVariantNumericBase,
+    ...borderSpacingBase,
+    ...boxShadowsBase,
+    ...ringBase,
     ...filterBase,
     ...backdropFilterBase
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-wind",
-  "version": "0.36.0",
+  "version": "0.37.2",
   "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.36.0",
-    "@unocss/preset-mini": "0.36.0"
+    "@unocss/core": "0.37.2",
+    "@unocss/preset-mini": "0.37.2"
   },
   "scripts": {
     "build": "unbuild",