@unocss/vite 66.5.9 → 66.5.10

package/dist/index.mjs

@@ -24,8 +24,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$/;
 
 const defaultPipelineExclude = [cssIdRE];
 const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|vine.ts|mdx?|astro|elm|php|phtml|marko|html)($|\?)/];
@@ -113,6 +111,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;
@@ -142,7 +156,8 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
       return root;
     },
     updateRoot,
-    getConfigFileList: () => configFileList
+    getConfigFileList: () => configFileList,
+    getVMPRegexes
   };
 }
 
@@ -462,13 +477,15 @@ async function setupContentExtractor(ctx, shouldWatch = false) {
   }
 }
 
-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] || "";
       if (importer)
         virtual = resolve$1(importer, "..", virtual);
@@ -478,10 +495,12 @@ function resolveId(id, importer) {
     }
   }
 }
-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;
+  }
 }
 function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer};escape-view:\\"\\'\\\`\\\\}`;
@@ -557,10 +576,10 @@ function GlobalModeBuildPlugin(ctx) {
           tasks.push(extract(code, filename));
         }
       },
-      resolveId(id, importer) {
-        const entry = resolveId(id, importer);
+      async resolveId(id, importer) {
+        const entry = await resolveId(ctx, id, importer);
         if (entry) {
-          const layer = resolveLayer(entry);
+          const layer = await resolveLayer(ctx, entry);
           if (layer) {
             if (importer)
               unocssImporters.add(importer);
@@ -574,8 +593,8 @@ function GlobalModeBuildPlugin(ctx) {
           return entry;
         }
       },
-      load(id) {
-        const layer = resolveLayer(getPath(id));
+      async load(id) {
+        const layer = await resolveLayer(ctx, getPath(id));
         if (layer) {
           if (!vfsLayers.has(layer)) {
             this.error(`[unocss] layer ${JSON.stringify(id)} is imported but not being resolved before, it might be an internal bug of UnoCSS`);
@@ -625,7 +644,8 @@ function GlobalModeBuildPlugin(ctx) {
     {
       name: "unocss:global:build:generate",
       apply: "build",
-      async renderChunk(code, chunk, options) {
+      async renderChunk(_, chunk, options) {
+        const { RESOLVED_ID_RE } = await ctx.getVMPRegexes();
         const entryModules = Object.keys(chunk.modules).filter((id) => RESOLVED_ID_RE.test(id));
         if (!entryModules.length)
           return null;
@@ -696,7 +716,7 @@ function GlobalModeDevPlugin(ctx) {
         break;
       tokensSize = tokens.size;
     } while (true);
-    const css = layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries).map((i) => resolveLayer(i)).filter((i) => !!i)) : result.getLayer(layer);
+    const css = layer === LAYER_MARK_ALL ? result.getLayers(void 0, await Promise.all(Array.from(entries).map((i) => resolveLayer(ctx, i))).then((layers) => layers.filter((i) => !!i))) : result.getLayer(layer);
     const hash = getHash(css || "", HASH_LENGTH);
     lastServedHash.set(layer, hash);
     lastServedTime = Date.now();
@@ -797,8 +817,8 @@ function GlobalModeDevPlugin(ctx) {
           tasks.push(extract(code, filename));
         }
       },
-      resolveId(id) {
-        const entry = resolveId(id);
+      async resolveId(id) {
+        const entry = await resolveId(ctx, id);
         if (entry) {
           resolved = true;
           clearWarnTimer();
@@ -807,7 +827,7 @@ function GlobalModeDevPlugin(ctx) {
         }
       },
       async load(id) {
-        const layer = resolveLayer(getPath(id));
+        const layer = await resolveLayer(ctx, getPath(id));
         if (!layer)
           return null;
         const { hash, css } = await generateCSS(layer);
@@ -828,7 +848,7 @@ function GlobalModeDevPlugin(ctx) {
       },
       enforce: "post",
       async transform(code, id) {
-        const layer = resolveLayer(getPath(id));
+        const layer = await resolveLayer(ctx, getPath(id));
         if (layer && code.includes("import.meta.hot")) {
           let hmr = `
 try {
@@ -895,13 +915,13 @@ function PerModuleModePlugin(ctx) {
     {
       name: "unocss:module-scope:pre",
       enforce: "pre",
-      resolveId(id) {
-        const entry = resolveId(id);
+      async resolveId(id) {
+        const entry = await resolveId(ctx, id);
         if (entry)
           return entry;
       },
       async load(id) {
-        const layer = resolveLayer(getPath(id));
+        const layer = await resolveLayer(ctx, getPath(id));
         if (!layer)
           return null;
         await ctx.ready;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/vite",
   "type": "module",
-  "version": "66.5.9",
+  "version": "66.5.10",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -55,9 +55,9 @@
     "pathe": "^2.0.3",
     "tinyglobby": "^0.2.15",
     "unplugin-utils": "^0.3.1",
-    "@unocss/config": "66.5.9",
-    "@unocss/inspector": "66.5.9",
-    "@unocss/core": "66.5.9"
+    "@unocss/config": "66.5.10",
+    "@unocss/inspector": "66.5.10",
+    "@unocss/core": "66.5.10"
   },
   "devDependencies": {
     "vite": "^7.2.2"