@unocss/preset-mini 0.21.0 → 0.22.1

package/dist/chunks/default.cjs

@@ -71,12 +71,12 @@ const textStrokeWidth = {
   lg: "thick"
 };
 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%), 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"
+  DEFAULT: ["0 0 1px rgba(0,0,0,0.2)", "0 0 1px rgba(1,0,5,0.1)"],
+  sm: "1px 1px 3px rgba(36,37,47,0.25)",
+  md: ["0 1px 2px rgba(30,29,39,0.19)", "1px 2px 4px rgba(54,64,147,0.18)"],
+  lg: ["3px 3px 6px rgba(0,0,0,0.26)", "0 0 5px rgba(15,3,86,0.22)"],
+  xl: ["1px 1px 3px rgba(0,0,0,0.29)", "2px 4px 7px rgba(73,64,125,0.35)"],
+  none: "0 0 #0000"
 };
 const lineHeight = {
   none: "1",
@@ -115,13 +115,13 @@ 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 -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 -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.05)",
+  "DEFAULT": ["var(--un-shadow-inset) 0 1px 3px 0 rgba(0,0,0,0.1)", "var(--un-shadow-inset) 0 1px 2px -1px rgba(0,0,0,0.1)"],
+  "sm": "var(--un-shadow-inset) 0 1px 2px 0 rgba(0,0,0,0.05)",
+  "md": ["var(--un-shadow-inset) 0 4px 6px -1px rgba(0,0,0,0.1)", "var(--un-shadow-inset) 0 2px 4px -2px rgba(0,0,0,0.1)"],
+  "lg": ["var(--un-shadow-inset) 0 10px 15px -3px rgba(0,0,0,0.1)", "var(--un-shadow-inset) 0 4px 6px -4px rgba(0,0,0,0.1)"],
+  "xl": ["var(--un-shadow-inset) 0 20px 25px -5px rgba(0,0,0,0.1)", "var(--un-shadow-inset) 0 8px 10px -6px rgba(0,0,0,0.1)"],
+  "2xl": "var(--un-shadow-inset) 0 25px 50px -12px rgba(0,0,0,0.25)",
+  "inner": "inset 0 2px 4px 0 rgba(0,0,0,0.05)",
   "none": "0 0 #0000"
 };
 
@@ -136,12 +136,12 @@ const blur = {
   "3xl": "64px"
 };
 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)",
-  "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)"],
-  "2xl": "0 25px 25px rgba(0, 0, 0, 0.15)",
+  "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)",
+  "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)"],
+  "2xl": "0 25px 25px rgba(0,0,0,0.15)",
   "none": "0 0 #0000"
 };
 
@@ -187,6 +187,12 @@ const theme = {
   maxHeight,
   minWidth: maxWidth,
   minHeight: maxHeight,
+  inlineSize: width,
+  blockSize: height,
+  maxInlineSize: maxWidth,
+  maxBlockSize: maxHeight,
+  minInlineSize: maxWidth,
+  minBlockSize: maxHeight,
   colors: colors.colors,
   fontFamily,
   fontSize,

package/dist/chunks/default.mjs

@@ -69,12 +69,12 @@ const textStrokeWidth = {
   lg: "thick"
 };
 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%), 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"
+  DEFAULT: ["0 0 1px rgba(0,0,0,0.2)", "0 0 1px rgba(1,0,5,0.1)"],
+  sm: "1px 1px 3px rgba(36,37,47,0.25)",
+  md: ["0 1px 2px rgba(30,29,39,0.19)", "1px 2px 4px rgba(54,64,147,0.18)"],
+  lg: ["3px 3px 6px rgba(0,0,0,0.26)", "0 0 5px rgba(15,3,86,0.22)"],
+  xl: ["1px 1px 3px rgba(0,0,0,0.29)", "2px 4px 7px rgba(73,64,125,0.35)"],
+  none: "0 0 #0000"
 };
 const lineHeight = {
   none: "1",
@@ -113,13 +113,13 @@ 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 -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 -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.05)",
+  "DEFAULT": ["var(--un-shadow-inset) 0 1px 3px 0 rgba(0,0,0,0.1)", "var(--un-shadow-inset) 0 1px 2px -1px rgba(0,0,0,0.1)"],
+  "sm": "var(--un-shadow-inset) 0 1px 2px 0 rgba(0,0,0,0.05)",
+  "md": ["var(--un-shadow-inset) 0 4px 6px -1px rgba(0,0,0,0.1)", "var(--un-shadow-inset) 0 2px 4px -2px rgba(0,0,0,0.1)"],
+  "lg": ["var(--un-shadow-inset) 0 10px 15px -3px rgba(0,0,0,0.1)", "var(--un-shadow-inset) 0 4px 6px -4px rgba(0,0,0,0.1)"],
+  "xl": ["var(--un-shadow-inset) 0 20px 25px -5px rgba(0,0,0,0.1)", "var(--un-shadow-inset) 0 8px 10px -6px rgba(0,0,0,0.1)"],
+  "2xl": "var(--un-shadow-inset) 0 25px 50px -12px rgba(0,0,0,0.25)",
+  "inner": "inset 0 2px 4px 0 rgba(0,0,0,0.05)",
   "none": "0 0 #0000"
 };
 
