@@ -139,15 +139,11 @@ function mergeAdjacentRules(initialRule, rulesToInsert) {
139139
140140function makeExtractUtilityRules ( css , config ) {
141141 const utilityMap = buildUtilityMap ( css )
142- const orderUtilityMap = _ . fromPairs (
143- _ . flatMap ( _ . toPairs ( utilityMap ) , ( [ _utilityName , utilities ] ) => {
144- return utilities . map ( utility => {
145- return [ utility . index , utility ]
146- } )
147- } )
148- )
149- return function ( utilityNames , rule ) {
150- return _ . flatMap ( utilityNames , utilityName => {
142+
143+ return function extractUtilityRules ( utilityNames , rule ) {
144+ const combined = [ ]
145+
146+ utilityNames . forEach ( utilityName => {
151147 if ( utilityMap [ utilityName ] === undefined ) {
152148 // Look for prefixed utility in case the user has goofed
153149 const prefixedUtility = prefixSelector ( config . prefix , `.${ utilityName } ` ) . slice ( 1 )
@@ -163,10 +159,11 @@ function makeExtractUtilityRules(css, config) {
163159 { word : utilityName }
164160 )
165161 }
166- return utilityMap [ utilityName ] . map ( ( { index } ) => index )
162+
163+ combined . push ( ...utilityMap [ utilityName ] )
167164 } )
168- . sort ( ( a , b ) => a - b )
169- . map ( i => orderUtilityMap [ i ] )
165+
166+ return combined . sort ( ( a , b ) => a . index - b . index )
170167 }
171168}
172169
0 commit comments