@unocss/preset-uno 0.11.3 → 0.11.4

package/dist/{chunk-GP4COTTP.js → chunk-IUVZVO7H.js}

@@ -18,8 +18,11 @@ var variantBreakpoints = (matcher, _, theme) => {
       direction = "max";
       order = -order;
     }
+    const m = matcher.slice(pre.length);
+    if (m === "container")
+      continue;
     return {
-      matcher: matcher.slice(pre.length),
+      matcher: m,
       parent: [`@media (${direction}-width: ${size})`, order]
     };
   }

package/dist/{chunk-VL3EBQ6W.js → chunk-PCPK4ZRF.js}

@@ -243,6 +243,43 @@ function handlerRounded([, a, b], { theme }) {
     return _chunkPVS5EBXXjs.cornerMap[d].map((i) => [`border${i}-radius`, v]);
 }
 
+// src/rules/container.ts
+
+var queryMatcher = /@media \(min-width: (.+)\)/;
+var container = [
+  [
+    /^__container$/,
+    (m, { variantHandlers }) => {
+      var _a;
+      let width = "100%";
+      for (const v of variantHandlers) {
+        const query = _core.toArray.call(void 0, v.parent || [])[0];
+        if (typeof query === "string") {
+          const match = (_a = query.match(queryMatcher)) == null ? void 0 : _a[1];
+          if (match)
+            width = match;
+        }
+      }
+      return { "max-width": width };
+    },
+    { internal: true }
+  ]
+];
+var containerShortcuts = [
+  [/^(?:(\w+)[:-])?container$/, ([, bp], { theme }) => {
+    let points = Object.keys(theme.breakpoints || {});
+    if (bp) {
+      if (!points.includes(bp))
+        return;
+      points = points.slice(points.indexOf(bp));
+    }
+    const shortcuts = points.map((p) => `${p}:__container`);
+    if (!bp)
+      shortcuts.unshift("__container");
+    return shortcuts;
+  }]
+];
+
 // src/rules/background.ts
 var colorResolver2 = (mode) => ([, body], { theme }) => {
   const data = parseColorUtil(body, theme);
@@ -610,7 +647,6 @@ var calSize = (s, theme) => {
   var _a;
   return _core.toArray.call(void 0, ((_a = theme.fontSize) == null ? void 0 : _a[s]) || _chunkPVS5EBXXjs.handler.bracket.rem(s))[0];
 };
-var isNumber = (s) => !isNaN(Number(s));
 var autoDirection = (selector, theme) => {
   if (selector === "min")
     return "min-content";
@@ -627,36 +663,29 @@ var grids = [
   [/^grid-rows-(\d+)$/, ([, d]) => ({ "grid-template-rows": `repeat(${d},minmax(0,1fr))` })],
   [/^grid-cols-\[(.+)\]$/, ([, v]) => ({ "grid-template-columns": v.replace(/,/g, " ") })],
   [/^grid-rows-\[(.+)\]$/, ([, v]) => ({ "grid-template-rows": v.replace(/,/g, " ") })],
-  [/^(?:grid-)?auto-flow-(.+)$/, ([, v]) => ({ "grid-auto-flow": `${v.replace("col", "column").split("-").join(" ")}` })],
-  [/^(?:grid-)?row-start-(.+)$/, ([, v]) => ({ "grid-row-start": `${v}` })],
-  [/^(?:grid-)?row-end-(.+)$/, ([, v]) => ({ "grid-row-end": `${v}` })],
-  [/^(?:grid-)?col-start-(.+)$/, ([, v]) => ({ "grid-column-start": `${v}` })],
-  [/^(?:grid-)?col-end-(.+)$/, ([, v]) => ({ "grid-column-end": `${v}` })],
-  [/^(?:grid-)?auto-rows-(.+)$/, ([, v], { theme }) => ({ "grid-auto-rows": `${autoDirection(v, theme)}` })],
-  [/^(?:grid-)?auto-cols-(.+)$/, ([, v], { theme }) => ({ "grid-auto-columns": `${autoDirection(v, theme)}` })],
-  [/^(?:grid-)?row-((?!(start)|(end)).+)$/, ([, v]) => {
-    const shortArr = v.split("-");
-    if (shortArr[0] === "span") {
-      if (shortArr[1] === "full") {
-        return {
-          "grid-row": "1/-1"
-        };
-      }
-      return isNumber(shortArr[1]) ? { "grid-row": `span ${shortArr[1]}/span ${shortArr[1]}` } : void 0;
-    }
-    return { "grid-row": v.split("-").join(" ") };
-  }],
-  [/^(?:grid-)?col-((?!(start)|(end)).+)$/, ([, v]) => {
-    const shortArr = v.split("-");
-    if (shortArr[0] === "span") {
-      if (shortArr[1] === "full") {
-        return {
-          "grid-column": "1 / -1"
-        };
-      }
-      return isNumber(shortArr[1]) ? { "grid-column": `span ${shortArr[1]}/span ${shortArr[1]}` } : void 0;
+  [/^(?:grid-)?auto-flow-([\w.-]+)$/, ([, v]) => ({ "grid-auto-flow": `${v.replace("col", "column").split("-").join(" ")}` })],
+  [/^(?:grid-)?row-start-([\w.-]+)$/, ([, v]) => ({ "grid-row-start": `${v}` })],
+  [/^(?:grid-)?row-end-([\w.-]+)$/, ([, v]) => ({ "grid-row-end": `${v}` })],
+  [/^(?:grid-)?col-start-([\w.-]+)$/, ([, v]) => ({ "grid-column-start": `${v}` })],
+  [/^(?:grid-)?col-end-([\w.]+)$/, ([, v]) => ({ "grid-column-end": `${v}` })],
+  [/^(?:grid-)?auto-rows-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-rows": `${autoDirection(v, theme)}` })],
+  [/^(?:grid-)?auto-cols-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-columns": `${autoDirection(v, theme)}` })],
+  [/^(?:grid-)?(row|col)-(.+)$/, ([, d, v]) => {
+    var _a;
+    const key = d === "row" ? "grid-row" : "grid-column";
+    let raw = _chunkPVS5EBXXjs.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 = (_a = _chunkPVS5EBXXjs.handler.number.bracket(parts[1])) == null ? void 0 : _a.toString().replace(/_/g, " ");
+      if (raw)
+        return { [key]: `span ${raw}/span ${raw}` };
     }
-    return { "grid-column": v.split("-").join(" ") };
   }]
 ];
 
@@ -1510,6 +1539,7 @@ var rules = [
   margins,
   lineClamps,
   isolations,
+  container,
   displays,
   opacity,
   bgAttachments,
@@ -1600,4 +1630,5 @@ var rules = [
 
 
 
-exports.rules = rules;
+
+exports.containerShortcuts = containerShortcuts; exports.rules = rules;

package/dist/{chunk-TBH55H4M.mjs → chunk-UOXINKKW.mjs}

@@ -243,6 +243,43 @@ function handlerRounded([, a, b], { theme }) {
     return cornerMap[d].map((i) => [`border${i}-radius`, v]);
 }
 
+// src/rules/container.ts
+import { toArray } from "@unocss/core";
+var queryMatcher = /@media \(min-width: (.+)\)/;
+var container = [
+  [
+    /^__container$/,
+    (m, { variantHandlers }) => {
+      var _a;
+      let width = "100%";
+      for (const v of variantHandlers) {
+        const query = toArray(v.parent || [])[0];
+        if (typeof query === "string") {
+          const match = (_a = query.match(queryMatcher)) == null ? void 0 : _a[1];
+          if (match)
+            width = match;
+        }
+      }
+      return { "max-width": width };
+    },
+    { internal: true }
+  ]
+];
+var containerShortcuts = [
+  [/^(?:(\w+)[:-])?container$/, ([, bp], { theme }) => {
+    let points = Object.keys(theme.breakpoints || {});
+    if (bp) {
+      if (!points.includes(bp))
+        return;
+      points = points.slice(points.indexOf(bp));
+    }
+    const shortcuts = points.map((p) => `${p}:__container`);
+    if (!bp)
+      shortcuts.unshift("__container");
+    return shortcuts;
+  }]
+];
+
 // src/rules/background.ts
 var colorResolver2 = (mode) => ([, body], { theme }) => {
   const data = parseColorUtil(body, theme);
@@ -372,7 +409,7 @@ var bgSizes = [
 ];
 
 // src/rules/filters.ts
-import { toArray } from "@unocss/core";
+import { toArray as toArray2 } from "@unocss/core";
 var varEmpty = "var(--un-empty,/*!*/ /*!*/)";
 var percentWithDefault = (defaultValue = "1") => (str) => {
   const v = str ? handler.bracket.percent(str) : defaultValue;
@@ -427,7 +464,7 @@ var filters = [
     var _a;
     const v = handler.bracket(s) || ((_a = theme.dropShadow) == null ? void 0 : _a[s || "DEFAULT"]);
     if (v)
-      return toArray(v).map((v2) => `drop-shadow(${v2})`).join(" ");
+      return toArray2(v).map((v2) => `drop-shadow(${v2})`).join(" ");
   })],
   [/^(backdrop-)?grayscale(?:-(\d+))?$/, toFilter("grayscale", percentWithDefault())],
   [/^(backdrop-)?hue-rotate-(\d+)$/, toFilter("hue-rotate", (s) => `${handler.bracket.number(s)}deg`)],
@@ -460,7 +497,7 @@ var flex = [
 ];
 
 // src/rules/typography.ts
-import { toArray as toArray2 } from "@unocss/core";
+import { toArray as toArray3 } from "@unocss/core";
 var fontsFamilies = [
   [/^font-(\w+)$/, ([, d], { theme }) => {
     var _a;
@@ -486,7 +523,7 @@ var weightMap = {
 var fontSizes = [
   [/^text-([^-]+)$/, ([, s = "base"], { theme }) => {
     var _a;
-    const result = toArray2(((_a = theme.fontSize) == null ? void 0 : _a[s]) || handler.bracket.rem(s));
+    const result = toArray3(((_a = theme.fontSize) == null ? void 0 : _a[s]) || handler.bracket.rem(s));
     if (result == null ? void 0 : result[0]) {
       const [size, height = "1"] = result;
       return {
@@ -605,12 +642,11 @@ var gaps = [
 ];
 
 // src/rules/grid.ts
-import { toArray as toArray3 } from "@unocss/core";
+import { toArray as toArray4 } from "@unocss/core";
 var calSize = (s, theme) => {
   var _a;
-  return toArray3(((_a = theme.fontSize) == null ? void 0 : _a[s]) || handler.bracket.rem(s))[0];
+  return toArray4(((_a = theme.fontSize) == null ? void 0 : _a[s]) || handler.bracket.rem(s))[0];
 };
-var isNumber = (s) => !isNaN(Number(s));
 var autoDirection = (selector, theme) => {
   if (selector === "min")
     return "min-content";
@@ -627,36 +663,29 @@ var grids = [
   [/^grid-rows-(\d+)$/, ([, d]) => ({ "grid-template-rows": `repeat(${d},minmax(0,1fr))` })],
   [/^grid-cols-\[(.+)\]$/, ([, v]) => ({ "grid-template-columns": v.replace(/,/g, " ") })],
   [/^grid-rows-\[(.+)\]$/, ([, v]) => ({ "grid-template-rows": v.replace(/,/g, " ") })],
-  [/^(?:grid-)?auto-flow-(.+)$/, ([, v]) => ({ "grid-auto-flow": `${v.replace("col", "column").split("-").join(" ")}` })],
-  [/^(?:grid-)?row-start-(.+)$/, ([, v]) => ({ "grid-row-start": `${v}` })],
-  [/^(?:grid-)?row-end-(.+)$/, ([, v]) => ({ "grid-row-end": `${v}` })],
-  [/^(?:grid-)?col-start-(.+)$/, ([, v]) => ({ "grid-column-start": `${v}` })],
-  [/^(?:grid-)?col-end-(.+)$/, ([, v]) => ({ "grid-column-end": `${v}` })],
-  [/^(?:grid-)?auto-rows-(.+)$/, ([, v], { theme }) => ({ "grid-auto-rows": `${autoDirection(v, theme)}` })],
-  [/^(?:grid-)?auto-cols-(.+)$/, ([, v], { theme }) => ({ "grid-auto-columns": `${autoDirection(v, theme)}` })],
-  [/^(?:grid-)?row-((?!(start)|(end)).+)$/, ([, v]) => {
-    const shortArr = v.split("-");
-    if (shortArr[0] === "span") {
-      if (shortArr[1] === "full") {
-        return {
-          "grid-row": "1/-1"
-        };
-      }
-      return isNumber(shortArr[1]) ? { "grid-row": `span ${shortArr[1]}/span ${shortArr[1]}` } : void 0;
-    }
-    return { "grid-row": v.split("-").join(" ") };
-  }],
-  [/^(?:grid-)?col-((?!(start)|(end)).+)$/, ([, v]) => {
-    const shortArr = v.split("-");
-    if (shortArr[0] === "span") {
-      if (shortArr[1] === "full") {
-        return {
-          "grid-column": "1 / -1"
-        };
-      }
-      return isNumber(shortArr[1]) ? { "grid-column": `span ${shortArr[1]}/span ${shortArr[1]}` } : void 0;
+  [/^(?:grid-)?auto-flow-([\w.-]+)$/, ([, v]) => ({ "grid-auto-flow": `${v.replace("col", "column").split("-").join(" ")}` })],
+  [/^(?:grid-)?row-start-([\w.-]+)$/, ([, v]) => ({ "grid-row-start": `${v}` })],
+  [/^(?:grid-)?row-end-([\w.-]+)$/, ([, v]) => ({ "grid-row-end": `${v}` })],
+  [/^(?:grid-)?col-start-([\w.-]+)$/, ([, v]) => ({ "grid-column-start": `${v}` })],
+  [/^(?:grid-)?col-end-([\w.]+)$/, ([, v]) => ({ "grid-column-end": `${v}` })],
+  [/^(?:grid-)?auto-rows-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-rows": `${autoDirection(v, theme)}` })],
+  [/^(?:grid-)?auto-cols-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-columns": `${autoDirection(v, theme)}` })],
+  [/^(?:grid-)?(row|col)-(.+)$/, ([, d, v]) => {
+    var _a;
+    const key = d === "row" ? "grid-row" : "grid-column";
+    let raw = 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 = (_a = handler.number.bracket(parts[1])) == null ? void 0 : _a.toString().replace(/_/g, " ");
+      if (raw)
+        return { [key]: `span ${raw}/span ${raw}` };
     }
-    return { "grid-column": v.split("-").join(" ") };
   }]
 ];
 
@@ -1510,6 +1539,7 @@ var rules = [
   margins,
   lineClamps,
   isolations,
+  container,
   displays,
   opacity,
   bgAttachments,
@@ -1599,5 +1629,6 @@ var rules = [
 ].flat(1);
 
 export {
+  containerShortcuts,
   rules
 };

package/dist/{chunk-27BCQBR5.mjs → chunk-Y2XBOS65.mjs}

@@ -18,8 +18,11 @@ var variantBreakpoints = (matcher, _, theme) => {
       direction = "max";
       order = -order;
     }
+    const m = matcher.slice(pre.length);
+    if (m === "container")
+      continue;
     return {
-      matcher: matcher.slice(pre.length),
+      matcher: m,
       parent: [`@media (${direction}-width: ${size})`, order]
     };
   }

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkVL3EBQ6Wjs = require('./chunk-VL3EBQ6W.js');
+
+var _chunkPCPK4ZRFjs = require('./chunk-PCPK4ZRF.js');
 
 
 
@@ -9,7 +10,7 @@ var _chunkR5JSOZOBjs = require('./chunk-R5JSOZOB.js');
 
 
 
-var _chunkGP4COTTPjs = require('./chunk-GP4COTTP.js');
+var _chunkIUVZVO7Hjs = require('./chunk-IUVZVO7H.js');
 require('./chunk-PVS5EBXX.js');
 require('./chunk-Y6EUTGDC.js');
 
@@ -17,10 +18,13 @@ require('./chunk-Y6EUTGDC.js');
 var preset = (options = {}) => ({
   name: "@unocss/preset-uno",
   theme: _chunkR5JSOZOBjs.theme,
-  rules: _chunkVL3EBQ6Wjs.rules,
+  rules: _chunkPCPK4ZRFjs.rules,
   variants: [
-    ..._chunkGP4COTTPjs.variants,
-    ...options.dark === "media" ? _chunkGP4COTTPjs.variantColorsMedia : _chunkGP4COTTPjs.variantColorsClass
+    ..._chunkIUVZVO7Hjs.variants,
+    ...options.dark === "media" ? _chunkIUVZVO7Hjs.variantColorsMedia : _chunkIUVZVO7Hjs.variantColorsClass
+  ],
+  shortcuts: [
+    ..._chunkPCPK4ZRFjs.containerShortcuts
   ]
 });
 var src_default = preset;

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import {
+  containerShortcuts,
   rules
-} from "./chunk-TBH55H4M.mjs";
+} from "./chunk-UOXINKKW.mjs";
 import {
   colors,
   theme
@@ -9,7 +10,7 @@ import {
   variantColorsClass,
   variantColorsMedia,
   variants
-} from "./chunk-27BCQBR5.mjs";
+} from "./chunk-Y2XBOS65.mjs";
 import "./chunk-FOQKHXUZ.mjs";
 import "./chunk-5SH5BFJ4.mjs";
 
@@ -21,6 +22,9 @@ var preset = (options = {}) => ({
   variants: [
     ...variants,
     ...options.dark === "media" ? variantColorsMedia : variantColorsClass
+  ],
+  shortcuts: [
+    ...containerShortcuts
   ]
 });
 var src_default = preset;

package/dist/rules.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkVL3EBQ6Wjs = require('./chunk-VL3EBQ6W.js');
+var _chunkPCPK4ZRFjs = require('./chunk-PCPK4ZRF.js');
 require('./chunk-PVS5EBXX.js');
 require('./chunk-Y6EUTGDC.js');
 
 
-exports.rules = _chunkVL3EBQ6Wjs.rules;
+exports.rules = _chunkPCPK4ZRFjs.rules;

package/dist/rules.mjs

@@ -1,6 +1,6 @@
 import {
   rules
-} from "./chunk-TBH55H4M.mjs";
+} from "./chunk-UOXINKKW.mjs";
 import "./chunk-FOQKHXUZ.mjs";
 import "./chunk-5SH5BFJ4.mjs";
 export {

package/dist/variants.js

@@ -10,7 +10,7 @@
 
 
 
-var _chunkGP4COTTPjs = require('./chunk-GP4COTTP.js');
+var _chunkIUVZVO7Hjs = require('./chunk-IUVZVO7H.js');
 require('./chunk-PVS5EBXX.js');
 require('./chunk-Y6EUTGDC.js');
 
@@ -25,4 +25,4 @@ require('./chunk-Y6EUTGDC.js');
 
 
 
-exports.PseudoClasses = _chunkGP4COTTPjs.PseudoClasses; exports.variantBreakpoints = _chunkGP4COTTPjs.variantBreakpoints; exports.variantChildren = _chunkGP4COTTPjs.variantChildren; exports.variantColorsClass = _chunkGP4COTTPjs.variantColorsClass; exports.variantColorsMedia = _chunkGP4COTTPjs.variantColorsMedia; exports.variantImportant = _chunkGP4COTTPjs.variantImportant; exports.variantNegative = _chunkGP4COTTPjs.variantNegative; exports.variantPseudoClasses = _chunkGP4COTTPjs.variantPseudoClasses; exports.variantPseudoElements = _chunkGP4COTTPjs.variantPseudoElements; exports.variantSpace = _chunkGP4COTTPjs.variantSpace; exports.variants = _chunkGP4COTTPjs.variants;
+exports.PseudoClasses = _chunkIUVZVO7Hjs.PseudoClasses; exports.variantBreakpoints = _chunkIUVZVO7Hjs.variantBreakpoints; exports.variantChildren = _chunkIUVZVO7Hjs.variantChildren; exports.variantColorsClass = _chunkIUVZVO7Hjs.variantColorsClass; exports.variantColorsMedia = _chunkIUVZVO7Hjs.variantColorsMedia; exports.variantImportant = _chunkIUVZVO7Hjs.variantImportant; exports.variantNegative = _chunkIUVZVO7Hjs.variantNegative; exports.variantPseudoClasses = _chunkIUVZVO7Hjs.variantPseudoClasses; exports.variantPseudoElements = _chunkIUVZVO7Hjs.variantPseudoElements; exports.variantSpace = _chunkIUVZVO7Hjs.variantSpace; exports.variants = _chunkIUVZVO7Hjs.variants;

package/dist/variants.mjs

@@ -10,7 +10,7 @@ import {
   variantPseudoElements,
   variantSpace,
   variants
-} from "./chunk-27BCQBR5.mjs";
+} from "./chunk-Y2XBOS65.mjs";
 import "./chunk-FOQKHXUZ.mjs";
 import "./chunk-5SH5BFJ4.mjs";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-uno",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "The default preset for UnoCSS",
   "keywords": [
     "unocss",
@@ -45,7 +45,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.11.3"
+    "@unocss/core": "0.11.4"
   },
   "scripts": {
     "build": "tsup",