@unocss/vite 0.39.0 → 0.39.3

package/dist/index.cjs

@@ -29,17 +29,16 @@ function resolveId(id) {
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias);
     if (match) {
-      return match[1] ? {
-        id: `/__uno_${match[1]}.css`,
-        layer: match[1]
-      } : {
-        id: "/__uno.css",
-        layer: LAYER_MARK_ALL
-      };
+      return match[1] ? `/__uno_${match[1]}.css` : "/__uno.css";
     }
   }
 }
-const RESOLVED_ID_RE = /\/__uno(_.*?)?\.css$/;
+const RESOLVED_ID_RE = /\/__uno(?:(_.*?))?\.css$/;
+function resolveLayer(id) {
+  const match = id.match(RESOLVED_ID_RE);
+  if (match)
+    return match[1] || LAYER_MARK_ALL;
+}
 const LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
@@ -60,6 +59,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   const uno = core.createGenerator(rawConfig, defaults);
   let rollupFilter = pluginutils.createFilter(defaultInclude, defaultExclude);
   const invalidations = [];
+  const reloadListeners = [];
   const modules = new core.BetterMap();
   const tokens = /* @__PURE__ */ new Set();
   let ready = reloadConfig();
@@ -73,6 +73,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     tokens.clear();
     await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
     invalidate();
+    dispatchReload();
     const presets = /* @__PURE__ */ new Set();
     uno.config.presets.forEach((i) => {
       if (!i.name)
@@ -94,6 +95,9 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   function invalidate() {
     invalidations.forEach((cb) => cb());
   }
+  function dispatchReload() {
+    reloadListeners.forEach((cb) => cb());
+  }
   async function extract(code, id) {
     if (id)
       modules.set(id, code);
@@ -123,6 +127,9 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     },
     filter,
     reloadConfig,
+    onReload(fn) {
+      reloadListeners.push(fn);
+    },
     uno,
     extract,
     getConfig,
@@ -203,7 +210,7 @@ function ChunkModeBuildPlugin({ uno, filter }) {
 }
 
 function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig }) {
-  const vfsLayerMap = /* @__PURE__ */ new Map();
+  const vfsLayers = /* @__PURE__ */ new Set();
   const layerImporterMap = /* @__PURE__ */ new Map();
   let tasks = [];
   const cssPostPlugins = /* @__PURE__ */ new Map();
@@ -258,14 +265,17 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
       resolveId(id, importer) {
         const entry = resolveId(id);
         if (entry) {
-          vfsLayerMap.set(entry.id, entry.layer);
-          if (importer)
-            layerImporterMap.set(importer, entry.id);
-          return entry.id;
+          const layer = resolveLayer(entry);
+          if (layer) {
+            vfsLayers.add(layer);
+            if (importer)
+              layerImporterMap.set(importer, entry);
+          }
+          return entry;
         }
       },
       load(id) {
-        const layer = vfsLayerMap.get(getPath(id));
+        const layer = resolveLayer(getPath(id));
         if (layer)
           return getLayerPlaceholder(layer);
       },
@@ -275,7 +285,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
         const layerKey = layerImporterMap.get(id);
         if (!importedIds.includes(layerKey)) {
           layerImporterMap.delete(id);
-          vfsLayerMap.delete(layerKey);
+          vfsLayers.delete(resolveLayer(layerKey));
         }
       },
       async configResolved(config) {
@@ -318,7 +328,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
         const cssFiles = files.filter((i) => i.endsWith(".css"));
         if (!cssFiles.length)
           return;
-        if (!vfsLayerMap.size) {
+        if (!vfsLayers.size) {
           const msg = "[unocss] entry module not found, have you add `import 'uno.css'` in your main entry?";
           this.warn(msg);
           return;
@@ -331,7 +341,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
             const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
             chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_, __, layer) => {
               replaced = true;
-              return await applyCssTransform(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(vfsLayers)) : result.getLayer(layer) || "", `${chunk.fileName}.css`, options.dir);
             });
           }
         }
