@unocss/core 0.52.2 → 0.52.4

package/dist/index.cjs

@@ -481,8 +481,29 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     p?.configResolved?.(resolved);
   return resolved;
 }
+function mergeConfigs(configs) {
+  function getMerged(key) {
+    return uniq(configs.flatMap((p) => toArray(p[key] || [])));
+  }
+  const merged = Object.assign(
+    {},
+    ...configs,
+    {
+      presets: getMerged("presets"),
+      safelist: getMerged("safelist"),
+      preprocess: getMerged("preprocess"),
+      postprocess: getMerged("postprocess"),
+      preflights: getMerged("preflights"),
+      rules: getMerged("rules"),
+      variants: getMerged("variants"),
+      shortcuts: getMerged("shortcuts"),
+      extractors: getMerged("extractors")
+    }
+  );
+  return merged;
+}
 
-const version = "0.52.2";
+const version = "0.52.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -994,6 +1015,7 @@ exports.isStaticShortcut = isStaticShortcut;
 exports.isString = isString;
 exports.isValidSelector = isValidSelector;
 exports.makeRegexClassGroup = makeRegexClassGroup;
+exports.mergeConfigs = mergeConfigs;
 exports.mergeDeep = mergeDeep;
 exports.noop = noop;
 exports.normalizeCSSEntries = normalizeCSSEntries;
@@ -1002,6 +1024,10 @@ exports.normalizeVariant = normalizeVariant;
 exports.notNull = notNull;
 exports.parseVariantGroup = parseVariantGroup;
 exports.regexScopePlaceholder = regexScopePlaceholder;
+exports.resolveConfig = resolveConfig;
+exports.resolvePreset = resolvePreset;
+exports.resolvePresets = resolvePresets;
+exports.resolveShortcuts = resolveShortcuts;
 exports.splitWithVariantGroupRE = splitWithVariantGroupRE;
 exports.toArray = toArray;
 exports.toEscapedSelector = toEscapedSelector;

package/dist/index.d.ts

@@ -864,4 +864,19 @@ declare const defaultSplitRE: RegExp;
 declare const splitWithVariantGroupRE: RegExp;
 declare const extractorSplit: Extractor;
 
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+declare function resolveShortcuts<Theme extends {} = {}>(shortcuts: UserShortcuts<Theme>): Shortcut<Theme>[];
+/**
+ * Resolve a single preset, nested presets are ignored
+ */
+declare function resolvePreset<Theme extends {} = {}>(preset: Preset<Theme>): Preset<Theme>;
+/**
+ * Resolve presets with nested presets
+ */
+declare function resolvePresets<Theme extends {} = {}>(preset: Preset<Theme>): Preset<Theme>[];
+declare function resolveConfig<Theme extends {} = {}>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): ResolvedConfig<Theme>;
+/**
+ * Merge multiple configs into one, later ones have higher priority
+ */
+declare function mergeConfigs<Theme extends {} = {}>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
+
+export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, ExtraContentOptions, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, ParsedColorValue, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetOptions, RGBAColorValue, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, Shift, Shortcut, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -477,8 +477,29 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     p?.configResolved?.(resolved);
   return resolved;
 }
+function mergeConfigs(configs) {
+  function getMerged(key) {
+    return uniq(configs.flatMap((p) => toArray(p[key] || [])));
+  }
+  const merged = Object.assign(
+    {},
+    ...configs,
+    {
+      presets: getMerged("presets"),
+      safelist: getMerged("safelist"),
+      preprocess: getMerged("preprocess"),
+      postprocess: getMerged("postprocess"),
+      preflights: getMerged("preflights"),
+      rules: getMerged("rules"),
+      variants: getMerged("variants"),
+      shortcuts: getMerged("shortcuts"),
+      extractors: getMerged("extractors")
+    }
+  );
+  return merged;
+}
 
-const version = "0.52.2";
+const version = "0.52.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -962,4 +983,4 @@ function defaultVariantHandler(input, next) {
   return next(input);
 }
 
-export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CONTROL_SHORTCUT_NO_MERGE, TwoKeyMap, UnoGenerator, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createValueHandler, cssIdRE, defaultSplitRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.52.2",
+  "version": "0.52.4",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -38,7 +38,7 @@
   ],
   "devDependencies": {
     "magic-string": "^0.30.0",
-    "unconfig": "^0.3.8"
+    "unconfig": "^0.3.9"
   },
   "scripts": {
     "build": "unbuild",