@unocss/webpack 0.60.3 → 0.61.0

package/dist/index.cjs

@@ -162,8 +162,11 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   };
 }
 
-function getHash(input, length = 8) {
-  return node_crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
+function getPath(id) {
+  return id.replace(/\?.*$/, "");
+}
+function isCssId(id) {
+  return core.cssIdRE.test(id);
 }
 function hash(str) {
   let i;
@@ -175,6 +178,22 @@ function hash(str) {
   }
   return `00000${(hval >>> 0).toString(36)}`.slice(-6);
 }
+function transformSkipCode(code, map, SKIP_RULES_RE, keyFlag) {
+  for (const item of Array.from(code.matchAll(SKIP_RULES_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `${keyFlag}${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.replaceAll(withHashKey, matched);
+  return code;
+}
 
 async function applyTransformers(ctx, original, id, enforce = "default") {
   if (original.includes(IGNORE_COMMENT))
@@ -184,7 +203,7 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     return;
   const skipMap = /* @__PURE__ */ new Map();
   let code = original;
-  let s = new MagicString__default(transformSkipCode(code, skipMap));
+  let s = new MagicString__default(transformSkipCode(code, skipMap, SKIP_COMMENT_RE, "@unocss-skip-placeholder-"));
   const maps = [];
   for (const t of transformers) {
     if (t.idFilter) {
@@ -210,22 +229,6 @@ 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();
@@ -273,6 +276,10 @@ 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(\?.*)?$/
 ];
@@ -316,13 +323,6 @@ function getHashPlaceholder(hash) {
   return `#--unocss-hash--{content:"${hash}"}`;
 }
 
-function getPath(id) {
-  return id.replace(/\?.*$/, "");
-}
-function isCssId(id) {
-  return core.cssIdRE.test(id);
-}
-
 const PLUGIN_NAME = "unocss:webpack";
 const UPDATE_DEBOUNCE = 10;
 function defineConfig(config) {

package/dist/index.mjs

@@ -149,8 +149,11 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
   };
 }
 
-function getHash(input, length = 8) {
-  return createHash("sha256").update(input).digest("hex").slice(0, length);
+function getPath(id) {
+  return id.replace(/\?.*$/, "");
+}
+function isCssId(id) {
+  return cssIdRE.test(id);
 }
 function hash(str) {
   let i;
@@ -162,6 +165,22 @@ function hash(str) {
   }
   return `00000${(hval >>> 0).toString(36)}`.slice(-6);
 }
+function transformSkipCode(code, map, SKIP_RULES_RE, keyFlag) {
+  for (const item of Array.from(code.matchAll(SKIP_RULES_RE))) {
+    if (item != null) {
+      const matched = item[0];
+      const withHashKey = `${keyFlag}${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.replaceAll(withHashKey, matched);
+  return code;
+}
 
 async function applyTransformers(ctx, original, id, enforce = "default") {
   if (original.includes(IGNORE_COMMENT))
@@ -171,7 +190,7 @@ async function applyTransformers(ctx, original, id, enforce = "default") {
     return;
   const skipMap = /* @__PURE__ */ new Map();
   let code = original;
-  let s = new MagicString(transformSkipCode(code, skipMap));
+  let s = new MagicString(transformSkipCode(code, skipMap, SKIP_COMMENT_RE, "@unocss-skip-placeholder-"));
   const maps = [];
   for (const t of transformers) {
     if (t.idFilter) {
@@ -197,22 +216,6 @@ 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();
@@ -260,6 +263,10 @@ 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(\?.*)?$/
 ];
@@ -303,13 +310,6 @@ function getHashPlaceholder(hash) {
   return `#--unocss-hash--{content:"${hash}"}`;
 }
 
-function getPath(id) {
-  return id.replace(/\?.*$/, "");
-}
-function isCssId(id) {
-  return cssIdRE.test(id);
-}
-
 const PLUGIN_NAME = "unocss:webpack";
 const UPDATE_DEBOUNCE = 10;
 function defineConfig(config) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/webpack",
   "type": "module",
-  "version": "0.60.3",
+  "version": "0.61.0",
   "description": "The Webpack plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -49,13 +49,13 @@
     "magic-string": "^0.30.10",
     "unplugin": "^1.10.1",
     "webpack-sources": "^3.2.3",
-    "@unocss/config": "0.60.3",
-    "@unocss/core": "0.60.3"
+    "@unocss/config": "0.61.0",
+    "@unocss/core": "0.61.0"
   },
   "devDependencies": {
     "@types/webpack": "^5.28.5",
     "@types/webpack-sources": "^3.2.3",
-    "webpack": "^5.91.0"
+    "webpack": "^5.92.0"
   },
   "scripts": {
     "build": "unbuild",