@@ -348,7 +358,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
   const servers = [];
   let base = "";
   const tasks = [];
-  const entries = /* @__PURE__ */ new Map();
+  const entries = /* @__PURE__ */ new Set();
   let invalidateTimer;
   let lastUpdate = Date.now();
   let lastServed = 0;
@@ -363,7 +373,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
   }
   function invalidate(timer = 10) {
     for (const server of servers) {
-      for (const id of entries.keys()) {
+      for (const id of entries) {
         const mod = server.moduleGraph.getModuleById(id);
         if (!mod)
           continue;
@@ -378,7 +388,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
     for (const server of servers) {
       server.ws.send({
         type: "update",
-        updates: Array.from(entries.keys()).map((i) => ({
+        updates: Array.from(entries).map((i) => ({
           acceptedPath: i,
           path: i,
           timestamp: lastUpdate,
@@ -436,18 +446,18 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
         const entry = resolveId(id);
         if (entry) {
           resolved = true;
-          entries.set(entry.id, entry.layer);
-          return entry.id;
+          entries.add(entry);
+          return entry;
         }
       },
       async load(id) {
-        const layer = entries.get(getPath(id));
+        const layer = resolveLayer(getPath(id));
         if (!layer)
           return null;
         await Promise.all(tasks);
         const result = await uno.generate(tokens);
         lastServed = Date.now();
-        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(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer);
       }
     },
     {
@@ -644,7 +654,10 @@ function ShadowDomModuleModePlugin({ uno }) {
   const transformWebComponent = async (code) => {
     if (!code.match(CSS_PLACEHOLDER))
       return code;
-    let { css, matched } = await uno.generate(code, { preflights: false });
+    let { css, matched } = await uno.generate(code, {
+      preflights: true,
+      safelist: true
+    });
     if (css && matched) {
       const useParts = Array.from(matched).reduce((acc, rule) => {
         const matcher = rule.match(partExtractorRegex);

package/dist/index.mjs

@@ -19,17 +19,16 @@ function resolveId(id) {
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias);
     if (match) {
-      return match[1] ? {
-        id: `/__uno_${match[1]}.css`,
-        layer: match[1]
-      } : {
-        id: "/__uno.css",
-        layer: LAYER_MARK_ALL
-      };
+      return match[1] ? `/__uno_${match[1]}.css` : "/__uno.css";
     }
   }
 }
-const RESOLVED_ID_RE = /\/__uno(_.*?)?\.css$/;
+const RESOLVED_ID_RE = /\/__uno(?:(_.*?))?\.css$/;
+function resolveLayer(id) {
+  const match = id.match(RESOLVED_ID_RE);
+  if (match)
+    return match[1] || LAYER_MARK_ALL;
+}
 const LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
@@ -50,6 +49,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   const uno = createGenerator(rawConfig, defaults);
   let rollupFilter = createFilter(defaultInclude, defaultExclude);
   const invalidations = [];
+  const reloadListeners = [];
   const modules = new BetterMap();
   const tokens = /* @__PURE__ */ new Set();
   let ready = reloadConfig();
@@ -63,6 +63,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     tokens.clear();
     await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
     invalidate();
+    dispatchReload();
     const presets = /* @__PURE__ */ new Set();
     uno.config.presets.forEach((i) => {
       if (!i.name)
@@ -84,6 +85,9 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   function invalidate() {
     invalidations.forEach((cb) => cb());
   }
+  function dispatchReload() {
+    reloadListeners.forEach((cb) => cb());
+  }
   async function extract(code, id) {
     if (id)
       modules.set(id, code);
@@ -113,6 +117,9 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     },
     filter,
     reloadConfig,
+    onReload(fn) {
+      reloadListeners.push(fn);
+    },
     uno,
     extract,
     getConfig,
@@ -193,7 +200,7 @@ function ChunkModeBuildPlugin({ uno, filter }) {
 }
 
 function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig }) {
-  const vfsLayerMap = /* @__PURE__ */ new Map();
+  const vfsLayers = /* @__PURE__ */ new Set();
   const layerImporterMap = /* @__PURE__ */ new Map();
   let tasks = [];
   const cssPostPlugins = /* @__PURE__ */ new Map();
@@ -248,14 +255,17 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
       resolveId(id, importer) {
         const entry = resolveId(id);
         if (entry) {
-          vfsLayerMap.set(entry.id, entry.layer);
-          if (importer)
-            layerImporterMap.set(importer, entry.id);
-          return entry.id;
+          const layer = resolveLayer(entry);
+          if (layer) {
+            vfsLayers.add(layer);
+            if (importer)
+              layerImporterMap.set(importer, entry);
+          }
+          return entry;
         }
       },
       load(id) {
-        const layer = vfsLayerMap.get(getPath(id));
+        const layer = resolveLayer(getPath(id));
         if (layer)
           return getLayerPlaceholder(layer);
       },
@@ -265,7 +275,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
         const layerKey = layerImporterMap.get(id);
         if (!importedIds.includes(layerKey)) {
           layerImporterMap.delete(id);
-          vfsLayerMap.delete(layerKey);
+          vfsLayers.delete(resolveLayer(layerKey));
         }
       },
       async configResolved(config) {
@@ -308,7 +318,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
         const cssFiles = files.filter((i) => i.endsWith(".css"));
         if (!cssFiles.length)
           return;
-        if (!vfsLayerMap.size) {
+        if (!vfsLayers.size) {
           const msg = "[unocss] entry module not found, have you add `import 'uno.css'` in your main entry?";
           this.warn(msg);
           return;
@@ -321,7 +331,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, filter, getConfig
             const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
             chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_, __, layer) => {
               replaced = true;
-              return await applyCssTransform(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(vfsLayers)) : result.getLayer(layer) || "", `${chunk.fileName}.css`, options.dir);
             });
           }
         }
@@ -338,7 +348,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
   const servers = [];
   let base = "";
   const tasks = [];
-  const entries = /* @__PURE__ */ new Map();
+  const entries = /* @__PURE__ */ new Set();
   let invalidateTimer;
   let lastUpdate = Date.now();
   let lastServed = 0;
@@ -353,7 +363,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
   }
   function invalidate(timer = 10) {
     for (const server of servers) {
-      for (const id of entries.keys()) {
+      for (const id of entries) {
         const mod = server.moduleGraph.getModuleById(id);
         if (!mod)
           continue;
@@ -368,7 +378,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
     for (const server of servers) {
       server.ws.send({
         type: "update",
-        updates: Array.from(entries.keys()).map((i) => ({
+        updates: Array.from(entries).map((i) => ({
           acceptedPath: i,
           path: i,
           timestamp: lastUpdate,
@@ -426,18 +436,18 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
         const entry = resolveId(id);
         if (entry) {
           resolved = true;
-          entries.set(entry.id, entry.layer);
-          return entry.id;
+          entries.add(entry);
+          return entry;
         }
       },
       async load(id) {
-        const layer = entries.get(getPath(id));
+        const layer = resolveLayer(getPath(id));
         if (!layer)
           return null;
         await Promise.all(tasks);
         const result = await uno.generate(tokens);
         lastServed = Date.now();
-        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(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer);
       }
     },
     {
@@ -634,7 +644,10 @@ function ShadowDomModuleModePlugin({ uno }) {
   const transformWebComponent = async (code) => {
     if (!code.match(CSS_PLACEHOLDER))
       return code;
-    let { css, matched } = await uno.generate(code, { preflights: false });
+    let { css, matched } = await uno.generate(code, {
+      preflights: true,
+      safelist: true
+    });
     if (css && matched) {
       const useParts = Array.from(matched).reduce((acc, rule) => {
         const matcher = rule.match(partExtractorRegex);

package/package.json

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