Skip to content

Fix multi imports #263

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

Merged
owjs3901 merged 2 commits into from
Jul 22, 2025
Merged

Fix multi imports #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80360c0
Fix multi imports issue
owjs3901 Jul 22, 2025
c17424a
Optimize rgba
owjs3901 Jul 22, 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
5 changes: 5 additions & 0 deletions .changeset/big-waves-dance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/wasm": patch
---

Fix multi imports issue
5 changes: 5 additions & 0 deletions .changeset/flat-states-relax.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/wasm": patch
---

Optimize rgba func
5 changes: 4 additions & 1 deletion apps/landing/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export const metadata: Metadata = {
resetCss()

globalCss({
imports: ['https://cdn.jsdelivr.net/gh/joungkyun/font-d2coding/d2coding.css'],
table: {
borderCollapse: 'collapse',
borderSpacing: 0,
Expand Down Expand Up @@ -76,6 +75,10 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<ThemeScript auto />
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
<link href="/favicon.ico" rel="shortcut icon" />
<link
href="https://cdn.jsdelivr.net/gh/joungkyun/font-d2coding/d2coding.css"
rel="stylesheet"
/>
<link
href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/static/pretendard.min.css"
rel="stylesheet"
Expand Down
34 changes: 26 additions & 8 deletions libs/sheet/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ pub struct StyleSheet {
#[serde(default)]
pub global_css_files: BTreeSet<String>,
#[serde(default)]
pub imports: BTreeMap<String, String>,
pub imports: BTreeMap<String, BTreeSet<String>>,
#[serde(skip)]
pub theme: Theme,
}
Expand Down Expand Up @@ -182,7 +182,10 @@ impl StyleSheet {

pub fn add_import(&mut self, file: &str, import: &str) {
self.global_css_files.insert(file.to_string());
self.imports.insert(file.to_string(), import.to_string());
self.imports
.entry(file.to_string())
.or_default()
.insert(import.to_string());
}

pub fn add_css(&mut self, file: &str, css: &str) -> bool {
Expand Down Expand Up @@ -289,6 +292,7 @@ impl StyleSheet {
let mut css = self
.imports
.values()
.flatten()
.map(|import| format!("@import \"{import}\";"))
.collect::<Vec<String>>()
.join("");
Expand Down Expand Up @@ -902,12 +906,26 @@ mod tests {

#[test]
fn test_create_css_with_imports() {
let mut sheet = StyleSheet::default();
sheet.add_import("test.tsx", "@devup-ui/core/css/global.css");
sheet.add_import("test2.tsx", "@devup-ui/core/css/global2.css");
sheet.add_import("test3.tsx", "@devup-ui/core/css/global3.css");
sheet.add_import("test4.tsx", "@devup-ui/core/css/global4.css");
assert_debug_snapshot!(sheet.create_css());
{
let mut sheet = StyleSheet::default();
sheet.add_import("test.tsx", "@devup-ui/core/css/global.css");
sheet.add_import("test2.tsx", "@devup-ui/core/css/global2.css");
sheet.add_import("test3.tsx", "@devup-ui/core/css/global3.css");
sheet.add_import("test4.tsx", "@devup-ui/core/css/global4.css");
assert_debug_snapshot!(sheet.create_css());
}
{
let mut sheet = StyleSheet::default();
sheet.add_import("test.tsx", "@devup-ui/core/css/global.css");
sheet.add_import("test.tsx", "@devup-ui/core/css/new-global.css");
assert_debug_snapshot!(sheet.create_css());
}
{
let mut sheet = StyleSheet::default();
sheet.add_import("test.tsx", "@devup-ui/core/css/global.css");
sheet.add_import("test.tsx", "@devup-ui/core/css/global.css");
assert_debug_snapshot!(sheet.create_css());
}
}

#[test]
Expand Down
5 changes: 5 additions & 0 deletions libs/sheet/src/snapshots/sheet__tests__create_css_with_imports-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: libs/sheet/src/lib.rs
expression: sheet.create_css()
---
"@import \"@devup-ui/core/css/global.css\";@import \"@devup-ui/core/css/new-global.css\";"
5 changes: 5 additions & 0 deletions libs/sheet/src/snapshots/sheet__tests__create_css_with_imports-3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: libs/sheet/src/lib.rs
expression: sheet.create_css()
---
"@import \"@devup-ui/core/css/global.css\";"