Skip to content

Commit 2a04b22

Browse files
authored
Merge pull request #32 from suitcss/stylelint7
Bump stylelint version to 7 Fixes #31
2 parents 1cb570a + 0bbe71f commit 2a04b22

File tree

7 files changed

+7
-10
lines changed

7 files changed

+7
-10
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
sudo: false
33
node_js:
4-
- "0.12"
54
- "4"
65
- "5"
6+
- "6"

appveyor.yml

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

33
environment:
44
matrix:
5+
- nodejs_version: 6
56
- nodejs_version: 5
67
- nodejs_version: 4
7-
- nodejs_version: 0.12
88

99
version: "{build}"
1010
build: off

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"postcss-custom-media": "^5.0.0",
2828
"postcss-custom-properties": "^5.0.0",
2929
"postcss-easy-import": "^1.0.1",
30-
"postcss-import": "^8.0.2",
3130
"postcss-reporter": "^1.3.0",
3231
"read-file-stdin": "^0.2.1",
33-
"stylelint": "^5.3.0"
32+
"stylelint": "^7.2.0",
33+
"stylelint-config-suitcss": "^8.0.0"
3434
},
3535
"devDependencies": {
3636
"chai": "^3.4.1",
@@ -42,8 +42,7 @@
4242
"rewire": "^2.5.1",
4343
"sinon": "^1.17.2",
4444
"sinon-as-promised": "^4.0.0",
45-
"sinon-chai": "^2.8.0",
46-
"stylelint-config-suitcss": "^5.0.0"
45+
"sinon-chai": "^2.8.0"
4746
},
4847
"scripts": {
4948
"test": "npm run lint && mocha --reporter spec --slow 400 --timeout 8000",

test/fixtures/component.out.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
.Component-item {
1313
display: -webkit-box;
14-
display: -webkit-flex;
1514
display: -ms-flexbox;
1615
display: flex;
1716
}

test/fixtures/config.out.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
.Component-item {
1313
display: -webkit-box;
14-
display: -webkit-flex;
1514
display: -ms-flexbox;
1615
display: flex;
1716
}

test/fixtures/minify.out.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.u-img{border-radius:50%}.Component{font-size:16px;width:16.66667%}.Component-item{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}@media (min-width:200px){.Component-item{color:red}}
1+
.u-img{border-radius:50%}.Component{font-size:16px;width:16.66667%}.Component-item{display:-webkit-box;display:-ms-flexbox;display:flex}@media (min-width:200px){.Component-item{color:red}}

test/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ describe('cli', function() {
332332
it('should output stylelint warnings', function(done) {
333333
exec('node bin/suitcss -i test/fixtures test/fixtures/stylelint-import.css test/fixtures/cli/output.css -l', function(err, stdout) {
334334
if (err) return done(err);
335-
expect(stdout).to.contain('Expected property "box-sizing" to come before property "flex"');
335+
expect(stdout).to.contain('Expected "box-sizing" to come before "flex"');
336336
done();
337337
});
338338
});

0 commit comments

Comments
 (0)