@unocss/vite 0.8.1 → 0.9.3

package/README.md

@@ -1,5 +1,6 @@
 # @unocss/vite
 
-The Vite plugin for UnoCSS.
+The Vite plugin for UnoCSS. Ships with the `unocss` package.
 
+> This plugin does not come with any default presets. You are are building a meta framework on top of UnoCSS, see [this file](https://github.com/antfu/unocss/blob/main/packages/unocss/src/vite.ts) for an example to bind the default presets.
 

package/dist/index.d.ts

@@ -1,11 +1,14 @@
 import * as vite from 'vite';
 import { Plugin } from 'vite';
 import { UserConfig, UnoGenerator, BetterMap, UserConfigDefaults } from '@unocss/core';
-import { FilterPattern } from '@rollup/pluginutils';
 
-interface VitePluginOptions {
+declare type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
+interface PluginOptions<Theme extends {} = {}> extends UserConfig<Theme> {
     include?: FilterPattern;
     exclude?: FilterPattern;
+}
+
+interface VitePluginOptions<Theme extends {} = {}> extends PluginOptions<Theme> {
     /**
      * Enable UnoCSS inspector
      *
@@ -24,17 +27,15 @@ interface VitePluginOptions {
      */
     mode?: 'global' | 'per-module' | 'vue-scoped' | 'dist-chunk';
 }
-interface UnocssPluginOptions extends UserConfig, VitePluginOptions {
-}
 
-declare function createContext(uno: UnoGenerator, config: UnocssPluginOptions, configFilepath?: string): {
+declare function createContext(uno: UnoGenerator, config: VitePluginOptions, configFilepath?: string): {
     tokens: Set<string>;
     modules: BetterMap<string, string>;
     invalidate: () => void;
     onInvalidate(fn: () => void): void;
     uno: UnoGenerator;
     scan: (code: string, id?: string | undefined) => Promise<void>;
-    config: UnocssPluginOptions;
+    config: VitePluginOptions<{}>;
     configFilepath: string | undefined;
 };
 declare type UnocssPluginContext = ReturnType<typeof createContext>;
@@ -51,6 +52,7 @@ declare function PerModuleModePlugin({ uno, config }: UnocssPluginContext): Plug
 
 declare function VueScopedPlugin({ uno, config }: UnocssPluginContext): Plugin;
 
-declare function UnocssPlugin(configOrPath?: UnocssPluginOptions | string, defaults?: UserConfigDefaults): Plugin[];
+declare function defineConfig<Theme extends {}>(config: VitePluginOptions<Theme>): VitePluginOptions<Theme>;
+declare function UnocssPlugin(configOrPath?: VitePluginOptions | string, defaults?: UserConfigDefaults): Plugin[];
 
-export { ChunkModeBuildPlugin, GlobalModeBuildPlugin, GlobalModeDevPlugin, GlobalModePlugin, PerModuleModePlugin, UnocssPluginContext, UnocssPluginOptions, VitePluginOptions, VueScopedPlugin, UnocssPlugin as default };
+export { ChunkModeBuildPlugin, GlobalModeBuildPlugin, GlobalModeDevPlugin, GlobalModePlugin, PerModuleModePlugin, UnocssPluginContext, VitePluginOptions, VueScopedPlugin, UnocssPlugin as default, defineConfig };

package/dist/index.js

@@ -30,7 +30,8 @@ __export(exports, {
   GlobalModePlugin: () => GlobalModePlugin,
   PerModuleModePlugin: () => PerModuleModePlugin,
   VueScopedPlugin: () => VueScopedPlugin,
-  default: () => UnocssPlugin
+  default: () => UnocssPlugin,
+  defineConfig: () => defineConfig
 });
 var import_core2 = __toModule(require("@unocss/core"));
 var import_config2 = __toModule(require("@unocss/config"));
@@ -68,16 +69,9 @@ function createContext(uno, config, configFilepath) {
 // src/modes/chunk-build.ts
 var import_pluginutils = __toModule(require("@rollup/pluginutils"));
 
-// src/utils.ts
-var import_crypto = __toModule(require("crypto"));
+// ../plugins-common/defaults.ts
 var defaultExclude = [/[\/\\]node_modules[\/\\]/, /[\/\\]dist[\/\\]/, /\.(css|postcss|sass|scss|less|stylus|styl)$/];
 var defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/];
-function getHash(input, length = 8) {
-  return (0, import_crypto.createHash)("sha256").update(input).digest("hex").substr(0, length);
-}
-function getPath(id) {
-  return id.replace(/\?.*$/, "");
-}
 
 // src/modes/chunk-build.ts
 function ChunkModeBuildPlugin({ uno, config }) {
@@ -126,12 +120,21 @@ function ChunkModeBuildPlugin({ uno, config }) {
 // src/modes/global/build.ts
 var import_pluginutils2 = __toModule(require("@rollup/pluginutils"));
 
-// src/modes/global/shared.ts
-var READY_CALLBACK_DEFAULT = "/__unocss_ready";
-var ALL_LAYERS = "__ALL__";
+// src/utils.ts
+var import_crypto = __toModule(require("crypto"));
+function getHash(input, length = 8) {
+  return (0, import_crypto.createHash)("sha256").update(input).digest("hex").substr(0, length);
+}
+function getPath(id) {
+  return id.replace(/\?.*$/, "");
+}
+
+// ../plugins-common/layers.ts
 var VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];
+var LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
+var LAYER_MARK_ALL = "__ALL__";
 function resolveId(id) {
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias);
@@ -141,14 +144,16 @@ function resolveId(id) {
         layer: match[1]
       } : {
         id: "/__uno.css",
-        layer: ALL_LAYERS
+        layer: LAYER_MARK_ALL
       };
     }
   }
 }
+function getLayerPlaceholder(layer) {
+  return `#--unocss--{layer:${layer}}`;
+}
 
 // src/modes/global/build.ts
-var PLACEHOLDER_RE = /#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
   const filter = (0, import_pluginutils2.createFilter)(config.include || defaultInclude, config.exclude || defaultExclude);
   const tasks = [];
@@ -176,10 +181,10 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
           return entry.id;
         }
       },
