@unocss/vite 0.37.3 → 0.38.1

package/dist/index.cjs

@@ -73,6 +73,15 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     tokens.clear();
     await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
     invalidate();
+    const presets = /* @__PURE__ */ new Set();
+    uno.config.presets.forEach((i) => {
+      if (!i.name)
+        return;
+      if (presets.has(i.name))
+        console.warn(`[unocss] duplication of preset ${i.name} found, there might be something wrong with your config.`);
+      else
+        presets.add(i.name);
+    });
     return result;
   }
   async function updateRoot(newRoot) {
@@ -197,15 +206,15 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
   const vfsLayerMap = /* @__PURE__ */ new Map();
   const layerImporterMap = /* @__PURE__ */ new Map();
   let tasks = [];
-  let cssPostPlugin;
-  let cssPlugin;
-  async function transformCSS(css, id) {
+  const cssPostPlugins = /* @__PURE__ */ new Map();
+  const cssPlugins = /* @__PURE__ */ new Map();
+  async function transformCSS(css, id, dir) {
     const {
       postcss = true
     } = await getConfig();
-    if (!cssPlugin || !postcss)
+    if (!cssPlugins.get(dir) || !postcss)
       return css;
-    const result = await cssPlugin.transform(css, id);
+    const result = await cssPlugins.get(dir).transform(css, id);
     if (!result)
       return css;
     if (typeof result === "string")
@@ -258,12 +267,12 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         }
       },
       async configResolved(config) {
-        cssPostPlugin = config.plugins.find((i) => i.name === "vite:css-post");
-        cssPlugin = config.plugins.find((i) => i.name === "vite:css");
+        cssPostPlugins.set(config.build.outDir, config.plugins.find((i) => i.name === "vite:css-post"));
+        cssPlugins.set(config.build.outDir, config.plugins.find((i) => i.name === "vite:css"));
         await ready;
       },
-      async renderChunk(_, chunk) {
-        if (!cssPostPlugin)
+      async renderChunk(_, chunk, options) {
+        if (!cssPostPlugins.get(options.dir))
           return null;
         const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
         if (!chunks.length)
@@ -276,9 +285,9 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
           return null;
         if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
           return null;
-        css = await transformCSS(css, fakeCssId);
+        css = await transformCSS(css, fakeCssId, options.dir);
         const hash = getHash(css);
-        await cssPostPlugin.transform(getHashPlaceholder(hash), fakeCssId);
+        await cssPostPlugins.get(options.dir).transform(getHashPlaceholder(hash), fakeCssId);
         chunk.modules[fakeCssId] = {
           code: null,
           originalLength: 0,
@@ -295,7 +304,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         return command === "build" && !options.build?.ssr;
       },
       enforce: "post",
-      async generateBundle(_, bundle) {
+      async generateBundle(options, bundle) {
         const files = Object.keys(bundle);
         const cssFiles = files.filter((i) => i.endsWith(".css"));
         if (!cssFiles.length)
@@ -312,9 +321,9 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
           const chunk = bundle[file];
           if (chunk.type === "asset" && typeof chunk.source === "string") {
             const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
-            chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_2, __, layer) => {
+            chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_, __, layer) => {
               replaced = true;
-              return await transformCSS(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`);
+              return await transformCSS(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`, options.dir);
             });
           }
         }

package/dist/index.mjs

@@ -63,6 +63,15 @@ function createContext(configOrPath, defaults = {}, extraConfigSources = [], res
     tokens.clear();
     await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
     invalidate();
+    const presets = /* @__PURE__ */ new Set();
+    uno.config.presets.forEach((i) => {
+      if (!i.name)
+        return;
+      if (presets.has(i.name))
+        console.warn(`[unocss] duplication of preset ${i.name} found, there might be something wrong with your config.`);
+      else
+        presets.add(i.name);
+    });
     return result;
   }
   async function updateRoot(newRoot) {
@@ -187,15 +196,15 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
   const vfsLayerMap = /* @__PURE__ */ new Map();
   const layerImporterMap = /* @__PURE__ */ new Map();
   let tasks = [];
-  let cssPostPlugin;
-  let cssPlugin;
-  async function transformCSS(css, id) {
+  const cssPostPlugins = /* @__PURE__ */ new Map();
+  const cssPlugins = /* @__PURE__ */ new Map();
+  async function transformCSS(css, id, dir) {
     const {
       postcss = true
     } = await getConfig();
-    if (!cssPlugin || !postcss)
+    if (!cssPlugins.get(dir) || !postcss)
       return css;
-    const result = await cssPlugin.transform(css, id);
+    const result = await cssPlugins.get(dir).transform(css, id);
     if (!result)
       return css;
     if (typeof result === "string")
@@ -248,12 +257,12 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         }
       },
       async configResolved(config) {
-        cssPostPlugin = config.plugins.find((i) => i.name === "vite:css-post");
-        cssPlugin = config.plugins.find((i) => i.name === "vite:css");
+        cssPostPlugins.set(config.build.outDir, config.plugins.find((i) => i.name === "vite:css-post"));
+        cssPlugins.set(config.build.outDir, config.plugins.find((i) => i.name === "vite:css"));
         await ready;
       },
-      async renderChunk(_, chunk) {
-        if (!cssPostPlugin)
+      async renderChunk(_, chunk, options) {
+        if (!cssPostPlugins.get(options.dir))
           return null;
         const chunks = Object.keys(chunk.modules).filter((i) => modules.has(i));
         if (!chunks.length)
@@ -266,9 +275,9 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
           return null;
         if (!Object.keys(chunk.modules).some((i) => i.match(RESOLVED_ID_RE)))
           return null;
-        css = await transformCSS(css, fakeCssId);
+        css = await transformCSS(css, fakeCssId, options.dir);
         const hash = getHash(css);
-        await cssPostPlugin.transform(getHashPlaceholder(hash), fakeCssId);
+        await cssPostPlugins.get(options.dir).transform(getHashPlaceholder(hash), fakeCssId);
         chunk.modules[fakeCssId] = {
           code: null,
           originalLength: 0,
@@ -285,7 +294,7 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         return command === "build" && !options.build?.ssr;
       },
       enforce: "post",
-      async generateBundle(_, bundle) {
+      async generateBundle(options, bundle) {
         const files = Object.keys(bundle);
         const cssFiles = files.filter((i) => i.endsWith(".css"));
         if (!cssFiles.length)
@@ -302,9 +311,9 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
           const chunk = bundle[file];
           if (chunk.type === "asset" && typeof chunk.source === "string") {
             const css = chunk.source.replace(HASH_PLACEHOLDER_RE, "");
-            chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_2, __, layer) => {
+            chunk.source = await replaceAsync(css, LAYER_PLACEHOLDER_RE, async (_, __, layer) => {
               replaced = true;
-              return await transformCSS(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`);
+              return await transformCSS(layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(vfsLayerMap.values())) : result.getLayer(layer) || "", `${chunk.fileName}.css`, options.dir);
             });
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.37.3",
+  "version": "0.38.1",
   "description": "The Vite plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -43,15 +43,15 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^4.2.1",
-    "@unocss/config": "0.37.3",
-    "@unocss/core": "0.37.3",
-    "@unocss/inspector": "0.37.3",
-    "@unocss/scope": "0.37.3",
-    "@unocss/transformer-directives": "0.37.3",
+    "@unocss/config": "0.38.1",
+    "@unocss/core": "0.38.1",
+    "@unocss/inspector": "0.38.1",
+    "@unocss/scope": "0.38.1",
+    "@unocss/transformer-directives": "0.38.1",
     "magic-string": "^0.26.2"
   },
   "devDependencies": {
-    "@unocss/shared-integration": "0.37.3",
+    "@unocss/shared-integration": "0.38.1",
     "vite": "^2.9.9"
   },
   "scripts": {