Skip to content

Commit 0670951

Browse files
committed
refactor: 移除多余的递归逻辑
1 parent 551dd31 commit 0670951

File tree

1 file changed

+3
-16
lines changed
  • packages/webpack-plugin/lib/platform/style/wx

1 file changed

+3
-16
lines changed

packages/webpack-plugin/lib/platform/style/wx/index.js

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,20 +108,13 @@ module.exports = function getSpec ({ warn, error }) {
108108
return fallback
109109
}
110110

111-
const verifyValues = ({ prop, value, selector }, isError = true, visited = new Set()) => {
111+
const verifyValues = ({ prop, value, selector }, isError = true) => {
112112
prop = prop.trim()
113113
value = value.trim()
114114
const tips = isError ? error : warn
115115

116116
// 对于包含 CSS 变量的值,提取 fallback 值进行验证
117117
if (cssVariableExp.test(value)) {
118-
// 防止循环引用
119-
if (visited.has(value)) {
120-
tips(`CSS variable circular reference detected in ${selector} for property ${prop}, value: ${value}`)
121-
return false
122-
}
123-
visited.add(value)
124-
125118
const fallback = getDefaultValueFromVar(value)
126119
// undefined 表示检测到循环引用
127120
if (fallback === undefined) {
@@ -132,14 +125,8 @@ module.exports = function getSpec ({ warn, error }) {
132125
if (fallback === null) {
133126
return true
134127
}
135-
// 有 fallback 值,继续验证
136-
const fallbackValid = verifyValues({ prop, value: fallback, selector }, isError, visited)
137-
if (!fallbackValid) {
138-
// fallback 值不合法,返回 false
139-
return false
140-
}
141-
// CSS 变量本身是合法的(运行时会解析)
142-
return true
128+
// 有 fallback 值,将 fallback 作为新的 value 继续后续验证流程
129+
value = fallback
143130
}
144131

145132
// calc() 和 env() 跳过验证

0 commit comments

Comments
 (0)