-      async load(id) {
+      load(id) {
         const layer = entries.get(getPath(id));
         if (layer)
-          return `#--unocss--{layer:${layer}}`;
+          return getLayerPlaceholder(layer);
       }
     },
     {
@@ -199,12 +204,9 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
         for (const file of files) {
           const chunk = bundle[file];
           if (chunk.type === "asset" && typeof chunk.source === "string") {
-            chunk.source = chunk.source.replace(PLACEHOLDER_RE, (_, layer) => {
+            chunk.source = chunk.source.replace(LAYER_PLACEHOLDER_RE, (_, __, layer) => {
               replaced = true;
-              if (layer === ALL_LAYERS)
-                return result.getLayers(Array.from(entries.values()));
-              else
-                return result.getLayer(layer) || "";
+              return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer) || "";
             });
           }
         }
@@ -217,6 +219,11 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
 
 // src/modes/global/dev.ts
 var import_pluginutils3 = __toModule(require("@rollup/pluginutils"));
+
+// src/modes/global/shared.ts
+var READY_CALLBACK_DEFAULT = "/__unocss_ready";
+
+// src/modes/global/dev.ts
 var WARN_TIMEOUT = 2e3;
 function GlobalModeDevPlugin({ config, uno, tokens, onInvalidate, scan }) {
   const servers = [];
@@ -316,10 +323,7 @@ function GlobalModeDevPlugin({ config, uno, tokens, onInvalidate, scan }) {
         await Promise.all(tasks);
         const result = await uno.generate(tokens);
         lastServed = Date.now();
-        if (layer === ALL_LAYERS)
-          return result.getLayers(Array.from(entries.values()));
-        else
-          return result.getLayer(layer);
+        return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer);
       }
     },
     {
@@ -461,12 +465,19 @@ function ConfigHMRPlugin({ uno, configFilepath: filepath, invalidate, tokens, mo
         tokens.clear();
         await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
         invalidate();
+        server.ws.send({
+          type: "custom",
+          event: "unocss:config-changed"
+        });
       });
     }
   };
 }
 
 // src/index.ts
+function defineConfig(config) {
+  return config;
+}
 function UnocssPlugin(configOrPath, defaults = {}) {
   var _a;
   const { config = {}, filepath } = (0, import_config2.loadConfig)(configOrPath);
@@ -498,5 +509,6 @@ function UnocssPlugin(configOrPath, defaults = {}) {
   GlobalModeDevPlugin,
   GlobalModePlugin,
   PerModuleModePlugin,
-  VueScopedPlugin
+  VueScopedPlugin,
+  defineConfig
 });

package/dist/index.mjs

