@unocss/vite 0.38.1 → 0.38.2

package/dist/index.cjs

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const UnocssInspector = require('@unocss/inspector');
+const path = require('path');
 const crypto = require('crypto');
 const core = require('@unocss/core');
 const pluginutils = require('@rollup/pluginutils');
 const MagicString = require('magic-string');
 const fs = require('fs');
-const path = require('path');
 const url = require('url');
 const config = require('@unocss/config');
 
@@ -202,13 +202,13 @@ function ChunkModeBuildPlugin({ uno, filter }) {
   };
 }
 
-function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }) {
+function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig }) {
   const vfsLayerMap = /* @__PURE__ */ new Map();
   const layerImporterMap = /* @__PURE__ */ new Map();
   let tasks = [];
   const cssPostPlugins = /* @__PURE__ */ new Map();
   const cssPlugins = /* @__PURE__ */ new Map();
-  async function transformCSS(css, id, dir) {
+  async function applyCssTransform(css, id, dir) {
     const {
       postcss = true
     } = await getConfig();
@@ -224,6 +224,16 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
     css = css.replace(/[\n\r]/g, "");
     return css;
   }
+  let lastTokenSize = 0;
+  let lastResult;
+  async function generateAll() {
+    await Promise.all(tasks);
+    if (lastResult && lastTokenSize === tokens.size)
+      return lastResult;
+    lastResult = await uno.generate(tokens, { minify: true });
+    lastTokenSize = tokens.size;
+    return lastResult;
+  }
   return [
     {
       name: "unocss:global:build:scan",
@@ -231,6 +241,8 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
       enforce: "pre",
       buildStart() {
         tasks = [];
+        lastTokenSize = 0;
+        lastResult = void 0;
       },
       transform(code, id) {
         if (filter(code, id))
@@ -267,27 +279,24 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         }
       },
       async configResolved(config) {
-        cssPostPlugins.set(config.build.outDir, config.plugins.find((i) => i.name === "vite:css-post"));
-        cssPlugins.set(config.build.outDir, config.plugins.find((i) => i.name === "vite:css"));
+        const distDir = path.resolve(config.root, config.build.outDir);
+        cssPostPlugins.set(distDir, config.plugins.find((i) => i.name === "vite:css-post"));
+        cssPlugins.set(distDir, config.plugins.find((i) => i.name === "vite:css"));
         await ready;
       },
       async renderChunk(_, chunk, options) {
-        if (!cssPostPlugins.get(options.dir))
+        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
           return null;
-        const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
-        if (!chunks.length)
+        const cssPost = cssPostPlugins.get(options.dir);
+        if (!cssPost) {
+          this.warn("[unocss] failed to find vite:css-post plugin. It might be an internal bug of UnoCSS");
           return null;
+        }
+        let { css } = await generateAll();
         const fakeCssId = `${chunk.fileName}-unocss-hash.css`;
-        const tokens2 = /* @__PURE__ */ new Set();
-        await Promise.all(chunks.map((c) => uno.applyExtractors(modules.get(c) || "", c, tokens2)));
-        let { css } = await uno.generate(tokens2, { minify: true });
-        if (!css)
-          return null;
-        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
-          return null;
-        css = await transformCSS(css, fakeCssId, options.dir);
+        css = await applyCssTransform(css, fakeCssId, options.dir);
         const hash = getHash(css);
-        await cssPostPlugins.get(options.dir).transform(getHashPlaceholder(hash), fakeCssId);
+        await cssPost.transform.call({}, getHashPlaceholder(hash), fakeCssId);
         chunk.modules[fakeCssId] = {
           code: null,
           originalLength: 0,
@@ -314,8 +323,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
           this.warn(msg);
           return;
         }
-        await Promise.all(tasks);
-        const result = await uno.generate(tokens, { minify: true });
+        const result = await generateAll();
         let replaced = false;
         for (const file of cssFiles) {
           const chunk = bundle[file];
@@ -323,7 +331,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
             const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
             chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_, __, layer) => {
               replaced = true;
-              return await transformCSS(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`, options.dir);
+              return await applyCssTransform(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`, options.dir);
             });
           }
         }

package/dist/index.d.ts

@@ -41,7 +41,7 @@ declare function ChunkModeBuildPlugin({ uno, filter }: UnocssPluginContext): Plu
 
 declare function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }: UnocssPluginContext): Plugin[];
 
-declare function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }: UnocssPluginContext<VitePluginConfig>): Plugin[];
+declare function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig }: UnocssPluginContext<VitePluginConfig>): Plugin[];
 
 declare function GlobalModePlugin(ctx: UnocssPluginContext): vite.Plugin[];
 

package/dist/index.mjs

@@ -1,10 +1,10 @@
 import UnocssInspector from '@unocss/inspector';
