@unocss/preset-mini 0.38.2 → 0.39.0

package/dist/chunks/default3.cjs

@@ -159,26 +159,11 @@ const variantScope = {
     }
   }
 };
-const variantImportant = {
-  name: "important",
-  match(matcher) {
-    const match = matcher.match(/^(important[:-]|!)/);
-    if (match) {
-      return {
-        matcher: matcher.slice(match[0].length),
-        body: (body) => {
-          body.forEach((v) => {
-            if (v[1])
-              v[1] += " !important";
-          });
-          return body;
-        }
-      };
-    }
-  },
-  autocomplete: "(important)"
-};
+
 const numberRE = /[0-9.]+(?:[a-z]+|%)?/;
+const ignoreProps = [
+  /opacity|color|flex/
+];
 const variantNegative = {
   name: "negative",
   match(matcher) {
@@ -194,6 +179,8 @@ const variantNegative = {
           const value = v[1]?.toString();
           if (!value || value === "0")
             return;
+          if (ignoreProps.some((i) => v[0].match(i)))
+            return;
           if (numberRE.test(value)) {
             v[1] = value.replace(numberRE, (i) => `-${i}`);
             changed = true;
@@ -201,11 +188,36 @@ const variantNegative = {
         });
         if (changed)
           return body;
+        return [];
       }
     };
   }
 };
 
+const variantImportant = {
+  name: "important",
+  match(matcher) {
+    let base;
+    const match = matcher.match(/^(important[:-]|!)/);
+    if (match)
+      base = matcher.slice(match[0].length);
+    else if (matcher.endsWith("!"))
+      base = matcher.slice(0, -1);
+    if (base) {
+      return {
+        matcher: base,
+        body: (body) => {
+          body.forEach((v) => {
+            if (v[1])
+              v[1] += " !important";
+          });
+          return body;
+        }
+      };
+    }
+  }
+};
+
 const PseudoClasses = Object.fromEntries([
   ["first-letter", "::first-letter"],
   ["first-line", "::first-line"],

package/dist/chunks/default3.mjs

@@ -157,26 +157,11 @@ const variantScope = {
     }
   }
 };
-const variantImportant = {
-  name: "important",
-  match(matcher) {
-    const match = matcher.match(/^(important[:-]|!)/);
-    if (match) {
-      return {
-        matcher: matcher.slice(match[0].length),
-        body: (body) => {
-          body.forEach((v) => {
-            if (v[1])
-              v[1] += " !important";
-          });
-          return body;
-        }
-      };
-    }
-  },
-  autocomplete: "(important)"
-};
+
 const numberRE = /[0-9.]+(?:[a-z]+|%)?/;
+const ignoreProps = [
+  /opacity|color|flex/
+];
 const variantNegative = {
   name: "negative",
   match(matcher) {
@@ -192,6 +177,8 @@ const variantNegative = {
           const value = v[1]?.toString();
           if (!value || value === "0")
             return;
+          if (ignoreProps.some((i) => v[0].match(i)))
+            return;
           if (numberRE.test(value)) {
             v[1] = value.replace(numberRE, (i) => `-${i}`);
             changed = true;
@@ -199,11 +186,36 @@ const variantNegative = {
         });
         if (changed)
           return body;
+        return [];
       }
     };
   }
 };
 
