@unocss/webpack 66.5.7 → 66.5.10-beta.1

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const unplugin = require('./shared/webpack.CXJDn6r7.cjs');
+const unplugin = require('./shared/webpack.CUaiXpSS.cjs');
 require('node:path');
 require('node:process');
 require('node:fs/promises');

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { u as unplugin } from './shared/webpack.BheCLG-d.mjs';
+import { u as unplugin } from './shared/webpack.CM0t2xuW.mjs';
 import 'node:path';
 import 'node:process';
 import 'node:fs/promises';

package/dist/rspack.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const unplugin = require('./shared/webpack.CXJDn6r7.cjs');
+const unplugin = require('./shared/webpack.CUaiXpSS.cjs');
 require('node:path');
 require('node:process');
 require('node:fs/promises');

package/dist/rspack.mjs

@@ -1,4 +1,4 @@
-import { u as unplugin } from './shared/webpack.BheCLG-d.mjs';
+import { u as unplugin } from './shared/webpack.CM0t2xuW.mjs';
 import 'node:path';
 import 'node:process';
 import 'node:fs/promises';

package/dist/shared/{webpack.BheCLG-d.mjs → webpack.CM0t2xuW.mjs}

@@ -22,8 +22,6 @@ const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];
 const LAYER_MARK_ALL = "__ALL__";
-const RESOLVED_ID_WITH_QUERY_RE = /[/\\]__uno(_.*?)?\.css(\?.*)?$/;
-const RESOLVED_ID_RE = /[/\\]__uno(?:_(.*?))?\.css$/;
 
 function getPath(id) {
   return id.replace(/\?.*$/, "");
@@ -225,6 +223,22 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     if (tasks[0] === _tasks[0])
       tasks.splice(0, _tasks.length);
   }
+  const vmpCache = /* @__PURE__ */ new Map();
+  async function getVMPRegexes() {
+    const config = await getConfig();
+    const prefix = config.virtualModulePrefix || "__uno";
+    if (vmpCache.has(prefix))
+      return vmpCache.get(prefix);
+    const RESOLVED_ID_WITH_QUERY_RE = new RegExp(`[/\\\\]${prefix}(_.*?)?\\.css(\\?.*)?$`);
+    const RESOLVED_ID_RE = new RegExp(`[/\\\\]${prefix}(?:_(.*?))?.css$`);
+    const regexes = {
+      prefix,
+      RESOLVED_ID_WITH_QUERY_RE,
+      RESOLVED_ID_RE
+    };
+    vmpCache.set(prefix, regexes);
+    return regexes;
+  }
   return {
     get ready() {
       return ready;
@@ -254,7 +268,8 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
       return root;
     },
     updateRoot,
-    getConfigFileList: () => configFileList
+    getConfigFileList: () => configFileList,
+    getVMPRegexes
   };
 }
 
@@ -263,23 +278,27 @@ function getHash(input, length = 8) {
   return hash("sha256", input, "hex").substring(0, length);
 }
 
-function resolveId(id, importer) {
-  if (id.match(RESOLVED_ID_WITH_QUERY_RE))
+async function resolveId(ctx, id, importer) {
+  const { RESOLVED_ID_WITH_QUERY_RE, prefix } = await ctx.getVMPRegexes();
+  if (id.match(RESOLVED_ID_WITH_QUERY_RE)) {
     return id;
+  }
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias);
     if (match) {
-      let virtual = match[1] ? `__uno_${match[1]}.css` : "__uno.css";
+      let virtual = match[1] ? `${prefix}_${match[1]}.css` : `${prefix}.css`;
       virtual += match[2] || "";
       virtual = `/${virtual}`;
       return virtual;
     }
   }
 }
