From 56a94479ff2f44efbde02fedf14a267f01914459 Mon Sep 17 00:00:00 2001 From: chenwanyue <527202897@qq.com> Date: Mon, 8 Dec 2025 15:52:07 +0800 Subject: [PATCH 1/4] fix: web filter --- packages/unocss-plugin/lib/web-plugin/utils.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/unocss-plugin/lib/web-plugin/utils.js b/packages/unocss-plugin/lib/web-plugin/utils.js index dfdabcc510..9bc4de33e5 100644 --- a/packages/unocss-plugin/lib/web-plugin/utils.js +++ b/packages/unocss-plugin/lib/web-plugin/utils.js @@ -27,9 +27,10 @@ function createContext (configOrPath, defaults = {}, extraConfigSources = []) { const result = await config.loadConfig(root, configOrPath, extraConfigSources, defaults) rawConfig = result.config uno.setConfig(rawConfig) + // 优先传入配置、再是config 再是defualt rollupFilter = pluginutils.createFilter( - rawConfig.include || defaultInclude, - rawConfig.exclude || defaultExclude + configOrPath.include || rawConfig.include || defaultInclude, + configOrPath.exclude || rawConfig.exclude || defaultExclude ) const presets = /* @__PURE__ */ new Set() uno.config.presets.forEach((i) => { @@ -81,7 +82,9 @@ function createContext (configOrPath, defaults = {}, extraConfigSources = []) { if (code.includes(IGNORE_COMMENT)) { return false } - return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(id.replace(/\?v=\w+$/, '')) + // rollupFilter不支持query，所以过滤掉query匹配 + const path = id.split('?')[0] // id.replace(/\?v=\w+$/, '') + return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(path) } return { From be700c28e165ef35039c1533bde5ad62542344be Mon Sep 17 00:00:00 2001 From: chenwanyue <527202897@qq.com> Date: Mon, 8 Dec 2025 16:10:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/unocss-plugin/lib/web-plugin/utils.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/unocss-plugin/lib/web-plugin/utils.js b/packages/unocss-plugin/lib/web-plugin/utils.js index 9bc4de33e5..246b3b6867 100644 --- a/packages/unocss-plugin/lib/web-plugin/utils.js +++ b/packages/unocss-plugin/lib/web-plugin/utils.js @@ -27,7 +27,7 @@ function createContext (configOrPath, defaults = {}, extraConfigSources = []) { const result = await config.loadConfig(root, configOrPath, extraConfigSources, defaults) rawConfig = result.config uno.setConfig(rawConfig) - // 优先传入配置、再是config 再是defualt + // plugin配置 > uno.config文件 > defualt rollupFilter = pluginutils.createFilter( configOrPath.include || rawConfig.include || defaultInclude, configOrPath.exclude || rawConfig.exclude || defaultExclude @@ -82,8 +82,8 @@ function createContext (configOrPath, defaults = {}, extraConfigSources = []) { if (code.includes(IGNORE_COMMENT)) { return false } - // rollupFilter不支持query，所以过滤掉query匹配 - const path = id.split('?')[0] // id.replace(/\?v=\w+$/, '') + // rollupFilter不支持query，所以直接过滤掉query匹配 + const path = id.split('?')[0] return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(path) } From d270b3991e798058bc4516d54a1aadfff73d13ba Mon Sep 17 00:00:00 2001 From: chenwanyue <527202897@qq.com> Date: Mon, 8 Dec 2025 16:37:59 +0800 Subject: [PATCH 3/4] fix: lint --- packages/unocss-plugin/lib/web-plugin/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/unocss-plugin/lib/web-plugin/utils.js b/packages/unocss-plugin/lib/web-plugin/utils.js index 246b3b6867..fe57447c93 100644 --- a/packages/unocss-plugin/lib/web-plugin/utils.js +++ b/packages/unocss-plugin/lib/web-plugin/utils.js @@ -29,7 +29,7 @@ function createContext (configOrPath, defaults = {}, extraConfigSources = []) { uno.setConfig(rawConfig) // plugin配置 > uno.config文件 > defualt rollupFilter = pluginutils.createFilter( - configOrPath.include || rawConfig.include || defaultInclude, + configOrPath.include || rawConfig.include || defaultInclude, configOrPath.exclude || rawConfig.exclude || defaultExclude ) const presets = /* @__PURE__ */ new Set() From 35f1780e8302ab19dcff16b24f757eb285537cb2 Mon Sep 17 00:00:00 2001 From: chenwanyue <527202897@qq.com> Date: Tue, 9 Dec 2025 10:49:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E5=85=9C=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/unocss-plugin/lib/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/unocss-plugin/lib/index.js b/packages/unocss-plugin/lib/index.js index 74054bbad2..c26cb6ba11 100644 --- a/packages/unocss-plugin/lib/index.js +++ b/packages/unocss-plugin/lib/index.js @@ -94,8 +94,8 @@ function normalizeOptions (options) { // web配置 // todo config读取逻辑通过UnoCSSWebpackPlugin内置逻辑进行，待改进 webOptions = { - include: scan.include || [], - exclude: scan.exclude || [], + include: scan.include, + exclude: scan.exclude, transformers: [ ...transformGroups ? [transformerVariantGroup(transformGroups)] : [], ...transformCSS ? [transformerDirectives()] : []