@unocss/vite 0.31.8 → 0.31.12

package/dist/index.cjs

@@ -54,16 +54,16 @@ const CSS_PLACEHOLDER = "@unocss-placeholder";
 
 function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
 }) {
-  const loadConfig = config.createConfigLoader(configOrPath, extraConfigSources);
+  let root = process.cwd();
   let rawConfig = {};
   const uno = core.createGenerator(rawConfig, defaults);
   let rollupFilter = pluginutils.createFilter(defaultInclude, defaultExclude);
   const invalidations = [];
   const modules = new core.BetterMap();
   const tokens = /* @__PURE__ */ new Set();
-  const ready = reloadConfig();
+  let ready = reloadConfig();
   async function reloadConfig() {
-    const result = await loadConfig();
+    const result = await config.loadConfig(root, configOrPath, extraConfigSources);
     resolveConfigResult(result);
     rawConfig = result.config;
     uno.setConfig(rawConfig);
@@ -74,6 +74,13 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     invalidate();
     return result;
   }
+  async function updateRoot(newRoot) {
+    if (newRoot !== root) {
+      root = newRoot;
+      ready = reloadConfig();
+    }
+    return await ready;
+  }
   function invalidate() {
     invalidations.forEach((cb) => cb());
   }
@@ -93,7 +100,9 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     return rawConfig;
   }
   return {
-    ready,
+    get ready() {
+      return ready;
+    },
     tokens,
     modules,
     invalidate,
@@ -104,7 +113,9 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     reloadConfig,
     uno,
     extract,
-    getConfig
+    getConfig,
+    root,
+    updateRoot
   };
 }
 
@@ -258,6 +269,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
   let base = "";
   const tasks = [];
   const entries = /* @__PURE__ */ new Map();
+  const cssModules = /* @__PURE__ */ new Set();
   let invalidateTimer;
   let lastUpdate = Date.now();
   let lastServed = 0;