@@ -35,16 +35,9 @@ function createContext(uno, config, configFilepath) {
 // src/modes/chunk-build.ts
 import { createFilter } from "@rollup/pluginutils";
 
-// src/utils.ts
-import { createHash } from "crypto";
+// ../plugins-common/defaults.ts
 var defaultExclude = [/[\/\\]node_modules[\/\\]/, /[\/\\]dist[\/\\]/, /\.(css|postcss|sass|scss|less|stylus|styl)$/];
 var defaultInclude = [/\.vue$/, /\.vue\?vue/, /\.svelte$/, /\.[jt]sx$/, /\.mdx?$/, /\.astro$/];
-function getHash(input, length = 8) {
-  return createHash("sha256").update(input).digest("hex").substr(0, length);
-}
-function getPath(id) {
-  return id.replace(/\?.*$/, "");
-}
 
 // src/modes/chunk-build.ts
 function ChunkModeBuildPlugin({ uno, config }) {
@@ -93,12 +86,21 @@ function ChunkModeBuildPlugin({ uno, config }) {
 // src/modes/global/build.ts
 import { createFilter as createFilter2 } from "@rollup/pluginutils";
 
-// src/modes/global/shared.ts
-var READY_CALLBACK_DEFAULT = "/__unocss_ready";
-var ALL_LAYERS = "__ALL__";
+// src/utils.ts
+import { createHash } from "crypto";
+function getHash(input, length = 8) {
+  return createHash("sha256").update(input).digest("hex").substr(0, length);
+}
+function getPath(id) {
+  return id.replace(/\?.*$/, "");
+}
+
+// ../plugins-common/layers.ts
 var VIRTUAL_ENTRY_ALIAS = [
   /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
 ];
+var LAYER_PLACEHOLDER_RE = /(\\?")?#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
+var LAYER_MARK_ALL = "__ALL__";
 function resolveId(id) {
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias);
@@ -108,14 +110,16 @@ function resolveId(id) {
         layer: match[1]
       } : {
         id: "/__uno.css",
-        layer: ALL_LAYERS
+        layer: LAYER_MARK_ALL
       };
     }
   }
 }
+function getLayerPlaceholder(layer) {
+  return `#--unocss--{layer:${layer}}`;
+}
 
 // src/modes/global/build.ts
-var PLACEHOLDER_RE = /#--unocss--\s*{\s*layer\s*:\s*(.+?);?\s*}/g;
 function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
   const filter = createFilter2(config.include || defaultInclude, config.exclude || defaultExclude);
   const tasks = [];
@@ -143,10 +147,10 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
           return entry.id;
         }
       },
-      async load(id) {
+      load(id) {
         const layer = entries.get(getPath(id));
         if (layer)
-          return `#--unocss--{layer:${layer}}`;
+          return getLayerPlaceholder(layer);
       }
     },
     {
@@ -166,12 +170,9 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
         for (const file of files) {
           const chunk = bundle[file];
           if (chunk.type === "asset" && typeof chunk.source === "string") {
-            chunk.source = chunk.source.replace(PLACEHOLDER_RE, (_, layer) => {
+            chunk.source = chunk.source.replace(LAYER_PLACEHOLDER_RE, (_, __, layer) => {
               replaced = true;
-              if (layer === ALL_LAYERS)
-                return result.getLayers(Array.from(entries.values()));
-              else
-                return result.getLayer(layer) || "";
+              return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer) || "";
             });
           }
         }
@@ -184,6 +185,11 @@ function GlobalModeBuildPlugin({ uno, config, scan, tokens }) {
 
 // src/modes/global/dev.ts
 import { createFilter as createFilter3 } from "@rollup/pluginutils";
+
+// src/modes/global/shared.ts
+var READY_CALLBACK_DEFAULT = "/__unocss_ready";
+
+// src/modes/global/dev.ts
 var WARN_TIMEOUT = 2e3;
 function GlobalModeDevPlugin({ config, uno, tokens, onInvalidate, scan }) {
   const servers = [];
@@ -283,10 +289,7 @@ function GlobalModeDevPlugin({ config, uno, tokens, onInvalidate, scan }) {
         await Promise.all(tasks);
         const result = await uno.generate(tokens);
         lastServed = Date.now();
-        if (layer === ALL_LAYERS)
-          return result.getLayers(Array.from(entries.values()));
-        else
-          return result.getLayer(layer);
+        return layer === LAYER_MARK_ALL ? result.getLayers(void 0, Array.from(entries.values())) : result.getLayer(layer);
       }
     },
     {
@@ -428,12 +431,19 @@ function ConfigHMRPlugin({ uno, configFilepath: filepath, invalidate, tokens, mo
         tokens.clear();
         await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
         invalidate();
+        server.ws.send({
+          type: "custom",
+          event: "unocss:config-changed"
+        });
       });
     }
   };
 }
 
 // src/index.ts
+function defineConfig(config) {
+  return config;
+}
 function UnocssPlugin(configOrPath, defaults = {}) {
   var _a;
   const { config = {}, filepath } = loadConfig2(configOrPath);
@@ -465,5 +475,6 @@ export {
   GlobalModePlugin,
   PerModuleModePlugin,
   VueScopedPlugin,
-  UnocssPlugin as default
+  UnocssPlugin as default,
+  defineConfig
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/vite",
-  "version": "0.8.1",
+  "version": "0.9.3",
   "description": "The Vite plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -34,10 +34,10 @@
   ],
   "dependencies": {
     "@rollup/pluginutils": "^4.1.1",
-    "@unocss/config": "0.8.1",
-    "@unocss/core": "0.8.1",
-    "@unocss/scope": "0.8.1",
-    "@unocss/inspector": "0.8.1"
+    "@unocss/config": "0.9.3",
+    "@unocss/core": "0.9.3",
+    "@unocss/scope": "0.9.3",
+    "@unocss/inspector": "0.9.3"
   },
   "devDependencies": {
     "vite": "^2.6.13"