@unocss/vite 0.40.0 → 0.41.2

package/dist/index.cjs

@@ -62,6 +62,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   const reloadListeners = [];
   const modules = new core.BetterMap();
   const tokens = /* @__PURE__ */ new Set();
+  const affectedModules = /* @__PURE__ */ new Set();
   let ready = reloadConfig();
   async function reloadConfig() {
     const result = await config.loadConfig(root, configOrPath, extraConfigSources);
@@ -121,6 +122,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     },
     tokens,
     modules,
+    affectedModules,
     invalidate,
     onInvalidate(fn) {
       invalidations.push(fn);
@@ -354,7 +356,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
 
 const WARN_TIMEOUT = 2e4;
 const WS_EVENT_PREFIX = "unocss:hmr";
-function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
+function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extract, filter }) {
   const servers = [];
   let base = "";
   const tasks = [];
@@ -371,9 +373,9 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
     else if (base.endsWith("/"))
       base = base.slice(0, base.length - 1);
   }
-  function invalidate(timer = 10) {
+  function invalidate(timer = 10, ids = entries) {
     for (const server of servers) {
-      for (const id of entries) {
+      for (const id of ids) {
         const mod = server.moduleGraph.getModuleById(id);
         if (!mod)
           continue;
@@ -381,19 +383,24 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
       }
     }
     clearTimeout(invalidateTimer);
-    invalidateTimer = setTimeout(sendUpdate, timer);
+    invalidateTimer = setTimeout(() => sendUpdate(ids), timer);
   }
-  function sendUpdate() {
+  function sendUpdate(ids) {
     lastUpdate = Date.now();
     for (const server of servers) {
       server.ws.send({
         type: "update",
-        updates: Array.from(entries).map((i) => ({
-          acceptedPath: i,
-          path: i,
-          timestamp: lastUpdate,
-          type: "js-update"
-        }))
+        updates: Array.from(ids).map((id) => {
+          const mod = server.moduleGraph.getModuleById(id);
+          if (!mod)
+            return null;
+          return {
+            acceptedPath: mod.url,
+            path: mod.url,
+            timestamp: lastUpdate,
+            type: "js-update"
+          };
+        }).filter(core.notNull)
       });
     }
   }
@@ -413,7 +420,9 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
       }, WARN_TIMEOUT);
     }
   }
-  onInvalidate(invalidate);
+  onInvalidate(() => {
+    invalidate(0, /* @__PURE__ */ new Set([...entries, ...affectedModules]));
+  });
   return [
     {
       name: "unocss:global",
@@ -754,6 +763,7 @@ function initTransformerPlugins(ctx) {
       await t.transform(s, id, ctx);
     }
     if (s.hasChanged()) {
+      ctx.affectedModules.add(id);
       return {
         code: s.toString(),
         map: s.generateMap({ hires: true, source: id })

package/dist/index.d.ts

@@ -39,7 +39,7 @@ interface VitePluginConfig<Theme extends {} = {}> extends UserConfig<Theme> {
 
 declare function ChunkModeBuildPlugin({ uno, filter }: UnocssPluginContext): Plugin;
 
-declare function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }: UnocssPluginContext): Plugin[];
+declare function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extract, filter }: UnocssPluginContext): Plugin[];
 
 declare function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig }: UnocssPluginContext<VitePluginConfig>): Plugin[];
 

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import UnocssInspector from '@unocss/inspector';
 import { resolve, dirname } from 'path';
 import { createHash } from 'crypto';
-import { cssIdRE, createGenerator, BetterMap, toEscapedSelector } from '@unocss/core';
+import { cssIdRE, createGenerator, BetterMap, notNull, toEscapedSelector } from '@unocss/core';
 import { createFilter } from '@rollup/pluginutils';
 import MagicString from 'magic-string';
 import fs from 'fs';
@@ -52,6 +52,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   const reloadListeners = [];
   const modules = new BetterMap();
   const tokens = /* @__PURE__ */ new Set();
+  const affectedModules = /* @__PURE__ */ new Set();
   let ready = reloadConfig();
   async function reloadConfig() {
     const result = await loadConfig(root, configOrPath, extraConfigSources);
@@ -111,6 +112,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     },
     tokens,
     modules,
+    affectedModules,
     invalidate,
     onInvalidate(fn) {
       invalidations.push(fn);
@@ -344,7 +346,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
 
 const WARN_TIMEOUT = 2e4;
 const WS_EVENT_PREFIX = "unocss:hmr";
-function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
+function GlobalModeDevPlugin({ uno, tokens, affectedModules, onInvalidate, extract, filter }) {
   const servers = [];
   let base = "";
   const tasks = [];
@@ -361,9 +363,9 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
     else if (base.endsWith("/"))
       base = base.slice(0, base.length - 1);
   }
-  function invalidate(timer = 10) {
+  function invalidate(timer = 10, ids = entries) {
     for (const server of servers) {
-      for (const id of entries) {
+      for (const id of ids) {
         const mod = server.moduleGraph.getModuleById(id);
         if (!mod)
           continue;
@@ -371,19 +373,24 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
       }
     }
     clearTimeout(invalidateTimer);
-    invalidateTimer = setTimeout(sendUpdate, timer);
+    invalidateTimer = setTimeout(() => sendUpdate(ids), timer);
   }
-  function sendUpdate() {
+  function sendUpdate(ids) {
     lastUpdate = Date.now();
     for (const server of servers) {
       server.ws.send({
         type: "update",
-        updates: Array.from(entries).map((i) => ({
-          acceptedPath: i,
-          path: i,
-          timestamp: lastUpdate,
-          type: "js-update"
-        }))
+        updates: Array.from(ids).map((id) => {
+          const mod = server.moduleGraph.getModuleById(id);
+          if (!mod)
+            return null;
+          return {
+            acceptedPath: mod.url,
+            path: mod.url,
+            timestamp: lastUpdate,
+            type: "js-update"
+          };
+        }).filter(notNull)
       });
     }
   }
@@ -403,7 +410,9 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
       }, WARN_TIMEOUT);
     }
   }
-  onInvalidate(invalidate);
+  onInvalidate(() => {
+    invalidate(0, /* @__PURE__ */ new Set([...entries, ...affectedModules]));
+  });
   return [
     {
       name: "unocss:global",
@@ -744,6 +753,7 @@ function initTransformerPlugins(ctx) {
       await t.transform(s, id, ctx);
     }
     if (s.hasChanged()) {
+      ctx.affectedModules.add(id);
       return {
         code: s.toString(),
         map: s.generateMap({ hires: true, source: id })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.40.0",
+  "version": "0.41.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.40.0",
-    "@unocss/core": "0.40.0",
-    "@unocss/inspector": "0.40.0",
-    "@unocss/scope": "0.40.0",
-    "@unocss/transformer-directives": "0.40.0",
+    "@unocss/config": "0.41.2",
+    "@unocss/core": "0.41.2",
+    "@unocss/inspector": "0.41.2",
+    "@unocss/scope": "0.41.2",
+    "@unocss/transformer-directives": "0.41.2",
     "magic-string": "^0.26.2"
   },
   "devDependencies": {
-    "@unocss/shared-integration": "0.40.0",
+    "@unocss/shared-integration": "0.41.2",
     "vite": "^2.9.12"
   },
   "scripts": {