@unocss/vite 0.53.0 → 0.53.3

package/dist/index.cjs

@@ -61,6 +61,9 @@ function getHashPlaceholder(hash) {
 const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
+const SKIP_START_COMMENT = "@unocss-skip-start";
+const SKIP_END_COMMENT = "@unocss-skip-end";
+const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
 
 function deprecationCheck(config) {
   let warned = false;
@@ -107,7 +110,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
       rawConfig.content?.pipeline?.exclude || rawConfig.exclude || defaultPipelineExclude
     );
     tokens.clear();
-    await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
+    await Promise.all(modules.map((code, id) => uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens)));
     invalidate();
     dispatchReload();
     const presets = /* @__PURE__ */ new Set();
@@ -138,7 +141,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     if (id)
       modules.set(id, code);
     const len = tokens.size;
-    await uno.applyExtractors(code, id, tokens);
+    await uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
     if (tokens.size > len)
       invalidate();
   }
@@ -190,6 +193,16 @@ function getPath(id) {
 function getHash(input, length = 8) {
   return node_crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
 }
+function hash(str) {
+  let i;
+  let l;
+  let hval = 2166136261;
+  for (i = 0, l = str.length; i < l; i++) {
+    hval ^= str.charCodeAt(i);
+    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+  }
+  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
+}
 
 function replaceAsync(string, searchValue, replacer) {
   try {
@@ -262,8 +275,9 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
   const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
   if (!transformers.length)
     return;
+  const skipMap = /* @__PURE__ */ new Map();
   let code = original;
-  let s = new MagicString__default(code);
+  let s = new MagicString__default(transformSkipCode(code, skipMap));
   const maps = [];
   for (const t of transformers) {
     if (t.idFilter) {
@@ -274,7 +288,7 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     }
     await t.transform(s, id, ctx);
     if (s.hasChanged()) {
-      code = s.toString();
+      code = restoreSkipCode(s.toString(), skipMap);
       maps.push(s.generateMap({ hires: true, source: id }));
       s = new MagicString__default(code);
     }
@@ -287,6 +301,22 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     };
   }
 }
+function transformSkipCode(code, map) {
+  for (const item of Array.from(code.matchAll(SKIP_COMMENT_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `@unocss-skip-placeholder-${hash(matched)}`;
+      map.set(withHashKey, matched);
+      code = code.replace(matched, withHashKey);
+    }
+  }
+  return code;
+}
+function restoreSkipCode(code, map) {
+  for (const [withHashKey, matched] of map.entries())
+    code = code.replace(withHashKey, matched);
+  return code;
+}
 
 async function setupContentExtractor(ctx, shouldWatch = false) {
   const { content } = await ctx.getConfig();

package/dist/index.mjs

@@ -48,6 +48,9 @@ function getHashPlaceholder(hash) {
 const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
 const CSS_PLACEHOLDER = "@unocss-placeholder";
+const SKIP_START_COMMENT = "@unocss-skip-start";
+const SKIP_END_COMMENT = "@unocss-skip-end";
+const SKIP_COMMENT_RE = new RegExp(`(//\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(//\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
 
 function deprecationCheck(config) {
   let warned = false;
@@ -94,7 +97,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
       rawConfig.content?.pipeline?.exclude || rawConfig.exclude || defaultPipelineExclude
     );
     tokens.clear();
-    await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
+    await Promise.all(modules.map((code, id) => uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens)));
     invalidate();
     dispatchReload();
     const presets = /* @__PURE__ */ new Set();
@@ -125,7 +128,7 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     if (id)
       modules.set(id, code);
     const len = tokens.size;
-    await uno.applyExtractors(code, id, tokens);
+    await uno.applyExtractors(code.replace(SKIP_COMMENT_RE, ""), id, tokens);
     if (tokens.size > len)
       invalidate();
   }
@@ -177,6 +180,16 @@ function getPath(id) {
 function getHash(input, length = 8) {
   return createHash("sha256").update(input).digest("hex").slice(0, length);
 }
+function hash(str) {
+  let i;
+  let l;
+  let hval = 2166136261;
+  for (i = 0, l = str.length; i < l; i++) {
+    hval ^= str.charCodeAt(i);
+    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+  }
+  return `00000${(hval >>> 0).toString(36)}`.slice(-6);
+}
 
 function replaceAsync(string, searchValue, replacer) {
   try {
@@ -249,8 +262,9 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
   const transformers = (ctx.uno.config.transformers || []).filter((i) => (i.enforce || "default") === enforce);
   if (!transformers.length)
     return;
+  const skipMap = /* @__PURE__ */ new Map();
   let code = original;
-  let s = new MagicString(code);
+  let s = new MagicString(transformSkipCode(code, skipMap));
   const maps = [];
   for (const t of transformers) {
     if (t.idFilter) {
@@ -261,7 +275,7 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     }
     await t.transform(s, id, ctx);
     if (s.hasChanged()) {
-      code = s.toString();
+      code = restoreSkipCode(s.toString(), skipMap);
       maps.push(s.generateMap({ hires: true, source: id }));
       s = new MagicString(code);
     }
@@ -274,6 +288,22 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     };
   }
 }
+function transformSkipCode(code, map) {
+  for (const item of Array.from(code.matchAll(SKIP_COMMENT_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `@unocss-skip-placeholder-${hash(matched)}`;
+      map.set(withHashKey, matched);
+      code = code.replace(matched, withHashKey);
+    }
+  }
+  return code;
+}
+function restoreSkipCode(code, map) {
+  for (const [withHashKey, matched] of map.entries())
+    code = code.replace(withHashKey, matched);
+  return code;
+}
 
 async function setupContentExtractor(ctx, shouldWatch = false) {
   const { content } = await ctx.getConfig();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.53.0",
+  "version": "0.53.3",
   "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.53.0",
-    "@unocss/core": "0.53.0",
-    "@unocss/inspector": "0.53.0",
-    "@unocss/scope": "0.53.0",
-    "@unocss/transformer-directives": "0.53.0"
+    "@unocss/config": "0.53.3",
+    "@unocss/core": "0.53.3",
+    "@unocss/inspector": "0.53.3",
+    "@unocss/scope": "0.53.3",
+    "@unocss/transformer-directives": "0.53.3"
   },
   "devDependencies": {
     "vite": "^4.3.9",
-    "@unocss/shared-integration": "0.53.0"
+    "@unocss/shared-integration": "0.53.3"
   },
   "scripts": {
     "build": "unbuild",