@unocss/core 0.62.0 → 0.62.1

package/dist/index.mjs

@@ -489,47 +489,29 @@ function resolvePresets(preset) {
   return [root, ...nested];
 }
 function mergeContentOptions(optionsArray) {
-  const mergedResult = {
-    filesystem: [],
-    inline: [],
-    pipeline: {
-      include: [],
-      exclude: []
-    },
-    plain: []
-  };
+  if (optionsArray.length === 0) {
+    return {};
+  }
+  const pipelineIncludes = [];
+  const pipelineExcludes = [];
+  let pipelineDisabled = false;
   for (const options of optionsArray) {
-    if (options.filesystem) {
-      mergedResult.filesystem.push(...options.filesystem);
-    }
-    if (options.inline) {
-      mergedResult.inline.push(...options.inline);
-    }
-    if (options.plain) {
-      mergedResult.inline.push(...options.plain);
-    }
-    if (options.pipeline !== false) {
-      if (options.pipeline?.include) {
-        mergedResult.pipeline?.include?.push(...options.pipeline?.include);
-      }
-      if (options.pipeline?.exclude) {
-        mergedResult.pipeline?.exclude?.push(...options.pipeline?.exclude);
-      }
+    if (options.pipeline === false) {
+      pipelineDisabled = true;
     } else {
-      mergedResult.pipeline = false;
+      pipelineIncludes.push(options.pipeline?.include ?? []);
+      pipelineExcludes.push(options.pipeline?.exclude ?? []);
     }
   }
-  if (mergedResult.filesystem) {
-    mergedResult.filesystem = Array.from(new Set(mergedResult.filesystem));
-  }
-  if (mergedResult.inline) {
-    mergedResult.inline = Array.from(new Set(mergedResult.inline));
-  }
-  if (mergedResult.pipeline !== false) {
-    mergedResult.pipeline.include = Array.from(new Set(mergedResult.pipeline?.include));
-    mergedResult.pipeline.exclude = Array.from(new Set(mergedResult.pipeline?.exclude));
-  }
-  return mergedResult;
+  return {
+    filesystem: uniq(optionsArray.flatMap((options) => options.filesystem ?? [])),
+    inline: uniq(optionsArray.flatMap((options) => options.inline ?? [])),
+    plain: uniq(optionsArray.flatMap((options) => options.plain ?? [])),
+    pipeline: pipelineDisabled ? false : {
+      include: uniq(mergeFilterPatterns(...pipelineIncludes)),
+      exclude: uniq(mergeFilterPatterns(...pipelineExcludes))
+    }
+  };
 }
 function resolveConfig(userConfig = {}, defaults = {}) {
   const config = Object.assign({}, defaults, userConfig);
@@ -617,10 +599,12 @@ function mergeConfigs(configs) {
   const config = configs.map((config2) => Object.entries(config2).reduce((acc, [key, value]) => ({
     ...acc,
     [key]: maybeArrays.includes(key) ? toArray(value) : value
-  }), {})).reduce(({ theme: themeA, ...a }, { theme: themeB, ...b }) => {
+  }), {})).reduce(({ theme: themeA, content: contentA, ...a }, { theme: themeB, content: contentB, ...b }) => {
     const c = mergeDeep(a, b, true);
     if (themeA || themeB)
       c.theme = mergeThemes([themeA, themeB]);
+    if (contentA || contentB)
+      c.content = mergeContentOptions([contentA || {}, contentB || {}]);
     return c;
   }, {});
   return config;
@@ -644,11 +628,17 @@ function mergeAutocompleteShorthands(shorthands) {
     };
   }, {});
 }
+function mergeFilterPatterns(...filterPatterns) {
+  return filterPatterns.flatMap(flatternFilterPattern);
+}
+function flatternFilterPattern(pattern) {
+  return Array.isArray(pattern) ? pattern : pattern ? [pattern] : [];
+}
 function definePreset(preset) {
   return preset;
 }
 
-const version = "0.62.0";
+const version = "0.62.1";
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;

package/package.json

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