@@ -271,8 +283,12 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
       base = base.slice(0, base.length - 1);
   }
   function invalidate(timer = 10) {
+    const ids = [
+      ...entries.keys(),
+      ...cssModules.keys()
+    ];
     for (const server of servers) {
-      for (const id of entries.keys()) {
+      for (const id of ids) {
         const mod = server.moduleGraph.getModuleById(id);
         if (!mod)
           continue;
@@ -284,10 +300,14 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
   }
   function sendUpdate() {
     lastUpdate = Date.now();
+    const ids = [
+      ...entries.keys(),
+      ...cssModules.keys()
+    ];
     for (const server of servers) {
       server.ws.send({
         type: "update",
-        updates: Array.from(entries.keys()).map((i) => ({
+        updates: Array.from(ids).map((i) => ({
           acceptedPath: i,
           path: i,
           timestamp: lastUpdate,
@@ -348,6 +368,8 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
           entries.set(entry.id, entry.layer);
           return entry.id;
         }
+        if (id.match(regexCssId))
+          cssModules.add(id);
       },
       async load(id) {
         const layer = entries.get(getPath(id));
@@ -610,8 +632,8 @@ function ConfigHMRPlugin(ctx) {
   const { ready, uno } = ctx;
   return {
     name: "unocss:config",
-    async configResolved() {
-      await ready;
+    async configResolved(config) {
+      await ctx.updateRoot(config.root);
     },
     async configureServer(server) {
       uno.config.envMode = "dev";
@@ -822,9 +844,9 @@ function UnocssPlugin(configOrPath, defaults = {}) {
   const inlineConfig = configOrPath && typeof configOrPath !== "string" ? configOrPath : {};
   const mode = inlineConfig.mode ?? "global";
   const plugins = [
+    ConfigHMRPlugin(ctx),
     ...initTransformerPlugins(ctx),
-    ...createDevtoolsPlugin(ctx),
-    ConfigHMRPlugin(ctx)
+    ...createDevtoolsPlugin(ctx)
   ];
   if (inlineConfig.inspector !== false)
     plugins.push(UnocssInspector__default(ctx));

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import UnocssInspector from '@unocss/inspector';
 import { createFilter } from '@rollup/pluginutils';
-import { createConfigLoader } from '@unocss/config';
+import { loadConfig } from '@unocss/config';
 import { createGenerator, BetterMap, toEscapedSelector } from '@unocss/core';
 import { createHash } from 'crypto';
 import MagicString from 'magic-string';
@@ -44,16 +44,16 @@ const CSS_PLACEHOLDER = "@unocss-placeholder";
 
 function createContext(configOrPath, defaults = {}, extraConfigSources = [], resolveConfigResult = () => {
 }) {
-  const loadConfig = createConfigLoader(configOrPath, extraConfigSources);
+  let root = process.cwd();
   let rawConfig = {};
   const uno = createGenerator(rawConfig, defaults);
   let rollupFilter = createFilter(defaultInclude, defaultExclude);
   const invalidations = [];
   const modules = new BetterMap();
   const tokens = /* @__PURE__ */ new Set();
-  const ready = reloadConfig();
+  let ready = reloadConfig();
   async function reloadConfig() {
-    const result = await loadConfig();
+    const result = await loadConfig(root, configOrPath, extraConfigSources);
     resolveConfigResult(result);
     rawConfig = result.config;
     uno.setConfig(rawConfig);
@@ -64,6 +64,13 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     invalidate();
     return result;
   }
+  async function updateRoot(newRoot) {
+    if (newRoot !== root) {
+      root = newRoot;
+      ready = reloadConfig();
+    }
+    return await ready;
+  }
   function invalidate() {
     invalidations.forEach((cb) => cb());
   }
@@ -83,7 +90,9 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     return rawConfig;
   }
   return {
-    ready,
+    get ready() {
+      return ready;
+    },
     tokens,
     modules,
     invalidate,
@@ -94,7 +103,9 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     reloadConfig,
     uno,
     extract,
-    getConfig
+    getConfig,
+    root,
+    updateRoot
   };
 }
 
@@ -248,6 +259,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
   let base = "";
   const tasks = [];
   const entries = /* @__PURE__ */ new Map();
+  const cssModules = /* @__PURE__ */ new Set();
   let invalidateTimer;
   let lastUpdate = Date.now();
   let lastServed = 0;
@@ -261,8 +273,12 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
       base = base.slice(0, base.length - 1);
   }
   function invalidate(timer = 10) {
+    const ids = [
+      ...entries.keys(),
+      ...cssModules.keys()
+    ];
     for (const server of servers) {
-      for (const id of entries.keys()) {
+      for (const id of ids) {
         const mod = server.moduleGraph.getModuleById(id);
         if (!mod)
           continue;
@@ -274,10 +290,14 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
   }
   function sendUpdate() {
     lastUpdate = Date.now();
+    const ids = [
+      ...entries.keys(),
+      ...cssModules.keys()
+    ];
     for (const server of servers) {
       server.ws.send({
         type: "update",
-        updates: Array.from(entries.keys()).map((i) => ({
+        updates: Array.from(ids).map((i) => ({
           acceptedPath: i,
           path: i,
           timestamp: lastUpdate,
@@ -338,6 +358,8 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
           entries.set(entry.id, entry.layer);
           return entry.id;
         }
+        if (id.match(regexCssId))
+          cssModules.add(id);
       },
       async load(id) {
         const layer = entries.get(getPath(id));
@@ -600,8 +622,8 @@ function ConfigHMRPlugin(ctx) {
   const { ready, uno } = ctx;
   return {
     name: "unocss:config",
-    async configResolved() {
-      await ready;
+    async configResolved(config) {
+      await ctx.updateRoot(config.root);
     },
     async configureServer(server) {
       uno.config.envMode = "dev";
@@ -812,9 +834,9 @@ function UnocssPlugin(configOrPath, defaults = {}) {
   const inlineConfig = configOrPath && typeof configOrPath !== "string" ? configOrPath : {};
   const mode = inlineConfig.mode ?? "global";
   const plugins = [
+    ConfigHMRPlugin(ctx),
     ...initTransformerPlugins(ctx),
-    ...createDevtoolsPlugin(ctx),
-    ConfigHMRPlugin(ctx)
+    ...createDevtoolsPlugin(ctx)
   ];
   if (inlineConfig.inspector !== false)
     plugins.push(UnocssInspector(ctx));

package/package.json

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