Merge pull request #263 from dev-five-git/fix-multi-imports

Fix multi imports

Author: owjs3901

.changeset/big-waves-dance.md

@@ -0,0 +1,5 @@
+---
+"@devup-ui/wasm": patch
+---
+
+Fix multi imports issue

.changeset/flat-states-relax.md

@@ -0,0 +1,5 @@
+---
+"@devup-ui/wasm": patch
+---
+
+Optimize rgba func

apps/landing/src/app/layout.tsx

@@ -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,
@@ -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/[email protected]/dist/web/static/pretendard.min.css"
           rel="stylesheet"

libs/sheet/src/lib.rs

@@ -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,
 }
@@ -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 {
@@ -289,6 +292,7 @@ impl StyleSheet {
         let mut css = self
             .imports
             .values()
+            .flatten()
             .map(|import| format!("@import \"{import}\";"))
             .collect::<Vec<String>>()
             .join("");
@@ -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]

libs/sheet/src/snapshots/sheet__tests__create_css_with_imports-2.snap

@@ -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\";"

libs/sheet/src/snapshots/sheet__tests__create_css_with_imports-3.snap

@@ -0,0 +1,5 @@
+---
+source: libs/sheet/src/lib.rs
+expression: sheet.create_css()
+---
+"@import \"@devup-ui/core/css/global.css\";"