@unocss/vite 0.31.16 → 0.32.1

package/dist/index.cjs

@@ -125,6 +125,26 @@ function getHash(input, length = 8) {
 function getPath(id) {
   return id.replace(/\?.*$/, "");
 }
+function replaceAsync(string, searchValue, replacer) {
+  try {
+    if (typeof replacer === "function") {
+      const values = [];
+      String.prototype.replace.call(string, searchValue, (...args) => {
+        values.push(replacer(...args));
+        return "";
+      });
+      return Promise.all(values).then((resolvedValues) => {
+        return String.prototype.replace.call(string, searchValue, () => {
+          return resolvedValues.shift() || "";
+        });
+      });
+    } else {
+      return Promise.resolve(String.prototype.replace.call(string, searchValue, replacer));
+    }
+  } catch (error) {
+    return Promise.reject(error);
+  }
+}
 
 function ChunkModeBuildPlugin({ uno, filter }) {
   let cssPlugin;
@@ -168,10 +188,27 @@ function ChunkModeBuildPlugin({ uno, filter }) {
   };
 }
 
-function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter }) {
+function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }) {
   const vfsLayerMap = /* @__PURE__ */ new Map();
   let tasks = [];
+  let cssPostPlugin;
   let cssPlugin;
+  async function transformCSS(css, id) {
+    const {
+      postcss = true
+    } = await getConfig();
+    if (!cssPlugin || !postcss)
+      return css;
+    const result = await cssPlugin.transform(css, id);
+    if (!result)
+      return css;
+    if (typeof result === "string")
+      css = result;
+    else if (result.code)
+      css = result.code;
+    css = css.replace(/[\n\r]/g, "");
+    return css;
+  }
   return [
     {
       name: "unocss:global:build:scan",
@@ -205,23 +242,25 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter })
           return getLayerPlaceholder(layer);
       },
       async configResolved(config) {
-        cssPlugin = config.plugins.find((i) => i.name === "vite:css-post");
+        cssPostPlugin = config.plugins.find((i) => i.name === "vite:css-post");
+        cssPlugin = config.plugins.find((i) => i.name === "vite:css");
         await ready;
       },
       async renderChunk(_, chunk) {
-        if (!cssPlugin)
+        if (!cssPostPlugin)
           return null;
         const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
         if (!chunks.length)
           return null;
         const tokens2 = /* @__PURE__ */ new Set();
         await Promise.all(chunks.map((c) => uno.applyExtractors(modules.get(c) || "", c, tokens2)));
-        const { css } = await uno.generate(tokens2, { minify: true });
+        let { css } = await uno.generate(tokens2, { minify: true });
         if (!css)
           return null;
-        const hash = getHash(css);
         const fakeCssId = `${chunk.fileName}-unocss-hash.css`;
-        await cssPlugin.transform(getHashPlaceholder(hash), fakeCssId);
+        css = await transformCSS(css, fakeCssId);
+        const hash = getHash(css);
+        await cssPostPlugin.transform(getHashPlaceholder(hash), fakeCssId);
         chunk.modules[fakeCssId] = {
           code: null,
           originalLength: 0,
@@ -249,9 +288,10 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter })
         for (const file of cssFiles) {
           const chunk = bundle[file];
           if (chunk.type === "asset" && typeof chunk.source === "string") {
-            chunk.source = chunk.source.replace(HASH_PLACEHOLDER_RE, "").replace(LAYER_PLACEHOLDER_RE, (_2, __, layer) => {
+            const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
+            chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_2, __, layer) => {
               replaced = true;
-              return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "";
+              return await transformCSS(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`);
             });
           }
         }

package/dist/index.d.ts

@@ -29,13 +29,19 @@ interface VitePluginConfig<Theme extends {} = {}> extends UserConfig<Theme> {
      * @default false
      */
     transformCSS?: boolean | 'pre' | 'post';
+    /**
+     *
+     * make the generate css processed by postcss(https://vitejs.dev/guide/features.html#postcss)
+     * @default true
+     */
+    postcss?: boolean;
 }
 
 declare function ChunkModeBuildPlugin({ uno, filter }: UnocssPluginContext): Plugin;
 
 declare function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }: UnocssPluginContext): Plugin[];
 
-declare function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter }: UnocssPluginContext): Plugin[];
+declare function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }: UnocssPluginContext<VitePluginConfig>): Plugin[];
 
 declare function GlobalModePlugin(ctx: UnocssPluginContext): vite.Plugin[];
 

package/dist/index.mjs

@@ -115,6 +115,26 @@ function getHash(input, length = 8) {
 function getPath(id) {
   return id.replace(/\?.*$/, "");
 }
+function replaceAsync(string, searchValue, replacer) {
+  try {
+    if (typeof replacer === "function") {
+      const values = [];
+      String.prototype.replace.call(string, searchValue, (...args) => {
+        values.push(replacer(...args));
+        return "";
+      });
+      return Promise.all(values).then((resolvedValues) => {
+        return String.prototype.replace.call(string, searchValue, () => {
+          return resolvedValues.shift() || "";
+        });
+      });
+    } else {
+      return Promise.resolve(String.prototype.replace.call(string, searchValue, replacer));
+    }
+  } catch (error) {
+    return Promise.reject(error);
+  }
+}
 
 function ChunkModeBuildPlugin({ uno, filter }) {
   let cssPlugin;
@@ -158,10 +178,27 @@ function ChunkModeBuildPlugin({ uno, filter }) {
   };
 }
 
-function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter }) {
+function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }) {
   const vfsLayerMap = /* @__PURE__ */ new Map();
   let tasks = [];
+  let cssPostPlugin;
   let cssPlugin;
+  async function transformCSS(css, id) {
+    const {
+      postcss = true
+    } = await getConfig();
+    if (!cssPlugin || !postcss)
+      return css;
+    const result = await cssPlugin.transform(css, id);
+    if (!result)
+      return css;
+    if (typeof result === "string")
+      css = result;
+    else if (result.code)
+      css = result.code;
+    css = css.replace(/[\n\r]/g, "");
+    return css;
+  }
   return [
     {
       name: "unocss:global:build:scan",
@@ -195,23 +232,25 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter })
           return getLayerPlaceholder(layer);
       },
       async configResolved(config) {
-        cssPlugin = config.plugins.find((i) => i.name === "vite:css-post");
+        cssPostPlugin = config.plugins.find((i) => i.name === "vite:css-post");
+        cssPlugin = config.plugins.find((i) => i.name === "vite:css");
         await ready;
       },
       async renderChunk(_, chunk) {
-        if (!cssPlugin)
+        if (!cssPostPlugin)
           return null;
         const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
         if (!chunks.length)
           return null;
         const tokens2 = /* @__PURE__ */ new Set();
         await Promise.all(chunks.map((c) => uno.applyExtractors(modules.get(c) || "", c, tokens2)));
-        const { css } = await uno.generate(tokens2, { minify: true });
+        let { css } = await uno.generate(tokens2, { minify: true });
         if (!css)
           return null;
-        const hash = getHash(css);
         const fakeCssId = `${chunk.fileName}-unocss-hash.css`;
-        await cssPlugin.transform(getHashPlaceholder(hash), fakeCssId);
+        css = await transformCSS(css, fakeCssId);
+        const hash = getHash(css);
+        await cssPostPlugin.transform(getHashPlaceholder(hash), fakeCssId);
         chunk.modules[fakeCssId] = {
           code: null,
           originalLength: 0,
@@ -239,9 +278,10 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter })
         for (const file of cssFiles) {
           const chunk = bundle[file];
           if (chunk.type === "asset" && typeof chunk.source === "string") {
-            chunk.source = chunk.source.replace(HASH_PLACEHOLDER_RE, "").replace(LAYER_PLACEHOLDER_RE, (_2, __, layer) => {
+            const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
+            chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_2, __, layer) => {
               replaced = true;
-              return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "";
+              return await transformCSS(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`);
             });
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.31.16",
+  "version": "0.32.1",
   "description": "The Vite plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -43,11 +43,11 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^4.2.1",
-    "@unocss/config": "0.31.16",
-    "@unocss/core": "0.31.16",
-    "@unocss/inspector": "0.31.16",
-    "@unocss/scope": "0.31.16",
-    "@unocss/transformer-directives": "0.31.16",
+    "@unocss/config": "0.32.1",
+    "@unocss/core": "0.32.1",
+    "@unocss/inspector": "0.32.1",
+    "@unocss/scope": "0.32.1",
+    "@unocss/transformer-directives": "0.32.1",
     "magic-string": "^0.26.1"
   },
   "devDependencies": {