@unocss/vite 0.33.1 → 0.33.5

package/dist/index.cjs

@@ -195,6 +195,7 @@ function ChunkModeBuildPlugin({ uno, filter }) {
 
 function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }) {
   const vfsLayerMap = /* @__PURE__ */ new Map();
+  const layerImporterMap = /* @__PURE__ */ new Map();
   let tasks = [];
   let cssPostPlugin;
   let cssPlugin;
@@ -221,7 +222,6 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
       enforce: "pre",
       buildStart() {
         tasks = [];
-        vfsLayerMap.clear();
       },
       transform(code, id) {
         if (filter(code, id))
@@ -234,10 +234,12 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
           tasks.push(extract(code, filename));
         }
       },
-      resolveId(id) {
+      resolveId(id, importer) {
         const entry = resolveId(id);
         if (entry) {
           vfsLayerMap.set(entry.id, entry.layer);
+          if (importer)
+            layerImporterMap.set(importer, entry.id);
           return entry.id;
         }
       },
@@ -246,6 +248,15 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         if (layer)
           return getLayerPlaceholder(layer);
       },
+      moduleParsed({ id, importedIds }) {
+        if (!layerImporterMap.has(id))
+          return;
+        const layerKey = layerImporterMap.get(id);
+        if (!importedIds.includes(layerKey)) {
+          layerImporterMap.delete(id);
+          vfsLayerMap.delete(layerKey);
+        }
+      },
       async configResolved(config) {
         cssPostPlugin = config.plugins.find((i) => i.name === "vite:css-post");
         cssPlugin = config.plugins.find((i) => i.name === "vite:css");
@@ -289,6 +300,11 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         const cssFiles = files.filter((i) => i.endsWith(".css"));
         if (!cssFiles.length)
           return;
+        if (!vfsLayerMap.size) {
+          const msg = "[unocss] entry module not found, have you add `import 'uno.css'` in your main entry?";
+          this.warn(msg);
+          return;
+        }
         await Promise.all(tasks);
         const result = await uno.generate(tokens, { minify: true });
         let replaced = false;

package/dist/index.d.ts

@@ -52,6 +52,6 @@ declare function VueScopedPlugin({ uno, ready }: UnocssPluginContext): Plugin;
 declare function SvelteScopedPlugin({ uno, ready }: UnocssPluginContext): Plugin;
 
 declare function defineConfig<Theme extends {}>(config: VitePluginConfig<Theme>): VitePluginConfig<Theme>;
-declare function UnocssPlugin(configOrPath?: VitePluginConfig | string, defaults?: UserConfigDefaults): Plugin[];
+declare function UnocssPlugin<Theme extends {}>(configOrPath?: VitePluginConfig<Theme> | string, defaults?: UserConfigDefaults): Plugin[];
 
 export { ChunkModeBuildPlugin, GlobalModeBuildPlugin, GlobalModeDevPlugin, GlobalModePlugin, PerModuleModePlugin, SvelteScopedPlugin, VitePluginConfig, VueScopedPlugin, UnocssPlugin as default, defineConfig };

package/dist/index.mjs

@@ -185,6 +185,7 @@ function ChunkModeBuildPlugin({ uno, filter }) {
 
 function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, getConfig }) {
   const vfsLayerMap = /* @__PURE__ */ new Map();
+  const layerImporterMap = /* @__PURE__ */ new Map();
   let tasks = [];
   let cssPostPlugin;
   let cssPlugin;
@@ -211,7 +212,6 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
       enforce: "pre",
       buildStart() {
         tasks = [];
-        vfsLayerMap.clear();
       },
       transform(code, id) {
         if (filter(code, id))
@@ -224,10 +224,12 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
           tasks.push(extract(code, filename));
         }
       },
-      resolveId(id) {
+      resolveId(id, importer) {
         const entry = resolveId(id);
         if (entry) {
           vfsLayerMap.set(entry.id, entry.layer);
+          if (importer)
+            layerImporterMap.set(importer, entry.id);
           return entry.id;
         }
       },
@@ -236,6 +238,15 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         if (layer)
           return getLayerPlaceholder(layer);
       },
+      moduleParsed({ id, importedIds }) {
+        if (!layerImporterMap.has(id))
+          return;
+        const layerKey = layerImporterMap.get(id);
+        if (!importedIds.includes(layerKey)) {
+          layerImporterMap.delete(id);
+          vfsLayerMap.delete(layerKey);
+        }
+      },
       async configResolved(config) {
         cssPostPlugin = config.plugins.find((i) => i.name === "vite:css-post");
         cssPlugin = config.plugins.find((i) => i.name === "vite:css");
@@ -279,6 +290,11 @@ function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter, g
         const cssFiles = files.filter((i) => i.endsWith(".css"));
         if (!cssFiles.length)
           return;
+        if (!vfsLayerMap.size) {
+          const msg = "[unocss] entry module not found, have you add `import 'uno.css'` in your main entry?";
+          this.warn(msg);
+          return;
+        }
         await Promise.all(tasks);
         const result = await uno.generate(tokens, { minify: true });
         let replaced = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.33.1",
+  "version": "0.33.5",
   "description": "The Vite plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -43,16 +43,16 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^4.2.1",
-    "@unocss/config": "0.33.1",
-    "@unocss/core": "0.33.1",
-    "@unocss/inspector": "0.33.1",
-    "@unocss/scope": "0.33.1",
-    "@unocss/transformer-directives": "0.33.1",
-    "magic-string": "^0.26.1"
+    "@unocss/config": "0.33.5",
+    "@unocss/core": "0.33.5",
+    "@unocss/inspector": "0.33.5",
+    "@unocss/scope": "0.33.5",
+    "@unocss/transformer-directives": "0.33.5",
+    "magic-string": "^0.26.2"
   },
   "devDependencies": {
-    "@unocss/shared-integration": "0.33.1",
-    "vite": "^2.9.8"
+    "@unocss/shared-integration": "0.33.5",
+    "vite": "^2.9.9"
   },
   "scripts": {
     "build": "unbuild",