Correctly handle @use rule

Darklg · Sep 20, 2024 · 672cffd · 672cffd
1 parent 5630143
commit 672cffd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/css/clean-code.css b/css/clean-code.css
@@ -1,5 +1,7 @@
 @charset "UTF-8";
 
+@use "sass:math";
+
 /* This comment should not be removed */
 
 $custom-br: 3px;
@@ -16,8 +18,6 @@ $custom-br: 3px;
     content: '•';
 }
 
-@use "sass:math";
-
 a {
     margin-left: -0.4px;
     border: 1px solid red;

diff --git a/css/dirty-code.css b/css/dirty-code.css
@@ -5,7 +5,7 @@ background-clip: border;/* This comment should stay contiguous to background-cli
 /* This comment should be removed */}
 @charset "UTF-8";
 
-@use "sass:math";a{border:1px solid red;-webkit-box-shadow: inset 0 0 0 1px #000;-moz-box-shadow: inset 0 0 0 1px #000;
+@use 'sass: math';a{border:1px solid red;-webkit-box-shadow: inset 0 0 0 1px #000;-moz-box-shadow: inset 0 0 0 1px #000;
 /* This comment should be removed */
 box-shadow: inset 0 0 0 1px #000;margin-left:-0.4px}
 .box{/* This comment should be removed */margin-top: 10px;margin-left: 20px;

diff --git a/inc/classes/csslisible.class.php b/inc/classes/csslisible.class.php
@@ -1429,6 +1429,19 @@ private function small_clean( $css ) {
         // Simplification des codes couleurs hexadécimaux
         $css = $this->identify_and_short_hex_color_values( $css );
 
+        // Extract all @use
+        preg_match_all('/\@use([^;]+)\;\\n+/ui', $css, $matches);
+        // Append all @use at the beginning
+        if (isset($matches[0][0])) {
+            foreach ($matches[0] as $match) {
+                $match = trim($match);
+                $new_match = str_replace("'", '"', $match);
+                $new_match = str_replace(": ", ':', $new_match);
+                $css = str_replace($match, '', $css);
+                $css = $new_match . $this->get_interlignage() . $css;
+            }
+        }
+
         // Keep only one @charset
         preg_match_all('/\@charset(.*)\;\\n+/ui', $css, $matches);
         if(isset($matches[0][0]))