@@ -11,8 +11,7 @@ var postcss = require("postcss")
1111var helpers = require ( "postcss-message-helpers" )
1212var glob = require ( "glob" )
1313
14- var Promize = global . Promise || require ( "es6-promise" ) . Promise
15- var resolvedPromise = new Promize ( function ( resolvePromise ) {
14+ var resolvedPromise = new Promise ( function ( resolvePromise ) {
1615 resolvePromise ( )
1716} )
1817
@@ -131,7 +130,7 @@ function parseStyles(
131130 processor
132131) {
133132 var imports = [ ]
134- styles . eachAtRule ( "import" , function checkAtRule ( atRule ) {
133+ styles . walkAtRules ( "import" , function checkAtRule ( atRule ) {
135134 if ( atRule . nodes ) {
136135 result . warn ( warnNodesMessage , { node : atRule } )
137136 }
@@ -157,7 +156,7 @@ function parseStyles(
157156 } )
158157
159158 if ( options . async ) {
160- return Promize . all ( importResults )
159+ return Promise . all ( importResults )
161160 }
162161 // else (!options.async)
163162 // nothing
@@ -204,7 +203,7 @@ function parseGlob(atRule, options, imports) {
204203 atRule . parent . insertBefore ( atRule , deglobbedAtRule )
205204 imports . push ( deglobbedAtRule )
206205 } )
207- atRule . removeSelf ( )
206+ atRule . remove ( )
208207
209208 return imports
210209}
@@ -234,8 +233,8 @@ function addIgnoredAtRulesOnTop(styles, ignoredAtRules) {
234233
235234 // separate remote import a little with others rules if no newlines already
236235 if ( first &&
237- first . before . indexOf ( "\n" ) === - 1 ) {
238- first . before = "\n\n" + first . before
236+ first . raws . before . indexOf ( "\n" ) === - 1 ) {
237+ first . raws . before = "\n\n" + first . raws . before
239238 }
240239 }
241240}
@@ -420,7 +419,7 @@ function insertRules(atRule, parsedAtImport, newStyles) {
420419 if ( parsedAtImport . media && parsedAtImport . media . length ) {
421420 // better output
422421 if ( newStyles . nodes && newStyles . nodes . length ) {
423- newStyles . nodes [ 0 ] . before = newStyles . nodes [ 0 ] . before || "\n"
422+ newStyles . nodes [ 0 ] . raws . before = newStyles . nodes [ 0 ] . raws . before || "\n"
424423 }
425424
426425 // wrap new rules with media (media query)
@@ -436,15 +435,15 @@ function insertRules(atRule, parsedAtImport, newStyles) {
436435 wrapper . source = atRule . source
437436
438437 // copy code style
439- wrapper . before = atRule . before
440- wrapper . after = atRule . after
438+ wrapper . raws . before = atRule . raws . before
439+ wrapper . raws . after = atRule . raws . after
441440
442441 // move nodes
443442 wrapper . nodes = newNodes
444443 newNodes = [ wrapper ]
445444 }
446445 else if ( newNodes && newNodes . length ) {
447- newNodes [ 0 ] . before = atRule . before
446+ newNodes [ 0 ] . raws . before = atRule . raws . before
448447 }
449448
450449 // keep AST clean
0 commit comments