+import { resolve, dirname } from 'path';
 import { createHash } from 'crypto';
 import { cssIdRE, createGenerator, BetterMap, toEscapedSelector } from '@unocss/core';
 import { createFilter } from '@rollup/pluginutils';
 import MagicString from 'magic-string';
 import fs from 'fs';
-import { resolve, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { loadConfig } from '@unocss/config';
 
@@ -192,13 +192,13 @@ function ChunkModeBuildPlugin({ uno, filter }) {
   };
 }
 
-function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }) {
+function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig }) {
   const vfsLayerMap = /* @__PURE__ */ new Map();
   const layerImporterMap = /* @__PURE__ */ new Map();
   let tasks = [];
   const cssPostPlugins = /* @__PURE__ */ new Map();
   const cssPlugins = /* @__PURE__ */ new Map();
-  async function transformCSS(css, id, dir) {
+  async function applyCssTransform(css, id, dir) {
     const {
       postcss = true
     } = await getConfig();
@@ -214,6 +214,16 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
     css = css.replace(/[\n\r]/g, "");
     return css;
   }
+  let lastTokenSize = 0;
+  let lastResult;
+  async function generateAll() {
+    await Promise.all(tasks);
+    if (lastResult && lastTokenSize === tokens.size)
+      return lastResult;
+    lastResult = await uno.generate(tokens, { minify: true });
+    lastTokenSize = tokens.size;
+    return lastResult;
+  }
   return [
     {
       name: "unocss:global:build:scan",
@@ -221,6 +231,8 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
       enforce: "pre",
       buildStart() {
         tasks = [];
+        lastTokenSize = 0;
+        lastResult = void 0;
       },
       transform(code, id) {
         if (filter(code, id))
@@ -257,27 +269,24 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         }
       },
       async configResolved(config) {
-        cssPostPlugins.set(config.build.outDir, config.plugins.find((i) => i.name === "vite:css-post"));
-        cssPlugins.set(config.build.outDir, config.plugins.find((i) => i.name === "vite:css"));
+        const distDir = resolve(config.root, config.build.outDir);
+        cssPostPlugins.set(distDir, config.plugins.find((i) => i.name === "vite:css-post"));
+        cssPlugins.set(distDir, config.plugins.find((i) => i.name === "vite:css"));
         await ready;
       },
       async renderChunk(_, chunk, options) {
-        if (!cssPostPlugins.get(options.dir))
+        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
           return null;
-        const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
-        if (!chunks.length)
+        const cssPost = cssPostPlugins.get(options.dir);
+        if (!cssPost) {
+          this.warn("[unocss] failed to find vite:css-post plugin. It might be an internal bug of UnoCSS");
           return null;
+        }
+        let { css } = await generateAll();
         const fakeCssId = `${chunk.fileName}-unocss-hash.css`;
-        const tokens2 = /* @__PURE__ */ new Set();
-        await Promise.all(chunks.map((c) => uno.applyExtractors(modules.get(c) || "", c, tokens2)));
-        let { css } = await uno.generate(tokens2, { minify: true });
-        if (!css)
-          return null;
-        if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
-          return null;
-        css = await transformCSS(css, fakeCssId, options.dir);
+        css = await applyCssTransform(css, fakeCssId, options.dir);
         const hash = getHash(css);
-        await cssPostPlugins.get(options.dir).transform(getHashPlaceholder(hash), fakeCssId);
+        await cssPost.transform.call({}, getHashPlaceholder(hash), fakeCssId);
         chunk.modules[fakeCssId] = {
           code: null,
           originalLength: 0,
@@ -304,8 +313,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
           this.warn(msg);
           return;
         }
-        await Promise.all(tasks);
-        const result = await uno.generate(tokens, { minify: true });
+        const result = await generateAll();
         let replaced = false;
         for (const file of cssFiles) {
           const chunk = bundle[file];
@@ -313,7 +321,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
             const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
             chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_, __, layer) => {
               replaced = true;
-              return await transformCSS(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`, options.dir);
+              return await applyCssTransform(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`, options.dir);
             });
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.38.1",
+  "version": "0.38.2",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -43,15 +43,15 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^4.2.1",
-    "@unocss/config": "0.38.1",
-    "@unocss/core": "0.38.1",
-    "@unocss/inspector": "0.38.1",
-    "@unocss/scope": "0.38.1",
-    "@unocss/transformer-directives": "0.38.1",
+    "@unocss/config": "0.38.2",
+    "@unocss/core": "0.38.2",
+    "@unocss/inspector": "0.38.2",
+    "@unocss/scope": "0.38.2",
+    "@unocss/transformer-directives": "0.38.2",
     "magic-string": "^0.26.2"
   },
   "devDependencies": {
-    "@unocss/shared-integration": "0.38.1",
+    "@unocss/shared-integration": "0.38.2",
     "vite": "^2.9.9"
   },
   "scripts": {