@unocss/webpack 0.32.12 → 0.33.1

package/dist/index.cjs

@@ -7,7 +7,7 @@ const WebpackSources = require('webpack-sources');
 const core = require('@unocss/core');
 const pluginutils = require('@rollup/pluginutils');
 const config = require('@unocss/config');
-require('crypto');
+const crypto = require('crypto');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -38,6 +38,10 @@ const LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
 }
+const HASH_PLACEHOLDER_RE = /#--unocss-hash--\s*{\s*content\s*:\s*\\*"(.+?)\\*";?\s*}/g;
+function getHashPlaceholder(hash) {
+  return `#--unocss-hash--{content:"${hash}"}`;
+}
 
 const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
@@ -116,6 +120,10 @@ function getPath(id) {
   return id.replace(/\?.*$/, "");
 }
 
+function getHash(input, length = 8) {
+  return crypto.createHash("sha256").update(input).digest("hex").slice(0, length);
+}
+
 const PLUGIN_NAME = "unocss:webpack";
 const UPDATE_DEBOUNCE = 10;
 function defineConfig(config) {
@@ -152,8 +160,9 @@ function WebpackPlugin(configOrPath, defaults) {
       },
       load(id) {
         const layer = entries.get(getPath(id));
+        const hash = entries.get(`${id}_hash`);
         if (layer)
-          return getLayerPlaceholder(layer);
+          return (hash ? getHashPlaceholder(hash) : "") + getLayerPlaceholder(layer);
       },
       webpack(compiler) {
         compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
@@ -164,6 +173,7 @@ function WebpackPlugin(configOrPath, defaults) {
             for (const file of files) {
               let code = compilation.assets[file].source().toString();
               let replaced = false;
+              code = code.replace(HASH_PLACEHOLDER_RE, "");
               code = code.replace(LAYER_PLACEHOLDER_RE, (_, quote, layer) => {
                 replaced = true;
                 const css = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer) || "";
@@ -186,11 +196,13 @@ function WebpackPlugin(configOrPath, defaults) {
         return;
       const result = await uno.generate(tokens);
       Array.from(plugin.__vfsModules).forEach((id) => {
-        const path = id.slice(plugin.__virtualModulePrefix.length);
+        const path = id.slice(plugin.__virtualModulePrefix.length).replace(/\\/g, "/");
         const layer = entries.get(path);
         if (!layer)
           return;
         const code = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer) || "";
+        const hash = getHash(code);
+        entries.set(`${path}_hash`, hash);
         plugin.__vfs.writeModule(id, code);
       });
     }

package/dist/index.mjs

@@ -3,7 +3,7 @@ import WebpackSources from 'webpack-sources';
 import { cssIdRE, createGenerator, BetterMap } from '@unocss/core';
 import { createFilter } from '@rollup/pluginutils';
 import { loadConfig } from '@unocss/config';
-import 'crypto';
+import { createHash } from 'crypto';
 
 const defaultExclude = [cssIdRE];
 const defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/, /\.elm$/];
@@ -30,6 +30,10 @@ const LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
 }
+const HASH_PLACEHOLDER_RE = /#--unocss-hash--\s*{\s*content\s*:\s*\\*"(.+?)\\*";?\s*}/g;
+function getHashPlaceholder(hash) {
+  return `#--unocss-hash--{content:"${hash}"}`;
+}
 
 const INCLUDE_COMMENT = "@unocss-include";
 const IGNORE_COMMENT = "@unocss-ignore";
@@ -108,6 +112,10 @@ function getPath(id) {
   return id.replace(/\?.*$/, "");
 }
 
+function getHash(input, length = 8) {
+  return createHash("sha256").update(input).digest("hex").slice(0, length);
+}
+
 const PLUGIN_NAME = "unocss:webpack";
 const UPDATE_DEBOUNCE = 10;
 function defineConfig(config) {
@@ -144,8 +152,9 @@ function WebpackPlugin(configOrPath, defaults) {
       },
       load(id) {
         const layer = entries.get(getPath(id));
+        const hash = entries.get(`${id}_hash`);
         if (layer)
-          return getLayerPlaceholder(layer);
+          return (hash ? getHashPlaceholder(hash) : "") + getLayerPlaceholder(layer);
       },
       webpack(compiler) {
         compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
@@ -156,6 +165,7 @@ function WebpackPlugin(configOrPath, defaults) {
             for (const file of files) {
               let code = compilation.assets[file].source().toString();
               let replaced = false;
+              code = code.replace(HASH_PLACEHOLDER_RE, "");
               code = code.replace(LAYER_PLACEHOLDER_RE, (_, quote, layer) => {
                 replaced = true;
                 const css = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer) || "";
@@ -178,11 +188,13 @@ function WebpackPlugin(configOrPath, defaults) {
         return;
       const result = await uno.generate(tokens);
       Array.from(plugin.__vfsModules).forEach((id) => {
-        const path = id.slice(plugin.__virtualModulePrefix.length);
+        const path = id.slice(plugin.__virtualModulePrefix.length).replace(/\\/g, "/");
         const layer = entries.get(path);
         if (!layer)
           return;
         const code = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer) || "";
+        const hash = getHash(code);
+        entries.set(`${path}_hash`, hash);
         plugin.__vfs.writeModule(id, code);
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/webpack",
-  "version": "0.32.12",
+  "version": "0.33.1",
   "description": "The Webpack plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -37,8 +37,8 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^4.2.1",
-    "@unocss/config": "0.32.12",
-    "@unocss/core": "0.32.12",
+    "@unocss/config": "0.33.1",
+    "@unocss/core": "0.33.1",
     "unplugin": "^0.6.2",
     "webpack-sources": "^3.2.3"
   },