@unocss/core 0.47.6 → 0.48.0

package/dist/index.cjs

@@ -219,8 +219,8 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
-function expandVariantGroup(str, seperators = ["-", ":"], depth = 5) {
+const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
+function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
   let content = str.toString();
@@ -229,7 +229,7 @@ function expandVariantGroup(str, seperators = ["-", ":"], depth = 5) {
     content = content.replace(
       regexClassGroup,
       (from, pre, sep, body) => {
-        if (!seperators.includes(sep))
+        if (!separators.includes(sep))
           return from;
         return body.split(/\s/g).filter(Boolean).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
       }
@@ -431,7 +431,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.47.6";
+const version = "0.48.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -849,17 +849,17 @@ class UnoGenerator {
       return result || [];
     }))).flat(1).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
-    const rawStringfieldUtil = [];
+    const rawStringifiedUtil = [];
     for (const item of parsed) {
       if (isRawUtil(item)) {
-        rawStringfieldUtil.push([item[0], void 0, item[1], void 0, item[2], context, void 0]);
+        rawStringifiedUtil.push([item[0], void 0, item[1], void 0, item[2], context, void 0]);
         continue;
       }
       const { selector, entries, parent: parent2, sort, noMerge } = this.applyVariants(item, [...item[4], ...parentVariants], raw);
       const mapItem = selectorMap.getFallback(selector, parent2, [[], item[0]]);
       mapItem[0].push([entries, !!(noMerge ?? item[3]?.noMerge), sort ?? 0]);
     }
-    return rawStringfieldUtil.concat(selectorMap.map(([e2, index], selector, joinedParents) => {
+    return rawStringifiedUtil.concat(selectorMap.map(([e2, index], selector, joinedParents) => {
       const stringify = (flatten, noMerge, entrySortPair) => {
         const maxSort = Math.max(...entrySortPair.map((e3) => e3[1]));
         const entriesList = entrySortPair.map((e3) => e3[0]);

package/dist/index.d.ts

@@ -132,8 +132,8 @@ declare class BetterMap<K, V> extends Map<K, V> {
 declare function withLayer<T extends {}>(layer: string, rules: Rule<T>[]): Rule<T>[];
 
 declare const regexClassGroup: RegExp;
-declare function expandVariantGroup(str: string, seperators?: string[], depth?: number): string;
-declare function expandVariantGroup(str: MagicString, seperators?: string[], depth?: number): MagicString;
+declare function expandVariantGroup(str: string, separators?: string[], depth?: number): string;
+declare function expandVariantGroup(str: MagicString, separators?: string[], depth?: number): MagicString;
 
 declare function warnOnce(msg: string): void;
 
@@ -620,6 +620,12 @@ interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
     modules: BetterMap<string, string>;
     /** Module IDs that been affected by UnoCSS */
     affectedModules: Set<string>;
+    /** Pending promises */
+    tasks: Promise<any>[];
+    /**
+     * Await all pending tasks
+     */
+    flushTasks(): Promise<any>;
     filter: (code: string, id: string) => boolean;
     extract: (code: string, id?: string) => Promise<void>;
     reloadConfig: () => Promise<LoadConfigResult<Config>>;
@@ -662,6 +668,17 @@ interface SourceCodeTransformer {
      */
     transform: (code: MagicString, id: string, ctx: UnocssPluginContext) => Awaitable<void>;
 }
+interface ExtraContentOptions {
+    /**
+     * Glob patterns to match the files to be extracted
+     * In dev mode, the files will be watched and trigger HMR
+     */
+    filesystem?: string[];
+    /**
+     * Plain text to be extracted
+     */
+    plain?: string[];
+}
 /**
  * For other modules to aggregate the options
  */
@@ -688,6 +705,10 @@ interface PluginOptions {
      * Custom transformers to the source code
      */
     transformers?: SourceCodeTransformer[];
+    /**
+     * Extra content outside of build pipeline (assets, backend, etc.) to be extracted
+     */
+    extraContent?: ExtraContentOptions;
 }
 interface UserConfig<Theme extends {} = {}> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions {
 }
@@ -789,4 +810,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, CliEntryItem, CliOptions, 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, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, 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, 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, TransformResult, TwoKeyMap, UnoGenerator, UnocssPluginContext, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, ValueHandler, ValueHandlerCallback, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, arbitraryPropertyRE, attributifyRE, clearIdenticalEntries, clone, createGenerator, createValueHandler, cssIdRE, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit, extractorSvelte, hasScopePlaceholder, isAttributifySelector, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, mergeDeep, movePseudoElementsEnd, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, regexClassGroup, regexScopePlaceholder, toArray, toEscapedSelector, uniq, validateFilterRE, warnOnce, withLayer };

package/dist/index.mjs

@@ -215,8 +215,8 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-const regexClassGroup = /((?:[!\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
-function expandVariantGroup(str, seperators = ["-", ":"], depth = 5) {
+const regexClassGroup = /((?:[!@\w+:_/-]|\[&?>?:?.*\])+?)([:-])\(((?:[~!\w\s:/\\,%#.$-]|\[.*?\])+?)\)(?!\s*?=>)/gm;
+function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
   regexClassGroup.lastIndex = 0;
   let hasChanged = false;
   let content = str.toString();
@@ -225,7 +225,7 @@ function expandVariantGroup(str, seperators = ["-", ":"], depth = 5) {
     content = content.replace(
       regexClassGroup,
       (from, pre, sep, body) => {
-        if (!seperators.includes(sep))
+        if (!separators.includes(sep))
           return from;
         return body.split(/\s/g).filter(Boolean).map((i) => i === "~" ? pre : i.replace(/^(!?)(.*)/, `$1${pre}${sep}$2`)).join(" ");
       }
@@ -427,7 +427,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.47.6";
+const version = "0.48.0";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -845,17 +845,17 @@ class UnoGenerator {
       return result || [];
     }))).flat(1).filter(Boolean).sort((a, b) => a[0] - b[0]);
     const [raw, , parentVariants] = parent;
-    const rawStringfieldUtil = [];
+    const rawStringifiedUtil = [];
     for (const item of parsed) {
       if (isRawUtil(item)) {
-        rawStringfieldUtil.push([item[0], void 0, item[1], void 0, item[2], context, void 0]);
+        rawStringifiedUtil.push([item[0], void 0, item[1], void 0, item[2], context, void 0]);
         continue;
       }
       const { selector, entries, parent: parent2, sort, noMerge } = this.applyVariants(item, [...item[4], ...parentVariants], raw);
       const mapItem = selectorMap.getFallback(selector, parent2, [[], item[0]]);
       mapItem[0].push([entries, !!(noMerge ?? item[3]?.noMerge), sort ?? 0]);
     }
-    return rawStringfieldUtil.concat(selectorMap.map(([e2, index], selector, joinedParents) => {
+    return rawStringifiedUtil.concat(selectorMap.map(([e2, index], selector, joinedParents) => {
       const stringify = (flatten, noMerge, entrySortPair) => {
         const maxSort = Math.max(...entrySortPair.map((e3) => e3[1]));
         const entriesList = entrySortPair.map((e3) => e3[0]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.47.6",
+  "version": "0.48.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.26.7",
+    "magic-string": "^0.27.0",
     "unconfig": "^0.3.7"
   },
   "scripts": {