@unocss/core 0.44.1 → 0.44.4

package/dist/index.cjs

@@ -87,7 +87,7 @@ function entriesToCss(arr) {
 function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
 }
-function mergeDeep(original, patch) {
+function mergeDeep(original, patch, level = Infinity) {
   const o = original;
   const p = patch;
   if (Array.isArray(o) && Array.isArray(p))
@@ -97,8 +97,8 @@ function mergeDeep(original, patch) {
   const output = { ...o };
   if (isObject(o) && isObject(p)) {
     Object.keys(p).forEach((key) => {
-      if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key]))
-        output[key] = mergeDeep(o[key], p[key]);
+      if (level > 0 && (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key])))
+        output[key] = mergeDeep(o[key], p[key], level - 1);
       else
         Object.assign(output, { [key]: p[key] });
     });
@@ -383,7 +383,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const theme = clone([
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
-  ].reduce((a, p) => mergeDeep(a, p), {}));
+  ].reduce((a, p) => mergeDeep(a, p, 1), {}));
   mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
   const autocomplete = {
     templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
@@ -414,7 +414,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.44.1";
+const version = "0.44.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/dist/index.d.ts

@@ -95,7 +95,7 @@ declare function normalizeCSSValues(obj: CSSValue | string | (CSSValue | string)
 declare function clearIdenticalEntries(entry: CSSEntries): CSSEntries;
 declare function entriesToCss(arr?: CSSEntries): string;
 declare function isObject(item: any): item is Record<string, any>;
-declare function mergeDeep<T>(original: T, patch: DeepPartial<T>): T;
+declare function mergeDeep<T>(original: T, patch: DeepPartial<T>, level?: number): T;
 declare function clone<T>(val: T): T;
 declare function isStaticRule(rule: Rule): rule is StaticRule;
 declare function isStaticShortcut(sc: Shortcut): sc is StaticShortcut;
@@ -633,12 +633,13 @@ interface TransformResult {
     deps?: string[];
     dynamicDeps?: string[];
 }
+declare type SourceCodeTransformerEnforce = 'pre' | 'post' | 'default';
 interface SourceCodeTransformer {
     name: string;
     /**
      * The order of transformer
      */
-    enforce?: 'pre' | 'post';
+    enforce?: SourceCodeTransformerEnforce;
     /**
      * Custom id filter, if not provided, the extraction filter will be applied
      */
@@ -672,8 +673,6 @@ interface PluginOptions {
     exclude?: FilterPattern;
     /**
      * Custom transformers to the source code
-     *
-     * Currently only supported in Vite
      */
     transformers?: SourceCodeTransformer[];
 }
@@ -770,4 +769,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, CSSValue, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, 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, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, mergeSet, movePseudoElementsEnd, 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, CSSValue, CSSValues, ConfigBase, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, 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, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, mergeSet, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -83,7 +83,7 @@ function entriesToCss(arr) {
 function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
 }
-function mergeDeep(original, patch) {
+function mergeDeep(original, patch, level = Infinity) {
   const o = original;
   const p = patch;
   if (Array.isArray(o) && Array.isArray(p))
@@ -93,8 +93,8 @@ function mergeDeep(original, patch) {
   const output = { ...o };
   if (isObject(o) && isObject(p)) {
     Object.keys(p).forEach((key) => {
-      if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key]))
-        output[key] = mergeDeep(o[key], p[key]);
+      if (level > 0 && (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key])))
+        output[key] = mergeDeep(o[key], p[key], level - 1);
       else
         Object.assign(output, { [key]: p[key] });
     });
@@ -379,7 +379,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   const theme = clone([
     ...sortedPresets.map((p) => p.theme || {}),
     config.theme || {}
-  ].reduce((a, p) => mergeDeep(a, p), {}));
+  ].reduce((a, p) => mergeDeep(a, p, 1), {}));
   mergePresets("extendTheme").forEach((extendTheme) => extendTheme(theme));
   const autocomplete = {
     templates: uniq(sortedPresets.map((p) => toArray(p.autocomplete?.templates)).flat()),
@@ -410,7 +410,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.44.1";
+const version = "0.44.4";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/package.json

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