@unocss/preset-wind 0.22.1 → 0.22.2

package/dist/index.cjs

@@ -237,7 +237,6 @@ const filterBase = {
   "--un-brightness": rules$1.varEmpty,
   "--un-contrast": rules$1.varEmpty,
   "--un-drop-shadow": rules$1.varEmpty,
-  "--un-drop-shadow-colored": rules$1.varEmpty,
   "--un-grayscale": rules$1.varEmpty,
   "--un-hue-rotate": rules$1.varEmpty,
   "--un-invert": rules$1.varEmpty,
@@ -293,13 +292,11 @@ const toFilter = (varName, resolver) => ([, b, s], { theme }) => {
 const dropShadowResolver = ([, s], { theme }) => {
   let v = theme.dropShadow?.[s || "DEFAULT"];
   if (v != null) {
-    const shadow = core.toArray(v);
-    const colored = shadow.map((s2) => s2.replace(/\s\S+$/, " var(--un-drop-shadow-color)"));
+    const shadows = rules$1.colorableShadows(v, "--un-drop-shadow-color");
     return [
       filterBase,
       {
-        "--un-drop-shadow": `drop-shadow(${shadow.join(") drop-shadow(")})`,
-        "--un-drop-shadow-colored": `drop-shadow(${colored.join(") drop-shadow(")})`,
+        "--un-drop-shadow": `drop-shadow(${shadows.join(") drop-shadow(")})`,
         "filter": "var(--un-filter)"
       }
     ];
@@ -320,15 +317,7 @@ const filters = [
   [/^(?:(backdrop-)|filter-)?brightness-(.+)$/, toFilter("brightness", (s) => utils.handler.bracket.percent(s))],
   [/^(?:(backdrop-)|filter-)?contrast-(.+)$/, toFilter("contrast", (s) => utils.handler.bracket.percent(s))],
   [/^(?:filter-)?drop-shadow(?:-(.+))?$/, dropShadowResolver],
-  [/^(?:filter-)?drop-shadow-color-(.+)$/, (m, ctx) => {
-    const color = utils.colorResolver("--un-drop-shadow-color", "drop-shadow")(m, ctx);
-    if (color) {
-      return {
-        ...color,
-        "--un-drop-shadow": "var(--un-drop-shadow-colored)"
-      };
-    }
-  }],
+  [/^(?:filter-)?drop-shadow-color-(.+)$/, utils.colorResolver("--un-drop-shadow-color", "drop-shadow")],
   [/^(?:filter-)?drop-shadow-color-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-drop-shadow-opacity": utils.handler.bracket.percent.cssvar(opacity) })],
   [/^(?:(backdrop-)|filter-)?grayscale(?:-(.+))?$/, toFilter("grayscale", percentWithDefault)],
   [/^(?:(backdrop-)|filter-)?hue-rotate-(.+)$/, toFilter("hue-rotate", (s) => utils.handler.bracket.degree(s))],

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { variants } from '@unocss/preset-mini/variants';
 import { toArray, CONTROL_SHORTCUT_NO_MERGE } from '@unocss/core';
 import { theme as theme$1 } from '@unocss/preset-mini/theme';
 export { colors } from '@unocss/preset-mini';
-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, fontStyles, textColors, textDecorations, fontSmoothings, tabSizes, textStrokes, textShadows, opacity, boxShadows, outline, rings, transitions, willChange, contents, questionMark } from '@unocss/preset-mini/rules';
+import { varEmpty, colorableShadows, 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, fontStyles, textColors, textDecorations, fontSmoothings, tabSizes, textStrokes, textShadows, opacity, boxShadows, outline, rings, transitions, willChange, contents, questionMark } from '@unocss/preset-mini/rules';
 import { handler, positionMap, parseColor, colorResolver, directionSize, directionMap, variantMatcher, variantParentMatcher } from '@unocss/preset-mini/utils';
 
 const animations = [
@@ -233,7 +233,6 @@ const filterBase = {
   "--un-brightness": varEmpty,
   "--un-contrast": varEmpty,
   "--un-drop-shadow": varEmpty,
-  "--un-drop-shadow-colored": varEmpty,
   "--un-grayscale": varEmpty,
   "--un-hue-rotate": varEmpty,
   "--un-invert": varEmpty,
@@ -289,13 +288,11 @@ const toFilter = (varName, resolver) => ([, b, s], { theme }) => {
 const dropShadowResolver = ([, s], { theme }) => {
   let v = theme.dropShadow?.[s || "DEFAULT"];
   if (v != null) {
-    const shadow = toArray(v);
-    const colored = shadow.map((s2) => s2.replace(/\s\S+$/, " var(--un-drop-shadow-color)"));
+    const shadows = colorableShadows(v, "--un-drop-shadow-color");
     return [
       filterBase,
       {
-        "--un-drop-shadow": `drop-shadow(${shadow.join(") drop-shadow(")})`,
-        "--un-drop-shadow-colored": `drop-shadow(${colored.join(") drop-shadow(")})`,
+        "--un-drop-shadow": `drop-shadow(${shadows.join(") drop-shadow(")})`,
         "filter": "var(--un-filter)"
       }
     ];
@@ -316,15 +313,7 @@ const filters = [
   [/^(?:(backdrop-)|filter-)?brightness-(.+)$/, toFilter("brightness", (s) => handler.bracket.percent(s))],
   [/^(?:(backdrop-)|filter-)?contrast-(.+)$/, toFilter("contrast", (s) => handler.bracket.percent(s))],
   [/^(?:filter-)?drop-shadow(?:-(.+))?$/, dropShadowResolver],
-  [/^(?:filter-)?drop-shadow-color-(.+)$/, (m, ctx) => {
-    const color = colorResolver("--un-drop-shadow-color", "drop-shadow")(m, ctx);
-    if (color) {
-      return {
-        ...color,
-        "--un-drop-shadow": "var(--un-drop-shadow-colored)"
-      };
-    }
-  }],
+  [/^(?:filter-)?drop-shadow-color-(.+)$/, colorResolver("--un-drop-shadow-color", "drop-shadow")],
   [/^(?:filter-)?drop-shadow-color-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-drop-shadow-opacity": handler.bracket.percent.cssvar(opacity) })],
   [/^(?:(backdrop-)|filter-)?grayscale(?:-(.+))?$/, toFilter("grayscale", percentWithDefault)],
   [/^(?:(backdrop-)|filter-)?hue-rotate-(.+)$/, toFilter("hue-rotate", (s) => handler.bracket.degree(s))],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-wind",
-  "version": "0.22.1",
+  "version": "0.22.2",
   "description": "Tailwind / Windi CSS compact preset for UnoCSS",
   "keywords": [
     "unocss",
@@ -35,8 +35,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.22.1",
-    "@unocss/preset-mini": "0.22.1"
+    "@unocss/core": "0.22.2",
+    "@unocss/preset-mini": "0.22.2"
   },
   "scripts": {
     "build": "unbuild",