@unocss/vite 0.45.24 → 0.45.26

package/dist/index.cjs

@@ -8,7 +8,7 @@ const pluginutils = require('@rollup/pluginutils');
 const config = require('@unocss/config');
 const crypto = require('crypto');
 const MagicString = require('magic-string');
-const pathe = require('pathe');
+const path = require('path');
 const remapping = require('@ampproject/remapping');
 const fs = require('fs');
 const url = require('url');
@@ -305,7 +305,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
         }
       },
       async configResolved(config) {
-        const distDir = pathe.resolve(config.root, config.build.outDir);
+        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;
@@ -412,9 +412,9 @@ function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extra
         server.moduleGraph.invalidateModule(mod);
       }
     }
-    lastServedHash.clear();
     clearTimeout(invalidateTimer);
     invalidateTimer = setTimeout(() => {
+      lastServedHash.clear();
       sendUpdate(ids);
     }, timer);
   }
@@ -464,14 +464,8 @@ function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extra
       async configureServer(_server) {
         servers.push(_server);
         _server.ws.on(WS_EVENT_PREFIX, ([layer, hash]) => {
-          if (lastServedHash.get(layer) !== hash) {
+          if (lastServedHash.get(layer) !== hash)
             sendUpdate(entries);
-          } else {
-            setTimeout(() => {
-              if (lastServedHash.get(layer) !== hash)
-                sendUpdate(entries);
-            }, 50);
-          }
         });
       },
       buildStart() {
@@ -502,7 +496,14 @@ function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extra
         if (!layer)
           return null;
         await Promise.all(tasks);
-        const result = await uno.generate(tokens);
+        let result;
+        let tokensSize = tokens.size;
+        do {
+          result = await uno.generate(tokens);
+          if (tokensSize === tokens.size)
+            break;
+          tokensSize = tokens.size;
+        } while (true);
         const css = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer);
         const hash = getHash(css || "", HASH_LENGTH);
         lastServedHash.set(layer, hash);
@@ -873,7 +874,7 @@ function createTransformerPlugins(ctx) {
   }));
 }
 
-const _dirname = typeof __dirname !== "undefined" ? __dirname : pathe.dirname(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))));
+const _dirname = typeof __dirname !== "undefined" ? __dirname : path.dirname(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))));
 const DEVTOOLS_MODULE_ID = "virtual:unocss-devtools";
 const MOCK_CLASSES_MODULE_ID = "virtual:unocss-mock-classes";
 const MOCK_CLASSES_PATH = "/@unocss/mock-classes";
@@ -983,7 +984,7 @@ function createDevtoolsPlugin(ctx) {
         if (id === DEVTOOLS_PATH) {
           if (!clientCode) {
             clientCode = [
-              await fs__default.promises.readFile(pathe.resolve(_dirname, "client.mjs"), "utf-8"),
+              await fs__default.promises.readFile(path.resolve(_dirname, "client.mjs"), "utf-8"),
               `import('${MOCK_CLASSES_MODULE_ID}')`,
               `import('${DEVTOOLS_CSS_PATH}')`
             ].join("\n").replace("__POST_PATH__", (config.server?.origin ?? "") + POST_PATH);

package/dist/index.mjs

@@ -4,7 +4,7 @@ import { createFilter } from '@rollup/pluginutils';
 import { loadConfig } from '@unocss/config';
 import { createHash } from 'crypto';
 import MagicString from 'magic-string';
-import { resolve, dirname } from 'pathe';
+import { resolve, dirname } from 'path';
 import remapping from '@ampproject/remapping';
 import fs from 'fs';
 import { fileURLToPath } from 'url';
@@ -401,9 +401,9 @@ function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extra
         server.moduleGraph.invalidateModule(mod);
       }
     }
-    lastServedHash.clear();
     clearTimeout(invalidateTimer);
     invalidateTimer = setTimeout(() => {
+      lastServedHash.clear();
       sendUpdate(ids);
     }, timer);
   }
@@ -453,14 +453,8 @@ function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extra
       async configureServer(_server) {
         servers.push(_server);
         _server.ws.on(WS_EVENT_PREFIX, ([layer, hash]) => {
-          if (lastServedHash.get(layer) !== hash) {
+          if (lastServedHash.get(layer) !== hash)
             sendUpdate(entries);
-          } else {
-            setTimeout(() => {
-              if (lastServedHash.get(layer) !== hash)
-                sendUpdate(entries);
-            }, 50);
-          }
         });
       },
       buildStart() {
@@ -491,7 +485,14 @@ function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extra
         if (!layer)
           return null;
         await Promise.all(tasks);
-        const result = await uno.generate(tokens);
+        let result;
+        let tokensSize = tokens.size;
+        do {
+          result = await uno.generate(tokens);
+          if (tokensSize === tokens.size)
+            break;
+          tokensSize = tokens.size;
+        } while (true);
         const css = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer);
         const hash = getHash(css || "", HASH_LENGTH);
         lastServedHash.set(layer, hash);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.45.24",
+  "version": "0.45.26",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -44,16 +44,15 @@
   "dependencies": {
     "@ampproject/remapping": "^2.2.0",
     "@rollup/pluginutils": "^4.2.1",
-    "@unocss/config": "0.45.24",
-    "@unocss/core": "0.45.24",
-    "@unocss/inspector": "0.45.24",
-    "@unocss/scope": "0.45.24",
-    "@unocss/transformer-directives": "0.45.24",
-    "magic-string": "^0.26.3",
-    "pathe": "^0.3.7"
+    "@unocss/config": "0.45.26",
+    "@unocss/core": "0.45.26",
+    "@unocss/inspector": "0.45.26",
+    "@unocss/scope": "0.45.26",
+    "@unocss/transformer-directives": "0.45.26",
+    "magic-string": "^0.26.3"
   },
   "devDependencies": {
-    "@unocss/shared-integration": "0.45.24",
+    "@unocss/shared-integration": "0.45.26",
     "vite": "^3.1.2"
   },
   "scripts": {