@unocss/vite 0.60.1 → 0.60.3

package/dist/index.mjs

@@ -20,8 +20,8 @@ const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];
 const LAYER_MARK_ALL = "__ALL__";
-const RESOLVED_ID_WITH_QUERY_RE = /[\/\\]__uno(?:(_.*?))?\.css(\?.*)?$/;
-const RESOLVED_ID_RE = /[\/\\]__uno(?:_(.*?))?\.css$/;
+const RESOLVED_ID_WITH_QUERY_RE = /[/\\]__uno(_.*?)?\.css(\?.*)?$/;
+const RESOLVED_ID_RE = /[/\\]__uno(?:_(.*?))?\.css$/;
 function resolveId(id) {
   if (id.match(RESOLVED_ID_WITH_QUERY_RE))
     return id;
@@ -37,11 +37,11 @@ function resolveLayer(id) {
   if (match)
     return match[1] || LAYER_MARK_ALL;
 }
-const LAYER_PLACEHOLDER_RE = /#--unocss--\s*{\s*layer\s*:\s*(.+?)\s*(?:;\s*escape-view\s*:\s*(.+?)\s*)?;?\s*}/g;
+const LAYER_PLACEHOLDER_RE = /#--unocss--\s*\{\s*layer\s*:\s*(.+?)\s*(?:;\s*escape-view\s*:\s*(.+?)\s*)?;?\s*\}/g;
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer};escape-view:\\"\\'\\\`\\\\}`;
 }
-const HASH_PLACEHOLDER_RE = /#--unocss-hash--\s*{\s*content\s*:\s*\\*"(.+?)\\*";?\s*}/g;
+const HASH_PLACEHOLDER_RE = /#--unocss-hash--\s*\{\s*content\s*:\s*\\*"([^\\"]+)\\*";?\s*\}/g;
 function getHashPlaceholder(hash) {
   return `#--unocss-hash--{content:"${hash}"}`;
 }
@@ -289,7 +289,6 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     }
   }
   if (code !== original) {
-    ctx.affectedModules.add(id);
     return {
       code,
       map: remapping(maps, (_, ctx2) => {
@@ -570,7 +569,7 @@ function GlobalModeBuildPlugin(ctx) {
             const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
             chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_, layer) => {
               replaced = true;
-              return getLayer(layer, css);
+              return getLayer(layer.trim(), css);
             });
             Array.from(vfsLayers).forEach((layer) => {
               chunk.source = getLayer(layer, chunk.source, true);
@@ -579,7 +578,7 @@ function GlobalModeBuildPlugin(ctx) {
             const js = chunk.code.replace(HASH_PLACEHOLDER_RE, "");
             chunk.code = await replaceAsync(js, LAYER_PLACEHOLDER_RE, async (_, layer) => {
               replaced = true;
-              const css = getLayer(layer, js);
+              const css = getLayer(layer.trim(), js);
               return css.replace(/\n/g, "").replace(/(?<!\\)(['"])/g, "\\$1");
             });
             Array.from(vfsLayers).forEach((layer) => {
@@ -593,7 +592,7 @@ function GlobalModeBuildPlugin(ctx) {
             msg += "\nIt seems you are building in library mode, it's recommended to set `build.cssCodeSplit` to true.\nSee https://github.com/vitejs/vite/issues/1579";
           else
             msg += "\nThis is likely an internal bug of unocss vite plugin";
-          this.error(msg);
+          this.warn(msg);
         }
       }
     }
@@ -924,9 +923,9 @@ function VueScopedPlugin({ uno, ready }) {
 }
 
 function ShadowDomModuleModePlugin({ uno }) {
-  const partExtractorRegex = /^part-\[(.+)]:/;
+  const partExtractorRegex = /^part-\[(.+)\]:/;
   const nameRegexp = /<([^\s^!>]+)\s*([^>]*)>/;
-  const vueSFCStyleRE = new RegExp(`<style.*>[\\s\\S]*${CSS_PLACEHOLDER}[\\s\\S]*<\\/style>`);
+  const vueSFCStyleRE = /<style[^>]*>[\s\S]*@unocss-placeholder[\s\S]*<\/style>/;
   const checkElement = (useParts, idxResolver, element) => {
     if (!element)
       return null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/vite",
   "type": "module",
-  "version": "0.60.1",
+  "version": "0.60.3",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -54,15 +54,15 @@
     "chokidar": "^3.6.0",
     "fast-glob": "^3.3.2",
     "magic-string": "^0.30.10",
-    "@unocss/config": "0.60.1",
-    "@unocss/core": "0.60.1",
-    "@unocss/inspector": "0.60.1",
-    "@unocss/scope": "0.60.1",
-    "@unocss/transformer-directives": "0.60.1"
+    "@unocss/core": "0.60.3",
+    "@unocss/config": "0.60.3",
+    "@unocss/inspector": "0.60.3",
+    "@unocss/scope": "0.60.3",
+    "@unocss/transformer-directives": "0.60.3"
   },
   "devDependencies": {
     "vite": "^5.2.11",
-    "@unocss/shared-integration": "0.60.1"
+    "@unocss/shared-integration": "0.60.3"
   },
   "scripts": {
     "build": "unbuild",