@unocss/vite 0.62.4 → 0.63.0

package/dist/index.mjs

@@ -437,6 +437,7 @@ function ChunkModeBuildPlugin({ uno, filter }) {
   };
 }
 
+const LAYER_PREFLIGHTS = "preflights";
 const LAYER_IMPORTS = "imports";
 
 async function applyTransformers(ctx, original, id, enforce = "default") {
@@ -690,11 +691,27 @@ function GlobalModeBuildPlugin(ctx) {
           return null;
         }
         const result = await generateAll();
-        const mappedVfsLayer = Array.from(vfsLayers).map((layer) => layer === LAYER_MARK_ALL ? layer : layer.replace(/^_/, ""));
-        const importStatements = result.getLayer(LAYER_IMPORTS);
-        const cssWithLayers = Array.from(vfsLayers).map((layer) => `${importStatements ?? ""}#--unocss-layer-start--${layer}--{start:${layer}} ${layer === LAYER_MARK_ALL ? result.getLayers(void 0, [...mappedVfsLayer, LAYER_IMPORTS]) : result.getLayer(layer.replace(/^_/, "")) || ""} #--unocss-layer-end--${layer}--{end:${layer}}`).join("");
+        const importsLayer = result.getLayer(LAYER_IMPORTS) ?? "";
         const fakeCssId = `${viteConfig.root}/${chunk.fileName}-unocss-hash.css`;
-        const css = await applyCssTransform(cssWithLayers, fakeCssId, options.dir, this);
+        const preflightLayers = ctx.uno.config.preflights?.map((i) => i.layer).concat(LAYER_PREFLIGHTS).filter(Boolean);
+        await Promise.all(preflightLayers.map((i) => result.setLayer(i, async (layerContent) => {
+          const preTransform = await applyTransformers(ctx, layerContent, fakeCssId, "pre");
+          const defaultTransform = await applyTransformers(ctx, preTransform?.code || layerContent, fakeCssId);
+          const postTransform = await applyTransformers(ctx, defaultTransform?.code || preTransform?.code || layerContent, fakeCssId, "post");
+          return postTransform?.code || defaultTransform?.code || preTransform?.code || layerContent;
+        })));
+        const cssWithLayers = await Promise.all(Array.from(vfsLayers).map(async (layer) => {
+          const layerStart = `#--unocss-layer-start--${layer}--{start:${layer}}`;
+          const layerEnd = `#--unocss-layer-end--${layer}--{end:${layer}}`;
+          let layerContent;
+          if (layer === LAYER_MARK_ALL) {
+            layerContent = result.getLayers(void 0, [...vfsLayers, LAYER_IMPORTS]);
+          } else {
+            layerContent = result.getLayer(layer) || "";
+          }
+          return `${importsLayer}${layerStart} ${layerContent} ${layerEnd}`;
+        }));
+        const css = await applyCssTransform(cssWithLayers.join(""), fakeCssId, options.dir, this);
         const transformHandler = "handler" in cssPost.transform ? cssPost.transform.handler : cssPost.transform;
         await transformHandler.call({}, css, fakeCssId);
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/vite",
   "type": "module",
-  "version": "0.62.4",
+  "version": "0.63.0",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -50,17 +50,17 @@
   },
   "dependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@rollup/pluginutils": "^5.1.0",
+    "@rollup/pluginutils": "^5.1.2",
     "chokidar": "^3.6.0",
     "magic-string": "^0.30.11",
     "tinyglobby": "^0.2.6",
-    "@unocss/config": "0.62.4",
-    "@unocss/inspector": "0.62.4",
-    "@unocss/core": "0.62.4"
+    "@unocss/config": "0.63.0",
+    "@unocss/core": "0.63.0",
+    "@unocss/inspector": "0.63.0"
   },
   "devDependencies": {
-    "vite": "^5.4.5",
-    "@unocss/shared-integration": "0.62.4"
+    "vite": "^5.4.8",
+    "@unocss/shared-integration": "0.63.0"
   },
   "scripts": {
     "build": "unbuild",