@unocss/vite 0.11.2 → 0.11.6

package/dist/index.d.ts

@@ -50,7 +50,7 @@ declare function ChunkModeBuildPlugin({ uno, config }: UnocssPluginContext): Plu
 
 declare function GlobalModeDevPlugin({ config, uno, tokens, onInvalidate, scan }: UnocssPluginContext): Plugin[];
 
-declare function GlobalModeBuildPlugin({ uno, config, scan, tokens }: UnocssPluginContext): Plugin[];
+declare function GlobalModeBuildPlugin({ uno, config, scan, tokens, modules }: UnocssPluginContext): Plugin[];
 
 declare function GlobalModePlugin(ctx: UnocssPluginContext): vite.Plugin[];
 

package/dist/index.js

@@ -120,7 +120,7 @@ function ChunkModeBuildPlugin({ uno, config }) {
 // src/modes/global/build.ts
 var import_pluginutils2 = __toModule(require("@rollup/pluginutils"));
 
-// src/utils.ts
+// ../plugins-common/utils.ts
 var import_crypto = __toModule(require("crypto"));
 function getHash(input, length = 8) {
   return (0, import_crypto.createHash)("sha256").update(input).digest("hex").substr(0, length);
@@ -133,7 +133,6 @@ function getPath(id) {
 var VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];
-var LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 var LAYER_MARK_ALL = "__ALL__";
 function resolveId(id) {
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
@@ -149,20 +148,30 @@ function resolveId(id) {
     }
   }
 }
+var LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
 }
+var HASH_PLACEHOLDER_RE = /#--unocss-hash--\s*{\s*content\s*:\s*"(.+?)";?\s*}/g;
+function getHashPlaceholder(hash) {
+  return `#--unocss-hash--{content:"${hash}"}`;
+}
 
 // src/modes/global/build.ts
