@unocss/webpack 0.12.17 → 0.14.0

package/dist/index.d.ts

@@ -1,19 +1,7 @@
 import * as webpack from 'webpack';
 import { UserConfig, UserConfigDefaults } from '@unocss/core';
 
-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 WebpackPluginOptions<Theme extends {} = {}> extends PluginConfig<Theme> {
+interface WebpackPluginOptions<Theme extends {} = {}> extends UserConfig<Theme> {
 }
 declare function defineConfig<Theme extends {}>(config: WebpackPluginOptions<Theme>): WebpackPluginOptions<Theme>;
 declare function WebpackPlugin(configOrPath?: WebpackPluginOptions | string, defaults?: UserConfigDefaults): webpack.WebpackPluginInstance;

package/dist/index.js

@@ -71,14 +71,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());
   }
@@ -90,21 +102,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,
@@ -115,10 +121,7 @@ function createContext(configOrPath, defaults = {}) {
     reloadConfig,
     uno,
     extract,
-    get config() {
-      return rawConfig;
-    },
-    configFilepath: filepath
+    getConfig
   };
 }
 

package/dist/index.mjs

@@ -41,16 +41,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());
   }
@@ -62,21 +74,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,
@@ -87,10 +93,7 @@ function createContext(configOrPath, defaults = {}) {
     reloadConfig,
     uno,
     extract,
-    get config() {
-      return rawConfig;
-    },
-    configFilepath: filepath
+    getConfig
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/webpack",
-  "version": "0.12.17",
+  "version": "0.14.0",
   "description": "The Webpack plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -34,8 +34,8 @@
   ],
   "dependencies": {
     "@rollup/pluginutils": "^4.1.1",
-    "@unocss/config": "0.12.17",
-    "@unocss/core": "0.12.17",
+    "@unocss/config": "0.14.0",
+    "@unocss/core": "0.14.0",
     "unplugin": "^0.2.21",
     "webpack-sources": "^3.2.2"
   },