@unocss/svelte-scoped 0.52.3 → 0.52.5

package/dist/preprocess.cjs

@@ -135,7 +135,7 @@ async function sortClassesIntoCategories(body, options, uno, filename) {
   return { rulesToGenerate, ignore };
 }
 
-const expressionsRE = /{[^{}]+?}/g;
+const expressionsRE = /\S*{[^{}]+?}\S*/g;
 const classesRE = /(["'\`])([\S\s]+?)\1/g;
 async function processExpressions(body, options, uno, filename) {
   const rulesToGenerate = {};
@@ -391,7 +391,7 @@ function getChildNodeValue(childNode, applyVariables) {
     return removeOuterQuotes(childNode.value.value.trim());
 }
 
-function UnocssSveltePreprocess(options = {}, unoContextFromVite) {
+function UnocssSveltePreprocess(options = {}, unoContextFromVite, isViteBuild) {
   if (!options.classPrefix)
     options.classPrefix = "spu-";
   let uno;
@@ -399,6 +399,8 @@ function UnocssSveltePreprocess(options = {}, unoContextFromVite) {
     markup: async ({ content, filename }) => {
       if (!uno)
         uno = await getGenerator(options.configOrPath, unoContextFromVite);
+      if (isViteBuild && !options.combine)
+        options.combine = isViteBuild();
       return await transformClasses({ content, filename: filename || "", uno, options });
     },
     style: async ({ content, attributes, filename }) => {

package/dist/preprocess.d.ts

@@ -3,6 +3,6 @@ import { U as UnocssSveltePreprocessOptions, S as SvelteScopedContext } from './
 export { S as SvelteScopedContext, a as TransformApplyOptions, T as TransformClassesOptions, U as UnocssSveltePreprocessOptions } from './types.d-48b837f0.js';
 import '@unocss/core';
 
-declare function UnocssSveltePreprocess(options?: UnocssSveltePreprocessOptions, unoContextFromVite?: SvelteScopedContext): PreprocessorGroup;
+declare function UnocssSveltePreprocess(options?: UnocssSveltePreprocessOptions, unoContextFromVite?: SvelteScopedContext, isViteBuild?: () => boolean): PreprocessorGroup;
 
 export { UnocssSveltePreprocess as default };

package/dist/preprocess.mjs

@@ -128,7 +128,7 @@ async function sortClassesIntoCategories(body, options, uno, filename) {
   return { rulesToGenerate, ignore };
 }
 
-const expressionsRE = /{[^{}]+?}/g;
+const expressionsRE = /\S*{[^{}]+?}\S*/g;
 const classesRE = /(["'\`])([\S\s]+?)\1/g;
 async function processExpressions(body, options, uno, filename) {
   const rulesToGenerate = {};
@@ -384,7 +384,7 @@ function getChildNodeValue(childNode, applyVariables) {
     return removeOuterQuotes(childNode.value.value.trim());
 }
 
-function UnocssSveltePreprocess(options = {}, unoContextFromVite) {
+function UnocssSveltePreprocess(options = {}, unoContextFromVite, isViteBuild) {
   if (!options.classPrefix)
     options.classPrefix = "spu-";
   let uno;
@@ -392,6 +392,8 @@ function UnocssSveltePreprocess(options = {}, unoContextFromVite) {
     markup: async ({ content, filename }) => {
       if (!uno)
         uno = await getGenerator(options.configOrPath, unoContextFromVite);
+      if (isViteBuild && !options.combine)
+        options.combine = isViteBuild();
       return await transformClasses({ content, filename: filename || "", uno, options });
     },
     style: async ({ content, attributes, filename }) => {

package/dist/vite.cjs

@@ -11,14 +11,16 @@ require('magic-string');
 require('css-tree');
 
 function PassPreprocessToSveltePlugin(options = {}, ctx) {
+  let commandIsBuild = true;
+  const isBuild = () => commandIsBuild;
   return {
     name: "unocss:svelte-scoped:pass-preprocess",
     enforce: "pre",
-    configResolved(viteConfig) {
-      options = { ...options, combine: viteConfig.command === "build" };
+    configResolved({ command }) {
+      commandIsBuild = command === "build";
     },
     api: {
-      sveltePreprocess: preprocess(options, ctx)
+      sveltePreprocess: preprocess(options, ctx, isBuild)
     }
   };
 }
@@ -75,7 +77,7 @@ async function generateGlobalCss(uno, injectReset) {
 }
 const SVELTE_ERROR = `[unocss] You have not setup the svelte-scoped global styles correctly. You must place '${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}' in your index.html file.
 `;
-const SVELTE_KIT_ERROR = `[unocss] You have not setup the svelte-scoped global styles correctly. You must place '${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}' in your app.html file. You also need to have a transformPageChunk hook in your server hooks file with: \`html.replace('${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}', '${GLOBAL_STYLES_PLACEHOLDER}')\`. You can see an example of the usage at https://github.com/unocss/unocss/tree/main/examples/sveltekit-scoped.`;
+const SVELTE_KIT_ERROR = `[unocss] You have not setup the svelte-scoped global styles correctly. You must place '${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}' in your app.html file. You also need to have a transformPageChunk hook in your hooks.server.js file with: \`html.replace('${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}', '${GLOBAL_STYLES_PLACEHOLDER}')\`. You can see an example of the usage at https://github.com/unocss/unocss/tree/main/examples/sveltekit-scoped.`;
 function checkTransformPageChunkHook(server, isSvelteKit) {
   server.middlewares.use((req, res, next) => {
     const originalWrite = res.write;

package/dist/vite.mjs

@@ -9,14 +9,16 @@ import 'magic-string';
 import 'css-tree';
 
 function PassPreprocessToSveltePlugin(options = {}, ctx) {
+  let commandIsBuild = true;
+  const isBuild = () => commandIsBuild;
   return {
     name: "unocss:svelte-scoped:pass-preprocess",
     enforce: "pre",
-    configResolved(viteConfig) {
-      options = { ...options, combine: viteConfig.command === "build" };
+    configResolved({ command }) {
+      commandIsBuild = command === "build";
     },
     api: {
-      sveltePreprocess: UnocssSveltePreprocess(options, ctx)
+      sveltePreprocess: UnocssSveltePreprocess(options, ctx, isBuild)
     }
   };
 }
@@ -73,7 +75,7 @@ async function generateGlobalCss(uno, injectReset) {
 }
 const SVELTE_ERROR = `[unocss] You have not setup the svelte-scoped global styles correctly. You must place '${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}' in your index.html file.
 `;
-const SVELTE_KIT_ERROR = `[unocss] You have not setup the svelte-scoped global styles correctly. You must place '${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}' in your app.html file. You also need to have a transformPageChunk hook in your server hooks file with: \`html.replace('${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}', '${GLOBAL_STYLES_PLACEHOLDER}')\`. You can see an example of the usage at https://github.com/unocss/unocss/tree/main/examples/sveltekit-scoped.`;
+const SVELTE_KIT_ERROR = `[unocss] You have not setup the svelte-scoped global styles correctly. You must place '${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}' in your app.html file. You also need to have a transformPageChunk hook in your hooks.server.js file with: \`html.replace('${PLACEHOLDER_USER_SETS_IN_INDEX_HTML}', '${GLOBAL_STYLES_PLACEHOLDER}')\`. You can see an example of the usage at https://github.com/unocss/unocss/tree/main/examples/sveltekit-scoped.`;
 function checkTransformPageChunkHook(server, isSvelteKit) {
   server.middlewares.use((req, res, next) => {
     const originalWrite = res.write;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/svelte-scoped",
   "type": "module",
-  "version": "0.52.3",
+  "version": "0.52.5",
   "description": "Use UnoCSS in a modular fashion with styles being stored only in the Svelte component they are used in: Vite plugin for apps, preprocessor for component libraries",
   "author": "Jacob Bowdoin",
   "license": "MIT",
@@ -54,11 +54,11 @@
   "dependencies": {
     "css-tree": "^2.3.1",
     "magic-string": "^0.30.0",
-    "@unocss/config": "0.52.3",
-    "@unocss/reset": "0.52.3"
+    "@unocss/config": "0.52.5",
+    "@unocss/reset": "0.52.5"
   },
   "devDependencies": {
-    "prettier-plugin-svelte": "^2.10.0",
+    "prettier-plugin-svelte": "^2.10.1",
     "svelte": "^3.59.1"
   },
   "scripts": {