-function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
+function GlobalModeBuildPlugin({ uno, config, scan, tokens, modules }) {
   const filter = (0, import_pluginutils2.createFilter)(config.include || defaultInclude, config.exclude || defaultExclude);
-  const tasks = [];
-  const entries = new Map();
+  const vfsLayerMap = new Map();
+  let tasks = [];
+  let cssPlugin;
   return [
     {
       name: "unocss:global:build:scan",
       apply: "build",
       enforce: "pre",
+      buildStart() {
+        tasks = [];
+        vfsLayerMap.clear();
+      },
       transform(code, id) {
         if (filter(id))
           tasks.push(scan(code, id));
@@ -177,14 +186,35 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
       resolveId(id) {
         const entry = resolveId(id);
         if (entry) {
-          entries.set(entry.id, entry.layer);
+          vfsLayerMap.set(entry.id, entry.layer);
           return entry.id;
         }
       },
       load(id) {
-        const layer = entries.get(getPath(id));
+        const layer = vfsLayerMap.get(getPath(id));
         if (layer)
           return getLayerPlaceholder(layer);
+      },
+      async renderChunk(_, chunk) {
+        const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
+        if (!chunks.length)
+          return null;
+        const tokens2 = new Set();
+        await Promise.all(chunks.map((c) => uno.applyExtractors(modules.get(c) || "", c, tokens2)));
+        const { 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);
+        chunk.modules[fakeCssId] = {
+          code: null,
+          originalLength: 0,
+          removedExports: [],
+          renderedExports: [],
+          renderedLength: 0
+        };
+        return null;
       }
     },
     {
@@ -193,8 +223,11 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
         var _a;
         return command === "build" && !((_a = options.build) == null ? void 0 : _a.ssr);
       },
+      configResolved(config2) {
+        cssPlugin = config2.plugins.find((i) => i.name === "vite:css-post");
+      },
       enforce: "post",
-      async generateBundle(options, bundle) {
+      async generateBundle(_, bundle) {
         const files = Object.keys(bundle);
         const cssFiles = files.filter((i) => i.endsWith(".css"));
         if (!cssFiles.length)
@@ -202,38 +235,17 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
         await Promise.all(tasks);
         const result = await uno.generate(tokens, { minify: true });
         let replaced = false;
-        const cssReplacedMap = {};
         for (const file of cssFiles) {
           const chunk = bundle[file];
           if (chunk.type === "asset" && typeof chunk.source === "string") {
-            let currentReplaced = false;
-            chunk.source = chunk.source.replace(LAYER_PLACEHOLDER_RE, (_, __, layer) => {
-              currentReplaced = true;
+            chunk.source = chunk.source.replace(HASH_PLACEHOLDER_RE, "").replace(LAYER_PLACEHOLDER_RE, (_2, __, layer) => {
               replaced = true;
-              return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer) || "";
+              return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "";
             });
-            if (currentReplaced) {
-              const newName = chunk.fileName.replace(/\.(\w+)\.css$/, `.${getHash(chunk.source)}.css`);
-              cssReplacedMap[chunk.fileName] = newName;
-              chunk.fileName = newName;
-            }
           }
         }
         if (!replaced)
           this.error(new Error("[unocss] does not found CSS placeholder in the generated chunks,\nthis is likely an internal bug of unocss vite plugin"));
-        const entires = Object.entries(cssReplacedMap);
-        if (!entires.length)
-          return;
-        for (const file of files) {
-          const chunk = bundle[file];
-          if (chunk.type === "chunk" && typeof chunk.code === "string") {
-            for (const [k, v] of entires)
-              chunk.code = chunk.code.replace(k, v);
-          } else if (chunk.type === "asset" && typeof chunk.source === "string") {
-            for (const [k, v] of entires)
-              chunk.source = chunk.source.replace(k, v);
-          }
-        }
       }
     }
   ];

package/dist/index.mjs

@@ -86,7 +86,7 @@ function ChunkModeBuildPlugin({ uno, config }) {
 // src/modes/global/build.ts
 import { createFilter as createFilter2 } from "@rollup/pluginutils";
 
-// src/utils.ts
+// ../plugins-common/utils.ts
 import { createHash } from "crypto";
 function getHash(input, length = 8) {
   return createHash("sha256").update(input).digest("hex").substr(0, length);
@@ -99,7 +99,6 @@ function getPath(id) {
 var VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];
-var LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 var LAYER_MARK_ALL = "__ALL__";
 function resolveId(id) {
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
@@ -115,20 +114,30 @@ function resolveId(id) {
     }
   }
 }
+var LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
 }
+var HASH_PLACEHOLDER_RE = /#--unocss-hash--\s*{\s*content\s*:\s*"(.+?)";?\s*}/g;
+function getHashPlaceholder(hash) {
+  return `#--unocss-hash--{content:"${hash}"}`;
+}
 
 // src/modes/global/build.ts
-function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
+function GlobalModeBuildPlugin({ uno, config, scan, tokens, modules }) {
   const filter = createFilter2(config.include || defaultInclude, config.exclude || defaultExclude);
-  const tasks = [];
-  const entries = new Map();
+  const vfsLayerMap = new Map();
+  let tasks = [];
+  let cssPlugin;
   return [
     {
       name: "unocss:global:build:scan",
       apply: "build",
       enforce: "pre",
+      buildStart() {
+        tasks = [];
+        vfsLayerMap.clear();
+      },
       transform(code, id) {
         if (filter(id))
           tasks.push(scan(code, id));
@@ -143,14 +152,35 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
       resolveId(id) {
         const entry = resolveId(id);
         if (entry) {
-          entries.set(entry.id, entry.layer);
+          vfsLayerMap.set(entry.id, entry.layer);
           return entry.id;
         }
       },
       load(id) {
-        const layer = entries.get(getPath(id));
+        const layer = vfsLayerMap.get(getPath(id));
         if (layer)
           return getLayerPlaceholder(layer);
+      },
+      async renderChunk(_, chunk) {
+        const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
+        if (!chunks.length)
+          return null;
+        const tokens2 = new Set();
+        await Promise.all(chunks.map((c) => uno.applyExtractors(modules.get(c) || "", c, tokens2)));
+        const { 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);
+        chunk.modules[fakeCssId] = {
+          code: null,
+          originalLength: 0,
+          removedExports: [],
+          renderedExports: [],
+          renderedLength: 0
+        };
+        return null;
       }
     },
     {
@@ -159,8 +189,11 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
         var _a;
         return command === "build" && !((_a = options.build) == null ? void 0 : _a.ssr);
       },
+      configResolved(config2) {
+        cssPlugin = config2.plugins.find((i) => i.name === "vite:css-post");
+      },
       enforce: "post",
-      async generateBundle(options, bundle) {
+      async generateBundle(_, bundle) {
         const files = Object.keys(bundle);
         const cssFiles = files.filter((i) => i.endsWith(".css"));
         if (!cssFiles.length)
@@ -168,38 +201,17 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
         await Promise.all(tasks);
         const result = await uno.generate(tokens, { minify: true });
         let replaced = false;
-        const cssReplacedMap = {};
         for (const file of cssFiles) {
           const chunk = bundle[file];
           if (chunk.type === "asset" && typeof chunk.source === "string") {
-            let currentReplaced = false;
-            chunk.source = chunk.source.replace(LAYER_PLACEHOLDER_RE, (_, __, layer) => {
-              currentReplaced = true;
+            chunk.source = chunk.source.replace(HASH_PLACEHOLDER_RE, "").replace(LAYER_PLACEHOLDER_RE, (_2, __, layer) => {
               replaced = true;
-              return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer) || "";
+              return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "";
             });
-            if (currentReplaced) {
-              const newName = chunk.fileName.replace(/\.(\w+)\.css$/, `.${getHash(chunk.source)}.css`);
-              cssReplacedMap[chunk.fileName] = newName;
-              chunk.fileName = newName;
-            }
           }
         }
         if (!replaced)
           this.error(new Error("[unocss] does not found CSS placeholder in the generated chunks,\nthis is likely an internal bug of unocss vite plugin"));
-        const entires = Object.entries(cssReplacedMap);
-        if (!entires.length)
-          return;
-        for (const file of files) {
-          const chunk = bundle[file];
-          if (chunk.type === "chunk" && typeof chunk.code === "string") {
-            for (const [k, v] of entires)
-              chunk.code = chunk.code.replace(k, v);
-          } else if (chunk.type === "asset" && typeof chunk.source === "string") {
-            for (const [k, v] of entires)
-              chunk.source = chunk.source.replace(k, v);
-          }
-        }
       }
     }
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.11.2",
+  "version": "0.11.6",
   "description": "The Vite plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -34,10 +34,10 @@
   ],
   "dependencies": {
     "@rollup/pluginutils": "^4.1.1",
-    "@unocss/config": "0.11.2",
-    "@unocss/core": "0.11.2",
-    "@unocss/scope": "0.11.2",
-    "@unocss/inspector": "0.11.2"
+    "@unocss/config": "0.11.6",
+    "@unocss/core": "0.11.6",
+    "@unocss/scope": "0.11.6",
+    "@unocss/inspector": "0.11.6"
   },
   "devDependencies": {
     "vite": "^2.6.13"