@@ -134,12 +134,12 @@ const blur = {
   "3xl": "64px"
 };
 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)",
-  "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)"],
-  "2xl": "0 25px 25px rgba(0, 0, 0, 0.15)",
+  "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)",
+  "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)"],
+  "2xl": "0 25px 25px rgba(0,0,0,0.15)",
   "none": "0 0 #0000"
 };
 
@@ -185,6 +185,12 @@ const theme = {
   maxHeight,
   minWidth: maxWidth,
   minHeight: maxHeight,
+  inlineSize: width,
+  blockSize: height,
+  maxInlineSize: maxWidth,
+  maxBlockSize: maxHeight,
+  minInlineSize: maxWidth,
+  minBlockSize: maxHeight,
   colors,
   fontFamily,
   fontSize,

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",
@@ -33,27 +32,42 @@ 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.auto.global(p) })]
+  [/^will-change-(.+)/, ([, p]) => ({ "will-change": willChangeProperty(p) })]
 ];
 
 const borders = [
   [/^(?:border|b)()(?:-(.+))?$/, handlerBorder],
   [/^(?:border|b)-([xy])(?:-(.+))?$/, handlerBorder],
   [/^(?:border|b)-([rltbse])(?:-(.+))?$/, handlerBorder],
-  [/^(?:border|b)-()size-(.+)$/, handlerBorderSize],
-  [/^(?:border|b)-([xy])-size-(.+)$/, handlerBorderSize],
-  [/^(?:border|b)-([rltbse])-size-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-(block|inline)(?:-(.+))?$/, handlerBorder],
+  [/^(?:border|b)-([bi][se])(?:-(.+))?$/, handlerBorder],
+  [/^(?:border|b)-()(?:width|size)-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-([xy])-(?:width|size)-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-([rltbse])-(?:width|size)-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-(block|inline)-(?:width|size)-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-([bi][se])-(?:width|size)-(.+)$/, handlerBorderSize],
   [/^(?:border|b)-()(?:color-)?(.+)$/, handlerBorderColor],
   [/^(?:border|b)-([xy])-(?:color-)?(.+)$/, handlerBorderColor],
   [/^(?:border|b)-([rltbse])-(?:color-)?(.+)$/, handlerBorderColor],
+  [/^(?:border|b)-(block|inline)-(?:color-)?(.+)$/, handlerBorderColor],
+  [/^(?:border|b)-([bi][se])-(?:color-)?(.+)$/, handlerBorderColor],
   [/^(?:border|b)-()op(?:acity)?-?(.+)$/, handlerBorderOpacity],
   [/^(?:border|b)-([xy])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
   [/^(?:border|b)-([rltbse])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
+  [/^(?:border|b)-(block|inline)-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
+  [/^(?:border|b)-([bi][se])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
   [/^(?:border-)?(?:rounded|rd)()(?:-(.+))?$/, handlerRounded],
-  [/^(?:border-)?(?:rounded|rd)-([xy])(?:-(.+))?$/, handlerRounded],
   [/^(?:border-)?(?:rounded|rd)-([rltb])(?:-(.+))?$/, handlerRounded],
   [/^(?:border-)?(?:rounded|rd)-([rltb]{2})(?:-(.+))?$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)-([bi][se])(?:-(.+))?$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)-([bi][se]-[bi][se])(?:-(.+))?$/, handlerRounded],
   ["border-solid", { "border-style": "solid" }],
   ["border-dashed", { "border-style": "dashed" }],
   ["border-dotted", { "border-style": "dotted" }],
@@ -210,17 +224,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) })],
@@ -249,7 +261,29 @@ const textStrokes = [
   [/^text-stroke-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-text-stroke-opacity": utilities.handler.bracket.percent(opacity) })]
 ];
 const textShadows = [
-  [/^text-shadow(?:-(.+))?$/, ([, s], { theme }) => ({ "text-shadow": theme.textShadow?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar(s) })]
+  [/^text-shadow(?:-(.+))?$/, ([, s], { theme }) => {
+    const v = theme.textShadow?.[s || "DEFAULT"];
+    if (v != null) {
+      const shadow = core.toArray(v);
+      const colored = shadow.map((s2) => s2.replace(/\s\S+$/, " var(--un-text-shadow-color)"));
+      return {
+        "--un-text-shadow": shadow.join(","),
+        "--un-text-shadow-colored": colored.join(","),
+        "text-shadow": "var(--un-text-shadow)"
+      };
+    }
+    return { "text-shadow": utilities.handler.bracket.cssvar(s) };
+  }],
+  [/^text-shadow-color-(.+)$/, (m, ctx) => {
+    const color = utilities.colorResolver("--un-text-shadow-color", "text-shadow")(m, ctx);
+    if (color) {
+      return {
+        ...color,
+        "--un-text-shadow": "var(--un-text-shadow-colored)"
+      };
+    }
+  }],
+  [/^text-shadow-color-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-text-shadow-opacity": utilities.handler.bracket.percent(opacity) })]
 ];
 
 const directions = {
@@ -385,16 +419,18 @@ const placements = [
   ["place-self-stretch", { "place-self": "stretch" }]
 ];
 function handleInsetValue(v) {
-  return { auto: "auto", full: "100%" }[v] ?? utilities.handler.bracket.fraction.cssvar.auto.rem(v);
+  return utilities.handler.bracket.fraction.cssvar.auto.rem(v);
 }
 function handleInsetValues([, d, v]) {
   const r = handleInsetValue(v);
-  if (r != null && d in utilities.directionMap)
-    return utilities.directionMap[d].map((i) => [i.slice(1), r]);
+  if (r != null && d in utilities.insetMap)
+    return utilities.insetMap[d].map((i) => [i.slice(1), r]);
 }
 const insets = [
   [/^(?:position-|pos-)?inset-(.+)$/, ([, v]) => ({ inset: handleInsetValue(v) })],
   [/^(?:position-|pos-)?inset-([xy])-(.+)$/, handleInsetValues],
+  [/^(?:position-|pos-)?inset-(block|inline)-(.+)$/, handleInsetValues],
+  [/^(?:position-|pos-)?inset-([bi][se])-(.+)$/, handleInsetValues],
   [/^(?:position-|pos-)?(top|left|right|bottom)-(.+)$/, ([, d, v]) => ({ [d]: handleInsetValue(v) })]
 ];
 const floats = [
@@ -454,7 +490,8 @@ 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" }],
@@ -489,19 +526,62 @@ const fontSmoothings = [
   }]
 ];
 
+const shadowBase = {
+  [core.CONTROL_SHORTCUT_NO_MERGE]: "",
+  "--un-ring-offset-shadow": "0 0 #0000",
+  "--un-ring-shadow": "0 0 #0000",
+  "--un-shadow-inset": varEmpty,
+  "--un-shadow": "0 0 #0000",
+  "--un-shadow-colored": "0 0 #0000"
+};
+const boxShadows = [
+  [/^shadow(?:-(.+))?$/, ([, d], { theme }) => {
+    const v = theme.boxShadow?.[d || "DEFAULT"];
+    if (v) {
+      const shadow = core.toArray(v);
+      const colored = shadow.map((s) => s.replace(/\s\S+$/, " var(--un-shadow-color)"));
+      return [
+        shadowBase,
+        {
+          "--un-shadow": shadow.join(","),
+          "--un-shadow-colored": colored.join(","),
+          "box-shadow": "var(--un-ring-offset-shadow, 0 0 #0000), var(--un-ring-shadow, 0 0 #0000), var(--un-shadow)"
+        }
+      ];
+    }
+  }],
+  [/^shadow-(.+)$/, (m, ctx) => {
+    const color = utilities.colorResolver("--un-shadow-color", "shadow")(m, ctx);
+    if (color) {
+      return {
+        ...color,
+        "--un-shadow": "var(--un-shadow-colored)"
+      };
+    }
+  }],
+  [/^shadow-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-shadow-opacity": utilities.handler.bracket.percent.cssvar(opacity) })],
+  ["shadow-inset", { "--un-shadow-inset": "inset" }]
+];
+
+const ringBase = {
+  "--un-ring-inset": varEmpty,
+  "--un-ring-offset-width": "0px",
+  "--un-ring-offset-color": "#fff",
+  "--un-ring-color": "rgba(147,197,253,0.5)",
+  ...shadowBase
+};
 const rings = [
   [/^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(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)"
-      };
+      return [
+        ringBase,
+        {
+          "--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)"
+        }
+      ];
     }
   }],
   ["ring-offset", { "--un-ring-offset-width": "1px" }],
@@ -513,46 +593,17 @@ const rings = [
   ["ring-inset", { "--un-ring-inset": "inset" }]
 ];
 
-const shadowColorResolver = (body, theme) => {
-  const data = utilities.parseColor(body, theme);
-  if (!data)
-    return;
-  const { color, rgba } = data;
-  if (!color)
-    return;
-  if (rgba) {
-    return {
-      "--un-shadow-color": `${rgba.slice(0, 3).join(",")}`
-    };
-  } else {
-    return {
-      "--un-shadow-color": color
-    };
-  }
+const sizeMapping = {
+  h: "height",
+  w: "width",
+  inline: "inline-size",
+  block: "block-size"
 };
-const boxShadows = [
-  [/^shadow(?:-(.+))?$/, ([, d], { theme }) => {
-    const value = theme.boxShadow?.[d || "DEFAULT"];
-    if (value) {
-      return {
-        "--un-shadow-inset": varEmpty,
-        "--un-shadow-color": "0,0,0",
-        "--un-shadow": value,
-        "box-shadow": "var(--un-ring-offset-shadow, 0 0 #0000), var(--un-ring-shadow, 0 0 #0000), var(--un-shadow)"
-      };
-    }
-  }],
-  [/^shadow-(.+)$/, ([, d], { theme }) => shadowColorResolver(d, theme)],
-  ["shadow-inset", { "--un-shadow-inset": "inset" }]
-];
-
 function getPropName(minmax, hw) {
-  return `${minmax ? `${minmax}-` : ""}${hw === "h" ? "height" : "width"}`;
+  return `${minmax || ""}${sizeMapping[hw]}`;
 }
 function getSizeValue(minmax, hw, theme, prop) {
-  let str = `${hw === "h" ? "height" : "width"}`;
-  if (minmax)
-    str = `${minmax}${utilities.capitalize(str)}`;
+  const str = getPropName(minmax, hw).replace(/-(\w)/g, (_, p) => p.toUpperCase());
   const v = theme[str]?.[prop];
   if (v != null)
     return v;
@@ -565,8 +616,9 @@ function getSizeValue(minmax, hw, theme, prop) {
   return utilities.handler.bracket.cssvar.fraction.auto.rem(prop);
 }
 const sizes = [
-  [/^(?:(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] })]
+  [/^(min-|max-)?([wh])-(.+)$/, ([, m, w, s], { theme }) => ({ [getPropName(m, w)]: getSizeValue(m, w, theme, s) })],
+  [/^(min-|max-)?(block|inline)-(.+)$/, ([, 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))
@@ -586,24 +638,53 @@ const aspectRatio = [
 const paddings = [
   [/^pa?()-?(-?.+)$/, utilities.directionSize("padding")],
   [/^p-?([xy])-?(-?.+)$/, utilities.directionSize("padding")],
-  [/^p-?([rltbse])-?(-?.+)$/, utilities.directionSize("padding")]
+  [/^p-?([rltbse])-?(-?.+)$/, utilities.directionSize("padding")],
+  [/^p-(inline|block)-(-?.+)$/, utilities.directionSize("padding")],
+  [/^p-?([bi][se])-?(-?.+)$/, utilities.directionSize("padding")]
 ];
 const margins = [
   [/^ma?()-?(-?.+)$/, utilities.directionSize("margin")],
   [/^m-?([xy])-?(-?.+)$/, utilities.directionSize("margin")],
-  [/^m-?([rltbse])-?(-?.+)$/, utilities.directionSize("margin")]
+  [/^m-?([rltbse])-?(-?.+)$/, utilities.directionSize("margin")],
+  [/^m-(inline|block)-(-?.+)$/, utilities.directionSize("margin")],
+  [/^m-?([bi][se])-?(-?.+)$/, utilities.directionSize("margin")]
 ];
 
 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": [
+    "translate3d(var(--un-translate-x), var(--un-translate-y), var(--un-translate-z))",
+    "rotate(var(--un-rotate))",
+    "rotateX(var(--un-rotate-x))",
+    "rotateY(var(--un-rotate-y))",
+    "rotateZ(var(--un-rotate-z))",
+    "skewX(var(--un-skew-x))",
+    "skewY(var(--un-skew-y))",
+    "scaleX(var(--un-scale-x))",
+    "scaleY(var(--un-scale-y))",
+    "scaleZ(var(--un-scale-z))"
+  ].join(" ")
 };
 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": [
+    "translateX(var(--un-translate-x))",
+    "translateY(var(--un-translate-y))",
+    "translateZ(var(--un-translate-z))",
+    "rotate(var(--un-rotate))",
+    "rotateX(var(--un-rotate-x))",
+    "rotateY(var(--un-rotate-y))",
+    "rotateZ(var(--un-rotate-z))",
+    "skewX(var(--un-skew-x))",
+    "skewY(var(--un-skew-y))",
+    "scaleX(var(--un-scale-x))",
+    "scaleY(var(--un-scale-y))",
+    "scaleZ(var(--un-scale-z))"
+  ].join(" ")
 };
 const transformBase = {
   "--un-rotate": 0,
+  "--un-rotate-x": 0,
+  "--un-rotate-y": 0,
+  "--un-rotate-z": 0,
   "--un-scale-x": 1,
   "--un-scale-y": 1,
   "--un-scale-z": 1,
@@ -612,20 +693,43 @@ 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],
   [/^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],
-  [/^rotate-(.+)$/, handleRotate],
+  [/^rotate-()(.+)$/, handleRotate],
+  [/^rotate(-[xyz])-(.+)$/, handleRotate],
   [/^skew-()(.+)$/, handleSkew],
   [/^skew-([xy])-(.+)$/, handleSkew],
   [/^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" }]
@@ -635,7 +739,10 @@ function handleTranslate([, d, 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)"]
+      ]
     ];
   }
 }
