@unocss/webpack 0.11.6 → 0.12.0

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as webpack from 'webpack';
 import { UserConfig, UserConfigDefaults } from '@unocss/core';
 
 declare type FilterPattern = ReadonlyArray<string | RegExp> | string | RegExp | null;
-interface PluginOptions<Theme extends {} = {}> extends UserConfig<Theme> {
+interface PluginConfig<Theme extends {} = {}> extends UserConfig<Theme> {
     /**
      * Patterns that filter the files being extracted.
      */
@@ -13,7 +13,7 @@ interface PluginOptions<Theme extends {} = {}> extends UserConfig<Theme> {
     exclude?: FilterPattern;
 }
 
-interface WebpackPluginOptions<Theme extends {} = {}> extends PluginOptions<Theme> {
+interface WebpackPluginOptions<Theme extends {} = {}> extends PluginConfig<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

@@ -27,10 +27,7 @@ __export(exports, {
   default: () => WebpackPlugin,
   defineConfig: () => defineConfig
 });
-var import_core = __toModule(require("@unocss/core"));
-var import_config = __toModule(require("@unocss/config"));
 var import_unplugin = __toModule(require("unplugin"));
-var import_pluginutils = __toModule(require("@rollup/pluginutils"));
 var import_webpack_sources = __toModule(require("webpack-sources"));
 
 // ../plugins-common/utils.ts
@@ -67,6 +64,58 @@ function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
 }
 
+// ../plugins-common/constants.ts
+var INCLUDE_COMMENT = "@unocss-include";
+
+// ../plugins-common/context.ts
+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);
+  const uno = (0, import_core.createGenerator)(config, defaults);
+  const invalidations = [];
+  const modules = new import_core.BetterMap();
+  const tokens = new Set();
+  let rollupFilter = (0, import_pluginutils.createFilter)(config.include || defaultInclude, config.exclude || defaultExclude);
+  function invalidate() {
+    invalidations.forEach((cb) => cb());
+  }
+  async function scan(code, id) {
+    if (id)
+      modules.set(id, code);
+    await uno.applyExtractors(code, id, tokens);
+    invalidate();
+  }
+  async function reloadConfig() {
+    if (!filepath)
+      return;
+    uno.setConfig((0, import_config.loadConfig)(filepath).config);
+    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);
+  };
+  return {
+    tokens,
+    modules,
+    invalidate,
+    onInvalidate(fn) {
+      invalidations.push(fn);
+    },
+    filter,
+    reloadConfig,
+    uno,
+    extract: scan,
+    config,
+    configFilepath: filepath
+  };
+}
+
 // src/index.ts
 var PLUGIN_NAME = "unocss:webpack";
 var UPDATE_DEBOUNCE = 10;
