Merge pull request #177 from dev-five-git/fix-vite-plugin

Fix vite plugin, Apply css optimize

Author: owjs3901

.changeset/fast-ravens-rescue.md

@@ -0,0 +1,5 @@
+---
+"@devup-ui/vite-plugin": patch
+---
+
+Fix css duplicate issue when exporting

.changeset/young-chairs-yawn.md

@@ -0,0 +1,5 @@
+---
+"@devup-ui/wasm": patch
+---
+
+Apply css optimize

Cargo.lock

@@ -14,6 +14,9 @@ export default function App() {
         hello
         <Lib />
       </Box>
+      <Text color="#777777"></Text>
+      <Text color="#777"></Text>
+      <Text color="#777"></Text>
       <Text typography="header">typo</Text>
     </div>
   )

apps/vite/src/App.tsx

@@ -10,7 +10,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@chakra-ui/react": "^3.15.0",
+    "@chakra-ui/react": "^3.15.1",
     "@emotion/react": "^11.14.0",
     "next": "^15.2.4",
     "next-themes": "^0.4.6",

benchmark/next-chakra-ui/package.json

@@ -13,7 +13,7 @@ static GLOBAL_STYLE_SHEET: Lazy<Mutex<StyleSheet>> =
 #[wasm_bindgen]
 pub struct Output {
     code: String,
-    styles: Vec<ExtractStyleValue>,
+    styles: HashSet<ExtractStyleValue>,
 }
 #[wasm_bindgen]
 extern "C" {

bindings/devup-ui-wasm/src/lib.rs

@@ -372,7 +372,7 @@ fn optimize_color(value: &str) -> String {
     format!("#{}", ret)
 }
 
-fn optimize_value(value: &str) -> String {
+pub fn optimize_value(value: &str) -> String {
     let mut ret = value.trim().to_string();
     if ret.contains(",") {
         ret = F_SPACE_RE.replace_all(&ret, ",").trim().to_string();

libs/css/src/lib.rs

@@ -1,12 +1,13 @@
-use crate::utils::convert_value;
 use crate::StyleProperty;
+use crate::utils::convert_value;
 use css::{
-    css_to_classname, sheet_to_classname, sheet_to_variable_name, short_to_long, StyleSelector,
+    StyleSelector, css_to_classname, optimize_value, sheet_to_classname, sheet_to_variable_name,
+    short_to_long,
 };
 use once_cell::sync::Lazy;
 use std::collections::HashSet;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Eq, Hash, Ord, PartialOrd)]
 pub struct ExtractStaticStyle {
     /// property
     property: String,
@@ -46,11 +47,11 @@ impl ExtractStaticStyle {
     /// create a new ExtractStaticStyle
     pub fn new(property: &str, value: &str, level: u8, selector: Option<StyleSelector>) -> Self {
         Self {
-            value: if MAINTAIN_VALUE_PROPERTIES.contains(property) {
+            value: optimize_value(&if MAINTAIN_VALUE_PROPERTIES.contains(property) {
                 value.to_string()
             } else {
                 convert_value(value)
-            },
+            }),
             property: short_to_long(property),
             level,
             selector,
@@ -65,11 +66,11 @@ impl ExtractStaticStyle {
         selector: Option<StyleSelector>,
     ) -> Self {
         Self {
-            value: if MAINTAIN_VALUE_PROPERTIES.contains(property) {
+            value: optimize_value(&if MAINTAIN_VALUE_PROPERTIES.contains(property) {
                 value.to_string()
             } else {
                 convert_value(value)
-            },
+            }),
             property: property.to_string(),
             level,
             selector,
@@ -109,20 +110,19 @@ impl ExtractStyleProperty for ExtractStaticStyle {
         StyleProperty::ClassName(sheet_to_classname(
             self.property.as_str(),
             self.level,
-            Some(
-                if MAINTAIN_VALUE_PROPERTIES.contains(self.property.as_str()) {
+            Some(&optimize_value(
+                &if MAINTAIN_VALUE_PROPERTIES.contains(self.property.as_str()) {
                     self.value.to_string()
                 } else {
                     convert_value(self.value.as_str())
-                }
-                .as_str(),
-            ),
+                },
+            )),
             s.as_deref(),
             self.style_order,
         ))
     }
 }
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Eq, Hash, Ord, PartialOrd)]
 pub struct ExtractCss {
     /// css code
     pub css: String,
@@ -135,7 +135,7 @@ impl ExtractStyleProperty for ExtractCss {
     }
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Eq, Hash, Ord, PartialOrd)]
 pub struct ExtractDynamicStyle {
     /// property
     property: String,
@@ -207,7 +207,7 @@ impl ExtractStyleProperty for ExtractDynamicStyle {
         }
     }
 }
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Eq, Hash, Ord, PartialOrd)]
 pub enum ExtractStyleValue {
     Static(ExtractStaticStyle),
     Typography(String),