Skip to content

Commit 0626939

Browse files
committed
Upgrade to PostCSS v5
1 parent 5db759d commit 0626939

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
language: node_js
2+
node_js:
3+
- '0.12'

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
environment:
44
matrix:
5-
- nodejs_version: 0.10
5+
- nodejs_version: 0.12
66

77
version: "{build}"
88
build: off

index.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ var postcss = require("postcss")
1111
var helpers = require("postcss-message-helpers")
1212
var 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

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
],
2424
"dependencies": {
2525
"clone": "^1.0.2",
26-
"es6-promise": "^3.0.2",
2726
"glob": "^5.0.14",
28-
"object-assign": "^3.0.0",
29-
"postcss": "^4.1.16",
27+
"object-assign": "^4.0.1",
28+
"postcss": "^5.0.2",
3029
"postcss-message-helpers": "^2.0.0",
3130
"resolve": "^1.1.6"
3231
},

test/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ test("@import", function(t) {
7474
plugins: [
7575
postcss.plugin("postcss-no-foo", function() {
7676
return function(css) {
77-
css.eachDecl("foo", function(decl) {
78-
decl.removeSelf()
77+
css.walkDecls("foo", function(decl) {
78+
decl.remove()
7979
})
8080
}
8181
}),
8282
postcss.plugin("postcss-no-bar", function() {
8383
return function(css) {
84-
css.eachDecl("bar", function(decl) {
85-
decl.removeSelf()
84+
css.walkDecls("bar", function(decl) {
85+
decl.remove()
8686
})
8787
}
8888
}),

0 commit comments

Comments
 (0)