@@ -164,16 +164,12 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
164164 . expression_string_literal ( SPAN , self . ast . atom ( "" ) , None )
165165 } else {
166166 // css can not reachable
167- // ExtractResult::ExtractStyleWithChangeTag(styles, _)
168167 let class_name =
169168 gen_class_names ( & self . ast , & mut styles, style_order) ;
170169
171- self . styles . extend (
172- styles
173- . into_iter ( )
174- // already set style order
175- . flat_map ( |ex| ex. extract ( ) ) ,
176- ) ;
170+ // already set style order
171+ self . styles
172+ . extend ( styles. into_iter ( ) . flat_map ( |ex| ex. extract ( ) ) ) ;
177173 if let Some ( cls) = class_name {
178174 cls
179175 } else {
@@ -206,17 +202,13 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
206202 call. arguments [ 0 ] . to_expression_mut ( ) ,
207203 & self . filename ,
208204 ) ;
209- self . styles . extend (
210- styles
211- . into_iter ( )
212- // already set style order
213- . flat_map ( |mut ex| {
214- if let ExtractStyleProp :: Static ( css) = & mut ex {
215- css. set_style_order ( style_order. unwrap_or ( 0 ) ) ;
216- }
217- ex. extract ( )
218- } ) ,
219- ) ;
205+ // already set style order
206+ self . styles . extend ( styles. into_iter ( ) . flat_map ( |mut ex| {
207+ if let ExtractStyleProp :: Static ( css) = & mut ex {
208+ css. set_style_order ( style_order. unwrap_or ( 0 ) ) ;
209+ }
210+ ex. extract ( )
211+ } ) ) ;
220212 self . ast . expression_identifier ( SPAN , self . ast . atom ( "" ) )
221213 }
222214 }
@@ -244,12 +236,9 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
244236 . ast
245237 . expression_string_literal ( SPAN , self . ast . atom ( "" ) , None ) ;
246238 }
247- self . styles . extend (
248- styles
249- . into_iter ( )
250- // already set style order
251- . flat_map ( |ex| ex. extract ( ) ) ,
252- ) ;
239+ // already set style order
240+ self . styles
241+ . extend ( styles. into_iter ( ) . flat_map ( |ex| ex. extract ( ) ) ) ;
253242 }
254243 UtilType :: Keyframes => {
255244 let keyframes = ExtractKeyframes {
@@ -382,11 +371,9 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
382371 }
383372 fn visit_variable_declarator ( & mut self , it : & mut VariableDeclarator < ' a > ) {
384373 if let Some ( Expression :: CallExpression ( call) ) = & it. init {
385- if call. arguments . len ( ) != 1 {
386- return ;
387- }
388- if let ( Expression :: Identifier ( ident) , Argument :: StringLiteral ( arg) ) =
389- ( & call. callee , & call. arguments [ 0 ] )
374+ if call. arguments . len ( ) == 1
375+ && let ( Expression :: Identifier ( ident) , Argument :: StringLiteral ( arg) ) =
376+ ( & call. callee , & call. arguments [ 0 ] )
390377 && ident. name == "require"
391378 {
392379 if arg. value == "react/jsx-runtime" {
0 commit comments