-function resolveLayer(id) {
+async function resolveLayer(ctx, id) {
+  const { RESOLVED_ID_RE } = await ctx.getVMPRegexes();
   const match = id.match(RESOLVED_ID_RE);
-  if (match)
+  if (match) {
     return match[1] || LAYER_MARK_ALL;
+  }
 }
 const LAYER_PLACEHOLDER_RE = /#--unocss--\s*\{\s*layer\s*:\s*(.+?)\s*(?:;\s*escape-view\s*:\s*(.+?)\s*)?;?\s*\}/g;
 function getLayerPlaceholder(layer) {
@@ -323,10 +342,10 @@ function unplugin(configOrPath, defaults) {
     const plugin = {
       name: "unocss:webpack",
       enforce: "pre",
-      transformInclude(id) {
-        return filter("", id) && !id.endsWith(".html") && !RESOLVED_ID_RE.test(id);
-      },
       async transform(code, id) {
+        const { RESOLVED_ID_RE } = await ctx.getVMPRegexes();
+        if (RESOLVED_ID_RE.test(id) || !filter("", id) || id.endsWith(".html"))
+          return;
         const result = await applyTransformers(ctx, code, id, "pre");
         if (isCssId(id))
           return result;
@@ -336,8 +355,8 @@ function unplugin(configOrPath, defaults) {
           tasks.push(extract(result.code, id));
         return result;
       },
-      resolveId(id) {
-        const entry = resolveId(id);
+      async resolveId(id) {
+        const entry = await resolveId(ctx, id);
         if (entry === id)
           return;
         if (entry) {
@@ -349,16 +368,13 @@ function unplugin(configOrPath, defaults) {
           return entry + query;
         }
       },
-      loadInclude(id) {
-        const layer = getLayer(id);
-        return !!layer;
-      },
       // serve the placeholders in virtual module
-      load(id) {
-        const layer = getLayer(id);
+      async load(id) {
+        const layer = await getLayer(ctx, id);
+        if (!layer)
+          return;
         const hash = hashes.get(id);
-        if (layer)
-          return (hash ? getHashPlaceholder(hash) : "") + getLayerPlaceholder(layer);
+        return (hash ? getHashPlaceholder(hash) : "") + getLayerPlaceholder(layer);
       },
       webpack(compiler) {
         compiler.hooks.beforeCompile.tapPromise(PLUGIN_NAME, async () => {
@@ -378,6 +394,7 @@ function unplugin(configOrPath, defaults) {
             const files = Object.keys(compilation.assets);
             await flushTasks();
             const result = await ctx.uno.generate(tokens, { minify: true });
+            const resolvedLayers = (await Promise.all(Array.from(entries).map((i) => resolveLayer(ctx, i)))).filter((i) => !!i);
             for (const file of files) {
               if (file === "*")
                 return;
@@ -387,7 +404,7 @@ function unplugin(configOrPath, defaults) {
               code = code.replace(HASH_PLACEHOLDER_RE, "");
               code = code.replace(LAYER_PLACEHOLDER_RE, (_, layer, escapeView) => {
                 replaced = true;
-                const css = layer.trim() === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer) || "";
+                const css = layer.trim() === LAYER_MARK_ALL ? result.getLayers(void 0, resolvedLayers) : result.getLayer(layer) || "";
                 escapeCss = escapeCss ?? getCssEscaperForJsContent(escapeView.trim());
                 return escapeCss(css);
               });
@@ -416,27 +433,28 @@ function unplugin(configOrPath, defaults) {
       } else {
         virtualModules = Array.from(plugin.__vfsModules);
       }
-      virtualModules.forEach((id) => {
+      const resolvedLayers = (await Promise.all(Array.from(entries).map((i) => resolveLayer(ctx, i)))).filter((i) => !!i);
+      for (const id of virtualModules) {
         let path = decodeURIComponent(id.startsWith(plugin.__virtualModulePrefix) ? id.slice(plugin.__virtualModulePrefix.length) : id);
         path = normalizeAbsolutePath(path);
-        const layer = resolveLayer(path);
+        const layer = await resolveLayer(ctx, path);
         if (!layer)
-          return;
-        const code = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer) || "";
+          continue;
+        const code = layer === LAYER_MARK_ALL ? result.getLayers(void 0, resolvedLayers) : result.getLayer(layer) || "";
         const hash = getHash(code);
         hashes.set(path, hash);
         plugin.__vfs.writeModule(id, code);
-      });
+      }
     }
     return plugin;
   });
 }
-function getLayer(id) {
-  let layer = resolveLayer(getPath(id));
+async function getLayer(ctx, id) {
+  let layer = await resolveLayer(ctx, getPath(id));
   if (!layer) {
-    const entry = resolveId(id);
+    const entry = await resolveId(ctx, id);
     if (entry)
-      layer = resolveLayer(entry);
+      layer = await resolveLayer(ctx, entry);
   }
   return layer;
 }

package/dist/shared/{webpack.CXJDn6r7.cjs → webpack.CUaiXpSS.cjs}

@@ -33,8 +33,6 @@ const VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];
 const LAYER_MARK_ALL = "__ALL__";
-const RESOLVED_ID_WITH_QUERY_RE = /[/\\]__uno(_.*?)?\.css(\?.*)?$/;
-const RESOLVED_ID_RE = /[/\\]__uno(?:_(.*?))?\.css$/;
 
 function getPath(id) {
   return id.replace(/\?.*$/, "");
@@ -236,6 +234,22 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     if (tasks[0] === _tasks[0])
       tasks.splice(0, _tasks.length);
   }
+  const vmpCache = /* @__PURE__ */ new Map();
+  async function getVMPRegexes() {
+    const config = await getConfig();
+    const prefix = config.virtualModulePrefix || "__uno";
+    if (vmpCache.has(prefix))
+      return vmpCache.get(prefix);
+    const RESOLVED_ID_WITH_QUERY_RE = new RegExp(`[/\\\\]${prefix}(_.*?)?\\.css(\\?.*)?$`);
+    const RESOLVED_ID_RE = new RegExp(`[/\\\\]${prefix}(?:_(.*?))?.css$`);
+    const regexes = {
+      prefix,
+      RESOLVED_ID_WITH_QUERY_RE,
+      RESOLVED_ID_RE
+    };
+    vmpCache.set(prefix, regexes);
+    return regexes;
+  }
   return {
     get ready() {
       return ready;
@@ -265,7 +279,8 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
       return root;
     },
     updateRoot,
-    getConfigFileList: () => configFileList
+    getConfigFileList: () => configFileList,
+    getVMPRegexes
   };
 }
 
@@ -274,23 +289,27 @@ function getHash(input, length = 8) {
   return hash("sha256", input, "hex").substring(0, length);
 }
 
-function resolveId(id, importer) {
-  if (id.match(RESOLVED_ID_WITH_QUERY_RE))
+async function resolveId(ctx, id, importer) {
+  const { RESOLVED_ID_WITH_QUERY_RE, prefix } = await ctx.getVMPRegexes();
+  if (id.match(RESOLVED_ID_WITH_QUERY_RE)) {
     return id;
+  }
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias);
     if (match) {
-      let virtual = match[1] ? `__uno_${match[1]}.css` : "__uno.css";
+      let virtual = match[1] ? `${prefix}_${match[1]}.css` : `${prefix}.css`;
       virtual += match[2] || "";
       virtual = `/${virtual}`;
       return virtual;
     }
   }
 }
-function resolveLayer(id) {
+async function resolveLayer(ctx, id) {
+  const { RESOLVED_ID_RE } = await ctx.getVMPRegexes();
   const match = id.match(RESOLVED_ID_RE);
-  if (match)
+  if (match) {
     return match[1] || LAYER_MARK_ALL;
+  }
 }
 const LAYER_PLACEHOLDER_RE = /#--unocss--\s*\{\s*layer\s*:\s*(.+?)\s*(?:;\s*escape-view\s*:\s*(.+?)\s*)?;?\s*\}/g;
 function getLayerPlaceholder(layer) {
@@ -334,10 +353,10 @@ function unplugin(configOrPath, defaults) {
     const plugin = {
       name: "unocss:webpack",
       enforce: "pre",
-      transformInclude(id) {
-        return filter("", id) && !id.endsWith(".html") && !RESOLVED_ID_RE.test(id);
-      },
       async transform(code, id) {
+        const { RESOLVED_ID_RE } = await ctx.getVMPRegexes();
+        if (RESOLVED_ID_RE.test(id) || !filter("", id) || id.endsWith(".html"))
+          return;
         const result = await applyTransformers(ctx, code, id, "pre");
         if (isCssId(id))
           return result;
@@ -347,8 +366,8 @@ function unplugin(configOrPath, defaults) {
           tasks.push(extract(result.code, id));
         return result;
       },
-      resolveId(id) {
-        const entry = resolveId(id);
+      async resolveId(id) {
+        const entry = await resolveId(ctx, id);
         if (entry === id)
           return;
         if (entry) {
@@ -360,16 +379,13 @@ function unplugin(configOrPath, defaults) {
           return entry + query;
         }
       },
-      loadInclude(id) {
-        const layer = getLayer(id);
-        return !!layer;
-      },
       // serve the placeholders in virtual module
-      load(id) {
-        const layer = getLayer(id);
+      async load(id) {
+        const layer = await getLayer(ctx, id);
+        if (!layer)
+          return;
         const hash = hashes.get(id);
-        if (layer)
-          return (hash ? getHashPlaceholder(hash) : "") + getLayerPlaceholder(layer);
+        return (hash ? getHashPlaceholder(hash) : "") + getLayerPlaceholder(layer);
       },
       webpack(compiler) {
         compiler.hooks.beforeCompile.tapPromise(PLUGIN_NAME, async () => {
@@ -389,6 +405,7 @@ function unplugin(configOrPath, defaults) {
             const files = Object.keys(compilation.assets);
             await flushTasks();
             const result = await ctx.uno.generate(tokens, { minify: true });
+            const resolvedLayers = (await Promise.all(Array.from(entries).map((i) => resolveLayer(ctx, i)))).filter((i) => !!i);
             for (const file of files) {
               if (file === "*")
                 return;
@@ -398,7 +415,7 @@ function unplugin(configOrPath, defaults) {
               code = code.replace(HASH_PLACEHOLDER_RE, "");
               code = code.replace(LAYER_PLACEHOLDER_RE, (_, layer, escapeView) => {
                 replaced = true;
-                const css = layer.trim() === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer) || "";
+                const css = layer.trim() === LAYER_MARK_ALL ? result.getLayers(void 0, resolvedLayers) : result.getLayer(layer) || "";
                 escapeCss = escapeCss ?? getCssEscaperForJsContent(escapeView.trim());
                 return escapeCss(css);
               });
@@ -427,27 +444,28 @@ function unplugin(configOrPath, defaults) {
       } else {
         virtualModules = Array.from(plugin.__vfsModules);
       }
-      virtualModules.forEach((id) => {
+      const resolvedLayers = (await Promise.all(Array.from(entries).map((i) => resolveLayer(ctx, i)))).filter((i) => !!i);
+      for (const id of virtualModules) {
         let path = decodeURIComponent(id.startsWith(plugin.__virtualModulePrefix) ? id.slice(plugin.__virtualModulePrefix.length) : id);
         path = normalizeAbsolutePath(path);
-        const layer = resolveLayer(path);
+        const layer = await resolveLayer(ctx, path);
         if (!layer)
-          return;
-        const code = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer) || "";
+          continue;
+        const code = layer === LAYER_MARK_ALL ? result.getLayers(void 0, resolvedLayers) : result.getLayer(layer) || "";
         const hash = getHash(code);
         hashes.set(path, hash);
         plugin.__vfs.writeModule(id, code);
-      });
+      }
     }
     return plugin;
   });
 }
-function getLayer(id) {
-  let layer = resolveLayer(getPath(id));
+async function getLayer(ctx, id) {
+  let layer = await resolveLayer(ctx, getPath(id));
   if (!layer) {
-    const entry = resolveId(id);
+    const entry = await resolveId(ctx, id);
     if (entry)
-      layer = resolveLayer(entry);
+      layer = await resolveLayer(ctx, entry);
   }
   return layer;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/webpack",
   "type": "module",
-  "version": "66.5.7",
+  "version": "66.5.10-beta.1",
   "description": "The Webpack plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -68,8 +68,8 @@
     "unplugin": "^2.3.10",
     "unplugin-utils": "^0.3.1",
     "webpack-sources": "^3.3.3",
-    "@unocss/config": "66.5.7",
-    "@unocss/core": "66.5.7"
+    "@unocss/config": "66.5.10-beta.1",
+    "@unocss/core": "66.5.10-beta.1"
   },
   "devDependencies": {
     "@types/webpack": "^5.28.5",