+const variantImportant = {
+  name: "important",
+  match(matcher) {
+    let base;
+    const match = matcher.match(/^(important[:-]|!)/);
+    if (match)
+      base = matcher.slice(match[0].length);
+    else if (matcher.endsWith("!"))
+      base = matcher.slice(0, -1);
+    if (base) {
+      return {
+        matcher: base,
+        body: (body) => {
+          body.forEach((v) => {
+            if (v[1])
+              v[1] += " !important";
+          });
+          return body;
+        }
+      };
+    }
+  }
+};
+
 const PseudoClasses = Object.fromEntries([
   ["first-letter", "::first-letter"],
   ["first-line", "::first-line"],
@@ -380,4 +392,4 @@ const variants = (options) => [
   variantScope
 ];
 
-export { variantBreakpoints as a, variantCombinators as b, variantPrint as c, variantCustomMedia as d, variantColorsMediaOrClass as e, variantLanguageDirections as f, variantSelector as g, variantCssLayer as h, variantInternalLayer as i, variantScope as j, variantImportant as k, variantNegative as l, variantPseudoClassesAndElements as m, variantPseudoClassFunctions as n, variantTaggedPseudoClasses as o, partClasses as p, variants as v };
+export { variantBreakpoints as a, variantCombinators as b, variantPrint as c, variantCustomMedia as d, variantColorsMediaOrClass as e, variantLanguageDirections as f, variantSelector as g, variantCssLayer as h, variantInternalLayer as i, variantScope as j, variantPseudoClassesAndElements as k, variantPseudoClassFunctions as l, variantTaggedPseudoClasses as m, variantImportant as n, variantNegative as o, partClasses as p, variants as v };

package/dist/chunks/transform.cjs

@@ -42,10 +42,8 @@ const whitespaces = [
   [/^(?:whitespace|ws)-(normal|nowrap|pre|pre-line|pre-wrap|break-spaces)$/, ([, v]) => ({ "white-space": v }), { autocomplete: "(whitespace|ws)-(normal|nowrap|pre|pre-line|pre-wrap|break-spaces)" }]
 ];
 const contents = [
-  [/^content-(.+)$/, ([, v]) => {
-    const c = utilities.handler.bracket.cssvar(v);
-    return { content: c == null ? `"${v}"` : c };
-  }],
+  [/^content-\[(.+)\]$/, ([, v]) => ({ content: `"${v}"` })],
+  [/^content-(\$.+)]$/, ([, v]) => ({ content: utilities.handler.cssvar(v) })],
   ["content-empty", { content: '""' }],
   ["content-none", { content: '""' }]
 ];

package/dist/chunks/transform.mjs

@@ -40,10 +40,8 @@ const whitespaces = [
   [/^(?:whitespace|ws)-(normal|nowrap|pre|pre-line|pre-wrap|break-spaces)$/, ([, v]) => ({ "white-space": v }), { autocomplete: "(whitespace|ws)-(normal|nowrap|pre|pre-line|pre-wrap|break-spaces)" }]
 ];
 const contents = [
-  [/^content-(.+)$/, ([, v]) => {
-    const c = handler.bracket.cssvar(v);
-    return { content: c == null ? `"${v}"` : c };
-  }],
+  [/^content-\[(.+)\]$/, ([, v]) => ({ content: `"${v}"` })],
+  [/^content-(\$.+)]$/, ([, v]) => ({ content: handler.cssvar(v) })],
   ["content-empty", { content: '""' }],
   ["content-none", { content: '""' }]
 ];

package/dist/chunks/utilities.cjs

@@ -97,6 +97,8 @@ const globalKeywords = [
 ];
 
 const cssColorFunctions = ["hsl", "hsla", "hwb", "lab", "lch", "oklab", "oklch", "rgb", "rgba"];
