Skip to content

fix: web filter #2353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cwyyue wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix: web filter #2353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56a9447
fix: web filter
cwyyue Dec 8, 2025
be700c2
perf: 优化注释
cwyyue Dec 8, 2025
d270b39
fix: lint
cwyyue Dec 8, 2025
35f1780
fix: 去除空数组兜底
cwyyue Dec 9, 2025
b0d6808
Merge branch 'master' into fix-unocss-web-filter
cwyyue Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/unocss-plugin/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()] : []
Expand Down
9 changes: 6 additions & 3 deletions packages/unocss-plugin/lib/web-plugin/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ function createContext (configOrPath, defaults = {}, extraConfigSources = []) {
const result = await config.loadConfig(root, configOrPath, extraConfigSources, defaults)
rawConfig = result.config
uno.setConfig(rawConfig)
// plugin配置 > uno.config文件 > defualt
rollupFilter = pluginutils.createFilter(
rawConfig.include || defaultInclude,
rawConfig.exclude || defaultExclude
configOrPath.include || rawConfig.include || defaultInclude,
Copy link
Collaborator

@hiyuki hiyuki Dec 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为啥需要加这个，我理解如果configOrPath是个config的话loadConfig就会直接作为结果返回了吧

Copy link
Collaborator Author

@cwyyue cwyyue Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

loadConfig 里 config 和 path是互斥的，用了 config，就不再读 path了。这里本意是想对齐小程序的实现，先通过scan筛选文件，再走uno默认逻辑（即读取 uno.config 配置处理token）。

configOrPath.exclude || rawConfig.exclude || defaultExclude
)
const presets = /* @__PURE__ */ new Set()
uno.config.presets.forEach((i) => {
Expand Down Expand Up @@ -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]
return code.includes(INCLUDE_COMMENT) || code.includes(CSS_PLACEHOLDER) || rollupFilter(path)
}

return {
Expand Down