diff --git a/.stylelintrc.json b/.stylelintrc.json index 11d88f0..613a649 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -1,6 +1,11 @@ { - "extends": "stylelint-config-standard", + "extends": "stylelint-config-sass-guidelines", "plugins": [ "stylelint-scss" - ] + ], + "rules": { + "max-nesting-depth": 5, + "property-no-vendor-prefix": null, + "value-no-vendor-prefix": null + } } diff --git a/package-lock.json b/package-lock.json index 7fd775a..d4b27b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14082,6 +14082,24 @@ } } }, + "postcss-sorting": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-3.1.0.tgz", + "integrity": "sha512-YCPTcJwGIInF1LpMD1lIYvMHTGUL4s97o/OraA6eKvoauhhk6vjwOWDDjm6uRKqug/kyDPMKEzmYZ6FtW6RDgw==", + "dev": true, + "requires": { + "lodash": "4.17.4", + "postcss": "6.0.15" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + } + } + }, "postcss-value-parser": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", @@ -16572,14 +16590,53 @@ } } }, +<<<<<<< HEAD "strip-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", +======= + "stylelint-config-recommended": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-2.0.1.tgz", + "integrity": "sha512-FXdgdOEGpaFQoKGhsi8IbsCI6dkxHQPa1CCqIybkN1d8LKtdxrn/A1rgu8DpJ6J+/4L30FOJeVdPttGfxCDHBQ==", + "dev": true + }, + "stylelint-config-sass-guidelines": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-sass-guidelines/-/stylelint-config-sass-guidelines-4.0.1.tgz", + "integrity": "sha512-IFaizPqp9Y2ZDVD7mCM/1KHRrwfdG53u9c2mQntmOS74CEtJA4Y4lzfIjwNLJnoakg73xEt3C+cF3QbE5N9Biw==", + "dev": true + }, + "stylelint-config-standard": { + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-18.0.0.tgz", + "integrity": "sha1-DYcrQPr9zdz0GI+1tk3bOIforvw=", + "dev": true, +>>>>>>> initial config "requires": { "stylelint-config-recommended": "2.0.1" } }, + "stylelint-order": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-0.8.0.tgz", + "integrity": "sha512-XwJO7rIAt/hnBJjOsDgEwNSeqw+5jE22da4pVKaePbojM9bGwhOoAWV7Q2BL8caOg81IlTesmYCEf8s0+2Cc5g==", + "dev": true, + "requires": { + "lodash": "4.17.4", + "postcss": "6.0.15", + "postcss-sorting": "3.1.0" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + } + } + }, "stylelint-scss": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-2.2.0.tgz", diff --git a/package.json b/package.json index d0e95a0..339c2ec 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "start": "node node_modules/gulp/bin/gulp.js", "build": "node node_modules/gulp/bin/gulp.js build", "test": "echo \"Error: no test specified\" && exit 1", - "postinstall": "gulp postinstall" + "postinstall": "gulp postinstall", + "stylelint": "node_modules/stylelint/bin/stylelint.js 'src/**/*.scss'; exit 0" }, "repository": { "type": "git", @@ -64,7 +65,9 @@ "simplebuild-jshint": "^1.3.0", "simplebuild-karma": "^1.0.0", "stylelint": "8.4.0", + "stylelint-config-sass-guidelines": "4.0.1", "stylelint-config-standard": "18.0.0", + "stylelint-order": "0.8.0", "stylelint-scss": "2.2.0", "webpack-dev-server": "2.7.1" }