+const alphaPlaceholders = ["%alpha", "<alpha-value>"];
+const alphaPlaceholdersRE = new RegExp(alphaPlaceholders.map((v) => core.escapeRegExp(v)).join("|"));
 function hex2rgba(hex = "") {
   const color = parseHexColor(hex);
   if (color != null) {
@@ -122,11 +124,11 @@ function parseCssColor(str = "") {
 }
 function colorOpacityToString(color) {
   const alpha = color.alpha ?? 1;
-  return alpha === "%alpha" ? 1 : alpha;
+  return typeof alpha === "string" && alphaPlaceholders.includes(alpha) ? 1 : alpha;
 }
 function colorToString(color, alphaOverride) {
   if (typeof color === "string")
-    return color.replace("%alpha", `${alphaOverride ?? 1}`);
+    return color.replace(alphaPlaceholdersRE, `${alphaOverride ?? 1}`);
   const { components } = color;
   let { alpha, type } = color;
   alpha = alphaOverride ?? alpha;

package/dist/chunks/utilities.mjs

@@ -1,4 +1,4 @@
-import { escapeSelector, createValueHandler, toArray } from '@unocss/core';
+import { escapeRegExp, escapeSelector, createValueHandler, toArray } from '@unocss/core';
 
 const directionMap = {
   "l": ["-left"],
@@ -95,6 +95,8 @@ const globalKeywords = [
 ];
 
 const cssColorFunctions = ["hsl", "hsla", "hwb", "lab", "lch", "oklab", "oklch", "rgb", "rgba"];
+const alphaPlaceholders = ["%alpha", "<alpha-value>"];
+const alphaPlaceholdersRE = new RegExp(alphaPlaceholders.map((v) => escapeRegExp(v)).join("|"));
 function hex2rgba(hex = "") {
   const color = parseHexColor(hex);
   if (color != null) {
@@ -120,11 +122,11 @@ function parseCssColor(str = "") {
 }
 function colorOpacityToString(color) {
   const alpha = color.alpha ?? 1;
-  return alpha === "%alpha" ? 1 : alpha;
+  return typeof alpha === "string" && alphaPlaceholders.includes(alpha) ? 1 : alpha;
 }
 function colorToString(color, alphaOverride) {
   if (typeof color === "string")
-    return color.replace("%alpha", `${alphaOverride ?? 1}`);
+    return color.replace(alphaPlaceholdersRE, `${alphaOverride ?? 1}`);
   const { components } = color;
   let { alpha, type } = color;
   alpha = alphaOverride ?? alpha;

package/dist/variants.d.ts

@@ -22,12 +22,14 @@ declare const variantSelector: Variant;
 declare const variantCssLayer: Variant;
 declare const variantInternalLayer: Variant;
 declare const variantScope: Variant;
-declare const variantImportant: Variant;
-declare const variantNegative: Variant;
 
 declare const variantPseudoClassesAndElements: VariantObject;
 declare const variantPseudoClassFunctions: VariantObject;
 declare const variantTaggedPseudoClasses: (options?: PresetMiniOptions) => VariantObject[];
 declare const partClasses: VariantObject;
 
+declare const variantImportant: Variant;
+
+declare const variantNegative: Variant;
+
 export { partClasses, variantBreakpoints, variantColorsMediaOrClass, variantCombinators, variantCssLayer, variantCustomMedia, variantImportant, variantInternalLayer, variantLanguageDirections, variantNegative, variantPrint, variantPseudoClassFunctions, variantPseudoClassesAndElements, variantScope, variantSelector, variantTaggedPseudoClasses, variants };

package/dist/variants.mjs

@@ -1,4 +1,4 @@
-export { p as partClasses, a as variantBreakpoints, e as variantColorsMediaOrClass, b as variantCombinators, h as variantCssLayer, d as variantCustomMedia, k as variantImportant, i as variantInternalLayer, f as variantLanguageDirections, l as variantNegative, c as variantPrint, n as variantPseudoClassFunctions, m as variantPseudoClassesAndElements, j as variantScope, g as variantSelector, o as variantTaggedPseudoClasses, v as variants } from './chunks/default3.mjs';
+export { p as partClasses, a as variantBreakpoints, e as variantColorsMediaOrClass, b as variantCombinators, h as variantCssLayer, d as variantCustomMedia, n as variantImportant, i as variantInternalLayer, f as variantLanguageDirections, o as variantNegative, c as variantPrint, l as variantPseudoClassFunctions, k as variantPseudoClassesAndElements, j as variantScope, g as variantSelector, m as variantTaggedPseudoClasses, v as variants } from './chunks/default3.mjs';
 import './chunks/utilities.mjs';
 import '@unocss/core';
 import './chunks/variants.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-mini",
-  "version": "0.38.2",
+  "version": "0.39.0",
   "description": "The minimal preset for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -61,7 +61,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.38.2"
+    "@unocss/core": "0.39.0"
   },
   "scripts": {
     "build": "unbuild",