@unocss/preset-mini 0.22.4 → 0.22.5

package/dist/chunks/default2.cjs

@@ -347,9 +347,9 @@ const fonts = [
   }],
   [/^text-size-(.+)$/, ([, s]) => ({ "font-size": utilities.handler.bracket.cssvar.rem(s) })],
   [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || utilities.handler.number(s) })],
-  [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || utilities.handler.bracket.rem(s) })],
-  [/^tracking-([^-]+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || utilities.handler.bracket.rem(s) })],
-  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || utilities.handler.bracket.rem(s) })]
+  [/^(?:leading|lh)-(.+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || utilities.handler.bracket.cssvar.rem(s) })],
+  [/^tracking-(.+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || utilities.handler.bracket.cssvar.rem(s) })],
+  [/^word-spacing-(.+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || utilities.handler.bracket.cssvar.rem(s) })]
 ];
 const tabSizes = [
   [/^tab(?:-(.+))?$/, ([, s]) => {
@@ -554,11 +554,12 @@ const boxSizing = [
 ];
 
 const ringBase = {
+  ...shadowBase,
   "--un-ring-inset": varEmpty,
   "--un-ring-offset-width": "0px",
   "--un-ring-offset-color": "#fff",
-  "--un-ring-color": "rgba(147,197,253,0.5)",
-  ...shadowBase
+  "--un-ring-width": "0px",
+  "--un-ring-color": "rgba(147,197,253,0.5)"
 };
 const rings = [
   [/^ring(?:-(.+))?$/, ([, d]) => {
@@ -567,13 +568,15 @@ const rings = [
       return [
         ringBase,
         {
+          "--un-ring-width": value,
           "--un-ring-offset-shadow": "var(--un-ring-inset) 0 0 0 var(--un-ring-offset-width) var(--un-ring-offset-color)",
-          "--un-ring-shadow": `var(--un-ring-inset) 0 0 0 calc(${value} + var(--un-ring-offset-width)) var(--un-ring-color)`,
+          "--un-ring-shadow": "var(--un-ring-inset) 0 0 0 calc(var(--un-ring-width) + var(--un-ring-offset-width)) var(--un-ring-color)",
           "box-shadow": "var(--un-ring-offset-shadow), var(--un-ring-shadow), var(--un-shadow, 0 0 #0000)"
         }
       ];
     }
   }],
+  [/^ring-(?:width-|size-)(.+)$/, ([, d]) => ({ "--un-ring-width": utilities.handler.bracket.cssvar.px(d) })],
   ["ring-offset", { "--un-ring-offset-width": "1px" }],
   [/^ring-offset-(?:width-|size-)?(.+)$/, ([, d]) => ({ "--un-ring-offset-width": utilities.handler.bracket.cssvar.px(d) })],
   [/^ring-(.+)$/, utilities.colorResolver("--un-ring-color", "ring")],
@@ -687,8 +690,8 @@ const transformBase = {
   [core.CONTROL_SHORTCUT_NO_MERGE]: ""
 };
 const transforms = [
-  [/^origin-(.+)$/, ([, s]) => ({ "transform-origin": utilities.positionMap[s] ?? utilities.handler.bracket.cssvar(s) })],
-  [/^perspect-(.+)$/, ([, s]) => {
+  [/^(?:transform-)?origin-(.+)$/, ([, s]) => ({ "transform-origin": utilities.positionMap[s] ?? utilities.handler.bracket.cssvar(s) })],
+  [/^(?:transform-)?perspect(?:ive)?-(.+)$/, ([, s]) => {
     const v = utilities.handler.bracket.cssvar.px.numberWithUnit(s);
     if (v != null) {
       return {
@@ -697,7 +700,7 @@ const transforms = [
       };
     }
   }],
-  [/^perspect-origin-(.+)$/, ([, s]) => {
+  [/^(?:transform-)?perspect(?:ive)?-origin-(.+)$/, ([, s]) => {
     const v = utilities.handler.bracket.cssvar(s) ?? (s.length >= 3 ? utilities.positionMap[s] : void 0);
     if (v != null) {
       return {
@@ -706,15 +709,15 @@ const transforms = [
       };
     }
   }],
-  [/^translate-()(.+)$/, handleTranslate],
-  [/^translate-([xyz])-(.+)$/, handleTranslate],
-  [/^rotate-()(.+)$/, handleRotate],
-  [/^rotate-([xyz])-(.+)$/, handleRotate],
-  [/^skew-([xy])-(.+)$/, handleSkew],
-  [/^scale-()(.+)$/, handleScale],
-  [/^scale-([xyz])-(.+)$/, handleScale],
-  ["preserve-3d", { "transform-style": "preserve-3d" }],
-  ["preserve-flat", { "transform-style": "flat" }],
+  [/^(?:transform-)?translate-()(.+)$/, handleTranslate],
+  [/^(?:transform-)?translate-([xyz])-(.+)$/, handleTranslate],
+  [/^(?:transform-)?rotate-()(.+)$/, handleRotate],
+  [/^(?:transform-)?rotate-([xyz])-(.+)$/, handleRotate],
+  [/^(?:transform-)?skew-([xy])-(.+)$/, handleSkew],
+  [/^(?:transform-)?scale-()(.+)$/, handleScale],
+  [/^(?:transform-)?scale-([xyz])-(.+)$/, handleScale],
+  [/^(?:transform-)?preserve-3d$/, () => ({ "transform-style": "preserve-3d" })],
+  [/^(?:transform-)?preserve-flat$/, () => ({ "transform-style": "flat" })],
   [/^transform$/, () => [
     transformBase,
     { transform: "var(--un-transform)" }
@@ -787,28 +790,24 @@ function handleSkew([, d, b]) {
 }
 
 const variablesAbbrMap = {
-  "backface": "backface-visibility",
-  "break": "word-break",
-  "case": "text-transform",
-  "content": "align-content",
-  "flex": "flex",
-  "fw": "font-weight",
-  "items": "align-items",
-  "justify": "justify-content",
-  "leading": "line-height",
-  "lh": "line-height",
-  "select": "user-select",
-  "self": "align-self",
-  "tracking": "letter-spacing",
-  "vertical": "vertical-align",
-  "visible": "visibility",
-  "whitespace": "white-space",
-  "word-spacing": "word-spacing",
-  "ws": "white-space"
+  backface: "backface-visibility",
+  break: "word-break",
+  case: "text-transform",
+  content: "align-content",
+  flex: "flex",
+  fw: "font-weight",
+  items: "align-items",
+  justify: "justify-content",
+  select: "user-select",
+  self: "align-self",
+  vertical: "vertical-align",
+  visible: "visibility",
+  whitespace: "white-space",
+  ws: "white-space"
 };
 const cssVariables = [
-  [/^([^$]+)(?<=-)\$(.+)$/, ([, name, varname]) => {
-    const prop = variablesAbbrMap[name.slice(0, -1)];
+  [/^(.+?)-\$(.+)$/, ([, name, varname]) => {
+    const prop = variablesAbbrMap[name];
     if (prop)
       return { [prop]: `var(--${varname})` };
   }]
@@ -856,7 +855,7 @@ const svgUtilities = [
   [/^fill-(.+)$/, utilities.colorResolver("fill", "fill")],
   [/^fill-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-fill-opacity": utilities.handler.bracket.percent(opacity) })],
   ["fill-none", { fill: "none" }],
-  [/^stroke-(?:width-|size-)?(.+)$/, ([, s]) => ({ "stroke-width": utilities.handler.bracket.fraction.px.number(s) })],
+  [/^stroke-(?:width-|size-)?(.+)$/, ([, s]) => ({ "stroke-width": utilities.handler.bracket.cssvar.fraction.px.number(s) })],
   [/^stroke-dash-(.+)$/, ([, s]) => ({ "stroke-dasharray": utilities.handler.bracket.cssvar.number(s) })],
   [/^stroke-offset-(.+)$/, ([, s]) => ({ "stroke-dashoffset": utilities.handler.bracket.cssvar.px.numberWithUnit(s) })],
   [/^stroke-(.+)$/, utilities.colorResolver("stroke", "stroke")],

package/dist/chunks/default2.mjs

@@ -345,9 +345,9 @@ const fonts = [
   }],
   [/^text-size-(.+)$/, ([, s]) => ({ "font-size": handler.bracket.cssvar.rem(s) })],
   [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || handler.number(s) })],
-  [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || handler.bracket.rem(s) })],
-  [/^tracking-([^-]+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || handler.bracket.rem(s) })],
-  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || handler.bracket.rem(s) })]
+  [/^(?:leading|lh)-(.+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || handler.bracket.cssvar.rem(s) })],
+  [/^tracking-(.+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || handler.bracket.cssvar.rem(s) })],
+  [/^word-spacing-(.+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || handler.bracket.cssvar.rem(s) })]
 ];
 const tabSizes = [
   [/^tab(?:-(.+))?$/, ([, s]) => {
@@ -552,11 +552,12 @@ const boxSizing = [
 ];
 
 const ringBase = {
+  ...shadowBase,
   "--un-ring-inset": varEmpty,
   "--un-ring-offset-width": "0px",
   "--un-ring-offset-color": "#fff",
-  "--un-ring-color": "rgba(147,197,253,0.5)",
-  ...shadowBase
+  "--un-ring-width": "0px",
+  "--un-ring-color": "rgba(147,197,253,0.5)"
 };
 const rings = [
   [/^ring(?:-(.+))?$/, ([, d]) => {
@@ -565,13 +566,15 @@ const rings = [
       return [
         ringBase,
         {
+          "--un-ring-width": value,
           "--un-ring-offset-shadow": "var(--un-ring-inset) 0 0 0 var(--un-ring-offset-width) var(--un-ring-offset-color)",
-          "--un-ring-shadow": `var(--un-ring-inset) 0 0 0 calc(${value} + var(--un-ring-offset-width)) var(--un-ring-color)`,
+          "--un-ring-shadow": "var(--un-ring-inset) 0 0 0 calc(var(--un-ring-width) + var(--un-ring-offset-width)) var(--un-ring-color)",
           "box-shadow": "var(--un-ring-offset-shadow), var(--un-ring-shadow), var(--un-shadow, 0 0 #0000)"
         }
       ];
     }
   }],
+  [/^ring-(?:width-|size-)(.+)$/, ([, d]) => ({ "--un-ring-width": handler.bracket.cssvar.px(d) })],
   ["ring-offset", { "--un-ring-offset-width": "1px" }],
   [/^ring-offset-(?:width-|size-)?(.+)$/, ([, d]) => ({ "--un-ring-offset-width": handler.bracket.cssvar.px(d) })],
   [/^ring-(.+)$/, colorResolver("--un-ring-color", "ring")],
@@ -685,8 +688,8 @@ const transformBase = {
   [CONTROL_SHORTCUT_NO_MERGE]: ""
 };
 const transforms = [
-  [/^origin-(.+)$/, ([, s]) => ({ "transform-origin": positionMap[s] ?? handler.bracket.cssvar(s) })],
-  [/^perspect-(.+)$/, ([, s]) => {
+  [/^(?:transform-)?origin-(.+)$/, ([, s]) => ({ "transform-origin": positionMap[s] ?? handler.bracket.cssvar(s) })],
+  [/^(?:transform-)?perspect(?:ive)?-(.+)$/, ([, s]) => {
     const v = handler.bracket.cssvar.px.numberWithUnit(s);
     if (v != null) {
       return {
@@ -695,7 +698,7 @@ const transforms = [
       };
     }
   }],
-  [/^perspect-origin-(.+)$/, ([, s]) => {
+  [/^(?:transform-)?perspect(?:ive)?-origin-(.+)$/, ([, s]) => {
     const v = handler.bracket.cssvar(s) ?? (s.length >= 3 ? positionMap[s] : void 0);
     if (v != null) {
       return {
@@ -704,15 +707,15 @@ const transforms = [
       };
     }
   }],
-  [/^translate-()(.+)$/, handleTranslate],
-  [/^translate-([xyz])-(.+)$/, handleTranslate],
-  [/^rotate-()(.+)$/, handleRotate],
-  [/^rotate-([xyz])-(.+)$/, handleRotate],
-  [/^skew-([xy])-(.+)$/, handleSkew],
-  [/^scale-()(.+)$/, handleScale],
-  [/^scale-([xyz])-(.+)$/, handleScale],
-  ["preserve-3d", { "transform-style": "preserve-3d" }],
-  ["preserve-flat", { "transform-style": "flat" }],
+  [/^(?:transform-)?translate-()(.+)$/, handleTranslate],
+  [/^(?:transform-)?translate-([xyz])-(.+)$/, handleTranslate],
+  [/^(?:transform-)?rotate-()(.+)$/, handleRotate],
+  [/^(?:transform-)?rotate-([xyz])-(.+)$/, handleRotate],
+  [/^(?:transform-)?skew-([xy])-(.+)$/, handleSkew],
+  [/^(?:transform-)?scale-()(.+)$/, handleScale],
+  [/^(?:transform-)?scale-([xyz])-(.+)$/, handleScale],
+  [/^(?:transform-)?preserve-3d$/, () => ({ "transform-style": "preserve-3d" })],
+  [/^(?:transform-)?preserve-flat$/, () => ({ "transform-style": "flat" })],
   [/^transform$/, () => [
     transformBase,
     { transform: "var(--un-transform)" }
@@ -785,28 +788,24 @@ function handleSkew([, d, b]) {
 }
 
 const variablesAbbrMap = {
-  "backface": "backface-visibility",
-  "break": "word-break",
-  "case": "text-transform",
-  "content": "align-content",
-  "flex": "flex",
-  "fw": "font-weight",
-  "items": "align-items",
-  "justify": "justify-content",
-  "leading": "line-height",
-  "lh": "line-height",
-  "select": "user-select",
-  "self": "align-self",
-  "tracking": "letter-spacing",
-  "vertical": "vertical-align",
-  "visible": "visibility",
-  "whitespace": "white-space",
-  "word-spacing": "word-spacing",
-  "ws": "white-space"
+  backface: "backface-visibility",
+  break: "word-break",
+  case: "text-transform",
+  content: "align-content",
+  flex: "flex",
+  fw: "font-weight",
+  items: "align-items",
+  justify: "justify-content",
+  select: "user-select",
+  self: "align-self",
+  vertical: "vertical-align",
+  visible: "visibility",
+  whitespace: "white-space",
+  ws: "white-space"
 };
 const cssVariables = [
-  [/^([^$]+)(?<=-)\$(.+)$/, ([, name, varname]) => {
-    const prop = variablesAbbrMap[name.slice(0, -1)];
+  [/^(.+?)-\$(.+)$/, ([, name, varname]) => {
+    const prop = variablesAbbrMap[name];
     if (prop)
       return { [prop]: `var(--${varname})` };
   }]
@@ -854,7 +853,7 @@ const svgUtilities = [
   [/^fill-(.+)$/, colorResolver("fill", "fill")],
   [/^fill-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-fill-opacity": handler.bracket.percent(opacity) })],
   ["fill-none", { fill: "none" }],
-  [/^stroke-(?:width-|size-)?(.+)$/, ([, s]) => ({ "stroke-width": handler.bracket.fraction.px.number(s) })],
+  [/^stroke-(?:width-|size-)?(.+)$/, ([, s]) => ({ "stroke-width": handler.bracket.cssvar.fraction.px.number(s) })],
   [/^stroke-dash-(.+)$/, ([, s]) => ({ "stroke-dasharray": handler.bracket.cssvar.number(s) })],
   [/^stroke-offset-(.+)$/, ([, s]) => ({ "stroke-dashoffset": handler.bracket.cssvar.px.numberWithUnit(s) })],
   [/^stroke-(.+)$/, colorResolver("stroke", "stroke")],

package/dist/chunks/utilities.cjs

@@ -206,7 +206,7 @@ function fraction(str) {
 }
 function bracket(str) {
   if (str && str[0] === "[" && str[str.length - 1] === "]") {
-    return str.slice(1, -1).replace(/(url\(.*?\))/g, (v) => v.replace(/_/g, "\\_")).replace(/(?<!\\)_/g, " ").replace(/calc\((.*)/g, (v) => {
+    return str.slice(1, -1).replace(/(url\(.*?\))/g, (v) => v.replace(/_/g, "\\_")).replace(/([^\\])_/g, "$1 ").replace(/calc\((.*)/g, (v) => {
       return v.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, "$1 $2 ");
     });
   }

package/dist/chunks/utilities.mjs

@@ -204,7 +204,7 @@ function fraction(str) {
 }
 function bracket(str) {
   if (str && str[0] === "[" && str[str.length - 1] === "]") {
-    return str.slice(1, -1).replace(/(url\(.*?\))/g, (v) => v.replace(/_/g, "\\_")).replace(/(?<!\\)_/g, " ").replace(/calc\((.*)/g, (v) => {
+    return str.slice(1, -1).replace(/(url\(.*?\))/g, (v) => v.replace(/_/g, "\\_")).replace(/([^\\])_/g, "$1 ").replace(/calc\((.*)/g, (v) => {
       return v.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, "$1 $2 ");
     });
   }

package/package.json

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