@unocss/vite 0.51.4 → 0.51.5

package/dist/index.cjs

@@ -862,10 +862,11 @@ function hash(str) {
   return `00000${(hval >>> 0).toString(36)}`.slice(-6);
 }
 
-const classesRE = /class=(["'\`])([\S\s]+?)\1/g;
+const classesRE = /class=(["'\`])([^\{][\S\s]*?)\1/g;
+const classesExpressionsRE = /class=(["'\`])?(\{[\S\s]+?\})\1/g;
 const classesDirectivesRE = /class:([\S]+?)={/g;
-const classDirectivesShorthandRE = /class:([^=>\s/]+)[{>\s/]/g;
-const classesFromInlineConditionalsRE = /'([\S\s]+?)'/g;
+const classesDirectivesShorthandRE = /class:([^=>\s/]+)[{>\s/]/g;
+const classesInsideExpressionsRE = /(["'\`])([\S\s]+?)\1/g;
 async function transformSvelteSFC(code, id, uno, options = {}) {
   const {
     classPrefix = "uno-",
@@ -881,9 +882,9 @@ async function transformSvelteSFC(code, id, uno, options = {}) {
     const { css: css2 } = await uno.generate("", { preflights, safelist });
     styles = css2;
   }
-  const classes = [...code.matchAll(classesRE)];
+  const classes = [...code.matchAll(classesRE), ...code.matchAll(classesExpressionsRE)];
   const classDirectives = [...code.matchAll(classesDirectivesRE)];
-  const classDirectivesShorthand = [...code.matchAll(classDirectivesShorthandRE)];
+  const classDirectivesShorthand = [...code.matchAll(classesDirectivesShorthandRE)];
   const originalShortcuts = uno.config.shortcuts;
   const shortcuts = {};
   const toGenerate = /* @__PURE__ */ new Set();
@@ -933,19 +934,26 @@ async function transformSvelteSFC(code, id, uno, options = {}) {
   const processedMap = /* @__PURE__ */ new Set();
   for (const match of classes) {
     let body = core.expandVariantGroup(match[2].trim());
-    const inlineConditionals = [...body.matchAll(classesFromInlineConditionalsRE)];
-    for (const conditional of inlineConditionals) {
-      const replacement2 = await sortKnownAndUnknownClasses(conditional[1].trim());
-      if (replacement2)
-        body = body.replace(conditional[0], `'${replacement2}'`);
+    let replaced = false;
+    const expressions = [...body.matchAll(classesInsideExpressionsRE)];
+    for (const expression of expressions) {
+      const replacement2 = await sortKnownAndUnknownClasses(expression[2].trim());
+      if (replacement2) {
+        body = body.replace(expression[2], replacement2);
+        replaced = true;
+      }
     }
     const replacement = await sortKnownAndUnknownClasses(body);
     if (replacement) {
-      const start = match.index + 7;
-      const end = match.index + match[0].length - 1;
-      processedMap.add(start);
-      s.overwrite(start, end, replacement);
+      body = body.replace(body, replacement);
+      replaced = true;
     }
+    if (!replaced)
+      continue;
+    const start = match.index + (match[1] ? 7 : 6);
+    const end = match.index + match[0].length - (match[1] ? 1 : 0);
+    processedMap.add(start);
+    s.overwrite(start, end, body);
   }
   for (const match of classDirectives) {
     const token = match[1];

package/dist/index.mjs

@@ -849,10 +849,11 @@ function hash(str) {
   return `00000${(hval >>> 0).toString(36)}`.slice(-6);
 }
 
-const classesRE = /class=(["'\`])([\S\s]+?)\1/g;
+const classesRE = /class=(["'\`])([^\{][\S\s]*?)\1/g;
+const classesExpressionsRE = /class=(["'\`])?(\{[\S\s]+?\})\1/g;
 const classesDirectivesRE = /class:([\S]+?)={/g;
-const classDirectivesShorthandRE = /class:([^=>\s/]+)[{>\s/]/g;
-const classesFromInlineConditionalsRE = /'([\S\s]+?)'/g;
+const classesDirectivesShorthandRE = /class:([^=>\s/]+)[{>\s/]/g;
+const classesInsideExpressionsRE = /(["'\`])([\S\s]+?)\1/g;
 async function transformSvelteSFC(code, id, uno, options = {}) {
   const {
     classPrefix = "uno-",
@@ -868,9 +869,9 @@ async function transformSvelteSFC(code, id, uno, options = {}) {
     const { css: css2 } = await uno.generate("", { preflights, safelist });
     styles = css2;
   }
-  const classes = [...code.matchAll(classesRE)];
+  const classes = [...code.matchAll(classesRE), ...code.matchAll(classesExpressionsRE)];
   const classDirectives = [...code.matchAll(classesDirectivesRE)];
-  const classDirectivesShorthand = [...code.matchAll(classDirectivesShorthandRE)];
+  const classDirectivesShorthand = [...code.matchAll(classesDirectivesShorthandRE)];
   const originalShortcuts = uno.config.shortcuts;
   const shortcuts = {};
   const toGenerate = /* @__PURE__ */ new Set();
@@ -920,19 +921,26 @@ async function transformSvelteSFC(code, id, uno, options = {}) {
   const processedMap = /* @__PURE__ */ new Set();
   for (const match of classes) {
     let body = expandVariantGroup(match[2].trim());
-    const inlineConditionals = [...body.matchAll(classesFromInlineConditionalsRE)];
-    for (const conditional of inlineConditionals) {
-      const replacement2 = await sortKnownAndUnknownClasses(conditional[1].trim());
-      if (replacement2)
-        body = body.replace(conditional[0], `'${replacement2}'`);
+    let replaced = false;
+    const expressions = [...body.matchAll(classesInsideExpressionsRE)];
+    for (const expression of expressions) {
+      const replacement2 = await sortKnownAndUnknownClasses(expression[2].trim());
+      if (replacement2) {
+        body = body.replace(expression[2], replacement2);
+        replaced = true;
+      }
     }
     const replacement = await sortKnownAndUnknownClasses(body);
     if (replacement) {
-      const start = match.index + 7;
-      const end = match.index + match[0].length - 1;
-      processedMap.add(start);
-      s.overwrite(start, end, replacement);
+      body = body.replace(body, replacement);
+      replaced = true;
     }
+    if (!replaced)
+      continue;
+    const start = match.index + (match[1] ? 7 : 6);
+    const end = match.index + match[0].length - (match[1] ? 1 : 0);
+    processedMap.add(start);
+    s.overwrite(start, end, body);
   }
   for (const match of classDirectives) {
     const token = match[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.51.4",
+  "version": "0.51.5",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -47,15 +47,15 @@
     "chokidar": "^3.5.3",
     "fast-glob": "^3.2.12",
     "magic-string": "^0.30.0",
-    "@unocss/config": "0.51.4",
-    "@unocss/core": "0.51.4",
-    "@unocss/inspector": "0.51.4",
-    "@unocss/scope": "0.51.4",
-    "@unocss/transformer-directives": "0.51.4"
+    "@unocss/config": "0.51.5",
+    "@unocss/core": "0.51.5",
+    "@unocss/inspector": "0.51.5",
+    "@unocss/scope": "0.51.5",
+    "@unocss/transformer-directives": "0.51.5"
   },
   "devDependencies": {
     "vite": "^4.2.1",
-    "@unocss/shared-integration": "0.51.4"
+    "@unocss/shared-integration": "0.51.5"
   },
   "scripts": {
     "build": "unbuild",