@unocss/core 0.52.6 → 0.53.0

package/dist/index.cjs

@@ -442,7 +442,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     }
     return [i, ...rule];
   }).filter(Boolean).reverse();
-  let theme = sources.map((p) => p.theme ? clone(p.theme) : {}).reduce((a, p) => mergeDeep(a, p), {});
+  let theme = mergeThemes(sources.map((p) => p.theme));
   const extendThemes = getMerged("extendTheme");
   for (const extendTheme of extendThemes)
     theme = extendTheme(theme) || theme;
@@ -489,6 +489,7 @@ function mergeConfigs(configs) {
     {},
     ...configs,
     {
+      theme: mergeThemes(configs.map((c) => c.theme)),
       presets: getMerged("presets"),
       safelist: getMerged("safelist"),
       preprocess: getMerged("preprocess"),
@@ -502,8 +503,11 @@ function mergeConfigs(configs) {
   );
   return merged;
 }
+function mergeThemes(themes) {
+  return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
+}
 
-const version = "0.52.6";
+const version = "0.53.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/dist/index.d.ts

@@ -317,6 +317,13 @@ interface RuleMeta {
      * @default false
      */
     internal?: boolean;
+    /**
+     * Store the hash of the rule boy
+     *
+     * @internal
+     * @private
+     */
+    __hash?: string;
 }
 type CSSValue = CSSObject | CSSEntries;
 type CSSValues = CSSValue | CSSValue[];
@@ -722,16 +729,61 @@ interface SourceCodeTransformer {
      */
     transform: (code: MagicString, id: string, ctx: UnocssPluginContext) => Awaitable<void>;
 }
-interface ExtraContentOptions {
+interface ContentOptions {
     /**
-     * Glob patterns to match the files to be extracted
-     * In dev mode, the files will be watched and trigger HMR
+     * Glob patterns to extract from the file system, in addition to other content sources.
+     *
+     * In dev mode, the files will be watched and trigger HMR.
+     *
+     * @default []
      */
     filesystem?: string[];
     /**
-     * Plain text to be extracted
+     * Inline text to be extracted
      */
-    plain?: string[];
+    inline?: (string | {
+        code: string;
+        id?: string;
+    } | (() => Awaitable<string | {
+        code: string;
+        id?: string;
+    }>))[];
+    /**
+     * Filters to determine whether to extract certain modules from the build tools' transformation pipeline.
+     *
+     * Currently only works for Vite and Webpack integration.
+     *
+     * Set `false` to disable.
+     */
+    pipeline?: false | {
+        /**
+         * Patterns that filter the files being extracted.
+         * Supports regular expressions and `picomatch` glob patterns.
+         *
+         * By default, `.ts` and `.js` files are NOT extracted.
+         *
+         * @see https://www.npmjs.com/package/picomatch
+         * @default [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/]
+         */
+        include?: FilterPattern;
+        /**
+         * Patterns that filter the files NOT being extracted.
+         * Supports regular expressions and `picomatch` glob patterns.
+         *
+         * By default, `node_modules` and `dist` are also extracted.
+         *
+         * @see https://www.npmjs.com/package/picomatch
+         * @default [/\.(css|postcss|sass|scss|less|stylus|styl)($|\?)/]
+         */
+        exclude?: FilterPattern;
+    };
+    /**
+     * @deprecated Renamed to `inline`
+     */
+    plain?: (string | {
+        code: string;
+        id?: string;
+    })[];
 }
 /**
  * For other modules to aggregate the options
@@ -748,21 +800,35 @@ interface PluginOptions {
      */
     configDeps?: string[];
     /**
-     * Patterns that filter the files being extracted.
+     * Custom transformers to the source code
      */
-    include?: FilterPattern;
+    transformers?: SourceCodeTransformer[];
     /**
-     * Patterns that filter the files NOT being extracted.
+     * Options for sources to be extracted as utilities usages
+     *
+     * Supported sources:
+     * - `filesystem` - extract from file system
+     * - `plain` - extract from plain inline text
+     * - `pipeline` - extract from build tools' transformation pipeline, such as Vite and Webpack
+     *
+     * The usage extracted from each source will be **merged** together.
      */
-    exclude?: FilterPattern;
+    content?: ContentOptions;
+    /** ========== DEPRECATED OPTIONS ========== **/
     /**
-     * Custom transformers to the source code
+     * @deprecated Renamed to `content`
      */
-    transformers?: SourceCodeTransformer[];
+    extraContent?: ContentOptions;
     /**
-     * Extra content outside of build pipeline (assets, backend, etc.) to be extracted
+     * Patterns that filter the files being extracted.
+     * @deprecated moved to `content.pipeline.include`
      */
-    extraContent?: ExtraContentOptions;
+    include?: FilterPattern;
+    /**
+      * Patterns that filter the files NOT being extracted.
+      * @deprecated moved to `content.pipeline.exclude`
+      */
+    exclude?: FilterPattern;
 }
 interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions {
 }
@@ -879,4 +945,4 @@ declare function resolveConfig<Theme extends {} = {}>(userConfig?: UserConfig<Th
  */
 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 };
+export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BetterMap, BlocklistRule, CONTROL_SHORTCUT_NO_MERGE, CSSColorValue, CSSEntries, CSSObject, CSSValue, CSSValues, CliEntryItem, CliOptions, ConfigBase, ContentOptions, 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, 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

@@ -438,7 +438,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     }
     return [i, ...rule];
   }).filter(Boolean).reverse();
-  let theme = sources.map((p) => p.theme ? clone(p.theme) : {}).reduce((a, p) => mergeDeep(a, p), {});
+  let theme = mergeThemes(sources.map((p) => p.theme));
   const extendThemes = getMerged("extendTheme");
   for (const extendTheme of extendThemes)
     theme = extendTheme(theme) || theme;
@@ -485,6 +485,7 @@ function mergeConfigs(configs) {
     {},
     ...configs,
     {
+      theme: mergeThemes(configs.map((c) => c.theme)),
       presets: getMerged("presets"),
       safelist: getMerged("safelist"),
       preprocess: getMerged("preprocess"),
@@ -498,8 +499,11 @@ function mergeConfigs(configs) {
   );
   return merged;
 }
+function mergeThemes(themes) {
+  return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
+}
 
-const version = "0.52.6";
+const version = "0.53.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {

package/package.json

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