@unocss/preset-mini 0.20.4 → 0.22.0

package/dist/chunks/default.cjs

@@ -74,7 +74,7 @@ const textShadow = {
   DEFAULT: "0px 0px 1px rgb(0 0 0/20%), 0px 0px 1px rgb(1 0 5/10%)",
   sm: "1px 1px 3px rgb(36 37 47 / 25%)",
   md: "0px 1px 2px rgb(30 29 39 / 19%), 1px 2px 4px rgb(54 64 147 / 18%)",
-  lg: "3px 3px 6px rgb(0 0 0 / 26%), 0 0 5px rgb(15 3 86 / 22%)",
+  lg: "3px 3px 6px rgb(0 0 0 / 26%), 0px 0px 5px rgb(15 3 86 / 22%)",
   xl: "1px 1px 3px rgb(0 0 0 / 29%), 2px 4px 7px rgb(73 64 125 / 35%)",
   none: "none"
 };
@@ -115,14 +115,14 @@ const borderRadius = {
   "full": "9999px"
 };
 const boxShadow = {
-  "DEFAULT": "var(--un-shadow-inset) 0 1px 3px 0 rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 1px 2px 0 rgba(var(--un-shadow-color), 0.06)",
+  "DEFAULT": "var(--un-shadow-inset) 0 1px 3px 0 rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 1px 2px -1px rgba(var(--un-shadow-color), 0.1)",
   "sm": "var(--un-shadow-inset) 0 1px 2px 0 rgba(var(--un-shadow-color), 0.05)",
-  "md": "var(--un-shadow-inset) 0 4px 6px -1px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 2px 4px -1px rgba(var(--un-shadow-color), 0.06)",
-  "lg": "var(--un-shadow-inset) 0 10px 15px -3px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 4px 6px -2px rgba(var(--un-shadow-color), 0.05)",
-  "xl": "var(--un-shadow-inset) 0 20px 25px -5px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 10px 10px -5px rgba(var(--un-shadow-color), 0.04)",
+  "md": "var(--un-shadow-inset) 0 4px 6px -1px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 2px 4px -2px rgba(var(--un-shadow-color), 0.1)",
+  "lg": "var(--un-shadow-inset) 0 10px 15px -3px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 4px 6px -4px rgba(var(--un-shadow-color), 0.1)",
+  "xl": "var(--un-shadow-inset) 0 20px 25px -5px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 8px 10px -6px rgba(var(--un-shadow-color), 0.1)",
   "2xl": "var(--un-shadow-inset) 0 25px 50px -12px rgba(var(--un-shadow-color), 0.25)",
-  "inner": "inset 0 2px 4px 0 rgba(var(--un-shadow-color), 0.06)",
-  "none": "none"
+  "inner": "inset 0 2px 4px 0 rgba(var(--un-shadow-color), 0.05)",
+  "none": "0 0 #0000"
 };
 
 const blur = {
@@ -137,7 +137,7 @@ const blur = {
 };
 const dropShadow = {
   "DEFAULT": ["0 1px 2px rgba(0, 0, 0, 0.1)", "0 1px 1px rgba(0, 0, 0, 0.06)"],
-  "sm": "0 1px 1px rgba(0,0,0,0.05)",
+  "sm": "0 1px 1px rgba(0, 0, 0, 0.05)",
   "md": ["0 4px 3px rgba(0, 0, 0, 0.07)", "0 2px 2px rgba(0, 0, 0, 0.06)"],
   "lg": ["0 10px 8px rgba(0, 0, 0, 0.04)", "0 4px 3px rgba(0, 0, 0, 0.1)"],
   "xl": ["0 20px 13px rgba(0, 0, 0, 0.03)", "0 8px 5px rgba(0, 0, 0, 0.08)"],
@@ -157,8 +157,6 @@ const baseSize = {
   "5xl": "64rem",
   "6xl": "72rem",
   "7xl": "80rem",
-  "min": "min-content",
-  "max": "max-content",
   "prose": "65ch"
 };
 const width = {

package/dist/chunks/default.mjs

@@ -72,7 +72,7 @@ const textShadow = {
   DEFAULT: "0px 0px 1px rgb(0 0 0/20%), 0px 0px 1px rgb(1 0 5/10%)",
   sm: "1px 1px 3px rgb(36 37 47 / 25%)",
   md: "0px 1px 2px rgb(30 29 39 / 19%), 1px 2px 4px rgb(54 64 147 / 18%)",
-  lg: "3px 3px 6px rgb(0 0 0 / 26%), 0 0 5px rgb(15 3 86 / 22%)",
+  lg: "3px 3px 6px rgb(0 0 0 / 26%), 0px 0px 5px rgb(15 3 86 / 22%)",
   xl: "1px 1px 3px rgb(0 0 0 / 29%), 2px 4px 7px rgb(73 64 125 / 35%)",
   none: "none"
 };
@@ -113,14 +113,14 @@ const borderRadius = {
   "full": "9999px"
 };
 const boxShadow = {
-  "DEFAULT": "var(--un-shadow-inset) 0 1px 3px 0 rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 1px 2px 0 rgba(var(--un-shadow-color), 0.06)",
+  "DEFAULT": "var(--un-shadow-inset) 0 1px 3px 0 rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 1px 2px -1px rgba(var(--un-shadow-color), 0.1)",
   "sm": "var(--un-shadow-inset) 0 1px 2px 0 rgba(var(--un-shadow-color), 0.05)",
-  "md": "var(--un-shadow-inset) 0 4px 6px -1px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 2px 4px -1px rgba(var(--un-shadow-color), 0.06)",
-  "lg": "var(--un-shadow-inset) 0 10px 15px -3px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 4px 6px -2px rgba(var(--un-shadow-color), 0.05)",
-  "xl": "var(--un-shadow-inset) 0 20px 25px -5px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 10px 10px -5px rgba(var(--un-shadow-color), 0.04)",
+  "md": "var(--un-shadow-inset) 0 4px 6px -1px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 2px 4px -2px rgba(var(--un-shadow-color), 0.1)",
+  "lg": "var(--un-shadow-inset) 0 10px 15px -3px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 4px 6px -4px rgba(var(--un-shadow-color), 0.1)",
+  "xl": "var(--un-shadow-inset) 0 20px 25px -5px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 8px 10px -6px rgba(var(--un-shadow-color), 0.1)",
   "2xl": "var(--un-shadow-inset) 0 25px 50px -12px rgba(var(--un-shadow-color), 0.25)",
-  "inner": "inset 0 2px 4px 0 rgba(var(--un-shadow-color), 0.06)",
-  "none": "none"
+  "inner": "inset 0 2px 4px 0 rgba(var(--un-shadow-color), 0.05)",
+  "none": "0 0 #0000"
 };
 
 const blur = {
@@ -135,7 +135,7 @@ const blur = {
 };
 const dropShadow = {
   "DEFAULT": ["0 1px 2px rgba(0, 0, 0, 0.1)", "0 1px 1px rgba(0, 0, 0, 0.06)"],
-  "sm": "0 1px 1px rgba(0,0,0,0.05)",
+  "sm": "0 1px 1px rgba(0, 0, 0, 0.05)",
   "md": ["0 4px 3px rgba(0, 0, 0, 0.07)", "0 2px 2px rgba(0, 0, 0, 0.06)"],
   "lg": ["0 10px 8px rgba(0, 0, 0, 0.04)", "0 4px 3px rgba(0, 0, 0, 0.1)"],
   "xl": ["0 20px 13px rgba(0, 0, 0, 0.03)", "0 8px 5px rgba(0, 0, 0, 0.08)"],
@@ -155,8 +155,6 @@ const baseSize = {
   "5xl": "64rem",
   "6xl": "72rem",
   "7xl": "80rem",
-  "min": "min-content",
-  "max": "max-content",
   "prose": "65ch"
 };
 const width = {

package/dist/chunks/default2.cjs

@@ -2,7 +2,6 @@
 
 const utilities = require('./utilities.cjs');
 const core = require('@unocss/core');
-const pseudo = require('./pseudo.cjs');
 
 const verticalAlignAlias = {
   mid: "middle",
@@ -10,7 +9,7 @@ const verticalAlignAlias = {
   btm: "bottom"
 };
 const verticalAligns = [
-  [/^(?:vertical|align|v)-(baseline|top|bottom|middle|text-top|text-bottom|mid|base|btm)$/, ([, v]) => ({ "vertical-align": verticalAlignAlias[v] || v })]
+  [/^(?:vertical|align|v)-(baseline|top|middle|bottom|text-top|text-bottom|sub|super|mid|base|btm)$/, ([, v]) => ({ "vertical-align": verticalAlignAlias[v] || v })]
 ];
 const textAligns = [
   ["text-center", { "text-align": "center" }],
@@ -24,7 +23,7 @@ const outline = [
   [/^outline-(?:color-)?(.+)$/, utilities.colorResolver("outline-color", "outline-color")],
   [/^outline-offset-(.+)$/, ([, d]) => ({ "outline-offset": utilities.handler.bracket.fraction.auto.rem(d) })],
   ["outline", { "outline-style": "solid" }],
-  [/^outline-(auto|dotted|dashed|solid|double|groove|ridge|inset|outset|inherit|initial|revert|unset)$/, ([, c]) => ({ "outline-style": c })],
+  [/^outline-(auto|dashed|dotted|double|hidden|solid|groove|ridge|inset|outset|inherit|initial|revert|unset)$/, ([, c]) => ({ "outline-style": c })],
   ["outline-none", { "outline": "2px solid transparent", "outline-offset": "2px" }]
 ];
 const appearance = [
@@ -33,8 +32,14 @@ const appearance = [
     "-webkit-appearance": "none"
   }]
 ];
+const willChangeProperty = (prop) => {
+  return utilities.handler.properties.auto.global(prop) ?? {
+    contents: "contents",
+    scroll: "scroll-position"
+  }[prop];
+};
 const willChange = [
-  [/^will-change-(.+)/, ([, p]) => ({ "will-change": utilities.handler.properties.global(p) })]
+  [/^will-change-(.+)/, ([, p]) => ({ "will-change": willChangeProperty(p) })]
 ];
 
 const borders = [
@@ -182,10 +187,10 @@ const flex = [
   ["flex-initial", { flex: "0 1 auto" }],
   ["flex-none", { flex: "none" }],
   [/^flex-(\[.+\])$/, ([, d]) => ({ flex: utilities.handler.bracket(d).replace(/\d+\/\d+/, ($1) => utilities.handler.fraction($1)) })],
-  ["flex-shrink", { "flex-shrink": 1 }],
-  ["flex-shrink-0", { "flex-shrink": 0 }],
-  ["flex-grow", { "flex-grow": 1 }],
-  ["flex-grow-0", { "flex-grow": 0 }],
+  [/^(?:flex-)?shrink$/, () => ({ "flex-shrink": 1 })],
+  [/^(?:flex-)?shrink-0$/, () => ({ "flex-shrink": 0 })],
+  [/^(?:flex-)?grow$/, () => ({ "flex-grow": 1 })],
+  [/^(?:flex-)?grow-0$/, () => ({ "flex-grow": 0 })],
   [/^(?:flex-)?basis-(.+)$/, ([, d]) => ({ "flex-basis": utilities.handler.bracket.fraction.auto.rem(d) })],
   ["flex-row", { "flex-direction": "row" }],
   ["flex-row-reverse", { "flex-direction": "row-reverse" }],
@@ -210,17 +215,15 @@ const weightMap = {
 const fonts = [
   [/^font-(\w+)$/, ([, d], { theme }) => ({ "font-family": theme.fontFamily?.[d] })],
   [/^text-(.+)$/, ([, s = "base"], { theme }) => {
-    const size = utilities.handler.bracket.auto.rem(s);
-    if (size)
-      return { "font-size": size };
     const themed = core.toArray(theme.fontSize?.[s]);
     if (themed?.[0]) {
-      const [size2, height] = themed;
+      const [size, height = "1"] = themed;
       return {
-        "font-size": size2,
+        "font-size": size,
         "line-height": height
       };
     }
+    return { "font-size": utilities.handler.bracket.auto.rem(s) };
   }],
   [/^text-size-(.+)$/, ([, s]) => ({ "font-size": utilities.handler.bracket.auto.rem(s) })],
   [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || utilities.handler.number(s) })],
@@ -229,7 +232,7 @@ const fonts = [
   [/^word-spacing-([^-]+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || utilities.handler.bracket.auto.rem(s) })]
 ];
 const tabSizes = [
-  [/^tab-?([^-]*)$/, ([, s]) => {
+  [/^tab(?:-([^-]+))?$/, ([, s]) => {
     const v = utilities.handler.bracket.global.number(s || "4");
     if (v != null) {
       return {
@@ -271,53 +274,47 @@ const gaps = [
   [/^(?:flex-|grid-)?gap-([xy])-([^-]+)$/, handleGap]
 ];
 
-const calSize = (s, theme) => core.toArray(theme.fontSize?.[s] || utilities.handler.bracket.auto.rem(s))[0];
+const rowCol = (s) => s.replace("col", "column");
 const autoDirection = (selector, theme) => {
-  if (selector === "min")
-    return "min-content";
-  else if (selector === "max")
-    return "max-content";
-  else if (selector === "fr")
-    return "minmax(0,1fr)";
-  return calSize(selector, theme);
+  const v = theme.fontSize?.[selector];
+  if (v != null)
+    return core.toArray(v)[0];
+  switch (selector) {
+    case "min":
+      return "min-content";
+    case "max":
+      return "max-content";
+    case "fr":
+      return "minmax(0,1fr)";
+  }
+  return utilities.handler.bracket.auto.rem(selector);
 };
 const grids = [
   ["grid", { display: "grid" }],
   ["inline-grid", { display: "inline-grid" }],
-  [/^(?:grid-)?col-start-([\w.-]+)$/, ([, v]) => ({ "grid-column-start": v })],
-  [/^(?:grid-)?col-end-([\w.]+)$/, ([, v]) => ({ "grid-column-end": v })],
-  [/^(?:grid-)?row-start-([\w.-]+)$/, ([, v]) => ({ "grid-row-start": v })],
-  [/^(?:grid-)?row-end-([\w.-]+)$/, ([, v]) => ({ "grid-row-end": v })],
-  [/^(?:grid-)?(row|col)-(.+)$/, ([, d, v]) => {
-    const key = d === "row" ? "grid-row" : "grid-column";
-    let raw = utilities.handler.bracket(v);
-    if (raw)
-      return { [key]: raw };
-    const parts = v.split("-");
-    if (parts.length === 1 && parts[0] === "auto")
-      return { [key]: parts[0] };
-    if (parts[0] === "span") {
-      if (parts[1] === "full")
-        return { [key]: "1/-1" };
-      raw = utilities.handler.number.bracket(parts[1]);
-      if (raw)
-        return { [key]: `span ${raw}/span ${raw}` };
-    }
+  [/^(?:grid-)?(row|col)-(.+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}`]: utilities.handler.bracket.auto(v) })],
+  [/^(?:grid-)?(row|col)-span-(.+)$/, ([, c, s]) => {
+    if (s === "full")
+      return { [`grid-${rowCol(c)}`]: "1/-1" };
+    const v = utilities.handler.bracket.number(s);
+    if (v != null)
+      return { [`grid-${rowCol(c)}`]: `span ${v}/span ${v}` };
   }],
-  [/^(?:grid-)?auto-cols-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-columns": autoDirection(v, theme) })],
-  [/^(?:grid-)?auto-flow-([\w.-]+)$/, ([, v]) => ({ "grid-auto-flow": v.replace("col", "column").split("-").join(" ") })],
-  [/^(?:grid-)?auto-rows-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-rows": autoDirection(v, theme) })],
-  [/^grid-cols-(.+)$/, ([, v]) => ({ "grid-template-columns": utilities.handler.bracket(v) })],
-  [/^grid-rows-(.+)$/, ([, v]) => ({ "grid-template-rows": utilities.handler.bracket(v) })],
-  [/^grid-cols-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-columns": `repeat(auto-fill,minmax(${d},1fr))` })],
-  [/^grid-rows-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-rows": `repeat(auto-fill,minmax(${d},1fr))` })],
-  [/^grid-cols-(\d+)$/, ([, d]) => ({ "grid-template-columns": `repeat(${d},minmax(0,1fr))` })],
-  [/^grid-rows-(\d+)$/, ([, d]) => ({ "grid-template-rows": `repeat(${d},minmax(0,1fr))` })]
+  [/^(?:grid-)?(row|col)-start-([\w.-]+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}-start`]: v })],
+  [/^(?:grid-)?(row|col)-end-([\w.-]+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}-end`]: v })],
+  [/^(?:grid-)?auto-(rows|cols)-([\w.-]+)$/, ([, c, v], { theme }) => ({ [`grid-auto-${rowCol(c)}`]: autoDirection(v, theme) })],
+  [/^(?:grid-auto-flow|auto-flow|grid-flow)-((?:row|col)(?:-dense)?)$/, ([, v]) => ({ "grid-auto-flow": rowCol(v).replace("-", " ") })],
+  [/^grid-(rows|cols)-(\[.+\])$/, ([, c, v]) => ({ [`grid-template-${rowCol(c)}`]: utilities.handler.bracket(v) })],
+  [/^grid-(rows|cols)-minmax-([\w.-]+)$/, ([, c, d]) => ({ [`grid-template-${rowCol(c)}`]: `repeat(auto-fill,minmax(${d},1fr))` })],
+  [/^grid-(rows|cols)-(\d+)$/, ([, c, d]) => ({ [`grid-template-${rowCol(c)}`]: `repeat(${d},minmax(0,1fr))` })],
+  ["grid-rows-none", { "grid-template-rows": "none" }],
+  ["grid-cols-none", { "grid-template-columns": "none" }]
 ];
 
 const overflowValues = [
   "auto",
   "hidden",
+  "clip",
   "visible",
   "scroll"
 ];
@@ -399,7 +396,7 @@ function handleInsetValues([, d, v]) {
     return utilities.directionMap[d].map((i) => [i.slice(1), r]);
 }
 const insets = [
-  [/^(?:position-|pos-)?inset-()(.+)$/, handleInsetValues],
+  [/^(?:position-|pos-)?inset-(.+)$/, ([, v]) => ({ inset: handleInsetValue(v) })],
   [/^(?:position-|pos-)?inset-([xy])-(.+)$/, handleInsetValues],
   [/^(?:position-|pos-)?(top|left|right|bottom)-(.+)$/, ([, d, v]) => ({ [d]: handleInsetValue(v) })]
 ];
@@ -460,11 +457,12 @@ const whitespaces = [
   [/^(?:whitespace|ws)-(normal|nowrap|pre|pre-line|pre-wrap)$/, ([, v]) => ({ "white-space": v })]
 ];
 const contents = [
-  ["content-empty", { content: '""' }]
+  ["content-empty", { content: '""' }],
+  ["content-none", { content: '""' }]
 ];
 const breaks = [
   ["break-normal", { "overflow-wrap": "normal", "word-break": "normal" }],
-  ["break-word", { "overflow-wrap": "break-word" }],
+  ["break-words", { "overflow-wrap": "break-word" }],
   ["break-all", { "word-break": "break-all" }]
 ];
 const textOverflows = [
@@ -496,14 +494,14 @@ const fontSmoothings = [
 ];
 
 const rings = [
-  [/^ring-?(.*)$/, ([, d]) => {
+  [/^ring(?:-(.+))?$/, ([, d]) => {
     const value = utilities.handler.px(d || "1");
     if (value) {
       return {
         "--un-ring-inset": varEmpty,
         "--un-ring-offset-width": "0px",
         "--un-ring-offset-color": "#fff",
-        "--un-ring-color": "rgba(59, 130, 246, .5)",
+        "--un-ring-color": "rgba(147, 197, 253, .5)",
         "--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)`,
         "box-shadow": "var(--un-ring-offset-shadow), var(--un-ring-shadow), var(--un-shadow, 0 0 #0000)"
@@ -537,7 +535,7 @@ const shadowColorResolver = (body, theme) => {
   }
 };
 const boxShadows = [
-  [/^shadow-?(.*)$/, ([, d], { theme }) => {
+  [/^shadow(?:-(.+))?$/, ([, d], { theme }) => {
     const value = theme.boxShadow?.[d || "DEFAULT"];
     if (value) {
       return {
@@ -555,37 +553,38 @@ const boxShadows = [
 function getPropName(minmax, hw) {
   return `${minmax ? `${minmax}-` : ""}${hw === "h" ? "height" : "width"}`;
 }
-function getThemeValue(minmax, hw, theme, prop) {
+function getSizeValue(minmax, hw, theme, prop) {
   let str = `${hw === "h" ? "height" : "width"}`;
   if (minmax)
     str = `${minmax}${utilities.capitalize(str)}`;
-  return theme[str]?.[prop];
+  const v = theme[str]?.[prop];
+  if (v != null)
+    return v;
+  switch (prop) {
+    case "fit":
+    case "max":
+    case "min":
+      return `${prop}-content`;
+  }
+  return utilities.handler.bracket.cssvar.fraction.auto.rem(prop);
 }
 const sizes = [
-  [/^(?:(min|max)-)?(w|h)-(.+)$/, ([, m, w, s], { theme }) => {
-    const v = getThemeValue(m, w, theme, s) || utilities.handler.bracket.cssvar.fraction.auto.rem(s);
-    if (v != null)
-      return { [getPropName(m, w)]: v };
-  }],
-  [/^(?:(min|max)-)?(w)-screen-(.+)$/, ([, m, w, s], { theme }) => {
-    const v = theme.breakpoints?.[s];
-    if (v != null)
-      return { [getPropName(m, w)]: v };
-  }]
-];
+  [/^(?:(min|max)-)?(w|h)-(.+)$/, ([, m, w, s], { theme }) => ({ [getPropName(m, w)]: getSizeValue(m, w, theme, s) })],
+  [/^(?:(min|max)-)?(w)-screen-(.+)$/, ([, m, w, s], { theme }) => ({ [getPropName(m, w)]: theme.breakpoints?.[s] })]
+];
+function getAspectRatio(prop) {
+  if (/^\d+\/\d+$/.test(prop))
+    return prop;
+  switch (prop) {
+    case "square":
+      return "1/1";
+    case "video":
+      return "16/9";
+  }
+  return utilities.handler.bracket.cssvar.auto.number(prop);
+}
 const aspectRatio = [
-  [/^aspect-(?:ratio-)?(.+)$/, ([, d]) => {
-    if (/^\d+\/\d+$/.test(d))
-      return { "aspect-ratio": d };
-    const v = {
-      auto: "auto",
-      square: "1/1",
-      video: "16/9"
-    }[d];
-    if (v != null)
-      return { "aspect-ratio": v };
-    return { "aspect-ratio": utilities.handler.bracket.cssvar.number(d) };
-  }]
+  [/^aspect-(?:ratio-)?(.+)$/, ([, d]) => ({ "aspect-ratio": getAspectRatio(d) })]
 ];
 
 const paddings = [
@@ -600,12 +599,10 @@ const margins = [
 ];
 
 const transformGpu = {
-  transform: "rotate(var(--un-rotate)) scaleX(var(--un-scale-x)) scaleY(var(--un-scale-y)) scaleZ(var(--un-scale-z)) skewX(var(--un-skew-x)) skewY(var(--un-skew-y)) translate3d(var(--un-translate-x), var(--un-translate-y), var(--un-translate-z))",
-  [pseudo.CONTROL_BYPASS_PSEUDO_CLASS]: ""
+  "--un-transform": "rotate(var(--un-rotate)) scaleX(var(--un-scale-x)) scaleY(var(--un-scale-y)) scaleZ(var(--un-scale-z)) skewX(var(--un-skew-x)) skewY(var(--un-skew-y)) translate3d(var(--un-translate-x), var(--un-translate-y), var(--un-translate-z))"
 };
 const transformCpu = {
-  transform: "rotate(var(--un-rotate)) scaleX(var(--un-scale-x)) scaleY(var(--un-scale-y)) scaleZ(var(--un-scale-z)) skewX(var(--un-skew-x)) skewY(var(--un-skew-y)) translateX(var(--un-translate-x)) translateY(var(--un-translate-y)) translateZ(var(--un-translate-z))",
-  [pseudo.CONTROL_BYPASS_PSEUDO_CLASS]: ""
+  "--un-transform": "rotate(var(--un-rotate)) scaleX(var(--un-scale-x)) scaleY(var(--un-scale-y)) scaleZ(var(--un-scale-z)) skewX(var(--un-skew-x)) skewY(var(--un-skew-y)) translateX(var(--un-translate-x)) translateY(var(--un-translate-y)) translateZ(var(--un-translate-z))"
 };
 const transformBase = {
   "--un-rotate": 0,
@@ -617,30 +614,55 @@ const transformBase = {
   "--un-translate-x": 0,
   "--un-translate-y": 0,
   "--un-translate-z": 0,
-  ...transformCpu
+  ...transformCpu,
+  [core.CONTROL_SHORTCUT_NO_MERGE]: ""
 };
 const transforms = [
-  ["transform", transformBase],
-  [/^preserve-(3d|flat)$/, ([, value]) => ({ "transform-style": value === "3d" ? `preserve-${value}` : value })],
-  [/^translate()-(.+)$/, handleTranslate],
+  [/^origin-([-\w]{3,})$/, ([, s]) => ({ "transform-origin": utilities.positionMap[s] })],
+  [/^perspect-(.+)$/, ([, s]) => {
+    const v = utilities.handler.px.numberWithUnit(s);
+    if (v != null) {
+      return {
+        "-webkit-perspective": v,
+        "perspective": v
+      };
+    }
+  }],
+  [/^perspect-origin-(.+)$/, ([, s]) => {
+    const v = utilities.handler.bracket(s) ?? (s.length >= 3 ? utilities.positionMap[s] : void 0);
+    if (v != null) {
+      return {
+        "-webkit-perspective-origin": v,
+        "perspective-origin": v
+      };
+    }
+  }],
+  [/^translate-()(.+)$/, handleTranslate],
   [/^translate-([xyz])-(.+)$/, handleTranslate],
-  [/^scale()-(.+)$/, handleScale],
-  [/^scale-([xyz])-(.+)$/, handleScale],
   [/^rotate-(.+)$/, handleRotate],
-  [/^rotate-((?!\[)[^-]+?)(?:deg)?$/, handleRotateWithUnit],
+  [/^skew-()(.+)$/, handleSkew],
   [/^skew-([xy])-(.+)$/, handleSkew],
-  [/^skew-([xy])-((?!\[)[^-]+?)(?:deg)?$/, handleSkewWithUnit],
+  [/^scale-()(.+)$/, handleScale],
+  [/^scale-([xyz])-(.+)$/, handleScale],
+  ["preserve-3d", { "transform-style": "preserve-3d" }],
+  ["preserve-flat", { "transform-style": "flat" }],
+  [/^transform$/, () => [
+    transformBase,
+    { transform: "var(--un-transform)" }
+  ]],
   ["transform-gpu", transformGpu],
   ["transform-cpu", transformCpu],
-  ["transform-none", { transform: "none" }],
-  [/^origin-([-\w]{3,})$/, ([, s]) => ({ "transform-origin": utilities.positionMap[s] })]
+  ["transform-none", { transform: "none" }]
 ];
 function handleTranslate([, d, b]) {
   const v = utilities.handler.bracket.fraction.auto.rem(b);
   if (v != null) {
     return [
       transformBase,
-      utilities.xyzMap[d].map((i) => [`--un-translate${i}`, v])
+      [
+        ...utilities.xyzMap[d].map((i) => [`--un-translate${i}`, v]),
+        ["transform", "var(--un-transform)"]
+      ]
     ];
   }
 }
@@ -649,43 +671,34 @@ function handleScale([, d, b]) {
   if (v != null) {
     return [
       transformBase,
-      utilities.xyzMap[d].map((i) => [`--un-scale${i}`, v])
-    ];
-  }
-}
-function handleRotateWithUnit([, b]) {
-  const v = utilities.handler.bracket.number(b);
-  if (v != null) {
-    return [
-      transformBase,
-      { "--un-rotate": `${v}deg` }
+      [
+        ...utilities.xyzMap[d].map((i) => [`--un-scale${i}`, v]),
+        ["transform", "var(--un-transform)"]
+      ]
     ];
   }
 }
 function handleRotate([, b]) {
-  const v = utilities.handler.bracket(b);
-  if (v != null) {
-    return [
-      transformBase,
-      { "--un-rotate": v }
-    ];
-  }
-}
-function handleSkewWithUnit([, d, b]) {
-  const v = utilities.handler.bracket.number(b);
+  const v = utilities.handler.bracket.degree(b);
   if (v != null) {
     return [
       transformBase,
-      { [`--un-skew-${d}`]: `${v}deg` }
+      {
+        "--un-rotate": v,
+        "transform": "var(--un-transform)"
+      }
     ];
   }
 }
 function handleSkew([, d, b]) {
-  const v = utilities.handler.bracket(b);
+  const v = utilities.handler.bracket.degree(b);
   if (v != null) {
     return [
       transformBase,
-      { [`--un-skew-${d}`]: v }
+      {
+        [`--un-skew-${d}`]: v,
+        transform: "var(--un-transform)"
+      }
     ];
   }
 }
@@ -734,10 +747,11 @@ ${constructCSS({ animation: "__un_qm 0.5s ease-in-out alternate infinite" })}`;
 ];
 
 const textDecorations = [
-  ["underline", { "text-decoration": "underline" }],
-  ["line-through", { "text-decoration": "line-through" }],
-  ["decoration-underline", { "text-decoration": "underline" }],
-  ["decoration-line-through", { "text-decoration": "line-through" }],
+  ["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" }],
   [/^(?:underline|decoration)-(?:size-)?(.+)$/, ([, s]) => ({ "text-decoration-thickness": utilities.handler.bracket.px(s) })],
   [/^(?:underline|decoration)-(auto|from-font)$/, ([, s]) => ({ "text-decoration-thickness": s })],
   [/^(?:underline|decoration)-(.+)$/, (match, ctx) => {
@@ -761,8 +775,18 @@ const svgUtilities = [
   [/^fill-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-fill-opacity": utilities.handler.bracket.percent(opacity) })],
   ["fill-none", { fill: "none" }],
   [/^stroke-(?:size-|width-)?(.+)$/, ([, s]) => ({ "stroke-width": utilities.handler.bracket.fraction.px.number(s) })],
+  [/^stroke-dash-(.+)$/, ([, s]) => ({ "stroke-dasharray": utilities.handler.bracket.number(s) })],
+  [/^stroke-offset-(.+)$/, ([, s]) => ({ "stroke-dashoffset": utilities.handler.bracket.px.numberWithUnit(s) })],
   [/^stroke-(.+)$/, utilities.colorResolver("stroke", "stroke")],
   [/^stroke-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-stroke-opacity": utilities.handler.bracket.percent(opacity) })],
+  ["stroke-cap-square", { "stroke-linecap": "square" }],
+  ["stroke-cap-round", { "stroke-linecap": "round" }],
+  ["stroke-cap-auto", { "stroke-linecap": "butt" }],
+  ["stroke-join-arcs", { "stroke-linejoin": "arcs" }],
+  ["stroke-join-bevel", { "stroke-linejoin": "bevel" }],
+  ["stroke-join-clip", { "stroke-linejoin": "miter-clip" }],
+  ["stroke-join-round", { "stroke-linejoin": "round" }],
+  ["stroke-join-auto", { "stroke-linejoin": "miter" }],
   ["stroke-none", { stroke: "none" }]
 ];