@unocss/preset-mini 0.27.5 → 0.28.1

package/README.md

@@ -13,8 +13,8 @@ import presetMini from '@unocss/preset-mini'
 
 Unocss({
   presets: [
-    presetMini()
-  ]
+    presetMini(),
+  ],
 })
 ```
 

package/dist/chunks/default2.cjs

@@ -180,11 +180,11 @@ const flex = [
   ["flex", { display: "flex" }],
   ["inline-flex", { display: "inline-flex" }],
   ["flex-inline", { display: "inline-flex" }],
+  [/^flex-(.*)$/, ([, d]) => ({ flex: utilities.handler.bracket(d) != null ? utilities.handler.bracket(d).split(" ").map((e) => utilities.handler.cssvar.fraction(e) ?? e).join(" ") : utilities.handler.cssvar.fraction(d) })],
   ["flex-1", { flex: "1 1 0%" }],
   ["flex-auto", { flex: "1 1 auto" }],
   ["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 })],
@@ -211,7 +211,7 @@ const weightMap = {
   black: "900"
 };
 const fonts = [
-  [/^font-(\w+)$/, ([, d], { theme }) => ({ "font-family": theme.fontFamily?.[d] })],
+  [/^font-(\w+)$/, ([, d], { theme }) => ({ "font-family": theme.fontFamily?.[d] || utilities.handler.global(d) })],
   [/^text-(.+)$/, ([, s = "base"], { theme }) => {
     const themed = core.toArray(theme.fontSize?.[s]);
     if (themed?.[0]) {
@@ -229,10 +229,10 @@ const fonts = [
     if (size != null)
       return { "font-size": size };
   }],
-  [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || utilities.handler.number(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) })]
+  [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || utilities.handler.global.number(s) })],
+  [/^(?:leading|lh)-(.+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || utilities.handler.bracket.cssvar.global.rem(s) })],
+  [/^tracking-(.+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || utilities.handler.bracket.cssvar.global.rem(s) })],
+  [/^word-spacing-(.+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || utilities.handler.bracket.cssvar.global.rem(s) })]
 ];
 const tabSizes = [
   [/^tab(?:-(.+))?$/, ([, s]) => {
@@ -247,7 +247,7 @@ const tabSizes = [
   }]
 ];
 const textIndents = [
-  [/^indent(?:-(.+))?$/, ([, s], { theme }) => ({ "text-indent": theme.textIndent?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.fraction.rem(s) })]
+  [/^indent(?:-(.+))?$/, ([, s], { theme }) => ({ "text-indent": theme.textIndent?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.global.fraction.rem(s) })]
 ];
 const textStrokes = [
   [/^text-stroke(?:-(.+))?$/, ([, s], { theme }) => ({ "-webkit-text-stroke-width": theme.textStrokeWidth?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.px(s) })],
@@ -781,7 +781,6 @@ const variablesAbbrMap = {
   break: "word-break",
   case: "text-transform",
   content: "align-content",
-  flex: "flex",
   fw: "font-weight",
   items: "align-items",
   justify: "justify-content",

package/dist/chunks/default2.mjs

@@ -178,11 +178,11 @@ const flex = [
   ["flex", { display: "flex" }],
   ["inline-flex", { display: "inline-flex" }],
   ["flex-inline", { display: "inline-flex" }],
+  [/^flex-(.*)$/, ([, d]) => ({ flex: handler.bracket(d) != null ? handler.bracket(d).split(" ").map((e) => handler.cssvar.fraction(e) ?? e).join(" ") : handler.cssvar.fraction(d) })],
   ["flex-1", { flex: "1 1 0%" }],
   ["flex-auto", { flex: "1 1 auto" }],
   ["flex-initial", { flex: "0 1 auto" }],
   ["flex-none", { flex: "none" }],
-  [/^flex-(\[.+\])$/, ([, d]) => ({ flex: handler.bracket(d).replace(/\d+\/\d+/, ($1) => handler.fraction($1)) })],
   [/^(?:flex-)?shrink$/, () => ({ "flex-shrink": 1 })],
   [/^(?:flex-)?shrink-0$/, () => ({ "flex-shrink": 0 })],
   [/^(?:flex-)?grow$/, () => ({ "flex-grow": 1 })],
@@ -209,7 +209,7 @@ const weightMap = {
   black: "900"
 };
 const fonts = [
-  [/^font-(\w+)$/, ([, d], { theme }) => ({ "font-family": theme.fontFamily?.[d] })],
+  [/^font-(\w+)$/, ([, d], { theme }) => ({ "font-family": theme.fontFamily?.[d] || handler.global(d) })],
   [/^text-(.+)$/, ([, s = "base"], { theme }) => {
     const themed = toArray(theme.fontSize?.[s]);
     if (themed?.[0]) {
@@ -227,10 +227,10 @@ const fonts = [
     if (size != null)
       return { "font-size": size };
   }],
-  [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || handler.number(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) })]
+  [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || handler.global.number(s) })],
+  [/^(?:leading|lh)-(.+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || handler.bracket.cssvar.global.rem(s) })],
+  [/^tracking-(.+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || handler.bracket.cssvar.global.rem(s) })],
+  [/^word-spacing-(.+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || handler.bracket.cssvar.global.rem(s) })]
 ];
 const tabSizes = [
   [/^tab(?:-(.+))?$/, ([, s]) => {
@@ -245,7 +245,7 @@ const tabSizes = [
   }]
 ];
 const textIndents = [
-  [/^indent(?:-(.+))?$/, ([, s], { theme }) => ({ "text-indent": theme.textIndent?.[s || "DEFAULT"] || handler.bracket.cssvar.fraction.rem(s) })]
+  [/^indent(?:-(.+))?$/, ([, s], { theme }) => ({ "text-indent": theme.textIndent?.[s || "DEFAULT"] || handler.bracket.cssvar.global.fraction.rem(s) })]
 ];
 const textStrokes = [
   [/^text-stroke(?:-(.+))?$/, ([, s], { theme }) => ({ "-webkit-text-stroke-width": theme.textStrokeWidth?.[s || "DEFAULT"] || handler.bracket.cssvar.px(s) })],
@@ -779,7 +779,6 @@ const variablesAbbrMap = {
   break: "word-break",
   case: "text-transform",
   content: "align-content",
-  flex: "flex",
   fw: "font-weight",
   items: "align-items",
   justify: "justify-content",

package/dist/chunks/default3.cjs

@@ -4,6 +4,12 @@ const variants$1 = require('./variants.cjs');
 const core = require('@unocss/core');
 
 const regexCache = {};
+const calcMaxWidthBySize = (size) => {
+  const value = size.match(/^-?[0-9]+\.?[0-9]*/)?.[0] || "";
+  const unit = size.slice(value.length);
+  const maxWidth = parseFloat(value) - 0.1;
+  return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
+};
 const variantBreakpoints = (matcher, { theme }) => {
   const variantEntries = Object.entries(theme.breakpoints || {}).map(([point, size], idx) => [point, size, idx]);
   for (const [point, size, idx] of variantEntries) {
@@ -16,23 +22,26 @@ const variantBreakpoints = (matcher, { theme }) => {
     const m = matcher.slice(pre.length);
     if (m === "container")
       continue;
-    let direction = "min";
+    const isLtPrefix = pre.startsWith("lt-");
+    const isAtPrefix = pre.startsWith("at-");
     let order = 1e3;
-    if (pre.startsWith("lt-")) {
-      direction = "max";
+    if (isLtPrefix) {
       order -= idx + 1;
-    } else {
-      order += idx + 1;
+      return {
+        matcher: m,
+        parent: [`@media (max-width: ${calcMaxWidthBySize(size)})`, order]
+      };
     }
-    if (pre.startsWith("at-") && idx < variantEntries.length - 1) {
+    order += idx + 1;
+    if (isAtPrefix && idx < variantEntries.length - 1) {
       return {
         matcher: m,
-        parent: [`@media (min-width: ${size}) and (max-width: ${variantEntries[idx + 1][1]})`, order]
+        parent: [`@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`, order]
       };
     }
     return {
       matcher: m,
-      parent: [`@media (${direction}-width: ${size})`, order]
+      parent: [`@media (min-width: ${size})`, order]
     };
   }
 };

package/dist/chunks/default3.mjs

@@ -2,6 +2,12 @@ import { v as variantParentMatcher, a as variantMatcher } from './variants.mjs';
 import { toArray, escapeRegExp } from '@unocss/core';
 
 const regexCache = {};
+const calcMaxWidthBySize = (size) => {
+  const value = size.match(/^-?[0-9]+\.?[0-9]*/)?.[0] || "";
+  const unit = size.slice(value.length);
+  const maxWidth = parseFloat(value) - 0.1;
+  return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
+};
 const variantBreakpoints = (matcher, { theme }) => {
   const variantEntries = Object.entries(theme.breakpoints || {}).map(([point, size], idx) => [point, size, idx]);
   for (const [point, size, idx] of variantEntries) {
@@ -14,23 +20,26 @@ const variantBreakpoints = (matcher, { theme }) => {
     const m = matcher.slice(pre.length);
     if (m === "container")
       continue;
-    let direction = "min";
+    const isLtPrefix = pre.startsWith("lt-");
+    const isAtPrefix = pre.startsWith("at-");
     let order = 1e3;
-    if (pre.startsWith("lt-")) {
-      direction = "max";
+    if (isLtPrefix) {
       order -= idx + 1;
-    } else {
-      order += idx + 1;
+      return {
+        matcher: m,
+        parent: [`@media (max-width: ${calcMaxWidthBySize(size)})`, order]
+      };
     }
-    if (pre.startsWith("at-") && idx < variantEntries.length - 1) {
+    order += idx + 1;
+    if (isAtPrefix && idx < variantEntries.length - 1) {
       return {
         matcher: m,
-        parent: [`@media (min-width: ${size}) and (max-width: ${variantEntries[idx + 1][1]})`, order]
+        parent: [`@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`, order]
       };
     }
     return {
       matcher: m,
-      parent: [`@media (${direction}-width: ${size})`, order]
+      parent: [`@media (min-width: ${size})`, order]
     };
   }
 };

package/dist/colors-ce2fecb8.d.ts

@@ -1,4 +1,4 @@
-import { T as Theme } from './types-f7b2c653';
+import { T as Theme } from './types-f7b2c653.js';
 
 declare const colors: Theme['colors'];
 

package/dist/colors.d.ts

@@ -1,2 +1,2 @@
-export { c as colors } from './colors-ce2fecb8';
-import './types-f7b2c653';
+export { c as colors } from './colors-ce2fecb8.js';
+import './types-f7b2c653.js';

package/dist/default-e6d1b2e8.d.ts

@@ -1,4 +1,4 @@
-import { T as Theme } from './types-f7b2c653';
+import { T as Theme } from './types-f7b2c653.js';
 
 declare const theme: Theme;
 

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { PresetOptions, Preset } from '@unocss/core';
-import { T as Theme } from './types-f7b2c653';
-export { T as Theme, a as ThemeAnimation } from './types-f7b2c653';
-export { t as theme } from './default-e6d1b2e8';
-export { c as colors } from './colors-ce2fecb8';
-export { p as parseColor } from './utilities-820bcff8';
+import { T as Theme } from './types-f7b2c653.js';
+export { T as Theme, a as ThemeAnimation } from './types-f7b2c653.js';
+export { t as theme } from './default-e6d1b2e8.js';
+export { c as colors } from './colors-ce2fecb8.js';
+export { p as parseColor } from './utilities-820bcff8.js';
 
 interface PresetMiniOptions extends PresetOptions {
     /**

package/dist/rules.d.ts

@@ -1,5 +1,5 @@
 import { Rule } from '@unocss/core';
-import { T as Theme } from './types-f7b2c653';
+import { T as Theme } from './types-f7b2c653.js';
 
 declare const verticalAligns: Rule[];
 declare const textAligns: Rule[];

package/dist/theme.d.ts

@@ -1,7 +1,7 @@
-export { c as colors } from './colors-ce2fecb8';
-export { t as theme } from './default-e6d1b2e8';
-import { T as Theme } from './types-f7b2c653';
-export { T as Theme, a as ThemeAnimation } from './types-f7b2c653';
+export { c as colors } from './colors-ce2fecb8.js';
+export { t as theme } from './default-e6d1b2e8.js';
+import { T as Theme } from './types-f7b2c653.js';
+export { T as Theme, a as ThemeAnimation } from './types-f7b2c653.js';
 
 declare const blur: {
     DEFAULT: string;

package/dist/utilities-820bcff8.d.ts

@@ -1,5 +1,5 @@
 import { RuleContext, CSSEntries, ParsedColorValue, CSSObject } from '@unocss/core';
-import { T as Theme } from './types-f7b2c653';
+import { T as Theme } from './types-f7b2c653.js';
 
 /**
  * Provide {@link DynamicMatcher} function returning spacing definition. See spacing rules.

package/dist/utils.d.ts

@@ -1,7 +1,7 @@
 import * as _unocss_core from '@unocss/core';
 import { RGBAColorValue, CSSColorValue, VariantHandler } from '@unocss/core';
-export { c as colorResolver, a as colorableShadows, d as directionSize, h as hasParseableColor, p as parseColor } from './utilities-820bcff8';
-import './types-f7b2c653';
+export { c as colorResolver, a as colorableShadows, d as directionSize, h as hasParseableColor, p as parseColor } from './utilities-820bcff8.js';
+import './types-f7b2c653.js';
 
 declare function hex2rgba(hex?: string): RGBAColorValue | undefined;
 declare function parseCssColor(str?: string): CSSColorValue | undefined;

package/dist/variants.d.ts

@@ -1,9 +1,9 @@
 import { Variant, VariantFunction, VariantObject } from '@unocss/core';
-import { T as Theme } from './types-f7b2c653';
-import { PresetMiniOptions } from './index';
-import './default-e6d1b2e8';
-import './colors-ce2fecb8';
-import './utilities-820bcff8';
+import { T as Theme } from './types-f7b2c653.js';
+import { PresetMiniOptions } from './index.js';
+import './default-e6d1b2e8.js';
+import './colors-ce2fecb8.js';
+import './utilities-820bcff8.js';
 
 declare const variantBreakpoints: Variant<Theme>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-mini",
-  "version": "0.27.5",
+  "version": "0.28.1",
   "description": "The minimal preset for UnoCSS",
   "keywords": [
     "unocss",
@@ -11,19 +11,16 @@
     "url": "https://github.com/unocss/unocss/issues"
   },
   "license": "MIT",
+  "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/unocss/unocss.git",
     "directory": "packages/preset-mini"
   },
   "funding": "https://github.com/sponsors/antfu",
-  "author": "Anthony Fu <anthonyfu117@hotmail.com>",
-  "sideEffects": false,
-  "files": [
-    "dist",
-    "*.d.ts",
-    "*.css"
-  ],
+  "main": "dist/index.cjs",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "require": "./dist/index.cjs",
@@ -57,14 +54,18 @@
     },
     "./*": "./*"
   },
-  "main": "dist/index.cjs",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "*.d.ts",
+    "*.css"
+  ],
+  "sideEffects": false,
   "dependencies": {
-    "@unocss/core": "0.27.5"
+    "@unocss/core": "0.28.1"
   },
   "scripts": {
     "build": "unbuild",
     "stub": "unbuild --stub"
-  }
+  },
+  "readme": "# @unocss/preset-mini\n\nThe minimal preset for [UnoCSS](https://github.com/unocss/unocss).\n\n## Installation\n\n```bash\nnpm i -D @unocss/preset-mini\n```\n\n```ts\nimport presetMini from '@unocss/preset-mini'\n\nUnocss({\n  presets: [\n    presetMini(),\n  ],\n})\n```\n\n## License\n\nMIT License © 2021-PRESENT [Anthony Fu](https://github.com/antfu)\n"
 }