@unocss/preset-mini 0.48.4 → 0.49.0

package/README.md

@@ -11,7 +11,7 @@ npm i -D @unocss/preset-mini
 ```ts
 import presetMini from '@unocss/preset-mini'
 
-Unocss({
+UnoCSS({
   presets: [
     presetMini(),
   ],

package/dist/index.cjs

@@ -8,8 +8,8 @@ const colors$1 = require('./shared/preset-mini.e54ce13d.cjs');
 const _default$1 = require('./shared/preset-mini.435805c5.cjs');
 const colors = require('./shared/preset-mini.30606736.cjs');
 const _default = require('./shared/preset-mini.43dfafb9.cjs');
-const _default$2 = require('./shared/preset-mini.89cb41ec.cjs');
-require('./shared/preset-mini.28b1d01c.cjs');
+const _default$2 = require('./shared/preset-mini.12bd206f.cjs');
+require('./shared/preset-mini.b5a73465.cjs');
 
 const preflights = [
   {
@@ -28,25 +28,41 @@ const presetMini = (options = {}) => {
   options.dark = options.dark ?? "class";
   options.attributifyPseudo = options.attributifyPseudo ?? false;
   options.preflight = options.preflight ?? true;
+  options.variablePrefix = options.variablePrefix ?? "un-";
   return {
     name: "@unocss/preset-mini",
     theme: _default.theme,
     rules: _default$1.rules,
     variants: _default$2.variants(options),
     options,
-    postprocess: options.variablePrefix && options.variablePrefix !== "un-" ? VarPrefixPostprocessor(options.variablePrefix) : void 0,
-    preflights: options.preflight ? preflights : [],
+    postprocess: VarPrefixPostprocessor(options.variablePrefix),
+    preflights: options.preflight ? normalizePreflights(preflights, options.variablePrefix) : [],
     prefix: options.prefix
   };
 };
 function VarPrefixPostprocessor(prefix) {
-  return (obj) => {
-    obj.entries.forEach((i) => {
-      i[0] = i[0].replace(/^--un-/, `--${prefix}`);
-      if (typeof i[1] === "string")
-        i[1] = i[1].replace(/var\(--un-/g, `var(--${prefix}`);
-    });
-  };
+  if (prefix !== "un-") {
+    return (obj) => {
+      obj.entries.forEach((i) => {
+        i[0] = i[0].replace(/^--un-/, `--${prefix}`);
+        if (typeof i[1] === "string")
+          i[1] = i[1].replace(/var\(--un-/g, `var(--${prefix}`);
+      });
+    };
+  }
+}
+function normalizePreflights(preflights3, variablePrefix) {
+  if (variablePrefix !== "un-") {
+    return preflights3.map((p) => ({
+      ...p,
+      getCSS: (() => async (ctx) => {
+        const css = await p.getCSS(ctx);
+        if (css)
+          return css.replace(/--un-/g, `--${variablePrefix}`);
+      })()
+    }));
+  }
+  return preflights3;
 }
 
 exports.parseColor = colors$1.parseColor;
@@ -54,5 +70,6 @@ exports.colors = colors.colors;
 exports.theme = _default.theme;
 exports.VarPrefixPostprocessor = VarPrefixPostprocessor;
 exports["default"] = presetMini;
+exports.normalizePreflights = normalizePreflights;
 exports.preflights = preflights;
 exports.presetMini = presetMini;

package/dist/index.d.ts

@@ -55,6 +55,7 @@ interface PresetMiniOptions extends PresetOptions {
 }
 declare const presetMini: (options?: PresetMiniOptions) => Preset<Theme>;
 
-declare function VarPrefixPostprocessor(prefix: string): Postprocessor;
+declare function VarPrefixPostprocessor(prefix: string): Postprocessor | undefined;
+declare function normalizePreflights(preflights: Preflight[], variablePrefix: string): Preflight<{}>[];
 
-export { DarkModeSelectors, PresetMiniOptions, VarPrefixPostprocessor, presetMini as default, preflights, presetMini };
+export { DarkModeSelectors, PresetMiniOptions, VarPrefixPostprocessor, presetMini as default, normalizePreflights, preflights, presetMini };

package/dist/index.mjs

@@ -5,8 +5,8 @@ import { r as rules } from './shared/preset-mini.6b96b995.mjs';
 export { c as colors } from './shared/preset-mini.65ac75be.mjs';
 import { t as theme } from './shared/preset-mini.0a36abfc.mjs';
 export { t as theme } from './shared/preset-mini.0a36abfc.mjs';
-import { v as variants } from './shared/preset-mini.0d510914.mjs';
-import './shared/preset-mini.bd4c0c0c.mjs';
+import { v as variants } from './shared/preset-mini.7ae92961.mjs';
+import './shared/preset-mini.d79c2b40.mjs';
 
 const preflights = [
   {
@@ -25,25 +25,41 @@ const presetMini = (options = {}) => {
   options.dark = options.dark ?? "class";
   options.attributifyPseudo = options.attributifyPseudo ?? false;
   options.preflight = options.preflight ?? true;
+  options.variablePrefix = options.variablePrefix ?? "un-";
   return {
     name: "@unocss/preset-mini",
     theme,
     rules,
     variants: variants(options),
     options,
-    postprocess: options.variablePrefix && options.variablePrefix !== "un-" ? VarPrefixPostprocessor(options.variablePrefix) : void 0,
-    preflights: options.preflight ? preflights : [],
+    postprocess: VarPrefixPostprocessor(options.variablePrefix),
+    preflights: options.preflight ? normalizePreflights(preflights, options.variablePrefix) : [],
     prefix: options.prefix
   };
 };
 function VarPrefixPostprocessor(prefix) {
-  return (obj) => {
-    obj.entries.forEach((i) => {
-      i[0] = i[0].replace(/^--un-/, `--${prefix}`);
-      if (typeof i[1] === "string")
-        i[1] = i[1].replace(/var\(--un-/g, `var(--${prefix}`);
-    });
-  };
+  if (prefix !== "un-") {
+    return (obj) => {
+      obj.entries.forEach((i) => {
+        i[0] = i[0].replace(/^--un-/, `--${prefix}`);
+        if (typeof i[1] === "string")
+          i[1] = i[1].replace(/var\(--un-/g, `var(--${prefix}`);
+      });
+    };
+  }
+}
+function normalizePreflights(preflights3, variablePrefix) {
+  if (variablePrefix !== "un-") {
+    return preflights3.map((p) => ({
+      ...p,
+      getCSS: (() => async (ctx) => {
+        const css = await p.getCSS(ctx);
+        if (css)
+          return css.replace(/--un-/g, `--${variablePrefix}`);
+      })()
+    }));
+  }
+  return preflights3;
 }
 
-export { VarPrefixPostprocessor, presetMini as default, preflights, presetMini };
+export { VarPrefixPostprocessor, presetMini as default, normalizePreflights, preflights, presetMini };

package/dist/shared/{preset-mini.89cb41ec.cjs → preset-mini.12bd206f.cjs}

@@ -2,15 +2,15 @@
 
 const colors = require('./preset-mini.e54ce13d.cjs');
 const core = require('@unocss/core');
-const variants$1 = require('./preset-mini.28b1d01c.cjs');
+const variants$1 = require('./preset-mini.b5a73465.cjs');
 
 const variantAria = {
   name: "aria",
-  match(matcher, { theme }) {
-    const variant = variants$1.variantGetParameter("aria-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variants$1.variantGetParameter("aria-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const aria = colors.handler.bracket(match) ?? theme.aria?.[match] ?? "";
+      const aria = colors.handler.bracket(match) ?? ctx.theme.aria?.[match] ?? "";
       if (aria) {
         return {
           matcher: rest,
@@ -21,74 +21,77 @@ const variantAria = {
   }
 };
 
-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 = {
-  name: "breakpoints",
-  match(matcher, context) {
-    const variantEntries = Object.entries(colors.resolveBreakpoints(context) ?? {}).map(([point, size], idx) => [point, size, idx]);
-    for (const [point, size, idx] of variantEntries) {
-      if (!regexCache[point])
-        regexCache[point] = new RegExp(`^((?:[al]t-)?${point}[:-])`);
-      const match = matcher.match(regexCache[point]);
-      if (!match)
-        continue;
-      const [, pre] = match;
-      const m = matcher.slice(pre.length);
-      if (m === "container")
-        continue;
-      const isLtPrefix = pre.startsWith("lt-");
-      const isAtPrefix = pre.startsWith("at-");
-      let order = 1e3;
-      if (isLtPrefix) {
-        order -= idx + 1;
-        return {
-          matcher: m,
-          handle: (input, next) => next({
-            ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (max-width: ${calcMaxWidthBySize(size)})`,
-            parentOrder: order
-          })
-        };
-      }
-      order += idx + 1;
-      if (isAtPrefix && idx < variantEntries.length - 1) {
+const variantBreakpoints = () => {
+  const regexCache = {};
+  return {
+    name: "breakpoints",
+    match(matcher, context) {
+      const variantEntries = Object.entries(colors.resolveBreakpoints(context) ?? {}).map(([point, size], idx) => [point, size, idx]);
+      for (const [point, size, idx] of variantEntries) {
+        if (!regexCache[point])
+          regexCache[point] = new RegExp(`^((?:[al]t-)?${point}(?:${context.generator.config.separators.join("|")}))`);
+        const match = matcher.match(regexCache[point]);
+        if (!match)
+          continue;
+        const [, pre] = match;
+        const m = matcher.slice(pre.length);
+        if (m === "container")
+          continue;
+        const isLtPrefix = pre.startsWith("lt-");
+        const isAtPrefix = pre.startsWith("at-");
+        let order = 1e3;
+        if (isLtPrefix) {
+          order -= idx + 1;
+          return {
+            matcher: m,
+            handle: (input, next) => next({
+              ...input,
+              parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (max-width: ${calcMaxWidthBySize(size)})`,
+              parentOrder: order
+            })
+          };
+        }
+        order += idx + 1;
+        if (isAtPrefix && idx < variantEntries.length - 1) {
+          return {
+            matcher: m,
+            handle: (input, next) => next({
+              ...input,
+              parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`,
+              parentOrder: order
+            })
+          };
+        }
         return {
           matcher: m,
           handle: (input, next) => next({
             ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`,
+            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size})`,
             parentOrder: order
           })
         };
       }
-      return {
-        matcher: m,
-        handle: (input, next) => next({
-          ...input,
-          parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size})`,
-          parentOrder: order
-        })
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: "(at-|lt-|)$breakpoints:"
+    },
+    multiPass: true,
+    autocomplete: "(at-|lt-|)$breakpoints:"
+  };
 };
 
 const scopeMatcher = (name, combinator) => ({
   name: `combinator:${name}`,
-  match(matcher) {
+  match(matcher, ctx) {
     if (!matcher.startsWith(name))
       return;
-    let body = variants$1.variantGetBracket(`${name}-`, matcher, [":", "-"]);
+    const separators = ctx.generator.config.separators;
+    let body = variants$1.variantGetBracket(`${name}-`, matcher, separators);
     if (!body) {
-      for (const separator of [":", "-"]) {
+      for (const separator of separators) {
         if (matcher.startsWith(`${name}${separator}`)) {
           body = ["", matcher.slice(name.length + separator.length)];
           break;
@@ -117,10 +120,10 @@ const variantCombinators = [
 
 const variantContainerQuery = {
   name: "@",
-  match(matcher, { theme }) {
+  match(matcher, ctx) {
     if (matcher.startsWith("@container"))
       return;
-    const variant = variants$1.variantGetParameter("@", matcher, [":", "-"]);
+    const variant = variants$1.variantGetParameter("@", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest, label] = variant;
       const unbracket = colors.handler.bracket(match);
@@ -130,7 +133,7 @@ const variantContainerQuery = {
         if (minWidth)
           container = `(min-width: ${minWidth})`;
       } else {
-        container = theme.containers?.[match] ?? "";
+        container = ctx.theme.containers?.[match] ?? "";
       }
       if (container) {
         core.warnOnce("The container query variant is experimental and may not follow semver.");
@@ -149,11 +152,11 @@ const variantContainerQuery = {
 
 const variantDataAttribute = {
   name: "data",
-  match(matcher, { theme }) {
-    const variant = variants$1.variantGetParameter("data-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variants$1.variantGetParameter("data-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const dataAttribute = colors.handler.bracket(match) ?? theme.data?.[match] ?? "";
+      const dataAttribute = colors.handler.bracket(match) ?? ctx.theme.data?.[match] ?? "";
       if (dataAttribute) {
         return {
           matcher: rest,
@@ -167,13 +170,13 @@ const variantDataAttribute = {
 const variantPrint = variants$1.variantParentMatcher("print", "@media print");
 const variantCustomMedia = {
   name: "media",
-  match(matcher, { theme }) {
-    const variant = variants$1.variantGetParameter("media-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variants$1.variantGetParameter("media-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       let media = colors.handler.bracket(match) ?? "";
       if (media === "")
-        media = theme.media?.[match] ?? "";
+        media = ctx.theme.media?.[match] ?? "";
       if (media) {
         return {
           matcher: rest,
@@ -190,13 +193,13 @@ const variantCustomMedia = {
 
 const variantSupports = {
   name: "supports",
-  match(matcher, { theme }) {
-    const variant = variants$1.variantGetParameter("supports-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variants$1.variantGetParameter("supports-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       let supports = colors.handler.bracket(match) ?? "";
       if (supports === "")
-        supports = theme.supports?.[match] ?? "";
+        supports = ctx.theme.supports?.[match] ?? "";
       if (supports) {
         return {
           matcher: rest,
@@ -232,8 +235,8 @@ const variantLanguageDirections = [
 
 const variantSelector = {
   name: "selector",
-  match(matcher) {
-    const variant = variants$1.variantGetBracket("selector-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variants$1.variantGetBracket("selector-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const selector = colors.handler.bracket(match);
@@ -248,8 +251,8 @@ const variantSelector = {
 };
 const variantCssLayer = {
   name: "layer",
-  match(matcher) {
-    const variant = variants$1.variantGetParameter("layer-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variants$1.variantGetParameter("layer-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const layer = colors.handler.bracket(match) ?? match;
@@ -267,8 +270,8 @@ const variantCssLayer = {
 };
 const variantInternalLayer = {
   name: "uno-layer",
-  match(matcher) {
-    const variant = variants$1.variantGetParameter("uno-layer-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variants$1.variantGetParameter("uno-layer-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const layer = colors.handler.bracket(match) ?? match;
@@ -283,8 +286,8 @@ const variantInternalLayer = {
 };
 const variantScope = {
   name: "scope",
-  match(matcher) {
-    const variant = variants$1.variantGetBracket("scope-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variants$1.variantGetBracket("scope-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const scope = colors.handler.bracket(match);
@@ -299,14 +302,14 @@ const variantScope = {
 };
 const variantVariables = {
   name: "variables",
-  match(matcher) {
+  match(matcher, ctx) {
     if (!matcher.startsWith("["))
       return;
     const [match, rest] = colors.getBracket(matcher, "[", "]") ?? [];
     if (!(match && rest))
       return;
     let newMatcher;
-    for (const separator of [":", "-"]) {
+    for (const separator of ctx.generator.config.separators) {
       if (rest.startsWith(separator)) {
         newMatcher = rest.slice(separator.length);
         break;
@@ -382,28 +385,33 @@ const variantNegative = {
   }
 };
 
-const variantImportant = {
-  name: "important",
-  match(matcher) {
-    let base;
-    const match = matcher.match(/^(important[:-]|!)/);
-    if (match)
-      base = matcher.slice(match[0].length);
-    else if (matcher.endsWith("!"))
-      base = matcher.slice(0, -1);
-    if (base) {
-      return {
-        matcher: base,
-        body: (body) => {
-          body.forEach((v) => {
-            if (v[1])
-              v[1] += " !important";
-          });
-          return body;
-        }
-      };
+const variantImportant = () => {
+  let re;
+  return {
+    name: "important",
+    match(matcher, ctx) {
+      if (!re)
+        re = new RegExp(`^(important(?:${ctx.generator.config.separators.join("|")})|!)`);
+      let base;
+      const match = matcher.match(re);
+      if (match)
+        base = matcher.slice(match[0].length);
+      else if (matcher.endsWith("!"))
+        base = matcher.slice(0, -1);
+      if (base) {
+        return {
+          matcher: base,
+          body: (body) => {
+            body.forEach((v) => {
+              if (v[1])
+                v[1] += " !important";
+            });
+            return body;
+          }
+        };
+      }
     }
-  }
+  };
 };
 
 const PseudoClasses = Object.fromEntries([
@@ -471,8 +479,9 @@ const sortValue = (pseudo) => {
 };
 const taggedPseudoClassMatcher = (tag, parent, combinator) => {
   const rawRE = new RegExp(`^(${core.escapeRegExp(parent)}:)(\\S+)${core.escapeRegExp(combinator)}\\1`);
-  const pseudoRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesStr}))(?:(/\\w+))?[:-]`);
-  const pseudoColonRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesColonStr}))(?:(/\\w+))?[:]`);
+  let splitRE;
+  let pseudoRE;
+  let pseudoColonRE;
   const matchBracket = (input) => {
     const body = variants$1.variantGetBracket(`${tag}-`, input, []);
     if (!body)
@@ -481,7 +490,7 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
     const bracketValue = colors.handler.bracket(match);
     if (bracketValue == null)
       return;
-    const label = rest.split(/[:-]/, 1)?.[0] ?? "";
+    const label = rest.split(splitRE, 1)?.[0] ?? "";
     const prefix = `${parent}${core.escapeSelector(label)}`;
     return [
       label,
@@ -507,7 +516,12 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
   };
   return {
     name: `pseudo:${tag}`,
-    match(input) {
+    match(input, ctx) {
+      if (!(splitRE && pseudoRE && pseudoColonRE)) {
+        splitRE = new RegExp(`(?:${ctx.generator.config.separators.join("|")})`);
+        pseudoRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesStr}))(?:(/\\w+))?(?:${ctx.generator.config.separators.join("|")})`);
+        pseudoColonRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesColonStr}))(?:(/\\w+))?(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
       if (!input.startsWith(tag))
         return;
       const result = matchBracket(input) || matchPseudo(input);
@@ -530,50 +544,62 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
 };
 const PseudoClassesAndElementsStr = Object.entries(PseudoClasses).map(([key]) => key).join("|");
 const PseudoClassesAndElementsColonStr = Object.entries(PseudoClassesColon).map(([key]) => key).join("|");
