@unocss/webpack 0.53.1 → 0.53.3

package/dist/index.cjs

@@ -25,6 +25,9 @@ const remapping__default = /*#__PURE__*/_interopDefaultLegacy(remapping);
 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");
 
 const defaultPipelineExclude = [core.cssIdRE];
 const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
@@ -74,7 +77,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();
@@ -105,7 +108,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();
   }
@@ -150,14 +153,29 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   };
 }
 
+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);
+}
+
 async function applyTransformers(ctx, original, id, enforce = "default") {
   if (original.includes(IGNORE_COMMENT))
     return;
   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) {
@@ -168,7 +186,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);
     }
@@ -181,6 +199,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();
@@ -227,10 +261,6 @@ async function setupContentExtractor(ctx, shouldWatch = false) {
   }
 }
 
-function getHash(input, length = 8) {
-  return node_crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
-}
-
 const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];

package/dist/index.mjs

@@ -13,6 +13,9 @@ import { createHash } from 'node:crypto';
 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");
 
 const defaultPipelineExclude = [cssIdRE];
 const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/];
@@ -62,7 +65,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();
@@ -93,7 +96,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();
   }
@@ -138,14 +141,29 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   };
 }
 
+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);
+}
+
 async function applyTransformers(ctx, original, id, enforce = "default") {
   if (original.includes(IGNORE_COMMENT))
     return;
   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) {
@@ -156,7 +174,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);
     }
@@ -169,6 +187,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();
@@ -215,10 +249,6 @@ async function setupContentExtractor(ctx, shouldWatch = false) {
   }
 }
 
-function getHash(input, length = 8) {
-  return createHash("sha256").update(input).digest("hex").slice(0, length);
-}
-
 const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/webpack",
-  "version": "0.53.1",
+  "version": "0.53.3",
   "description": "The Webpack plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -43,13 +43,13 @@
     "magic-string": "^0.30.0",
     "unplugin": "^1.3.1",
     "webpack-sources": "^3.2.3",
-    "@unocss/config": "0.53.1",
-    "@unocss/core": "0.53.1"
+    "@unocss/config": "0.53.3",
+    "@unocss/core": "0.53.3"
   },
   "devDependencies": {
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
-    "webpack": "^5.85.0"
+    "webpack": "^5.88.0"
   },
   "scripts": {
     "build": "unbuild",