@unocss/preset-wind 0.40.0 → 0.41.2

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');
@@ -163,6 +162,7 @@ const backgroundStyles = [
   ["bg-none", { "background-image": "none" }],
   ["box-decoration-slice", { "box-decoration-break": "slice" }],
   ["box-decoration-clone", { "box-decoration-break": "clone" }],
+  ...utils.makeGlobalStaticRules("box-decoration", "box-decoration-break"),
   ["bg-auto", { "background-size": "auto" }],
   ["bg-cover", { "background-size": "cover" }],
   ["bg-contain", { "background-size": "contain" }],
@@ -173,6 +173,10 @@ const backgroundStyles = [
   ["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" }],
+  ...utils.globalKeywords.map((keyword) => [`bg-clip-${keyword}`, {
+    "-webkit-background-clip": keyword,
+    "background-clip": keyword
+  }]),
   [/^bg-([-\w]{3,})$/, ([, s]) => ({ "background-position": utils.positionMap[s] })],
   ["bg-repeat", { "background-repeat": "repeat" }],
   ["bg-no-repeat", { "background-repeat": "no-repeat" }],
@@ -180,9 +184,11 @@ const backgroundStyles = [
   ["bg-repeat-y", { "background-repeat": "repeat-y" }],
   ["bg-repeat-round", { "background-repeat": "round" }],
   ["bg-repeat-space", { "background-repeat": "space" }],
+  ...utils.makeGlobalStaticRules("bg-repeat", "background-repeat"),
   ["bg-origin-border", { "background-origin": "border-box" }],
   ["bg-origin-padding", { "background-origin": "padding-box" }],
-  ["bg-origin-content", { "background-origin": "content-box" }]
+  ["bg-origin-content", { "background-origin": "content-box" }],
+  ...utils.makeGlobalStaticRules("bg-origin", "background-origin")
 ];
 
 const listStyles = {
@@ -211,7 +217,8 @@ const listStyle = [
   }, { autocomplete: [`list-(${Object.keys(listStyles).join("|")})`, `list-(${Object.keys(listStyles).join("|")})-(outside|inside)`] }],
   ["list-outside", { "list-style-position": "outside" }],
   ["list-inside", { "list-style-position": "inside" }],
-  ["list-none", { "list-style-type": "none" }]
+  ["list-none", { "list-style-type": "none" }],
+  ...utils.makeGlobalStaticRules("list", "list-style")
 ];
 const accents = [
   [/^accent-(.+)$/, utils.colorResolver("accent-color", "accent"), { autocomplete: "accent-$colors" }],
@@ -236,16 +243,20 @@ const overscrolls = [
   ["overscroll-auto", { "overscroll-behavior": "auto" }],
   ["overscroll-contain", { "overscroll-behavior": "contain" }],
   ["overscroll-none", { "overscroll-behavior": "none" }],
+  ...utils.makeGlobalStaticRules("overscroll", "overscroll-behavior"),
   ["overscroll-x-auto", { "overscroll-behavior-x": "auto" }],
   ["overscroll-x-contain", { "overscroll-behavior-x": "contain" }],
   ["overscroll-x-none", { "overscroll-behavior-x": "none" }],
+  ...utils.makeGlobalStaticRules("overscroll-x", "overscroll-behavior-x"),
   ["overscroll-y-auto", { "overscroll-behavior-y": "auto" }],
   ["overscroll-y-contain", { "overscroll-behavior-y": "contain" }],
-  ["overscroll-y-none", { "overscroll-behavior-y": "none" }]
+  ["overscroll-y-none", { "overscroll-behavior-y": "none" }],
+  ...utils.makeGlobalStaticRules("overscroll-y", "overscroll-behavior-y")
 ];
 const scrollBehaviors = [
   ["scroll-auto", { "scroll-behavior": "auto" }],
-  ["scroll-smooth", { "scroll-behavior": "smooth" }]
+  ["scroll-smooth", { "scroll-behavior": "smooth" }],
+  ...utils.makeGlobalStaticRules("scroll", "scroll-behavior")
 ];
 
 const columns = [
@@ -258,10 +269,12 @@ const columns = [
   ["break-before-left", { "break-before": "left" }],
   ["break-before-right", { "break-before": "right" }],
   ["break-before-column", { "break-before": "column" }],
+  ...utils.makeGlobalStaticRules("break-before"),
   ["break-inside-auto", { "break-inside": "auto" }],
   ["break-inside-avoid", { "break-inside": "avoid" }],
   ["break-inside-avoid-page", { "break-inside": "avoid-page" }],
   ["break-inside-avoid-column", { "break-inside": "avoid-column" }],
+  ...utils.makeGlobalStaticRules("break-inside"),
   ["break-after-auto", { "break-after": "auto" }],
   ["break-after-avoid", { "break-after": "avoid" }],
   ["break-after-all", { "break-after": "all" }],
@@ -269,23 +282,31 @@ const columns = [
   ["break-after-page", { "break-after": "page" }],
   ["break-after-left", { "break-after": "left" }],
   ["break-after-right", { "break-after": "right" }],
-  ["break-after-column", { "break-after": "column" }]
+  ["break-after-column", { "break-after": "column" }],
+  ...utils.makeGlobalStaticRules("break-after")
 ];
 
 const queryMatcher = /@media \(min-width: (.+)\)/;
 const container = [
   [
     /^__container$/,
-    (m, { variantHandlers }) => {
+    (m, { theme, 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)
             width = match;
         }
       }
+      if (theme.container?.center) {
+        return {
+          "max-width": width,
+          "margin-left": "auto",
+          "margin-right": "auto"
+        };
+      }
       return { "max-width": width };
     },
     { internal: true }
@@ -410,7 +431,12 @@ const filters = [
   ["backdrop-filter-none", {
     "-webkit-backdrop-filter": "none",
     "backdrop-filter": "none"
-  }]
+  }],
+  ...utils.globalKeywords.map((keyword) => [`filter-${keyword}`, { filter: keyword }]),
+  ...utils.globalKeywords.map((keyword) => [`backdrop-filter-${keyword}`, {
+    "-webkit-backdrop-filter": keyword,
+    "backdrop-filter": keyword
+  }])
 ];
 
 const spaces = [
@@ -443,31 +469,23 @@ const textTransforms = [
   ["normal-case", { "text-transform": "none" }]
 ];
 const hyphens = [
-  ["hyphens-manual", {
-    "-webkit-hyphens": "manual",
-    "-ms-hyphens": "manual",
-    "hyphens": "manual"
-  }],
-  ["hyphens-auto", {
-    "-webkit-hyphens": "auto",
-    "-ms-hyphens": "auto",
-    "hyphens": "auto"
-  }],
-  ["hyphens-none", {
-    "-webkit-hyphens": "none",
-    "-ms-hyphens": "none",
-    "hyphens": "none"
-  }]
+  ...["manual", "auto", "none", ...utils.globalKeywords].map((keyword) => [`hyphens-${keyword}`, {
+    "-webkit-hyphens": keyword,
+    "-ms-hyphens": keyword,
+    "hyphens": keyword
+  }])
 ];
 const writingModes = [
   ["write-vertical-right", { "writing-mode": "vertical-rl" }],
   ["write-vertical-left", { "writing-mode": "vertical-lr" }],
-  ["write-normal", { "writing-mode": "horizontal-tb" }]
+  ["write-normal", { "writing-mode": "horizontal-tb" }],
+  ...utils.makeGlobalStaticRules("write", "writing-mode")
 ];
 const writingOrientations = [
   ["write-orient-mixed", { "text-orientation": "mixed" }],
   ["write-orient-sideways", { "text-orientation": "sideways" }],
-  ["write-orient-upright", { "text-orientation": "upright" }]
+  ["write-orient-upright", { "text-orientation": "upright" }],
+  ...utils.makeGlobalStaticRules("write-orient", "text-orientation")
 ];
 const screenReadersAccess = [
   [
@@ -532,7 +550,8 @@ const backgroundBlendModes = [
   ["bg-blend-saturation", { "background-blend-mode": "saturation" }],
   ["bg-blend-color", { "background-blend-mode": "color" }],
   ["bg-blend-luminosity", { "background-blend-mode": "luminosity" }],
-  ["bg-blend-normal", { "background-blend-mode": "normal" }]
+  ["bg-blend-normal", { "background-blend-mode": "normal" }],
+  ...utils.makeGlobalStaticRules("bg-blend", "background-blend")
 ];
 const mixBlendModes = [
   ["mix-blend-multiply", { "mix-blend-mode": "multiply" }],
@@ -551,7 +570,8 @@ const mixBlendModes = [
   ["mix-blend-color", { "mix-blend-mode": "color" }],
   ["mix-blend-luminosity", { "mix-blend-mode": "luminosity" }],
   ["mix-blend-plus-lighter", { "mix-blend-mode": "plus-lighter" }],
-  ["mix-blend-normal", { "mix-blend-mode": "normal" }]
+  ["mix-blend-normal", { "mix-blend-mode": "normal" }],
+  ...utils.makeGlobalStaticRules("mix-blend")
 ];
 
 const borderSpacingBase = {
@@ -712,7 +732,8 @@ const touchActions = [
   }],
   ["touch-auto", { "touch-action": "auto" }],
   ["touch-manipulation", { "touch-action": "manipulation" }],
-  ["touch-none", { "touch-action": "none" }]
+  ["touch-none", { "touch-action": "none" }],
+  ...utils.makeGlobalStaticRules("touch", "touch-action")
 ];
 
 const scrollSnapTypeBase = {
@@ -1044,8 +1065,8 @@ const variantCombinators = [
 ];
 
 const variantColorsScheme = [
-  utils.variantMatcher(".dark", (input) => ({ prefix: `${input.prefix}.dark $$ ` })),
-  utils.variantMatcher(".light", (input) => ({ prefix: `${input.prefix}.light $$ ` })),
+  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,7 +1,6 @@
 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 { handler, positionMap, makeGlobalStaticRules, globalKeywords, 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';
 import { variants as variants$1 } from '@unocss/preset-mini/variants';
@@ -160,6 +159,7 @@ const backgroundStyles = [
   ["bg-none", { "background-image": "none" }],
   ["box-decoration-slice", { "box-decoration-break": "slice" }],
   ["box-decoration-clone", { "box-decoration-break": "clone" }],
+  ...makeGlobalStaticRules("box-decoration", "box-decoration-break"),
   ["bg-auto", { "background-size": "auto" }],
   ["bg-cover", { "background-size": "cover" }],
   ["bg-contain", { "background-size": "contain" }],
@@ -170,6 +170,10 @@ const backgroundStyles = [
   ["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" }],
+  ...globalKeywords.map((keyword) => [`bg-clip-${keyword}`, {
+    "-webkit-background-clip": keyword,
+    "background-clip": keyword
+  }]),
   [/^bg-([-\w]{3,})$/, ([, s]) => ({ "background-position": positionMap[s] })],
   ["bg-repeat", { "background-repeat": "repeat" }],
   ["bg-no-repeat", { "background-repeat": "no-repeat" }],
@@ -177,9 +181,11 @@ const backgroundStyles = [
   ["bg-repeat-y", { "background-repeat": "repeat-y" }],
   ["bg-repeat-round", { "background-repeat": "round" }],
   ["bg-repeat-space", { "background-repeat": "space" }],
+  ...makeGlobalStaticRules("bg-repeat", "background-repeat"),
   ["bg-origin-border", { "background-origin": "border-box" }],
   ["bg-origin-padding", { "background-origin": "padding-box" }],
-  ["bg-origin-content", { "background-origin": "content-box" }]
+  ["bg-origin-content", { "background-origin": "content-box" }],
+  ...makeGlobalStaticRules("bg-origin", "background-origin")
 ];
 
 const listStyles = {
@@ -208,7 +214,8 @@ const listStyle = [
   }, { autocomplete: [`list-(${Object.keys(listStyles).join("|")})`, `list-(${Object.keys(listStyles).join("|")})-(outside|inside)`] }],
   ["list-outside", { "list-style-position": "outside" }],
   ["list-inside", { "list-style-position": "inside" }],
-  ["list-none", { "list-style-type": "none" }]
+  ["list-none", { "list-style-type": "none" }],
+  ...makeGlobalStaticRules("list", "list-style")
 ];
 const accents = [
   [/^accent-(.+)$/, colorResolver("accent-color", "accent"), { autocomplete: "accent-$colors" }],
@@ -233,16 +240,20 @@ const overscrolls = [
   ["overscroll-auto", { "overscroll-behavior": "auto" }],
   ["overscroll-contain", { "overscroll-behavior": "contain" }],
   ["overscroll-none", { "overscroll-behavior": "none" }],
+  ...makeGlobalStaticRules("overscroll", "overscroll-behavior"),
   ["overscroll-x-auto", { "overscroll-behavior-x": "auto" }],
   ["overscroll-x-contain", { "overscroll-behavior-x": "contain" }],
   ["overscroll-x-none", { "overscroll-behavior-x": "none" }],
+  ...makeGlobalStaticRules("overscroll-x", "overscroll-behavior-x"),
   ["overscroll-y-auto", { "overscroll-behavior-y": "auto" }],
   ["overscroll-y-contain", { "overscroll-behavior-y": "contain" }],
-  ["overscroll-y-none", { "overscroll-behavior-y": "none" }]
+  ["overscroll-y-none", { "overscroll-behavior-y": "none" }],
+  ...makeGlobalStaticRules("overscroll-y", "overscroll-behavior-y")
 ];
 const scrollBehaviors = [
   ["scroll-auto", { "scroll-behavior": "auto" }],
-  ["scroll-smooth", { "scroll-behavior": "smooth" }]
+  ["scroll-smooth", { "scroll-behavior": "smooth" }],
+  ...makeGlobalStaticRules("scroll", "scroll-behavior")
 ];
 
 const columns = [
@@ -255,10 +266,12 @@ const columns = [
   ["break-before-left", { "break-before": "left" }],
   ["break-before-right", { "break-before": "right" }],
   ["break-before-column", { "break-before": "column" }],
+  ...makeGlobalStaticRules("break-before"),
   ["break-inside-auto", { "break-inside": "auto" }],
   ["break-inside-avoid", { "break-inside": "avoid" }],
   ["break-inside-avoid-page", { "break-inside": "avoid-page" }],
   ["break-inside-avoid-column", { "break-inside": "avoid-column" }],
+  ...makeGlobalStaticRules("break-inside"),
   ["break-after-auto", { "break-after": "auto" }],
   ["break-after-avoid", { "break-after": "avoid" }],
   ["break-after-all", { "break-after": "all" }],
@@ -266,23 +279,31 @@ const columns = [
   ["break-after-page", { "break-after": "page" }],
   ["break-after-left", { "break-after": "left" }],
   ["break-after-right", { "break-after": "right" }],
-  ["break-after-column", { "break-after": "column" }]
+  ["break-after-column", { "break-after": "column" }],
+  ...makeGlobalStaticRules("break-after")
 ];
 
 const queryMatcher = /@media \(min-width: (.+)\)/;
 const container = [
   [
     /^__container$/,
-    (m, { variantHandlers }) => {
+    (m, { theme, 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)
             width = match;
         }
       }
+      if (theme.container?.center) {
+        return {
+          "max-width": width,
+          "margin-left": "auto",
+          "margin-right": "auto"
+        };
+      }
       return { "max-width": width };
     },
     { internal: true }
@@ -407,7 +428,12 @@ const filters = [
   ["backdrop-filter-none", {
     "-webkit-backdrop-filter": "none",
     "backdrop-filter": "none"
-  }]
+  }],
+  ...globalKeywords.map((keyword) => [`filter-${keyword}`, { filter: keyword }]),
+  ...globalKeywords.map((keyword) => [`backdrop-filter-${keyword}`, {
+    "-webkit-backdrop-filter": keyword,
+    "backdrop-filter": keyword
+  }])
 ];
 
 const spaces = [
@@ -440,31 +466,23 @@ const textTransforms = [
   ["normal-case", { "text-transform": "none" }]
 ];
 const hyphens = [
-  ["hyphens-manual", {
-    "-webkit-hyphens": "manual",
-    "-ms-hyphens": "manual",
-    "hyphens": "manual"
-  }],
-  ["hyphens-auto", {
-    "-webkit-hyphens": "auto",
-    "-ms-hyphens": "auto",
-    "hyphens": "auto"
-  }],
-  ["hyphens-none", {
-    "-webkit-hyphens": "none",
-    "-ms-hyphens": "none",
-    "hyphens": "none"
-  }]
+  ...["manual", "auto", "none", ...globalKeywords].map((keyword) => [`hyphens-${keyword}`, {
+    "-webkit-hyphens": keyword,
+    "-ms-hyphens": keyword,
+    "hyphens": keyword
+  }])
 ];
 const writingModes = [
   ["write-vertical-right", { "writing-mode": "vertical-rl" }],
   ["write-vertical-left", { "writing-mode": "vertical-lr" }],
-  ["write-normal", { "writing-mode": "horizontal-tb" }]
+  ["write-normal", { "writing-mode": "horizontal-tb" }],
+  ...makeGlobalStaticRules("write", "writing-mode")
 ];
 const writingOrientations = [
   ["write-orient-mixed", { "text-orientation": "mixed" }],
   ["write-orient-sideways", { "text-orientation": "sideways" }],
-  ["write-orient-upright", { "text-orientation": "upright" }]
+  ["write-orient-upright", { "text-orientation": "upright" }],
+  ...makeGlobalStaticRules("write-orient", "text-orientation")
 ];
 const screenReadersAccess = [
   [
@@ -529,7 +547,8 @@ const backgroundBlendModes = [
   ["bg-blend-saturation", { "background-blend-mode": "saturation" }],
   ["bg-blend-color", { "background-blend-mode": "color" }],
   ["bg-blend-luminosity", { "background-blend-mode": "luminosity" }],
-  ["bg-blend-normal", { "background-blend-mode": "normal" }]
+  ["bg-blend-normal", { "background-blend-mode": "normal" }],
+  ...makeGlobalStaticRules("bg-blend", "background-blend")
 ];
 const mixBlendModes = [
   ["mix-blend-multiply", { "mix-blend-mode": "multiply" }],
@@ -548,7 +567,8 @@ const mixBlendModes = [
   ["mix-blend-color", { "mix-blend-mode": "color" }],
   ["mix-blend-luminosity", { "mix-blend-mode": "luminosity" }],
   ["mix-blend-plus-lighter", { "mix-blend-mode": "plus-lighter" }],
-  ["mix-blend-normal", { "mix-blend-mode": "normal" }]
+  ["mix-blend-normal", { "mix-blend-mode": "normal" }],
+  ...makeGlobalStaticRules("mix-blend")
 ];
 
 const borderSpacingBase = {
@@ -709,7 +729,8 @@ const touchActions = [
   }],
   ["touch-auto", { "touch-action": "auto" }],
   ["touch-manipulation", { "touch-action": "manipulation" }],
-  ["touch-none", { "touch-action": "none" }]
+  ["touch-none", { "touch-action": "none" }],
+  ...makeGlobalStaticRules("touch", "touch-action")
 ];
 
 const scrollSnapTypeBase = {
@@ -1041,8 +1062,8 @@ const variantCombinators = [
 ];
 
 const variantColorsScheme = [
-  variantMatcher(".dark", (input) => ({ prefix: `${input.prefix}.dark $$ ` })),
-  variantMatcher(".light", (input) => ({ prefix: `${input.prefix}.light $$ ` })),
+  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.40.0",
+  "version": "0.41.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.40.0",
-    "@unocss/preset-mini": "0.40.0"
+    "@unocss/core": "0.41.2",
+    "@unocss/preset-mini": "0.41.2"
   },
   "scripts": {
     "build": "unbuild",