@unocss/core 0.38.1 → 0.38.2

package/dist/index.cjs

@@ -458,7 +458,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.38.1";
+const version = "0.38.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -563,7 +563,8 @@ class UnoGenerator {
     const layerSet = /* @__PURE__ */ new Set(["default"]);
     const matched = /* @__PURE__ */ new Set();
     const sheet = /* @__PURE__ */ new Map();
-    await Promise.all(Array.from(tokens).map(async (raw) => {
+    let preflightsMap = {};
+    const tokenPromises = Array.from(tokens).map(async (raw) => {
       if (matched.has(raw))
         return;
       const payload = await this.parseToken(raw);
@@ -572,33 +573,40 @@ class UnoGenerator {
       matched.add(raw);
       for (const item of payload) {
         const parent = item[3] || "";
+        const layer = item[4]?.layer;
         if (!sheet.has(parent))
           sheet.set(parent, []);
         sheet.get(parent).push(item);
-        if (item[4]?.layer)
-          layerSet.add(item[4].layer);
+        if (layer)
+          layerSet.add(layer);
       }
-    }));
-    if (preflights) {
-      this.config.preflights.forEach((i) => {
-        if (i.layer)
-          layerSet.add(i.layer);
-      });
-    }
-    const layerCache = {};
-    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
-    let preflightsMap = {};
-    if (preflights) {
+    });
+    const preflightPromise = (async () => {
+      if (!preflights)
+        return;
       const preflightContext = {
         generator: this,
         theme: this.config.theme
       };
-      preflightsMap = Object.fromEntries(await Promise.all(layers.map(async (layer) => {
+      const preflightLayerSet = /* @__PURE__ */ new Set(["default"]);
+      this.config.preflights.forEach(({ layer }) => {
+        if (layer) {
+          layerSet.add(layer);
+          preflightLayerSet.add(layer);
+        }
+      });
+      preflightsMap = Object.fromEntries(await Promise.all(Array.from(preflightLayerSet).map(async (layer) => {
         const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || "default") === layer).map(async (i) => await i.getCSS(preflightContext)));
         const css = preflights2.filter(Boolean).join(nl);
         return [layer, css];
       })));
-    }
+    })();
+    await Promise.all([
+      ...tokenPromises,
+      preflightPromise
+    ]);
+    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
+    const layerCache = {};
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];

package/dist/index.d.ts

@@ -565,7 +565,9 @@ interface UserOnlyOptions<Theme extends {} = {}> {
 interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
     ready: Promise<LoadConfigResult<Config>>;
     uno: UnoGenerator;
+    /** All tokens scanned */
     tokens: Set<string>;
+    /** Map for all module's raw content */
     modules: BetterMap<string, string>;
     filter: (code: string, id: string) => boolean;
     extract: (code: string, id?: string) => Promise<void>;

package/dist/index.mjs

@@ -454,7 +454,7 @@ function resolveConfig(userConfig = {}, defaults = {}) {
   };
 }
 
-const version = "0.38.1";
+const version = "0.38.2";
 
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
@@ -559,7 +559,8 @@ class UnoGenerator {
     const layerSet = /* @__PURE__ */ new Set(["default"]);
     const matched = /* @__PURE__ */ new Set();
     const sheet = /* @__PURE__ */ new Map();
-    await Promise.all(Array.from(tokens).map(async (raw) => {
+    let preflightsMap = {};
+    const tokenPromises = Array.from(tokens).map(async (raw) => {
       if (matched.has(raw))
         return;
       const payload = await this.parseToken(raw);
@@ -568,33 +569,40 @@ class UnoGenerator {
       matched.add(raw);
       for (const item of payload) {
         const parent = item[3] || "";
+        const layer = item[4]?.layer;
         if (!sheet.has(parent))
           sheet.set(parent, []);
         sheet.get(parent).push(item);
-        if (item[4]?.layer)
-          layerSet.add(item[4].layer);
+        if (layer)
+          layerSet.add(layer);
       }
-    }));
-    if (preflights) {
-      this.config.preflights.forEach((i) => {
-        if (i.layer)
-          layerSet.add(i.layer);
-      });
-    }
-    const layerCache = {};
-    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
-    let preflightsMap = {};
-    if (preflights) {
+    });
+    const preflightPromise = (async () => {
+      if (!preflights)
+        return;
       const preflightContext = {
         generator: this,
         theme: this.config.theme
       };
-      preflightsMap = Object.fromEntries(await Promise.all(layers.map(async (layer) => {
+      const preflightLayerSet = /* @__PURE__ */ new Set(["default"]);
+      this.config.preflights.forEach(({ layer }) => {
+        if (layer) {
+          layerSet.add(layer);
+          preflightLayerSet.add(layer);
+        }
+      });
+      preflightsMap = Object.fromEntries(await Promise.all(Array.from(preflightLayerSet).map(async (layer) => {
         const preflights2 = await Promise.all(this.config.preflights.filter((i) => (i.layer || "default") === layer).map(async (i) => await i.getCSS(preflightContext)));
         const css = preflights2.filter(Boolean).join(nl);
         return [layer, css];
       })));
-    }
+    })();
+    await Promise.all([
+      ...tokenPromises,
+      preflightPromise
+    ]);
+    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
+    const layerCache = {};
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];

package/package.json

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