From e18840147bb3e756a40835af60991a3865cf33e8 Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Thu, 10 Sep 2026 14:50:19 +0800 Subject: [PATCH 1/2] fix(turbopack): preserve dynamic URL alternatives --- .../crates/turbopack-ecmascript/src/references/mod.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/turbopack/crates/turbopack-ecmascript/src/references/mod.rs b/turbopack/crates/turbopack-ecmascript/src/references/mod.rs index 793a21f0bf28..eba08abfc6d6 100644 --- a/turbopack/crates/turbopack-ecmascript/src/references/mod.rs +++ b/turbopack/crates/turbopack-ecmascript/src/references/mod.rs @@ -1982,7 +1982,15 @@ where && meta_prop.as_str() == "url" { let pat = js_value_to_pattern(url); - if !pat.has_constant_parts() { + // Every alternative must constrain resolution. A constant fallback does not + // constrain another branch that can be an arbitrary runtime URL. + let has_constant_parts = match &pat { + Pattern::Alternatives(alternatives) => { + alternatives.iter().all(Pattern::has_constant_parts) + } + _ => pat.has_constant_parts(), + }; + if !has_constant_parts { let (args, hints) = explain_args(args); handler.span_warn_with_code( span, From 16bfb2bbfe581bf0a34af09d5f0e733447caf49b Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Thu, 10 Sep 2026 15:36:08 +0800 Subject: [PATCH 2/2] fix(turbopack): retain static URL fallback assets --- .../turbopack-ecmascript/src/references/mod.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/turbopack/crates/turbopack-ecmascript/src/references/mod.rs b/turbopack/crates/turbopack-ecmascript/src/references/mod.rs index eba08abfc6d6..e3529571081b 100644 --- a/turbopack/crates/turbopack-ecmascript/src/references/mod.rs +++ b/turbopack/crates/turbopack-ecmascript/src/references/mod.rs @@ -1982,11 +1982,14 @@ where && meta_prop.as_str() == "url" { let pat = js_value_to_pattern(url); - // Every alternative must constrain resolution. A constant fallback does not - // constrain another branch that can be an arbitrary runtime URL. - let has_constant_parts = match &pat { - Pattern::Alternatives(alternatives) => { - alternatives.iter().all(Pattern::has_constant_parts) + // An undefined default does not constrain an otherwise dynamic URL. Keep + // other static alternatives so their assets are still resolved and emitted. + let has_constant_parts = match url { + JsValue::Alternatives { values, .. } if pat.has_dynamic_parts() => { + values.iter().any(|value| { + !matches!(value, JsValue::Constant(JsConstantValue::Undefined)) + && js_value_to_pattern(value).has_constant_parts() + }) } _ => pat.has_constant_parts(), };