@unocss/vite 0.50.2 → 0.50.4

package/dist/index.cjs

@@ -6,14 +6,14 @@ const UnocssInspector = require('@unocss/inspector');
 const core = require('@unocss/core');
 const pluginutils = require('@rollup/pluginutils');
 const config = require('@unocss/config');
-const crypto = require('crypto');
+const node_crypto = require('node:crypto');
 const MagicString = require('magic-string');
-const path = require('path');
-const fs = require('fs/promises');
+const node_path = require('node:path');
+const fs = require('node:fs/promises');
 const fg = require('fast-glob');
 const remapping = require('@ampproject/remapping');
-const fs$1 = require('fs');
-const url = require('url');
+const fs$1 = require('node:fs');
+const node_url = require('node:url');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -168,7 +168,7 @@ function getPath(id) {
 }
 
 function getHash(input, length = 8) {
-  return crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
+  return node_crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
 }
 
 function replaceAsync(string, searchValue, replacer) {
@@ -300,7 +300,7 @@ async function setupExtraContent(ctx, shouldWatch = false) {
       });
       watcher.on("all", (type, file) => {
         if (type === "add" || type === "change") {
-          const absolutePath = path.resolve(root, file);
+          const absolutePath = node_path.resolve(root, file);
           tasks.push(extractFile(absolutePath));
         }
       });
@@ -395,15 +395,15 @@ function GlobalModeBuildPlugin(ctx) {
       },
       async configResolved(config) {
         const distDirs = [
-          path.resolve(config.root, config.build.outDir)
+          node_path.resolve(config.root, config.build.outDir)
         ];
         if (config.build.rollupOptions.output) {
           const outputOptions = config.build.rollupOptions.output;
           const outputDirs = Array.isArray(outputOptions) ? outputOptions.map((option) => option.dir).filter(Boolean) : outputOptions.dir ? [outputOptions.dir] : [];
           outputDirs.forEach((dir) => {
             distDirs.push(dir);
-            if (!path.isAbsolute(dir))
-              distDirs.push(path.resolve(config.root, dir));
+            if (!node_path.isAbsolute(dir))
+              distDirs.push(node_path.resolve(config.root, dir));
           });
         }
         const cssPostPlugin = config.plugins.find((i) => i.name === "vite:css-post");
@@ -948,14 +948,15 @@ async function transformSvelteSFC(code, id, uno, options = {}) {
     processedMap.add(start);
     s.overwrite(start, start + match[1].length, `${className}={${token}}`);
   }
-  const { matched } = await uno.generate(code, { preflights: false, safelist: false, minify: true });
+  const templateCode = code.replace(/<(script|style)[^>]*>[\s\S]*?<\/\1\s*>/g, (match) => Array(match.length).fill(" ").join(""));
+  const { matched } = await uno.generate(templateCode, { preflights: false, safelist: false, minify: true });
   for (const token of matched) {
     const match = token.match(core.attributifyRE);
     if (match) {
       const [, name, value] = match;
       if (!value) {
         let start = 0;
-        code.split(/([\s"'`;*]|:\(|\)"|\)\s)/g).forEach((i) => {
+        templateCode.split(/([\s"'`;*]|:\(|\)"|\)\s)/g).forEach((i) => {
           const end = start + i.length;
           if (i === name && !processedMap.has(start)) {
             const className = queueCompiledClass([name]);
@@ -966,7 +967,7 @@ async function transformSvelteSFC(code, id, uno, options = {}) {
         });
       } else {
         const regex = new RegExp(`(${core.escapeRegExp(name)}=)(['"])[^\\2]*?${core.escapeRegExp(value)}[^\\2]*?\\2`, "g");
-        for (const match2 of code.matchAll(regex)) {
+        for (const match2 of templateCode.matchAll(regex)) {
           const escaped = match2[1];
           const body = match2[0].slice(escaped.length);
           let bodyIndex = body.match(`[\\b\\s'"]${core.escapeRegExp(value)}[\\b\\s'"]`)?.index ?? -1;
@@ -1181,7 +1182,7 @@ function createTransformerPlugins(ctx) {
   }));
 }
 
-const _dirname = typeof __dirname !== "undefined" ? __dirname : path.dirname(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))));
+const _dirname = typeof __dirname !== "undefined" ? __dirname : node_path.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))));
 const DEVTOOLS_MODULE_ID = "virtual:unocss-devtools";
 const MOCK_CLASSES_MODULE_ID = "virtual:unocss-mock-classes";
 const MOCK_CLASSES_PATH = "/@unocss/mock-classes";
