Fixup deduped package names in collapse()
This commit is contained in:
parent
feb74eef7a
commit
fe4a4ee81b
@ -284,7 +284,10 @@ class ImportList(List[ImportVar]):
|
|||||||
f"Imports from {lib} have conflicting version specifiers: "
|
f"Imports from {lib} have conflicting version specifiers: "
|
||||||
f"{packages} {imps}"
|
f"{packages} {imps}"
|
||||||
)
|
)
|
||||||
deduped[list(packages)[0] or ""] = list(imps.values())
|
package = lib
|
||||||
|
if packages:
|
||||||
|
package = packages.pop() or ""
|
||||||
|
deduped[package] = list(imps.values())
|
||||||
return deduped
|
return deduped
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,12 +15,12 @@ def test_websocket_target_url():
|
|||||||
|
|
||||||
def test_connection_banner():
|
def test_connection_banner():
|
||||||
banner = ConnectionBanner.create()
|
banner = ConnectionBanner.create()
|
||||||
_imports = banner._get_all_imports()
|
_imports = banner._get_all_imports().collapse()
|
||||||
assert [i.library for i in _imports] == [
|
assert list(_imports) == [
|
||||||
"react",
|
"react",
|
||||||
"/utils/context",
|
"/utils/context",
|
||||||
"/utils/state",
|
"/utils/state",
|
||||||
"@radix-ui/themes",
|
"@radix-ui/themes@^3.0.0",
|
||||||
"/env.json",
|
"/env.json",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -31,12 +31,12 @@ def test_connection_banner():
|
|||||||
|
|
||||||
def test_connection_modal():
|
def test_connection_modal():
|
||||||
modal = ConnectionModal.create()
|
modal = ConnectionModal.create()
|
||||||
_imports = modal._get_all_imports()
|
_imports = modal._get_all_imports().collapse()
|
||||||
assert [i.library for i in _imports] == [
|
assert list(_imports) == [
|
||||||
"react",
|
"react",
|
||||||
"/utils/context",
|
"/utils/context",
|
||||||
"/utils/state",
|
"/utils/state",
|
||||||
"@radix-ui/themes",
|
"@radix-ui/themes@^3.0.0",
|
||||||
"/env.json",
|
"/env.json",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user