@unocss/core 66.2.1 → 66.2.2

package/dist/index.d.mts

@@ -535,7 +535,7 @@ interface VariantObject<Theme extends object = object> {
 type Variant<Theme extends object = object> = VariantFunction<Theme> | VariantObject<Theme>;
 type Preprocessor = (matcher: string) => string | undefined;
 type Postprocessor = (util: UtilObject) => void;
-type ThemeExtender<T> = (theme: T) => T | void;
+type ThemeExtender<Theme extends object = object> = (theme: Theme, config: Readonly<ResolvedConfig<Theme>>) => Theme | void;
 interface ConfigBase<Theme extends object = object> {
     /**
      * Rules to generate CSS utilities.
@@ -651,7 +651,7 @@ interface ConfigBase<Theme extends object = object> {
      *
      * First presets runs first and the user config
      */
-    configResolved?: (config: ResolvedConfig) => void;
+    configResolved?: (config: ResolvedConfig<Theme>) => void;
     /**
      * Expose internal details for debugging / inspecting
      *

package/dist/index.d.ts

@@ -535,7 +535,7 @@ interface VariantObject<Theme extends object = object> {
 type Variant<Theme extends object = object> = VariantFunction<Theme> | VariantObject<Theme>;
 type Preprocessor = (matcher: string) => string | undefined;
 type Postprocessor = (util: UtilObject) => void;
-type ThemeExtender<T> = (theme: T) => T | void;
+type ThemeExtender<Theme extends object = object> = (theme: Theme, config: Readonly<ResolvedConfig<Theme>>) => Theme | void;
 interface ConfigBase<Theme extends object = object> {
     /**
      * Rules to generate CSS utilities.
@@ -651,7 +651,7 @@ interface ConfigBase<Theme extends object = object> {
      *
      * First presets runs first and the user config
      */
-    configResolved?: (config: ResolvedConfig) => void;
+    configResolved?: (config: ResolvedConfig<Theme>) => void;
     /**
      * Expose internal details for debugging / inspecting
      *

package/dist/index.mjs

@@ -567,10 +567,6 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
     });
     return false;
   }).reverse();
-  let theme = mergeThemes(sources.map((p) => p.theme));
-  const extendThemes = getMerged("extendTheme");
-  for (const extendTheme of extendThemes)
-    theme = extendTheme(theme) || theme;
   const autocomplete = {
     templates: uniq(sources.flatMap((p) => toArray(p.autocomplete?.templates))),
     extractors: sources.flatMap((p) => toArray(p.autocomplete?.extractors)).sort((a, b) => (a.order || 0) - (b.order || 0)),
@@ -591,7 +587,7 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
     envMode: config.envMode || "build",
     shortcutsLayer: config.shortcutsLayer || "shortcuts",
     layers,
-    theme,
+    theme: mergeThemes(sources.map((p) => p.theme)),
     rules,
     rulesSize,
     rulesDynamic,
@@ -609,6 +605,9 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
     content,
     transformers: uniqueBy(getMerged("transformers"), (a, b) => a.name === b.name)
   };
+  const extendThemes = getMerged("extendTheme");
+  for (const extendTheme of extendThemes)
+    resolved.theme = extendTheme(resolved.theme, resolved) || resolved.theme;
   for (const p of sources)
     p?.configResolved?.(resolved);
   return resolved;
@@ -657,7 +656,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "66.2.1";
+const version = "66.2.2";
 
 const symbols = {
   shortcutsNoMerge: "$$symbol-shortcut-no-merge",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "66.2.1",
+  "version": "66.2.2",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",