@@ -644,16 +751,22 @@ function handleScale([, d, b]) {
   if (v != null) {
     return [
       transformBase,
-      utilities.xyzMap[d].map((i) => [`--un-scale${i}`, v])
+      [
+        ...utilities.xyzMap[d].map((i) => [`--un-scale${i}`, v]),
+        ["transform", "var(--un-transform)"]
+      ]
     ];
   }
 }
-function handleRotate([, b]) {
+function handleRotate([, d, b]) {
   const v = utilities.handler.bracket.degree(b);
   if (v != null) {
     return [
       transformBase,
-      { "--un-rotate": v }
+      {
+        [`--un-rotate${d || ""}`]: v,
+        transform: "var(--un-transform)"
+      }
     ];
   }
 }
@@ -662,7 +775,10 @@ function handleSkew([, d, b]) {
   if (v != null) {
     return [
       transformBase,
-      { [`--un-skew-${d}`]: v }
+      {
+        [`--un-skew-${d}`]: v,
+        transform: "var(--un-transform)"
+      }
     ];
   }
 }
@@ -698,6 +814,9 @@ const cssVariables = [
       return { [prop]: `var(--${varname})` };
   }]
 ];
+const cssProperty = [
+  [/^\[(.+):(.+)\]$/, ([, prop, value]) => ({ [prop]: utilities.handler.bracket(`[${value}]`) })]
+];
 
 const questionMark = [
   [
@@ -738,14 +857,25 @@ const svgUtilities = [
   [/^fill-(.+)$/, utilities.colorResolver("fill", "fill")],
   [/^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-(?:width-|size-)?(.+)$/, ([, 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" }]
 ];
 
 const rules = [
   cssVariables,
+  cssProperty,
   paddings,
   margins,
   displays,
@@ -810,6 +940,7 @@ exports.boxShadows = boxShadows;
 exports.boxSizing = boxSizing;
 exports.breaks = breaks;
 exports.contents = contents;
+exports.cssProperty = cssProperty;
 exports.cssVariables = cssVariables;
 exports.cursors = cursors;
 exports.displays = displays;
@@ -835,6 +966,7 @@ exports.questionMark = questionMark;
 exports.resizes = resizes;
 exports.rings = rings;
 exports.rules = rules;
+exports.shadowBase = shadowBase;
 exports.sizes = sizes;
 exports.svgUtilities = svgUtilities;
 exports.tabSizes = tabSizes;