diff --git a/package.json b/package.json index e93c83a..9fb4a91 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "stylelint": "8.0.0", "stylelint-csstree-validator": "1.1.1", "stylelint-order": "0.6.0", - "stylelint-scss": "1.3.4" + "stylelint-scss": "2.0.0" }, "devDependencies": { "eslint-config-get-off-my-lawn": "2.1.0" diff --git a/src/scss.js b/src/scss.js index 1f4a6b0..0b1b046 100644 --- a/src/scss.js +++ b/src/scss.js @@ -3,9 +3,21 @@ module.exports = { 'scss/at-import-no-partial-leading-underscore': true, 'scss/at-import-partial-extension-whitelist': [], 'scss/at-mixin-argumentless-call-parentheses': 'never', + 'scss/at-rule-no-unknown': true, 'scss/declaration-nested-properties': 'never', + 'scss/declaration-nested-properties-no-divided-groups': true, 'scss/dollar-variable-colon-space-after': 'always', 'scss/dollar-variable-colon-space-before': 'never', + 'scss/dollar-variable-empty-line-before': [ + 'always', + { + except: [ + 'after-comment', + 'after-dollar-variable', + 'first-nested' + ] + } + ], 'scss/dollar-variable-no-missing-interpolation': true, 'scss/double-slash-comment-empty-line-before': [ 'always', diff --git a/src/stylelint.js b/src/stylelint.js index eb9e44a..0c3a49c 100644 --- a/src/stylelint.js +++ b/src/stylelint.js @@ -13,29 +13,6 @@ module.exports = { ], 'at-rule-name-case': 'lower', 'at-rule-name-space-after': 'always', - 'at-rule-no-unknown': [ - true, - { - ignoreAtRules: [ - 'at-root', - 'content', - 'debug', - 'each', - 'else', - 'error', - 'extend', - 'for', - 'function', - 'if', - 'include', - 'mixin', - 'placeholder', - 'return', - 'warn', - 'while' - ] - } - ], 'at-rule-no-vendor-prefix': true, 'at-rule-semicolon-newline-after': 'always', 'at-rule-semicolon-space-before': 'never', diff --git a/yarn.lock b/yarn.lock index 59ff205..a277d52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1604,10 +1604,6 @@ postcss-less@^1.1.0: dependencies: postcss "^5.2.16" -postcss-media-query-parser@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.1.0.tgz#af258e28ef89f2d84b10102ac8be4a99fc779445" - postcss-media-query-parser@^0.2.0, postcss-media-query-parser@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" @@ -2040,16 +2036,15 @@ stylelint-order@0.6.0: postcss-sorting "^3.0.1" stylelint "^8.0.0" -stylelint-scss@1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-1.3.4.tgz#a7a2597e897fff8430dfb22b940dfecbbfdc75a6" +stylelint-scss@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-2.0.0.tgz#033fd781b311e9a7604231ba0201559972b3eaf4" dependencies: lodash "^4.11.1" - postcss-media-query-parser "^0.1.0" + postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1" postcss-selector-parser "^2.0.0" postcss-value-parser "^3.3.0" - stylelint "^7.0.3" stylelint@8.0.0, stylelint@^8.0.0: version "8.0.0" @@ -2092,7 +2087,7 @@ stylelint@8.0.0, stylelint@^8.0.0: svg-tags "^1.0.0" table "^4.0.1" -stylelint@^7.0.0, stylelint@^7.0.3: +stylelint@^7.0.0: version "7.13.0" resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.13.0.tgz#111f97b6da72e775c80800d6bb6f5f869997785d" dependencies: