@unocss/core 0.27.1 → 0.27.4

package/dist/index.cjs

@@ -221,20 +221,10 @@ function withLayer(layer, rules) {
 
 const regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
 function expandVariantGroup(str) {
-  const replaces = [];
-  let match;
-  while (match = regexClassGroup.exec(str)) {
-    const start = match.index;
-    const end = start + match[0].length;
-    const [, pre, sep, body] = match;
-    const replacement = body.split(/\s/g).map((i) => i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
-    replaces.unshift([start, end, replacement]);
-  }
-  let result = str;
-  replaces.forEach(([start, end, replacement]) => {
-    result = result.slice(0, start) + replacement + result.slice(end);
+  regexClassGroup.lastIndex = 0;
+  return str.replace(regexClassGroup, (_, pre, sep, body) => {
+    return body.split(/\s/g).map((i) => i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
   });
-  return result;
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -366,7 +356,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.27.1";
+const version = "0.27.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -493,8 +483,12 @@ class UnoGenerator {
     const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     let preflightsMap = {};
     if (preflights) {
+      const preflightContext = {
+        generator: this,
+        theme: this.config.theme
+      };
       preflightsMap = Object.fromEntries(await Promise.all(layers.map(async (layer) => {
-        const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || "default") === layer).map(async (i) => await i.getCSS()));
+        const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || "default") === layer).map(async (i) => await i.getCSS(preflightContext)));
         const css = preflights2.filter(Boolean).join(nl);
         return [layer, css];
       })));

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { LoadConfigResult } from 'unconfig';
-import MagicString from 'magic-string-extra';
+import MagicString from 'magic-string';
 
 declare class UnoGenerator {
     userConfig: UserConfig;
@@ -76,6 +76,7 @@ declare function withLayer<T>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare const regexClassGroup: RegExp;
 declare function expandVariantGroup(str: string): string;
+declare function expandVariantGroup(str: MagicString): MagicString;
 
 declare function warnOnce(msg: string): void;
 
@@ -189,6 +190,16 @@ interface ExtractorContext {
     code: string;
     id?: string;
 }
+interface PreflightContext<Theme extends {} = {}> {
+    /**
+     * UnoCSS generator instance
+     */
+    generator: UnoGenerator;
+    /**
+     * The theme object
+     */
+    theme: Theme;
+}
 interface Extractor {
     name: string;
     extract(ctx: ExtractorContext): Awaitable<Set<string> | undefined>;
@@ -228,7 +239,7 @@ declare type UserShortcuts<Theme extends {} = {}> = StaticShortcutMap | (StaticS
 declare type Shortcut<Theme extends {} = {}> = StaticShortcut | DynamicShortcut<Theme>;
 declare type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
 interface Preflight {
-    getCSS: () => Promise<string | undefined> | string | undefined;
+    getCSS: (context: PreflightContext) => Promise<string | undefined> | string | undefined;
     layer?: string;
 }
 declare type BlocklistRule = string | RegExp;
@@ -533,4 +544,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, mergeDeep, mergeSet, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -217,20 +217,10 @@ function withLayer(layer, rules) {
 
 const regexClassGroup = /([!\w+:_/-]+?)([:-])\(((?:[!\w\s:/\\,%#.$-]|\[.*?\])*?)\)/gm;
 function expandVariantGroup(str) {
-  const replaces = [];
-  let match;
-  while (match = regexClassGroup.exec(str)) {
-    const start = match.index;
-    const end = start + match[0].length;
-    const [, pre, sep, body] = match;
-    const replacement = body.split(/\s/g).map((i) => i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
-    replaces.unshift([start, end, replacement]);
-  }
-  let result = str;
-  replaces.forEach(([start, end, replacement]) => {
-    result = result.slice(0, start) + replacement + result.slice(end);
+  regexClassGroup.lastIndex = 0;
+  return str.replace(regexClassGroup, (_, pre, sep, body) => {
+    return body.split(/\s/g).map((i) => i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
   });
-  return result;
 }
 
 const warned = /* @__PURE__ */ new Set();
@@ -362,7 +352,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.27.1";
+const version = "0.27.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -489,8 +479,12 @@ class UnoGenerator {
     const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     let preflightsMap = {};
     if (preflights) {
+      const preflightContext = {
+        generator: this,
+        theme: this.config.theme
+      };
       preflightsMap = Object.fromEntries(await Promise.all(layers.map(async (layer) => {
-        const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || "default") === layer).map(async (i) => await i.getCSS()));
+        const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || "default") === layer).map(async (i) => await i.getCSS(preflightContext)));
         const css = preflights2.filter(Boolean).join(nl);
         return [layer, css];
       })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.27.1",
+  "version": "0.27.4",
   "description": "The instant on-demand Atomic CSS engine.",
   "keywords": [
     "unocss",
@@ -37,7 +37,7 @@
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "magic-string-extra": "^0.1.2",
+    "magic-string": "^0.26.1",
     "unconfig": "^0.3.1"
   },
   "scripts": {