@unocss/core 0.33.5 → 0.35.0

package/dist/index.cjs

@@ -457,7 +457,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.33.5";
+const version = "0.35.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -661,7 +661,7 @@ class UnoGenerator {
         processed = handler.matcher;
         if (Array.isArray(handler.parent))
           this.parentOrders.set(handler.parent[0], handler.parent[1]);
-        handlers.push(handler);
+        handlers.unshift(handler);
         variants.add(v);
         applied = true;
         break;
@@ -676,8 +676,9 @@ class UnoGenerator {
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
     const handlers = [...variantHandlers].sort((a, b) => (a.order || 0) - (b.order || 0));
     const entries = handlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
+    const selector = handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw));
     const obj = {
-      selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
+      selector: movePseudoElementsEnd(selector),
       entries,
       parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0),
       layer: handlers.reduce((p, v) => v.layer || p, void 0),
@@ -840,6 +841,14 @@ function applyScope(css, scope) {
   else
     return scope ? `${scope} ${css}` : css;
 }
+function movePseudoElementsEnd(selector) {
+  const pseudoElements = selector.match(/::[\w-]+/g);
+  if (pseudoElements) {
+    pseudoElements.forEach((e2) => selector = selector.replace(e2, ""));
+    selector += pseudoElements.join("");
+  }
+  return selector;
+}
 const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
   if (attributifyRe.test(raw))
@@ -875,6 +884,7 @@ exports.isValidSelector = isValidSelector;
 exports.matchingPair = matchingPair;
 exports.mergeDeep = mergeDeep;
 exports.mergeSet = mergeSet;
+exports.movePseudoElementsEnd = movePseudoElementsEnd;
 exports.noop = noop;
 exports.normalizeCSSEntries = normalizeCSSEntries;
 exports.normalizeCSSValues = normalizeCSSValues;

package/dist/index.d.ts

@@ -80,6 +80,7 @@ declare class UnoGenerator {
 declare function createGenerator(config?: UserConfig, defaults?: UserConfigDefaults): UnoGenerator;
 declare const regexScopePlaceholder: RegExp;
 declare const hasScopePlaceholder: (css: string) => RegExpMatchArray | null;
+declare function movePseudoElementsEnd(selector: string): string;
 declare function toEscapedSelector(raw: string): string;
 
 declare function escapeRegExp(string: string): string;
@@ -326,8 +327,8 @@ declare type DynamicShortcut<Theme extends {} = {}> = [RegExp, DynamicShortcutMa
 declare type UserShortcuts<Theme extends {} = {}> = StaticShortcutMap | (StaticShortcut | DynamicShortcut<Theme> | StaticShortcutMap)[];
 declare type Shortcut<Theme extends {} = {}> = StaticShortcut | DynamicShortcut<Theme>;
 declare type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
-interface Preflight {
-    getCSS: (context: PreflightContext) => Promise<string | undefined> | string | undefined;
+interface Preflight<Theme extends {} = {}> {
+    getCSS: (context: PreflightContext<Theme>) => Promise<string | undefined> | string | undefined;
     layer?: string;
 }
 declare type BlocklistRule = string | RegExp;
@@ -418,7 +419,7 @@ interface ConfigBase<Theme extends {} = {}> {
     /**
      * Raw CSS injections.
      */
-    preflights?: Preflight[];
+    preflights?: Preflight<Theme>[];
     /**
      * Theme object for shared configuration between rules
      */
@@ -553,7 +554,7 @@ interface UserOnlyOptions<Theme extends {} = {}> {
     /**
      * Presets
      */
-    presets?: (Preset | Preset[])[];
+    presets?: (Preset<Theme> | Preset<Theme>[])[];
     /**
      * Environment mode
      *
@@ -721,4 +722,4 @@ declare const extractorSplit: Extractor;
 
 declare const extractorSvelte: Extractor;
 
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DetailString, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtractStringOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, Preprocessor, Preset, PresetOptions, RGBAColorValue, Range, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValues, ConfigBase, DeepPartial, DetailString, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtractStringOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, Preprocessor, Preset, PresetOptions, RGBAColorValue, Range, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, SourceCodeTransformer, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -453,7 +453,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.33.5";
+const version = "0.35.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -657,7 +657,7 @@ class UnoGenerator {
         processed = handler.matcher;
         if (Array.isArray(handler.parent))
           this.parentOrders.set(handler.parent[0], handler.parent[1]);
-        handlers.push(handler);
+        handlers.unshift(handler);
         variants.add(v);
         applied = true;
         break;
@@ -672,8 +672,9 @@ class UnoGenerator {
   applyVariants(parsed, variantHandlers = parsed[4], raw = parsed[1]) {
     const handlers = [...variantHandlers].sort((a, b) => (a.order || 0) - (b.order || 0));
     const entries = handlers.reduce((p, v) => v.body?.(p) || p, parsed[2]);
+    const selector = handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw));
     const obj = {
-      selector: handlers.reduce((p, v) => v.selector?.(p, entries) || p, toEscapedSelector(raw)),
+      selector: movePseudoElementsEnd(selector),
       entries,
       parent: handlers.reduce((p, v) => Array.isArray(v.parent) ? v.parent[0] : v.parent || p, void 0),
       layer: handlers.reduce((p, v) => v.layer || p, void 0),
@@ -836,6 +837,14 @@ function applyScope(css, scope) {
   else
     return scope ? `${scope} ${css}` : css;
 }
+function movePseudoElementsEnd(selector) {
+  const pseudoElements = selector.match(/::[\w-]+/g);
+  if (pseudoElements) {
+    pseudoElements.forEach((e2) => selector = selector.replace(e2, ""));
+    selector += pseudoElements.join("");
+  }
+  return selector;
+}
 const attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
   if (attributifyRe.test(raw))
@@ -843,4 +852,4 @@ function toEscapedSelector(raw) {
   return `.${e(raw)}`;
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractQuoted, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isValidSelector, matchingPair, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

@@ -1,7 +1,19 @@
 {
   "name": "@unocss/core",
-  "version": "0.33.5",
+  "version": "0.35.0",
   "description": "The instant on-demand Atomic CSS engine.",
+  "author": "Anthony Fu <anthonyfu117@hotmail.com>",
+  "license": "MIT",
+  "funding": "https://github.com/sponsors/antfu",
+  "homepage": "https://github.com/unocss/unocss/tree/main/packages/core#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/unocss/unocss.git",
+    "directory": "packages/core"
+  },
+  "bugs": {
+    "url": "https://github.com/unocss/unocss/issues"
+  },
   "keywords": [
     "unocss",
     "atomic-css",
@@ -10,32 +22,20 @@
     "tailwind",
     "windicss"
   ],
-  "homepage": "https://github.com/unocss/unocss/tree/main/packages/core#readme",
-  "bugs": {
-    "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/core"
-  },
-  "funding": "https://github.com/sponsors/antfu",
-  "main": "dist/index.cjs",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "sideEffects": false,
   "exports": {
     ".": {
-      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
+  "main": "dist/index.cjs",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
-  "sideEffects": false,
   "devDependencies": {
     "magic-string": "^0.26.2",
     "unconfig": "^0.3.4"