Merge pull request #25 from suitcss/upgrade-stylelint

Upgrade stylelint

Author: giuseppeg

lib/index.js

@@ -91,7 +91,9 @@ function mergeOptions(options) {
   var merged = assign({}, defaults, options);
 
   // Set some core options
-  merged['postcss-import'].root = merged.root;
+  if (merged.root) {
+    merged['postcss-import'].root = merged.root;
+  }
 
   // Call beforeLint function and pass processed css to bem-linter
   var beforeLint = merged.beforeLint;
@@ -130,5 +132,5 @@ function lintImportedFiles(options, css, filename) {
   .use(bemLinter(options['postcss-bem-linter']))
   .use(reporter(options['postcss-reporter']));
 
-  return processor.process(css, {from: filename}).css;
+  return processor.process(css, {from: filename});
 }

package.json

@@ -17,30 +17,32 @@
     "commander": "~2.9.0",
     "cssnano": "^3.3.2",
     "fs-extra": "^0.26.2",
-    "lodash.difference": "^3.2.2",
-    "lodash.isempty": "^3.0.4",
+    "lodash.difference": "^4.0.2",
+    "lodash.isempty": "^4.1.1",
     "object-assign-deep": "0.0.4",
     "pad-component": "0.0.1",
     "postcss": "^5.0.12",
     "postcss-bem-linter": "^2.3.0",
     "postcss-calc": "^5.0.0",
     "postcss-custom-media": "^5.0.0",
     "postcss-custom-properties": "^5.0.0",
-    "postcss-import": "^7.1.3",
+    "postcss-import": "^8.0.2",
     "postcss-reporter": "^1.3.0",
-    "read-file-stdin": "0.2.0",
-    "stylelint": "^2.3.5"
+    "read-file-stdin": "^0.2.1",
+    "stylelint": "^4.2.0"
   },
   "devDependencies": {
     "chai": "^3.4.1",
+    "chai-as-promised": "^5.2.0",
     "eslint": "^1.10.3",
     "eslint-config-airbnb": "^5.0.0",
     "mocha": "^2.3.4",
     "postcss-property-lookup": "^1.1.4",
     "rewire": "^2.5.1",
     "sinon": "^1.17.2",
+    "sinon-as-promised": "^4.0.0",
     "sinon-chai": "^2.8.0",
-    "stylelint-config-suitcss": "^1.0.0"
+    "stylelint-config-suitcss": "^3.0.0"
   },
   "scripts": {
     "test": "npm run lint && mocha --reporter spec --slow 400 --timeout 3000",

test/error.config.json

@@ -1,6 +1,5 @@
 {
   "postcss-reporter": {
-    "throwError": true,
-    "plugins": ["postcss-bem-linter"]
+    "throwError": true
   }
 }

test/test.js

@@ -7,8 +7,11 @@ var rewire = require('rewire');
 var suitcss = rewire('../lib');
 var path = require('path');
 var sinonChai = require('sinon-chai');
+var chaiAsPromised = require('chai-as-promised');
+require('sinon-as-promised');
 
 chai.use(sinonChai);
+chai.use(chaiAsPromised);
 var expect = chai.expect;
 
 /**
@@ -151,27 +154,37 @@ describe('suitcss', function() {
     });
 
     describe('stylelint', function() {
-      it('should check the input conforms to SUIT style rules', function(done) {
-        suitcss('@import "./stylelint.css"', {
-          lint: true,
-          root: 'test/fixtures',
-          'postcss-reporter': {
-            throwError: true
-          }
-        }).then(function() {
-          done(new Error('stylelint should have failed conformance'));
-        }).catch(function(err) {
-          expect(err.message).to.contain('postcss-reporter: warnings or errors were found');
-          done();
-        });
+      it('should lint the component', function() {
+        return expect(
+          suitcss(read('fixtures/component'), {
+            lint: true,
+            root: 'test/fixtures',
+            'postcss-reporter': {
+              throwError: true
+            }
+          })
+        ).to.be.fulfilled;
+      });
+
+      it('should throw an error if stylelint fails', function() {
+        return expect(
+          suitcss('@import "./stylelint.css"', {
+            lint: true,
+            root: 'test/fixtures',
+            'postcss-reporter': {
+              throwError: true
+            }
+          })
+        ).to.be.rejectedWith(Error, 'postcss-reporter: warnings or errors were found');
       });
     });
 
     describe('transforming css before linting', function() {
       var lintImportedFilesStub, beforeLintStub, revert;
 
       beforeEach(function() {
-        lintImportedFilesStub = sinon.stub().returns('/*linting done*/');
+        var postcssPromise = sinon.stub().resolves('/*linting done*/')();
+        lintImportedFilesStub = sinon.stub().returns(postcssPromise);
         beforeLintStub = sinon.stub().returns('/*before lint*/');
         revert = suitcss.__set__('lintImportedFiles', lintImportedFilesStub);
       });
@@ -184,35 +197,38 @@ describe('suitcss', function() {
         suitcss(read('fixtures/component'), {
           root: 'test/fixtures',
           beforeLint: beforeLintStub
-        }).catch(done);
-
-        expect(lintImportedFilesStub).to.be.calledOnce;
-        expect(beforeLintStub).to.be.calledOnce;
-        expect(beforeLintStub).to.have.been.calledBefore(lintImportedFilesStub);
-
-        done();
+        })
+        .then(function() {
+          expect(beforeLintStub).to.be.calledOnce;
+          expect(lintImportedFilesStub).to.be.calledOnce;
+          expect(beforeLintStub).to.have.been.calledBefore(lintImportedFilesStub);
+          done();
+        })
+        .catch(done);
       });
 
       it('should pass the result of `beforeLint` to `lintImportedFiles`', function(done) {
         suitcss(read('fixtures/component'), {
           root: 'test/fixtures',
           beforeLint: beforeLintStub
-        }).catch(done);
-
-        expect(lintImportedFilesStub.args[0][1]).to.equal('/*before lint*/');
-
-        done();
+        })
+        .then(function() {
+          expect(lintImportedFilesStub.args[0][1]).to.equal('/*before lint*/');
+          done();
+        })
+        .catch(done);
       });
 
       it('should pass the options object to the beforeLint function as the third parameter', function(done) {
         suitcss(read('fixtures/component'), {
           root: 'test/fixtures',
           beforeLint: beforeLintStub
-        }).catch(done);
-
-        expect(beforeLintStub.args[0][2]).to.contain({root: 'test/fixtures'});
-
-        done();
+        })
+        .then(function() {
+          expect(beforeLintStub.args[0][2]).to.contain({root: 'test/fixtures'});
+          done();
+        })
+        .catch(done);
       });
     });
   });