@unocss/preset-mini 0.22.7 → 0.23.0

package/dist/chunks/default2.cjs

@@ -155,6 +155,7 @@ const bgColors = [
 const transitionPropertyGroup = {
   all: "all",
   colors: ["color", "background-color", "border-color", "text-decoration-color", "fill", "stroke"].join(","),
+  none: "none",
   opacity: "opacity",
   shadow: "box-shadow",
   transform: "transform"
@@ -177,8 +178,6 @@ const transitions = [
   [/^(?:transition-)?delay-(.+)$/, ([, d]) => ({ "transition-delay": utilities.handler.bracket.cssvar.time(d) })],
   [/^(?:transition-)?ease(?:-(.+))?$/, ([, d], { theme }) => ({ "transition-timing-function": theme.easing?.[d || "DEFAULT"] ?? utilities.handler.bracket.cssvar(d) })],
   [/^(?:transition-)?property-(.+)$/, ([, v]) => ({ "transition-property": utilities.handler.global(v) || transitionProperty(v) })],
-  ["transition-property-none", { "transition-property": "none" }],
-  ["property-none", { "transition-property": "none" }],
   ["transition-none", { transition: "none" }]
 ];
 
@@ -213,7 +212,8 @@ const displays = [
   ["contents", { display: "contents" }],
   ["flow-root", { display: "flow-root" }],
   ["list-item", { display: "list-item" }],
-  ["hidden", { display: "none" }]
+  ["hidden", { display: "none" }],
+  [/^display-(.+)$/, ([, c]) => ({ display: utilities.handler.bracket.cssvar(c) || c })]
 ];
 const appearances = [
   ["visible", { visibility: "visible" }],
@@ -540,8 +540,7 @@ const floats = [
   ["clear-none", { clear: "none" }]
 ];
 const zIndexes = [
-  [/^z-(.+)$/, ([, v]) => ({ "z-index": utilities.handler.bracket.cssvar.number(v) })],
-  ["z-auto", { "z-index": "auto" }]
+  [/^z-(.+)$/, ([, v]) => ({ "z-index": utilities.handler.bracket.cssvar.auto.number(v) })]
 ];
 const boxSizing = [
   ["box-border", { "box-sizing": "border-box" }],
@@ -823,11 +822,7 @@ ${constructCSS({ animation: "__un_qm 0.5s ease-in-out alternate infinite" })}`;
 ];
 
 const textDecorations = [
-  ["underline", { "text-decoration-line": "underline" }],
-  ["overline", { "text-decoration-line": "overline" }],
-  ["line-through", { "text-decoration-line": "line-through" }],
-  ["decoration-underline", { "text-decoration-line": "underline" }],
-  ["decoration-line-through", { "text-decoration-line": "line-through" }],
+  [/^(?:decoration-)?(underline|overline|line-through)$/, ([, s]) => ({ "text-decoration-line": s })],
   [/^(?:underline|decoration)-(?:size-)?(.+)$/, ([, s]) => ({ "text-decoration-thickness": utilities.handler.bracket.cssvar.px(s) })],
   [/^(?:underline|decoration)-(auto|from-font)$/, ([, s]) => ({ "text-decoration-thickness": s })],
   [/^(?:underline|decoration)-(.+)$/, (match, ctx) => {

package/dist/chunks/default2.mjs

@@ -153,6 +153,7 @@ const bgColors = [
 const transitionPropertyGroup = {
   all: "all",
   colors: ["color", "background-color", "border-color", "text-decoration-color", "fill", "stroke"].join(","),
+  none: "none",
   opacity: "opacity",
   shadow: "box-shadow",
   transform: "transform"
@@ -175,8 +176,6 @@ const transitions = [
   [/^(?:transition-)?delay-(.+)$/, ([, d]) => ({ "transition-delay": handler.bracket.cssvar.time(d) })],
   [/^(?:transition-)?ease(?:-(.+))?$/, ([, d], { theme }) => ({ "transition-timing-function": theme.easing?.[d || "DEFAULT"] ?? handler.bracket.cssvar(d) })],
   [/^(?:transition-)?property-(.+)$/, ([, v]) => ({ "transition-property": handler.global(v) || transitionProperty(v) })],
-  ["transition-property-none", { "transition-property": "none" }],
-  ["property-none", { "transition-property": "none" }],
   ["transition-none", { transition: "none" }]
 ];
 
@@ -211,7 +210,8 @@ const displays = [
   ["contents", { display: "contents" }],
   ["flow-root", { display: "flow-root" }],
   ["list-item", { display: "list-item" }],
-  ["hidden", { display: "none" }]
+  ["hidden", { display: "none" }],
+  [/^display-(.+)$/, ([, c]) => ({ display: handler.bracket.cssvar(c) || c })]
 ];
 const appearances = [
   ["visible", { visibility: "visible" }],
@@ -538,8 +538,7 @@ const floats = [
   ["clear-none", { clear: "none" }]
 ];
 const zIndexes = [
-  [/^z-(.+)$/, ([, v]) => ({ "z-index": handler.bracket.cssvar.number(v) })],
-  ["z-auto", { "z-index": "auto" }]
+  [/^z-(.+)$/, ([, v]) => ({ "z-index": handler.bracket.cssvar.auto.number(v) })]
 ];
 const boxSizing = [
   ["box-border", { "box-sizing": "border-box" }],
@@ -821,11 +820,7 @@ ${constructCSS({ animation: "__un_qm 0.5s ease-in-out alternate infinite" })}`;
 ];
 
 const textDecorations = [
-  ["underline", { "text-decoration-line": "underline" }],
-  ["overline", { "text-decoration-line": "overline" }],
-  ["line-through", { "text-decoration-line": "line-through" }],
-  ["decoration-underline", { "text-decoration-line": "underline" }],
-  ["decoration-line-through", { "text-decoration-line": "line-through" }],
+  [/^(?:decoration-)?(underline|overline|line-through)$/, ([, s]) => ({ "text-decoration-line": s })],
   [/^(?:underline|decoration)-(?:size-)?(.+)$/, ([, s]) => ({ "text-decoration-thickness": handler.bracket.cssvar.px(s) })],
   [/^(?:underline|decoration)-(auto|from-font)$/, ([, s]) => ({ "text-decoration-thickness": s })],
   [/^(?:underline|decoration)-(.+)$/, (match, ctx) => {

package/dist/chunks/default3.cjs

@@ -37,12 +37,28 @@ const variantBreakpoints = (matcher, { theme }) => {
   }
 };
 
+const scopeMatcher = (strict, name, template) => {
+  const re = strict ? new RegExp(`^${name}(?:-\\[(.+?)\\])[:-]`) : new RegExp(`^${name}(?:-\\[(.+?)\\])?[:-]`);
+  return (matcher) => {
+    const match = matcher.match(re);
+    if (match) {
+      return {
+        matcher: matcher.slice(match[0].length),
+        selector: (s) => template.replace("&&-s", s).replace("&&-c", match[1] ?? "*")
+      };
+    }
+  };
+};
 const variantCombinators = [
-  variants$1.variantMatcher("all", (input) => `${input} *`),
-  variants$1.variantMatcher("children", (input) => `${input}>*`),
-  variants$1.variantMatcher("next", (input) => `${input}+*`),
-  variants$1.variantMatcher("sibling", (input) => `${input}+*`),
-  variants$1.variantMatcher("siblings", (input) => `${input}~*`),
+  scopeMatcher(false, "all", "&&-s &&-c"),
+  scopeMatcher(false, "children", "&&-s>&&-c"),
+  scopeMatcher(false, "next", "&&-s+&&-c"),
+  scopeMatcher(false, "sibling", "&&-s+&&-c"),
+  scopeMatcher(false, "siblings", "&&-s~&&-c"),
+  scopeMatcher(true, "group", "&&-c &&-s"),
+  scopeMatcher(true, "parent", "&&-c>&&-s"),
+  scopeMatcher(true, "previous", "&&-c+&&-s"),
+  scopeMatcher(true, "peer", "&&-c~&&-s"),
   variants$1.variantMatcher("svg", (input) => `${input} svg`)
 ];
 
@@ -191,7 +207,7 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
       if (match[2])
         pseudo = `:${match[2]}(${pseudo})`;
       return {
-        matcher: input.slice(match[1].length + tag.length + 2),
+        matcher: input.slice(match[0].length),
         selector: (s) => rawRe.test(s) ? s.replace(rawRe, `${parent}${pseudo}:`) : `${parent}${pseudo}${combinator}${s}`
       };
     }
@@ -202,7 +218,7 @@ const variantPseudoElements = (input) => {
   if (match) {
     const pseudo = PseudoElements[match[1]] || `::${match[1]}`;
     return {
-      matcher: input.slice(match[1].length + 1),
+      matcher: input.slice(match[0].length),
       selector: (s) => `${s}${pseudo}`
     };
   }
@@ -213,7 +229,7 @@ const variantPseudoClasses = {
     if (match) {
       const pseudo = PseudoClasses[match[1]] || `:${match[1]}`;
       return {
-        matcher: input.slice(match[1].length + 1),
+        matcher: input.slice(match[0].length),
         selector: (s) => `${s}${pseudo}`
       };
     }
@@ -227,7 +243,7 @@ const variantPseudoClassFunctions = {
       const fn = match[1];
       const pseudo = PseudoClasses[match[2]] || `:${match[2]}`;
       return {
-        matcher: input.slice(match[1].length + match[2].length + 2),
+        matcher: input.slice(match[0].length),
         selector: (s) => `${s}:${fn}(${pseudo})`
       };
     }
@@ -248,6 +264,10 @@ const variantTaggedPseudoClasses = (options = {}) => {
     {
       match: taggedPseudoClassMatcher("parent", attributify ? '[parent=""]' : ".parent", ">"),
       multiPass: true
+    },
+    {
+      match: taggedPseudoClassMatcher("previous", attributify ? '[previous=""]' : ".previous", "+"),
+      multiPass: true
     }
   ];
 };

package/dist/chunks/default3.mjs

@@ -35,12 +35,28 @@ const variantBreakpoints = (matcher, { theme }) => {
   }
 };
 
+const scopeMatcher = (strict, name, template) => {
+  const re = strict ? new RegExp(`^${name}(?:-\\[(.+?)\\])[:-]`) : new RegExp(`^${name}(?:-\\[(.+?)\\])?[:-]`);
+  return (matcher) => {
+    const match = matcher.match(re);
+    if (match) {
+      return {
+        matcher: matcher.slice(match[0].length),
+        selector: (s) => template.replace("&&-s", s).replace("&&-c", match[1] ?? "*")
+      };
+    }
+  };
+};
 const variantCombinators = [
-  variantMatcher("all", (input) => `${input} *`),
-  variantMatcher("children", (input) => `${input}>*`),
-  variantMatcher("next", (input) => `${input}+*`),
-  variantMatcher("sibling", (input) => `${input}+*`),
-  variantMatcher("siblings", (input) => `${input}~*`),
+  scopeMatcher(false, "all", "&&-s &&-c"),
+  scopeMatcher(false, "children", "&&-s>&&-c"),
+  scopeMatcher(false, "next", "&&-s+&&-c"),
+  scopeMatcher(false, "sibling", "&&-s+&&-c"),
+  scopeMatcher(false, "siblings", "&&-s~&&-c"),
+  scopeMatcher(true, "group", "&&-c &&-s"),
+  scopeMatcher(true, "parent", "&&-c>&&-s"),
+  scopeMatcher(true, "previous", "&&-c+&&-s"),
+  scopeMatcher(true, "peer", "&&-c~&&-s"),
   variantMatcher("svg", (input) => `${input} svg`)
 ];
 
@@ -189,7 +205,7 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
       if (match[2])
         pseudo = `:${match[2]}(${pseudo})`;
       return {
-        matcher: input.slice(match[1].length + tag.length + 2),
+        matcher: input.slice(match[0].length),
         selector: (s) => rawRe.test(s) ? s.replace(rawRe, `${parent}${pseudo}:`) : `${parent}${pseudo}${combinator}${s}`
       };
     }
@@ -200,7 +216,7 @@ const variantPseudoElements = (input) => {
   if (match) {
     const pseudo = PseudoElements[match[1]] || `::${match[1]}`;
     return {
-      matcher: input.slice(match[1].length + 1),
+      matcher: input.slice(match[0].length),
       selector: (s) => `${s}${pseudo}`
     };
   }
@@ -211,7 +227,7 @@ const variantPseudoClasses = {
     if (match) {
       const pseudo = PseudoClasses[match[1]] || `:${match[1]}`;
       return {
-        matcher: input.slice(match[1].length + 1),
+        matcher: input.slice(match[0].length),
         selector: (s) => `${s}${pseudo}`
       };
     }
@@ -225,7 +241,7 @@ const variantPseudoClassFunctions = {
       const fn = match[1];
       const pseudo = PseudoClasses[match[2]] || `:${match[2]}`;
       return {
-        matcher: input.slice(match[1].length + match[2].length + 2),
+        matcher: input.slice(match[0].length),
         selector: (s) => `${s}:${fn}(${pseudo})`
       };
     }
@@ -246,6 +262,10 @@ const variantTaggedPseudoClasses = (options = {}) => {
     {
       match: taggedPseudoClassMatcher("parent", attributify ? '[parent=""]' : ".parent", ">"),
       multiPass: true
+    },
+    {
+      match: taggedPseudoClassMatcher("previous", attributify ? '[previous=""]' : ".previous", "+"),
+      multiPass: true
     }
   ];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-mini",
-  "version": "0.22.7",
+  "version": "0.23.0",
   "description": "The minimal preset for UnoCSS",
   "keywords": [
     "unocss",
@@ -61,7 +61,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.22.7"
+    "@unocss/core": "0.23.0"
   },
   "scripts": {
     "build": "unbuild",