@@ -75,21 +124,23 @@ function defineConfig(config) {
 }
 function WebpackPlugin(configOrPath, defaults) {
   return (0, import_unplugin.createUnplugin)(() => {
-    const { config = {} } = (0, import_config.loadConfig)(configOrPath);
-    const filter = (0, import_pluginutils.createFilter)(config.include || defaultInclude, config.exclude || defaultExclude);
-    const uno = (0, import_core.createGenerator)(config, defaults);
-    const modules = new import_core.BetterMap();
-    const tokens = new Set();
+    const context = createContext(configOrPath, defaults);
+    const { uno, tokens, filter, extract, onInvalidate } = context;
+    let timer;
+    onInvalidate(() => {
+      clearTimeout(timer);
+      timer = setTimeout(updateModules, UPDATE_DEBOUNCE);
+    });
     const tasks = [];
     const entries = new Map();
     const plugin = {
       name: "unocss:webpack",
       enforce: "pre",
       transformInclude(id) {
-        return filter(id);
+        return filter("", id);
       },
       transform(code, id) {
-        tasks.push(scan(code, id));
+        tasks.push(extract(code, id));
         return null;
       },
       resolveId(id) {
@@ -131,17 +182,6 @@ function WebpackPlugin(configOrPath, defaults) {
         });
       }
     };
-    async function scan(code, id) {
-      if (id)
-        modules.set(id, code);
-      await uno.applyExtractors(code, id, tokens);
-      scheduleUpdate();
-    }
-    let timer;
-    function scheduleUpdate() {
-      clearTimeout(timer);
-      timer = setTimeout(updateModules, UPDATE_DEBOUNCE);
-    }
     async function updateModules() {
       if (!plugin.__vfsModules)
         return;

package/dist/index.mjs

@@ -1,8 +1,5 @@
 // src/index.ts
-import { BetterMap, createGenerator } from "@unocss/core";
-import { loadConfig } from "@unocss/config";
 import { createUnplugin } from "unplugin";
-import { createFilter } from "@rollup/pluginutils";
 import WebpackSources from "webpack-sources";
 
 // ../plugins-common/utils.ts
@@ -39,6 +36,58 @@ function getLayerPlaceholder(layer) {
   return `#--unocss--{layer:${layer}}`;
 }
 
+// ../plugins-common/constants.ts
+var INCLUDE_COMMENT = "@unocss-include";
+
+// ../plugins-common/context.ts
+import { createFilter } from "@rollup/pluginutils";
+import { loadConfig } from "@unocss/config";
+import { BetterMap, createGenerator } from "@unocss/core";
+function createContext(configOrPath, defaults = {}) {
+  const { config = {}, filepath } = loadConfig(configOrPath);
+  const uno = createGenerator(config, defaults);
+  const invalidations = [];
+  const modules = new BetterMap();
+  const tokens = new Set();
+  let rollupFilter = createFilter(config.include || defaultInclude, config.exclude || defaultExclude);
+  function invalidate() {
+    invalidations.forEach((cb) => cb());
+  }
+  async function scan(code, id) {
+    if (id)
+      modules.set(id, code);
+    await uno.applyExtractors(code, id, tokens);
+    invalidate();
+  }
+  async function reloadConfig() {
+    if (!filepath)
+      return;
+    uno.setConfig(loadConfig(filepath).config);
+    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);
+  };
+  return {
+    tokens,
+    modules,
+    invalidate,
+    onInvalidate(fn) {
+      invalidations.push(fn);
+    },
+    filter,
+    reloadConfig,
+    uno,
+    extract: scan,
+    config,
+    configFilepath: filepath
+  };
+}
+
 // src/index.ts
 var PLUGIN_NAME = "unocss:webpack";
 var UPDATE_DEBOUNCE = 10;
@@ -47,21 +96,23 @@ function defineConfig(config) {
 }
 function WebpackPlugin(configOrPath, defaults) {
   return createUnplugin(() => {
-    const { config = {} } = loadConfig(configOrPath);
-    const filter = createFilter(config.include || defaultInclude, config.exclude || defaultExclude);
-    const uno = createGenerator(config, defaults);
-    const modules = new BetterMap();
-    const tokens = new Set();
+    const context = createContext(configOrPath, defaults);
+    const { uno, tokens, filter, extract, onInvalidate } = context;
+    let timer;
+    onInvalidate(() => {
+      clearTimeout(timer);
+      timer = setTimeout(updateModules, UPDATE_DEBOUNCE);
+    });
     const tasks = [];
     const entries = new Map();
     const plugin = {
       name: "unocss:webpack",
       enforce: "pre",
       transformInclude(id) {
-        return filter(id);
+        return filter("", id);
       },
       transform(code, id) {
-        tasks.push(scan(code, id));
+        tasks.push(extract(code, id));
         return null;
       },
       resolveId(id) {
@@ -103,17 +154,6 @@ function WebpackPlugin(configOrPath, defaults) {
         });
       }
     };
-    async function scan(code, id) {
-      if (id)
-        modules.set(id, code);
-      await uno.applyExtractors(code, id, tokens);
-      scheduleUpdate();
-    }
-    let timer;
-    function scheduleUpdate() {
-      clearTimeout(timer);
-      timer = setTimeout(updateModules, UPDATE_DEBOUNCE);
-    }
     async function updateModules() {
       if (!plugin.__vfsModules)
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/webpack",
-  "version": "0.11.6",
+  "version": "0.12.0",
   "description": "The Webpack plugin for UnoCSS",
   "keywords": [
     "unocss",
@@ -33,8 +33,8 @@
   ],
   "dependencies": {
     "@rollup/pluginutils": "^4.1.1",
-    "@unocss/config": "0.11.6",
-    "@unocss/core": "0.11.6",
+    "@unocss/config": "0.12.0",
+    "@unocss/core": "0.12.0",
     "unplugin": "^0.2.20",
     "webpack-sources": "^3.2.1"
   },