@unocss/webpack 0.12.15 → 0.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +22 -15
  2. package/dist/index.mjs +23 -16
  3. package/package.json +3 -3
package/dist/index.js CHANGED
@@ -72,12 +72,25 @@ var import_pluginutils = __toModule(require("@rollup/pluginutils"));
72
72
  var import_config = __toModule(require("@unocss/config"));
73
73
  var import_core = __toModule(require("@unocss/core"));
74
74
  function createContext(configOrPath, defaults = {}) {
75
- const { config = {}, filepath } = (0, import_config.loadConfig)(configOrPath);
76
- const uno = (0, import_core.createGenerator)(config, defaults);
75
+ const loadConfig = (0, import_config.createConfigLoader)(configOrPath);
76
+ let rawConfig = {};
77
+ const uno = (0, import_core.createGenerator)(rawConfig, defaults);
78
+ let rollupFilter = (0, import_pluginutils.createFilter)(defaultInclude, defaultExclude);
77
79
  const invalidations = [];
78
80
  const modules = new import_core.BetterMap();
79
81
  const tokens = new Set();
80
- let rollupFilter = (0, import_pluginutils.createFilter)(config.include || defaultInclude, config.exclude || defaultExclude);
82
+ const ready = reloadConfig();
83
+ async function reloadConfig() {
84
+ const result = await loadConfig();
85
+ rawConfig = result.config;
86
+ uno.setConfig(rawConfig);
87
+ uno.config.envMode = "dev";
88
+ rollupFilter = (0, import_pluginutils.createFilter)(rawConfig.include || defaultInclude, rawConfig.exclude || defaultExclude);
89
+ tokens.clear();
90
+ await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
91
+ invalidate();
92
+ return result;
93
+ }
81
94
  function invalidate() {
82
95
  invalidations.forEach((cb) => cb());
83
96
  }
@@ -89,20 +102,15 @@ function createContext(configOrPath, defaults = {}) {
89
102
  if (tokens.size > len)
90
103
  invalidate();
91
104
  }
92
- async function reloadConfig() {
93
- if (!filepath)
94
- return;
95
- uno.setConfig((0, import_config.loadConfig)(filepath).config);
96
- uno.config.envMode = "dev";
97
- rollupFilter = (0, import_pluginutils.createFilter)(config.include || defaultInclude, config.exclude || defaultExclude);
98
- tokens.clear();
99
- await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
100
- invalidate();
101
- }
102
105
  const filter = (code, id) => {
103
106
  return code.includes(INCLUDE_COMMENT) || rollupFilter(id);
104
107
  };
108
+ async function getConfig() {
109
+ await ready;
110
+ return rawConfig;
111
+ }
105
112
  return {
113
+ ready,
106
114
  tokens,
107
115
  modules,
108
116
  invalidate,
@@ -113,8 +121,7 @@ function createContext(configOrPath, defaults = {}) {
113
121
  reloadConfig,
114
122
  uno,
115
123
  extract,
116
- config,
117
- configFilepath: filepath
124
+ getConfig
118
125
  };
119
126
  }
120
127
 
package/dist/index.mjs CHANGED
@@ -41,15 +41,28 @@ var INCLUDE_COMMENT = "@unocss-include";
41
41
 
42
42
  // ../plugins-common/context.ts
43
43
  import { createFilter } from "@rollup/pluginutils";
44
- import { loadConfig } from "@unocss/config";
44
+ import { createConfigLoader } from "@unocss/config";
45
45
  import { BetterMap, createGenerator } from "@unocss/core";
46
46
  function createContext(configOrPath, defaults = {}) {
47
- const { config = {}, filepath } = loadConfig(configOrPath);
48
- const uno = createGenerator(config, defaults);
47
+ const loadConfig = createConfigLoader(configOrPath);
48
+ let rawConfig = {};
49
+ const uno = createGenerator(rawConfig, defaults);
50
+ let rollupFilter = createFilter(defaultInclude, defaultExclude);
49
51
  const invalidations = [];
50
52
  const modules = new BetterMap();
51
53
  const tokens = new Set();
52
- let rollupFilter = createFilter(config.include || defaultInclude, config.exclude || defaultExclude);
54
+ const ready = reloadConfig();
55
+ async function reloadConfig() {
56
+ const result = await loadConfig();
57
+ rawConfig = result.config;
58
+ uno.setConfig(rawConfig);
59
+ uno.config.envMode = "dev";
60
+ rollupFilter = createFilter(rawConfig.include || defaultInclude, rawConfig.exclude || defaultExclude);
61
+ tokens.clear();
62
+ await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
63
+ invalidate();
64
+ return result;
65
+ }
53
66
  function invalidate() {
54
67
  invalidations.forEach((cb) => cb());
55
68
  }
@@ -61,20 +74,15 @@ function createContext(configOrPath, defaults = {}) {
61
74
  if (tokens.size > len)
62
75
  invalidate();
63
76
  }
64
- async function reloadConfig() {
65
- if (!filepath)
66
- return;
67
- uno.setConfig(loadConfig(filepath).config);
68
- uno.config.envMode = "dev";
69
- rollupFilter = createFilter(config.include || defaultInclude, config.exclude || defaultExclude);
70
- tokens.clear();
71
- await Promise.all(modules.map((code, id) => uno.applyExtractors(code, id, tokens)));
72
- invalidate();
73
- }
74
77
  const filter = (code, id) => {
75
78
  return code.includes(INCLUDE_COMMENT) || rollupFilter(id);
76
79
  };
80
+ async function getConfig() {
81
+ await ready;
82
+ return rawConfig;
83
+ }
77
84
  return {
85
+ ready,
78
86
  tokens,
79
87
  modules,
80
88
  invalidate,
@@ -85,8 +93,7 @@ function createContext(configOrPath, defaults = {}) {
85
93
  reloadConfig,
86
94
  uno,
87
95
  extract,
88
- config,
89
- configFilepath: filepath
96
+ getConfig
90
97
  };
91
98
  }
92
99
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unocss/webpack",
3
- "version": "0.12.15",
3
+ "version": "0.13.0",
4
4
  "description": "The Webpack plugin for UnoCSS",
5
5
  "keywords": [
6
6
  "unocss",
@@ -34,8 +34,8 @@
34
34
  ],
35
35
  "dependencies": {
36
36
  "@rollup/pluginutils": "^4.1.1",
37
- "@unocss/config": "0.12.15",
38
- "@unocss/core": "0.12.15",
37
+ "@unocss/config": "0.13.0",
38
+ "@unocss/core": "0.13.0",
39
39
  "unplugin": "^0.2.21",
40
40
  "webpack-sources": "^3.2.2"
41
41
  },