@unocss/vite 0.12.16 → 0.13.1

package/dist/index.d.ts

@@ -1,20 +1,9 @@
 import * as vite from 'vite';
 import { Plugin } from 'vite';
 import { UserConfig, UnoGenerator, BetterMap, UserConfigDefaults } from '@unocss/core';
+import { LoadConfigResult } from '@unocss/config';
 
-declare type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
-interface PluginConfig<Theme extends {} = {}> extends UserConfig<Theme> {
-    /**
-     * Patterns that filter the files being extracted.
-     */
-    include?: FilterPattern;
-    /**
-     * Patterns that filter the files NOT being extracted.
-     */
-    exclude?: FilterPattern;
-}
-
-interface VitePluginConfig<Theme extends {} = {}> extends PluginConfig<Theme> {
+interface VitePluginConfig<Theme extends {} = {}> extends UserConfig<Theme> {
     /**
      * Enable UnoCSS inspector
      *
@@ -34,15 +23,15 @@ interface VitePluginConfig<Theme extends {} = {}> extends PluginConfig<Theme> {
     mode?: 'global' | 'per-module' | 'vue-scoped' | 'dist-chunk';
 }
 
-interface UnocssPluginContext<Config extends PluginConfig = PluginConfig> {
+interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
+    ready: Promise<LoadConfigResult<Config>>;
     uno: UnoGenerator;
-    config: Config;
     tokens: Set<string>;
     modules: BetterMap<string, string>;
     filter: (code: string, id: string) => boolean;
-    reloadConfig: () => Promise<void>;
     extract: (code: string, id?: string) => Promise<void>;
-    configFilepath?: string;
+    reloadConfig: () => Promise<LoadConfigResult<Config>>;
+    getConfig: () => Promise<Config>;
     invalidate: () => void;
     onInvalidate: (fn: () => void) => void;
 }
@@ -51,13 +40,13 @@ declare function ChunkModeBuildPlugin({ uno, filter }: UnocssPluginContext): Plu
 
 declare function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }: UnocssPluginContext): Plugin[];
 
-declare function GlobalModeBuildPlugin({ uno, extract, tokens, modules, filter }: UnocssPluginContext): Plugin[];
+declare function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter }: UnocssPluginContext): Plugin[];
 
 declare function GlobalModePlugin(ctx: UnocssPluginContext): vite.Plugin[];
 
 declare function PerModuleModePlugin({ uno, filter }: UnocssPluginContext): Plugin;
 
-declare function VueScopedPlugin({ uno, config }: UnocssPluginContext): Plugin;
+declare function VueScopedPlugin({ uno, ready }: UnocssPluginContext): Plugin;
 
 declare function defineConfig<Theme extends {}>(config: VitePluginConfig<Theme>): VitePluginConfig<Theme>;
 declare function UnocssPlugin(configOrPath?: VitePluginConfig | string, defaults?: UserConfigDefaults): Plugin[];

package/dist/index.js

@@ -74,14 +74,26 @@ var INCLUDE_COMMENT = "@unocss-include";
 var import_pluginutils = __toModule(require("@rollup/pluginutils"));
 var import_config = __toModule(require("@unocss/config"));
 var import_core = __toModule(require("@unocss/core"));
-function createContext(configOrPath, defaults = {}) {
-  const { config = {}, filepath } = (0, import_config.loadConfig)(configOrPath);
-  let rawConfig = config;
-  const uno = (0, import_core.createGenerator)(config, defaults);
+function createContext(configOrPath, defaults = {}, extraConfigSources = []) {
+  const loadConfig = (0, import_config.createConfigLoader)(configOrPath, extraConfigSources);
+  let rawConfig = {};
+  const uno = (0, import_core.createGenerator)(rawConfig, defaults);
+  let rollupFilter = (0, import_pluginutils.createFilter)(defaultInclude, defaultExclude);
   const invalidations = [];
   const modules = new import_core.BetterMap();
   const tokens = new Set();
-  let rollupFilter = (0, import_pluginutils.createFilter)(config.include || defaultInclude, config.exclude || defaultExclude);
+  const ready = reloadConfig();
+  async function reloadConfig() {
+    const result = await loadConfig();
+    rawConfig = result.config;
+    uno.setConfig(rawConfig);
+    uno.config.envMode = "dev";
+    rollupFilter = (0, import_pluginutils.createFilter)(rawConfig.include || defaultInclude, rawConfig.exclude || defaultExclude);
+    tokens.clear();
+    await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
+    invalidate();
+    return result;
+  }
   function invalidate() {
     invalidations.forEach((cb) => cb());
   }
@@ -93,21 +105,15 @@ function createContext(configOrPath, defaults = {}) {
     if (tokens.size > len)
       invalidate();
   }
-  async function reloadConfig() {
-    if (!filepath)
-      return;
-    rawConfig = (0, import_config.loadConfig)(filepath).config;
-    uno.setConfig(rawConfig);
-    uno.config.envMode = "dev";
-    rollupFilter = (0, import_pluginutils.createFilter)(config.include || defaultInclude, config.exclude || defaultExclude);
-    tokens.clear();
-    await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
-    invalidate();
-  }
   const filter = (code, id) => {
     return code.includes(INCLUDE_COMMENT) || rollupFilter(id);
   };
+  async function getConfig() {
+    await ready;
+    return rawConfig;
+  }
   return {
+    ready,
     tokens,
     modules,
     invalidate,
@@ -118,17 +124,14 @@ function createContext(configOrPath, defaults = {}) {
     reloadConfig,
     uno,
     extract,
-    get config() {
-      return rawConfig;
-    },
-    configFilepath: filepath
+    getConfig
   };
 }
 
 // ../plugins-common/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);
+  return (0, import_crypto.createHash)("sha256").update(input).digest("hex").slice(0, length);
 }
 function getPath(id) {
   return id.replace(/\?.*$/, "");
@@ -178,7 +181,7 @@ function ChunkModeBuildPlugin({ uno, filter }) {
 }
 
 // src/modes/global/build.ts
-function GlobalModeBuildPlugin({ uno, extract, tokens, modules, filter }) {
+function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter }) {
   const vfsLayerMap = new Map();
   let tasks = [];
   let cssPlugin;
@@ -214,8 +217,9 @@ function GlobalModeBuildPlugin({ uno, extract, tokens, modules, filter }) {
         if (layer)
           return getLayerPlaceholder(layer);
       },
-      configResolved(config) {
+      async configResolved(config) {
         cssPlugin = config.plugins.find((i) => i.name === "vite:css-post");
+        await ready;
       },
       async renderChunk(_, chunk) {
         if (!cssPlugin)
@@ -332,7 +336,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
       name: "unocss:global",
       apply: "serve",
       enforce: "pre",
-      configureServer(_server) {
+      async configureServer(_server) {
         servers.push(_server);
         _server.middlewares.use(async (req, res, next) => {
           var _a;
@@ -467,8 +471,8 @@ ${css}`;
 
 // src/modes/vue-scoped.ts
 var import_pluginutils2 = __toModule(require("@rollup/pluginutils"));
-function VueScopedPlugin({ uno, config }) {
-  const filter = (0, import_pluginutils2.createFilter)(config.include || [/\.vue$/], config.exclude || defaultExclude);
+function VueScopedPlugin({ uno, ready }) {
+  let filter = (0, import_pluginutils2.createFilter)([/\.vue$/], defaultExclude);
   async function transformSFC(code) {
     const { css } = await uno.generate(code);
     if (!css)
@@ -479,6 +483,10 @@ function VueScopedPlugin({ uno, config }) {
   return {
     name: "unocss:vue-scoped",
     enforce: "pre",
+    async configResolved() {
+      const { config } = await ready;
+      filter = (0, import_pluginutils2.createFilter)(config.include || [/\.vue$/], config.exclude || defaultExclude);
+    },
     transform(code, id) {
       if (!filter(id))
         return;
@@ -498,24 +506,22 @@ function VueScopedPlugin({ uno, config }) {
 
 // src/config-hmr.ts
 function ConfigHMRPlugin(ctx) {
-  const { uno, configFilepath, reloadConfig } = ctx;
+  const { ready, uno } = ctx;
   return {
     name: "unocss:config",
-    api: {
-      get config() {
-        if (!configFilepath)
-          return ctx.config;
-      }
+    async configResolved() {
+      await ready;
     },
-    configureServer(server) {
+    async configureServer(server) {
       uno.config.envMode = "dev";
-      if (!configFilepath)
+      const { sources } = await ready;
+      if (!sources.length)
         return;
-      server.watcher.add(configFilepath);
+      server.watcher.add(sources);
       server.watcher.on("change", async (p) => {
-        if (p !== configFilepath)
+        if (!sources.includes(p))
           return;
-        reloadConfig();
+        await ctx.reloadConfig();
         server.ws.send({
           type: "custom",
           event: "unocss:config-changed"
@@ -531,12 +537,12 @@ function defineConfig(config) {
 }
 function UnocssPlugin(configOrPath, defaults = {}) {
   const ctx = createContext(configOrPath, defaults);
-  const { config } = ctx;
-  const mode = config.mode ?? "global";
+  const inlineConfig = configOrPath && typeof configOrPath !== "string" ? configOrPath : {};
+  const mode = inlineConfig.mode ?? "global";
   const plugins = [
     ConfigHMRPlugin(ctx)
   ];
-  if (config.inspector !== false)
+  if (inlineConfig.inspector !== false)
     plugins.push((0, import_inspector.default)(ctx));
   if (mode === "per-module") {
     plugins.push(PerModuleModePlugin(ctx));

package/dist/index.mjs

@@ -38,16 +38,28 @@ var INCLUDE_COMMENT = "@unocss-include";
 
 // ../plugins-common/context.ts
 import { createFilter } from "@rollup/pluginutils";
-import { loadConfig } from "@unocss/config";
+import { createConfigLoader } from "@unocss/config";
 import { BetterMap, createGenerator } from "@unocss/core";
-function createContext(configOrPath, defaults = {}) {
-  const { config = {}, filepath } = loadConfig(configOrPath);
-  let rawConfig = config;
-  const uno = createGenerator(config, defaults);
+function createContext(configOrPath, defaults = {}, extraConfigSources = []) {
+  const loadConfig = createConfigLoader(configOrPath, extraConfigSources);
+  let rawConfig = {};
+  const uno = createGenerator(rawConfig, defaults);
+  let rollupFilter = createFilter(defaultInclude, defaultExclude);
   const invalidations = [];
   const modules = new BetterMap();
   const tokens = new Set();
-  let rollupFilter = createFilter(config.include || defaultInclude, config.exclude || defaultExclude);
+  const ready = reloadConfig();
+  async function reloadConfig() {
+    const result = await loadConfig();
+    rawConfig = result.config;
+    uno.setConfig(rawConfig);
+    uno.config.envMode = "dev";
+    rollupFilter = createFilter(rawConfig.include || defaultInclude, rawConfig.exclude || defaultExclude);
+    tokens.clear();
+    await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
+    invalidate();
+    return result;
+  }
   function invalidate() {
     invalidations.forEach((cb) => cb());
   }
@@ -59,21 +71,15 @@ function createContext(configOrPath, defaults = {}) {
     if (tokens.size > len)
       invalidate();
   }
-  async function reloadConfig() {
-    if (!filepath)
-      return;
-    rawConfig = loadConfig(filepath).config;
-    uno.setConfig(rawConfig);
-    uno.config.envMode = "dev";
-    rollupFilter = createFilter(config.include || defaultInclude, config.exclude || defaultExclude);
-    tokens.clear();
-    await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
-    invalidate();
-  }
   const filter = (code, id) => {
     return code.includes(INCLUDE_COMMENT) || rollupFilter(id);
   };
+  async function getConfig() {
+    await ready;
+    return rawConfig;
+  }
   return {
+    ready,
     tokens,
     modules,
     invalidate,
@@ -84,17 +90,14 @@ function createContext(configOrPath, defaults = {}) {
     reloadConfig,
     uno,
     extract,
-    get config() {
-      return rawConfig;
-    },
-    configFilepath: filepath
+    getConfig
   };
 }
 
 // ../plugins-common/utils.ts
 import { createHash } from "crypto";
 function getHash(input, length = 8) {
-  return createHash("sha256").update(input).digest("hex").substr(0, length);
+  return createHash("sha256").update(input).digest("hex").slice(0, length);
 }
 function getPath(id) {
   return id.replace(/\?.*$/, "");
@@ -144,7 +147,7 @@ function ChunkModeBuildPlugin({ uno, filter }) {
 }
 
 // src/modes/global/build.ts
-function GlobalModeBuildPlugin({ uno, extract, tokens, modules, filter }) {
+function GlobalModeBuildPlugin({ uno, ready, extract, tokens, modules, filter }) {
   const vfsLayerMap = new Map();
   let tasks = [];
   let cssPlugin;
@@ -180,8 +183,9 @@ function GlobalModeBuildPlugin({ uno, extract, tokens, modules, filter }) {
         if (layer)
           return getLayerPlaceholder(layer);
       },
-      configResolved(config) {
+      async configResolved(config) {
         cssPlugin = config.plugins.find((i) => i.name === "vite:css-post");
+        await ready;
       },
       async renderChunk(_, chunk) {
         if (!cssPlugin)
@@ -298,7 +302,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
       name: "unocss:global",
       apply: "serve",
       enforce: "pre",
-      configureServer(_server) {
+      async configureServer(_server) {
         servers.push(_server);
         _server.middlewares.use(async (req, res, next) => {
           var _a;
@@ -433,8 +437,8 @@ ${css}`;
 
 // src/modes/vue-scoped.ts
 import { createFilter as createFilter2 } from "@rollup/pluginutils";
-function VueScopedPlugin({ uno, config }) {
-  const filter = createFilter2(config.include || [/\.vue$/], config.exclude || defaultExclude);
+function VueScopedPlugin({ uno, ready }) {
+  let filter = createFilter2([/\.vue$/], defaultExclude);
   async function transformSFC(code) {
     const { css } = await uno.generate(code);
     if (!css)
@@ -445,6 +449,10 @@ function VueScopedPlugin({ uno, config }) {
   return {
     name: "unocss:vue-scoped",
     enforce: "pre",
+    async configResolved() {
+      const { config } = await ready;
+      filter = createFilter2(config.include || [/\.vue$/], config.exclude || defaultExclude);
+    },
     transform(code, id) {
       if (!filter(id))
         return;
@@ -464,24 +472,22 @@ function VueScopedPlugin({ uno, config }) {
 
 // src/config-hmr.ts
 function ConfigHMRPlugin(ctx) {
-  const { uno, configFilepath, reloadConfig } = ctx;
+  const { ready, uno } = ctx;
   return {
     name: "unocss:config",
-    api: {
-      get config() {
-        if (!configFilepath)
-          return ctx.config;
-      }
+    async configResolved() {
+      await ready;
     },
-    configureServer(server) {
+    async configureServer(server) {
       uno.config.envMode = "dev";
-      if (!configFilepath)
+      const { sources } = await ready;
+      if (!sources.length)
         return;
-      server.watcher.add(configFilepath);
+      server.watcher.add(sources);
       server.watcher.on("change", async (p) => {
-        if (p !== configFilepath)
+        if (!sources.includes(p))
           return;
-        reloadConfig();
+        await ctx.reloadConfig();
         server.ws.send({
           type: "custom",
           event: "unocss:config-changed"
@@ -497,12 +503,12 @@ function defineConfig(config) {
 }
 function UnocssPlugin(configOrPath, defaults = {}) {
   const ctx = createContext(configOrPath, defaults);
-  const { config } = ctx;
-  const mode = config.mode ?? "global";
+  const inlineConfig = configOrPath && typeof configOrPath !== "string" ? configOrPath : {};
+  const mode = inlineConfig.mode ?? "global";
   const plugins = [
     ConfigHMRPlugin(ctx)
   ];
-  if (config.inspector !== false)
+  if (inlineConfig.inspector !== false)
     plugins.push(UnocssInspector(ctx));
   if (mode === "per-module") {
     plugins.push(PerModuleModePlugin(ctx));

package/package.json

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