-const PseudoClassesAndElementsRE = new RegExp(`^(${PseudoClassesAndElementsStr})[:-]`);
-const PseudoClassesAndElementsColonRE = new RegExp(`^(${PseudoClassesAndElementsColonStr})[:]`);
-const variantPseudoClassesAndElements = {
-  name: "pseudo",
-  match(input) {
-    const match = input.match(PseudoClassesAndElementsRE) || input.match(PseudoClassesAndElementsColonRE);
-    if (match) {
-      const pseudo = PseudoClasses[match[1]] || PseudoClassesColon[match[1]] || `:${match[1]}`;
-      return {
-        matcher: input.slice(match[0].length),
-        handle: (input2, next) => {
-          const selectors = pseudo.startsWith("::") ? {
-            pseudo: `${input2.pseudo}${pseudo}`
-          } : {
-            selector: `${input2.selector}${pseudo}`
-          };
-          return next({
-            ...input2,
-            ...selectors,
-            sort: sortValue(match[1])
-          });
-        }
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: `(${PseudoClassesAndElementsStr}):`
+const variantPseudoClassesAndElements = () => {
+  let PseudoClassesAndElementsRE;
+  let PseudoClassesAndElementsColonRE;
+  return {
+    name: "pseudo",
+    match(input, ctx) {
+      if (!(PseudoClassesAndElementsRE && PseudoClassesAndElementsRE)) {
+        PseudoClassesAndElementsRE = new RegExp(`^(${PseudoClassesAndElementsStr})(?:${ctx.generator.config.separators.join("|")})`);
+        PseudoClassesAndElementsColonRE = new RegExp(`^(${PseudoClassesAndElementsColonStr})(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
+      const match = input.match(PseudoClassesAndElementsRE) || input.match(PseudoClassesAndElementsColonRE);
+      if (match) {
+        const pseudo = PseudoClasses[match[1]] || PseudoClassesColon[match[1]] || `:${match[1]}`;
+        return {
+          matcher: input.slice(match[0].length),
+          handle: (input2, next) => {
+            const selectors = pseudo.startsWith("::") ? {
+              pseudo: `${input2.pseudo}${pseudo}`
+            } : {
+              selector: `${input2.selector}${pseudo}`
+            };
+            return next({
+              ...input2,
+              ...selectors,
+              sort: sortValue(match[1])
+            });
+          }
+        };
+      }
+    },
+    multiPass: true,
+    autocomplete: `(${PseudoClassesAndElementsStr}|${PseudoClassesAndElementsColonStr}):`
+  };
 };
-const PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})[:-]`);
-const PseudoClassColonFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesColonStr})[:]`);
-const variantPseudoClassFunctions = {
-  match(input) {
-    const match = input.match(PseudoClassFunctionsRE) || input.match(PseudoClassColonFunctionsRE);
-    if (match) {
-      const fn = match[1];
-      const pseudo = PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
-      return {
-        matcher: input.slice(match[0].length),
-        selector: (s) => `${s}:${fn}(${pseudo})`
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: `(${PseudoClassFunctionsStr})-(${PseudoClassesStr}|${PseudoClassesColonStr}):`
+const variantPseudoClassFunctions = () => {
+  let PseudoClassFunctionsRE;
+  let PseudoClassColonFunctionsRE;
+  return {
+    match(input, ctx) {
+      if (!(PseudoClassFunctionsRE && PseudoClassColonFunctionsRE)) {
+        PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})(?:${ctx.generator.config.separators.join("|")})`);
+        PseudoClassColonFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesColonStr})(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
+      const match = input.match(PseudoClassFunctionsRE) || input.match(PseudoClassColonFunctionsRE);
+      if (match) {
+        const fn = match[1];
+        const pseudo = PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
+        return {
+          matcher: input.slice(match[0].length),
+          selector: (s) => `${s}:${fn}(${pseudo})`
+        };
+      }
+    },
+    multiPass: true,
+    autocomplete: `(${PseudoClassFunctionsStr})-(${PseudoClassesStr}|${PseudoClassesColonStr}):`
+  };
 };
 const variantTaggedPseudoClasses = (options = {}) => {
   const attributify = !!options?.attributifyPseudo;
@@ -606,14 +632,14 @@ const variants = (options) => [
   variantSelector,
   variantInternalLayer,
   variantNegative,
-  variantImportant,
+  variantImportant(),
   variantSupports,
   variantPrint,
   variantCustomMedia,
-  variantBreakpoints,
+  variantBreakpoints(),
   ...variantCombinators,
-  variantPseudoClassesAndElements,
-  variantPseudoClassFunctions,
+  variantPseudoClassesAndElements(),
+  variantPseudoClassFunctions(),
   ...variantTaggedPseudoClasses(options),
   partClasses,
   ...variantColorsMediaOrClass(options),

package/dist/shared/{preset-mini.0d510914.mjs → preset-mini.7ae92961.mjs}

@@ -1,14 +1,14 @@
 import { h as handler, l as resolveBreakpoints, q as getBracket, C as CONTROL_MINI_NO_NEGATIVE, t as getComponent } from './preset-mini.ca595ab5.mjs';
 import { warnOnce, escapeRegExp, escapeSelector } from '@unocss/core';
-import { v as variantGetParameter, a as variantGetBracket, b as variantParentMatcher, c as variantMatcher } from './preset-mini.bd4c0c0c.mjs';
+import { v as variantGetParameter, a as variantGetBracket, b as variantParentMatcher, c as variantMatcher } from './preset-mini.d79c2b40.mjs';
 
 const variantAria = {
   name: "aria",
-  match(matcher, { theme }) {
-    const variant = variantGetParameter("aria-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("aria-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const aria = handler.bracket(match) ?? theme.aria?.[match] ?? "";
+      const aria = handler.bracket(match) ?? ctx.theme.aria?.[match] ?? "";
       if (aria) {
         return {
           matcher: rest,
@@ -19,74 +19,77 @@ const variantAria = {
   }
 };
 
-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 = {
-  name: "breakpoints",
-  match(matcher, context) {
-    const variantEntries = Object.entries(resolveBreakpoints(context) ?? {}).map(([point, size], idx) => [point, size, idx]);
-    for (const [point, size, idx] of variantEntries) {
-      if (!regexCache[point])
-        regexCache[point] = new RegExp(`^((?:[al]t-)?${point}[:-])`);
-      const match = matcher.match(regexCache[point]);
-      if (!match)
-        continue;
-      const [, pre] = match;
-      const m = matcher.slice(pre.length);
-      if (m === "container")
-        continue;
-      const isLtPrefix = pre.startsWith("lt-");
-      const isAtPrefix = pre.startsWith("at-");
-      let order = 1e3;
-      if (isLtPrefix) {
-        order -= idx + 1;
-        return {
-          matcher: m,
-          handle: (input, next) => next({
-            ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (max-width: ${calcMaxWidthBySize(size)})`,
-            parentOrder: order
-          })
-        };
-      }
-      order += idx + 1;
-      if (isAtPrefix && idx < variantEntries.length - 1) {
+const variantBreakpoints = () => {
+  const regexCache = {};
+  return {
+    name: "breakpoints",
+    match(matcher, context) {
+      const variantEntries = Object.entries(resolveBreakpoints(context) ?? {}).map(([point, size], idx) => [point, size, idx]);
+      for (const [point, size, idx] of variantEntries) {
+        if (!regexCache[point])
+          regexCache[point] = new RegExp(`^((?:[al]t-)?${point}(?:${context.generator.config.separators.join("|")}))`);
+        const match = matcher.match(regexCache[point]);
+        if (!match)
+          continue;
+        const [, pre] = match;
+        const m = matcher.slice(pre.length);
+        if (m === "container")
+          continue;
+        const isLtPrefix = pre.startsWith("lt-");
+        const isAtPrefix = pre.startsWith("at-");
+        let order = 1e3;
+        if (isLtPrefix) {
+          order -= idx + 1;
+          return {
+            matcher: m,
+            handle: (input, next) => next({
+              ...input,
+              parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (max-width: ${calcMaxWidthBySize(size)})`,
+              parentOrder: order
+            })
+          };
+        }
+        order += idx + 1;
+        if (isAtPrefix && idx < variantEntries.length - 1) {
+          return {
+            matcher: m,
+            handle: (input, next) => next({
+              ...input,
+              parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`,
+              parentOrder: order
+            })
+          };
+        }
         return {
           matcher: m,
           handle: (input, next) => next({
             ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`,
+            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size})`,
             parentOrder: order
           })
         };
       }
-      return {
-        matcher: m,
-        handle: (input, next) => next({
-          ...input,
-          parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size})`,
-          parentOrder: order
-        })
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: "(at-|lt-|)$breakpoints:"
+    },
+    multiPass: true,
+    autocomplete: "(at-|lt-|)$breakpoints:"
+  };
 };
 
 const scopeMatcher = (name, combinator) => ({
   name: `combinator:${name}`,
-  match(matcher) {
+  match(matcher, ctx) {
     if (!matcher.startsWith(name))
       return;
-    let body = variantGetBracket(`${name}-`, matcher, [":", "-"]);
+    const separators = ctx.generator.config.separators;
+    let body = variantGetBracket(`${name}-`, matcher, separators);
     if (!body) {
-      for (const separator of [":", "-"]) {
+      for (const separator of separators) {
         if (matcher.startsWith(`${name}${separator}`)) {
           body = ["", matcher.slice(name.length + separator.length)];
           break;
@@ -115,10 +118,10 @@ const variantCombinators = [
 
 const variantContainerQuery = {
   name: "@",
-  match(matcher, { theme }) {
+  match(matcher, ctx) {
     if (matcher.startsWith("@container"))
       return;
-    const variant = variantGetParameter("@", matcher, [":", "-"]);
+    const variant = variantGetParameter("@", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest, label] = variant;
       const unbracket = handler.bracket(match);
@@ -128,7 +131,7 @@ const variantContainerQuery = {
         if (minWidth)
           container = `(min-width: ${minWidth})`;
       } else {
-        container = theme.containers?.[match] ?? "";
+        container = ctx.theme.containers?.[match] ?? "";
       }
       if (container) {
         warnOnce("The container query variant is experimental and may not follow semver.");
@@ -147,11 +150,11 @@ const variantContainerQuery = {
 
 const variantDataAttribute = {
   name: "data",
-  match(matcher, { theme }) {
-    const variant = variantGetParameter("data-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("data-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const dataAttribute = handler.bracket(match) ?? theme.data?.[match] ?? "";
+      const dataAttribute = handler.bracket(match) ?? ctx.theme.data?.[match] ?? "";
       if (dataAttribute) {
         return {
           matcher: rest,
@@ -165,13 +168,13 @@ const variantDataAttribute = {
 const variantPrint = variantParentMatcher("print", "@media print");
 const variantCustomMedia = {
   name: "media",
-  match(matcher, { theme }) {
-    const variant = variantGetParameter("media-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("media-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       let media = handler.bracket(match) ?? "";
       if (media === "")
-        media = theme.media?.[match] ?? "";
+        media = ctx.theme.media?.[match] ?? "";
       if (media) {
         return {
           matcher: rest,
@@ -188,13 +191,13 @@ const variantCustomMedia = {
 
 const variantSupports = {
   name: "supports",
-  match(matcher, { theme }) {
-    const variant = variantGetParameter("supports-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("supports-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       let supports = handler.bracket(match) ?? "";
       if (supports === "")
-        supports = theme.supports?.[match] ?? "";
+        supports = ctx.theme.supports?.[match] ?? "";
       if (supports) {
         return {
           matcher: rest,
@@ -230,8 +233,8 @@ const variantLanguageDirections = [
 
 const variantSelector = {
   name: "selector",
-  match(matcher) {
-    const variant = variantGetBracket("selector-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetBracket("selector-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const selector = handler.bracket(match);
@@ -246,8 +249,8 @@ const variantSelector = {
 };
 const variantCssLayer = {
   name: "layer",
-  match(matcher) {
-    const variant = variantGetParameter("layer-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("layer-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const layer = handler.bracket(match) ?? match;
@@ -265,8 +268,8 @@ const variantCssLayer = {
 };
 const variantInternalLayer = {
   name: "uno-layer",
-  match(matcher) {
-    const variant = variantGetParameter("uno-layer-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("uno-layer-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const layer = handler.bracket(match) ?? match;
@@ -281,8 +284,8 @@ const variantInternalLayer = {
 };
 const variantScope = {
   name: "scope",
-  match(matcher) {
-    const variant = variantGetBracket("scope-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetBracket("scope-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const scope = handler.bracket(match);
@@ -297,14 +300,14 @@ const variantScope = {
 };
 const variantVariables = {
   name: "variables",
-  match(matcher) {
+  match(matcher, ctx) {
     if (!matcher.startsWith("["))
       return;
     const [match, rest] = getBracket(matcher, "[", "]") ?? [];
     if (!(match && rest))
       return;
     let newMatcher;
-    for (const separator of [":", "-"]) {
+    for (const separator of ctx.generator.config.separators) {
       if (rest.startsWith(separator)) {
         newMatcher = rest.slice(separator.length);
         break;
@@ -380,28 +383,33 @@ const variantNegative = {
   }
 };
 
-const variantImportant = {
-  name: "important",
-  match(matcher) {
-    let base;
-    const match = matcher.match(/^(important[:-]|!)/);
-    if (match)
-      base = matcher.slice(match[0].length);
-    else if (matcher.endsWith("!"))
-      base = matcher.slice(0, -1);
-    if (base) {
-      return {
-        matcher: base,
-        body: (body) => {
-          body.forEach((v) => {
-            if (v[1])
-              v[1] += " !important";
-          });
-          return body;
-        }
-      };
+const variantImportant = () => {
+  let re;
+  return {
+    name: "important",
+    match(matcher, ctx) {
+      if (!re)
+        re = new RegExp(`^(important(?:${ctx.generator.config.separators.join("|")})|!)`);
+      let base;
+      const match = matcher.match(re);
+      if (match)
+        base = matcher.slice(match[0].length);
+      else if (matcher.endsWith("!"))
+        base = matcher.slice(0, -1);
+      if (base) {
+        return {
+          matcher: base,
+          body: (body) => {
+            body.forEach((v) => {
+              if (v[1])
+                v[1] += " !important";
+            });
+            return body;
+          }
+        };
+      }
     }
-  }
+  };
 };
 
 const PseudoClasses = Object.fromEntries([
@@ -469,8 +477,9 @@ const sortValue = (pseudo) => {
 };
 const taggedPseudoClassMatcher = (tag, parent, combinator) => {
   const rawRE = new RegExp(`^(${escapeRegExp(parent)}:)(\\S+)${escapeRegExp(combinator)}\\1`);
-  const pseudoRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesStr}))(?:(/\\w+))?[:-]`);
-  const pseudoColonRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesColonStr}))(?:(/\\w+))?[:]`);
+  let splitRE;
+  let pseudoRE;
+  let pseudoColonRE;
   const matchBracket = (input) => {
     const body = variantGetBracket(`${tag}-`, input, []);
     if (!body)
@@ -479,7 +488,7 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
     const bracketValue = handler.bracket(match);
     if (bracketValue == null)
       return;
-    const label = rest.split(/[:-]/, 1)?.[0] ?? "";
+    const label = rest.split(splitRE, 1)?.[0] ?? "";
     const prefix = `${parent}${escapeSelector(label)}`;
     return [
       label,
@@ -505,7 +514,12 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
   };
   return {
     name: `pseudo:${tag}`,
-    match(input) {
+    match(input, ctx) {
+      if (!(splitRE && pseudoRE && pseudoColonRE)) {
+        splitRE = new RegExp(`(?:${ctx.generator.config.separators.join("|")})`);
+        pseudoRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesStr}))(?:(/\\w+))?(?:${ctx.generator.config.separators.join("|")})`);
+        pseudoColonRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesColonStr}))(?:(/\\w+))?(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
       if (!input.startsWith(tag))
         return;
       const result = matchBracket(input) || matchPseudo(input);
@@ -528,50 +542,62 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
 };
 const PseudoClassesAndElementsStr = Object.entries(PseudoClasses).map(([key]) => key).join("|");
 const PseudoClassesAndElementsColonStr = Object.entries(PseudoClassesColon).map(([key]) => key).join("|");
-const PseudoClassesAndElementsRE = new RegExp(`^(${PseudoClassesAndElementsStr})[:-]`);
-const PseudoClassesAndElementsColonRE = new RegExp(`^(${PseudoClassesAndElementsColonStr})[:]`);
-const variantPseudoClassesAndElements = {
-  name: "pseudo",
-  match(input) {
-    const match = input.match(PseudoClassesAndElementsRE) || input.match(PseudoClassesAndElementsColonRE);
-    if (match) {
-      const pseudo = PseudoClasses[match[1]] || PseudoClassesColon[match[1]] || `:${match[1]}`;
-      return {
-        matcher: input.slice(match[0].length),
-        handle: (input2, next) => {
-          const selectors = pseudo.startsWith("::") ? {
-            pseudo: `${input2.pseudo}${pseudo}`
-          } : {
-            selector: `${input2.selector}${pseudo}`
-          };
-          return next({
-            ...input2,
-            ...selectors,
-            sort: sortValue(match[1])
-          });
-        }
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: `(${PseudoClassesAndElementsStr}):`
+const variantPseudoClassesAndElements = () => {
+  let PseudoClassesAndElementsRE;
+  let PseudoClassesAndElementsColonRE;
+  return {
+    name: "pseudo",
+    match(input, ctx) {
+      if (!(PseudoClassesAndElementsRE && PseudoClassesAndElementsRE)) {
+        PseudoClassesAndElementsRE = new RegExp(`^(${PseudoClassesAndElementsStr})(?:${ctx.generator.config.separators.join("|")})`);
+        PseudoClassesAndElementsColonRE = new RegExp(`^(${PseudoClassesAndElementsColonStr})(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
+      const match = input.match(PseudoClassesAndElementsRE) || input.match(PseudoClassesAndElementsColonRE);
+      if (match) {
+        const pseudo = PseudoClasses[match[1]] || PseudoClassesColon[match[1]] || `:${match[1]}`;
+        return {
+          matcher: input.slice(match[0].length),
+          handle: (input2, next) => {
+            const selectors = pseudo.startsWith("::") ? {
+              pseudo: `${input2.pseudo}${pseudo}`
+            } : {
+              selector: `${input2.selector}${pseudo}`
+            };
+            return next({
+              ...input2,
+              ...selectors,
+              sort: sortValue(match[1])
+            });
+          }
+        };
+      }
+    },
+    multiPass: true,
+    autocomplete: `(${PseudoClassesAndElementsStr}|${PseudoClassesAndElementsColonStr}):`
+  };
 };
-const PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})[:-]`);
-const PseudoClassColonFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesColonStr})[:]`);
-const variantPseudoClassFunctions = {
-  match(input) {
-    const match = input.match(PseudoClassFunctionsRE) || input.match(PseudoClassColonFunctionsRE);
-    if (match) {
-      const fn = match[1];
-      const pseudo = PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
-      return {
-        matcher: input.slice(match[0].length),
-        selector: (s) => `${s}:${fn}(${pseudo})`
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: `(${PseudoClassFunctionsStr})-(${PseudoClassesStr}|${PseudoClassesColonStr}):`
+const variantPseudoClassFunctions = () => {
+  let PseudoClassFunctionsRE;
+  let PseudoClassColonFunctionsRE;
+  return {
+    match(input, ctx) {
+      if (!(PseudoClassFunctionsRE && PseudoClassColonFunctionsRE)) {
+        PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})(?:${ctx.generator.config.separators.join("|")})`);
+        PseudoClassColonFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesColonStr})(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
+      const match = input.match(PseudoClassFunctionsRE) || input.match(PseudoClassColonFunctionsRE);
+      if (match) {
+        const fn = match[1];
+        const pseudo = PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
+        return {
+          matcher: input.slice(match[0].length),
+          selector: (s) => `${s}:${fn}(${pseudo})`
+        };
+      }
+    },
+    multiPass: true,
+    autocomplete: `(${PseudoClassFunctionsStr})-(${PseudoClassesStr}|${PseudoClassesColonStr}):`
+  };
 };
 const variantTaggedPseudoClasses = (options = {}) => {
   const attributify = !!options?.attributifyPseudo;
@@ -604,14 +630,14 @@ const variants = (options) => [
   variantSelector,
   variantInternalLayer,
   variantNegative,
-  variantImportant,
+  variantImportant(),
   variantSupports,
   variantPrint,
   variantCustomMedia,
-  variantBreakpoints,
+  variantBreakpoints(),
   ...variantCombinators,
-  variantPseudoClassesAndElements,
-  variantPseudoClassFunctions,
+  variantPseudoClassesAndElements(),
+  variantPseudoClassFunctions(),
   ...variantTaggedPseudoClasses(options),
   partClasses,
   ...variantColorsMediaOrClass(options),

package/dist/shared/{preset-mini.28b1d01c.cjs → preset-mini.b5a73465.cjs}

@@ -4,10 +4,12 @@ const core = require('@unocss/core');
 const colors = require('./preset-mini.e54ce13d.cjs');
 
 const variantMatcher = (name, handler) => {
-  const re = new RegExp(`^${core.escapeRegExp(name)}[:-]`);
+  let re;
   return {
     name,
-    match(input) {
+    match(input, ctx) {
+      if (!re)
+        re = new RegExp(`^${core.escapeRegExp(name)}(?:${ctx.generator.config.separators.join("|")})`);
       const match = input.match(re);
       if (match) {
         return {
@@ -23,10 +25,12 @@ const variantMatcher = (name, handler) => {
   };
 };
 const variantParentMatcher = (name, parent) => {
-  const re = new RegExp(`^${core.escapeRegExp(name)}[:-]`);
+  let re;
   return {
     name,
-    match(input) {
+    match(input, ctx) {
+      if (!re)
+        re = new RegExp(`^${core.escapeRegExp(name)}(?:${ctx.generator.config.separators.join("|")})`);
       const match = input.match(re);
       if (match) {
         return {

package/dist/shared/{preset-mini.bd4c0c0c.mjs → preset-mini.d79c2b40.mjs}

@@ -2,10 +2,12 @@ import { escapeRegExp } from '@unocss/core';
 import { q as getBracket } from './preset-mini.ca595ab5.mjs';
 
 const variantMatcher = (name, handler) => {
-  const re = new RegExp(`^${escapeRegExp(name)}[:-]`);
+  let re;
   return {
     name,
-    match(input) {
+    match(input, ctx) {
+      if (!re)
+        re = new RegExp(`^${escapeRegExp(name)}(?:${ctx.generator.config.separators.join("|")})`);
       const match = input.match(re);
       if (match) {
         return {
@@ -21,10 +23,12 @@ const variantMatcher = (name, handler) => {
   };
 };
 const variantParentMatcher = (name, parent) => {
-  const re = new RegExp(`^${escapeRegExp(name)}[:-]`);
+  let re;
   return {
     name,
-    match(input) {
+    match(input, ctx) {
+      if (!re)
+        re = new RegExp(`^${escapeRegExp(name)}(?:${ctx.generator.config.separators.join("|")})`);
       const match = input.match(re);
       if (match) {
         return {

package/dist/utils.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const colors = require('./shared/preset-mini.e54ce13d.cjs');
-const variants = require('./shared/preset-mini.28b1d01c.cjs');
+const variants = require('./shared/preset-mini.b5a73465.cjs');
 require('@unocss/core');
 
 

package/dist/utils.mjs

@@ -1,3 +1,3 @@
 export { C as CONTROL_MINI_NO_NEGATIVE, f as colorOpacityToString, c as colorResolver, e as colorToString, i as colorableShadows, b as cornerMap, d as directionMap, o as directionSize, q as getBracket, t as getComponent, z as getComponents, g as globalKeywords, w as h, h as handler, a as hasParseableColor, u as hex2rgba, j as insetMap, m as makeGlobalStaticRules, p as parseColor, v as parseCssColor, k as positionMap, l as resolveBreakpoints, r as resolveVerticalBreakpoints, s as splitShorthand, y as valueHandlers, x as xyzMap } from './shared/preset-mini.ca595ab5.mjs';
-export { a as variantGetBracket, v as variantGetParameter, c as variantMatcher, b as variantParentMatcher } from './shared/preset-mini.bd4c0c0c.mjs';
+export { a as variantGetBracket, v as variantGetParameter, c as variantMatcher, b as variantParentMatcher } from './shared/preset-mini.d79c2b40.mjs';
 import '@unocss/core';

package/dist/variants.cjs

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const _default = require('./shared/preset-mini.89cb41ec.cjs');
+const _default = require('./shared/preset-mini.12bd206f.cjs');
 require('./shared/preset-mini.e54ce13d.cjs');
 require('@unocss/core');
-require('./shared/preset-mini.28b1d01c.cjs');
+require('./shared/preset-mini.b5a73465.cjs');
 
 
 

package/dist/variants.d.ts

@@ -1,6 +1,6 @@
 import { VariantObject, Variant } from '@unocss/core';
-import { T as Theme } from './types-fa74508f.js';
 import { PresetMiniOptions } from './index.js';
+import { T as Theme } from './types-fa74508f.js';
 import './colors-b217808a.js';
 import './default-344896b2.js';
 import './utilities-d2f973f4.js';
@@ -8,7 +8,7 @@ import './utilities-d2f973f4.js';
 declare const variantAria: VariantObject;
 
 declare const calcMaxWidthBySize: (size: string) => string;
-declare const variantBreakpoints: Variant<Theme>;
+declare const variantBreakpoints: () => VariantObject;
 
 declare const variantCombinators: Variant[];
 
@@ -16,7 +16,7 @@ declare const variantContainerQuery: VariantObject;
 
 declare const variantDataAttribute: VariantObject;
 
-declare const variantPrint: Variant;
+declare const variantPrint: VariantObject;
 declare const variantCustomMedia: VariantObject;
 
 declare const variantSupports: VariantObject;
@@ -33,12 +33,12 @@ declare const variantInternalLayer: Variant;
 declare const variantScope: Variant;
 declare const variantVariables: Variant;
 
-declare const variantPseudoClassesAndElements: VariantObject;
-declare const variantPseudoClassFunctions: VariantObject;
+declare const variantPseudoClassesAndElements: () => VariantObject;
+declare const variantPseudoClassFunctions: () => VariantObject;
 declare const variantTaggedPseudoClasses: (options?: PresetMiniOptions) => VariantObject[];
 declare const partClasses: VariantObject;
 
-declare const variantImportant: Variant;
+declare const variantImportant: () => VariantObject;
 
 declare const variantNegative: Variant;
 

package/dist/variants.mjs

@@ -1,4 +1,4 @@
-export { c as calcMaxWidthBySize, t as partClasses, a as variantAria, b as variantBreakpoints, j as variantColorsMediaOrClass, d as variantCombinators, e as variantContainerQuery, m as variantCssLayer, h as variantCustomMedia, f as variantDataAttribute, u as variantImportant, n as variantInternalLayer, k as variantLanguageDirections, w as variantNegative, g as variantPrint, r as variantPseudoClassFunctions, q as variantPseudoClassesAndElements, o as variantScope, l as variantSelector, i as variantSupports, s as variantTaggedPseudoClasses, p as variantVariables, v as variants } from './shared/preset-mini.0d510914.mjs';
+export { c as calcMaxWidthBySize, t as partClasses, a as variantAria, b as variantBreakpoints, j as variantColorsMediaOrClass, d as variantCombinators, e as variantContainerQuery, m as variantCssLayer, h as variantCustomMedia, f as variantDataAttribute, u as variantImportant, n as variantInternalLayer, k as variantLanguageDirections, w as variantNegative, g as variantPrint, r as variantPseudoClassFunctions, q as variantPseudoClassesAndElements, o as variantScope, l as variantSelector, i as variantSupports, s as variantTaggedPseudoClasses, p as variantVariables, v as variants } from './shared/preset-mini.7ae92961.mjs';
 import './shared/preset-mini.ca595ab5.mjs';
 import '@unocss/core';
-import './shared/preset-mini.bd4c0c0c.mjs';
+import './shared/preset-mini.d79c2b40.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-mini",
-  "version": "0.48.4",
+  "version": "0.49.0",
   "description": "The minimal preset for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -61,7 +61,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.48.4"
+    "@unocss/core": "0.49.0"
   },
   "scripts": {
     "build": "unbuild",