@@ -1291,7 +1292,7 @@ function createDevtoolsPlugin(ctx) {
         if (id === DEVTOOLS_PATH) {
           if (!clientCode) {
             clientCode = [
-              await fs__default$1.promises.readFile(path.resolve(_dirname, "client.mjs"), "utf-8"),
+              await fs__default$1.promises.readFile(node_path.resolve(_dirname, "client.mjs"), "utf-8"),
               `import('${MOCK_CLASSES_MODULE_ID}')`,
               `import('${DEVTOOLS_CSS_PATH}')`
             ].join("\n").replace("__POST_PATH__", (config.server?.origin ?? "") + POST_PATH);

package/dist/index.mjs

@@ -2,14 +2,14 @@ import UnocssInspector from '@unocss/inspector';
 import { cssIdRE, createGenerator, BetterMap, notNull, expandVariantGroup, attributifyRE, escapeRegExp, toEscapedSelector } from '@unocss/core';
 import { createFilter } from '@rollup/pluginutils';
 import { loadConfig } from '@unocss/config';
-import { createHash } from 'crypto';
+import { createHash } from 'node:crypto';
 import MagicString from 'magic-string';
-import { resolve, isAbsolute, dirname } from 'path';
-import fs from 'fs/promises';
+import { resolve, isAbsolute, dirname } from 'node:path';
+import fs from 'node:fs/promises';
 import fg from 'fast-glob';
 import remapping from '@ampproject/remapping';
-import fs$1 from 'fs';
-import { fileURLToPath } from 'url';
+import fs$1 from 'node:fs';
+import { fileURLToPath } from 'node:url';
 
 const defaultExclude = [cssIdRE];
 const defaultInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
@@ -935,14 +935,15 @@ async function transformSvelteSFC(code, id, uno, options = {}) {
     processedMap.add(start);
     s.overwrite(start, start + match[1].length, `${className}={${token}}`);
   }
-  const { matched } = await uno.generate(code, { preflights: false, safelist: false, minify: true });
+  const templateCode = code.replace(/<(script|style)[^>]*>[\s\S]*?<\/\1\s*>/g, (match) => Array(match.length).fill(" ").join(""));
+  const { matched } = await uno.generate(templateCode, { preflights: false, safelist: false, minify: true });
   for (const token of matched) {
     const match = token.match(attributifyRE);
     if (match) {
       const [, name, value] = match;
       if (!value) {
         let start = 0;
-        code.split(/([\s"'`;*]|:\(|\)"|\)\s)/g).forEach((i) => {
+        templateCode.split(/([\s"'`;*]|:\(|\)"|\)\s)/g).forEach((i) => {
           const end = start + i.length;
           if (i === name && !processedMap.has(start)) {
             const className = queueCompiledClass([name]);
@@ -953,7 +954,7 @@ async function transformSvelteSFC(code, id, uno, options = {}) {
         });
       } else {
         const regex = new RegExp(`(${escapeRegExp(name)}=)(['"])[^\\2]*?${escapeRegExp(value)}[^\\2]*?\\2`, "g");
-        for (const match2 of code.matchAll(regex)) {
+        for (const match2 of templateCode.matchAll(regex)) {
           const escaped = match2[1];
           const body = match2[0].slice(escaped.length);
           let bodyIndex = body.match(`[\\b\\s'"]${escapeRegExp(value)}[\\b\\s'"]`)?.index ?? -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.50.2",
+  "version": "0.50.4",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -44,18 +44,18 @@
   "dependencies": {
     "@ampproject/remapping": "^2.2.0",
     "@rollup/pluginutils": "^5.0.2",
-    "@unocss/config": "0.50.2",
-    "@unocss/core": "0.50.2",
-    "@unocss/inspector": "0.50.2",
-    "@unocss/scope": "0.50.2",
-    "@unocss/transformer-directives": "0.50.2",
     "chokidar": "^3.5.3",
     "fast-glob": "^3.2.12",
-    "magic-string": "^0.30.0"
+    "magic-string": "^0.30.0",
+    "@unocss/config": "0.50.4",
+    "@unocss/core": "0.50.4",
+    "@unocss/inspector": "0.50.4",
+    "@unocss/scope": "0.50.4",
+    "@unocss/transformer-directives": "0.50.4"
   },
   "devDependencies": {
-    "@unocss/shared-integration": "0.50.2",
-    "vite": "^4.1.4"
+    "vite": "^4.1.4",
+    "@unocss/shared-integration": "0.50.4"
   },
   "scripts": {
     "build": "unbuild",