bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stylelint' into 'develop'

Browse source 
Stylelint updates

See merge request soapbox-pub/soapbox-fe!355
This commit is contained in:
Alex Gleason 2020-10-11 22:59:52 +00:00
commit 9ba8074765
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.stylelintrc.json
View file

@ -1,15 +1,15 @@
{ {
"extends": [ "extends": ["stylelint-config-standard"],
"stylelint-config-standard",
"stylelint-config-recommended-scss"
],
"ignoreFiles": ["app/styles/reset.scss"], "ignoreFiles": ["app/styles/reset.scss"],
"plugins": ["stylelint-scss"],
"rules": { "rules": {
"at-rule-no-unknown": null,
"at-rule-empty-line-before": ["always", { "ignore": ["after-comment", "first-nested", "inside-block", "blockless-after-same-name-blockless", "blockless-after-blockless"] }], "at-rule-empty-line-before": ["always", { "ignore": ["after-comment", "first-nested", "inside-block", "blockless-after-same-name-blockless", "blockless-after-blockless"] }],
"declaration-colon-newline-after": null, "declaration-colon-newline-after": null,
"declaration-empty-line-before": "never", "declaration-empty-line-before": "never",
"font-family-no-missing-generic-family-keyword": [true, { "ignoreFontFamilies": ["ForkAwesome", "OpenDyslexic", "soapbox"] }], "font-family-no-missing-generic-family-keyword": [true, { "ignoreFontFamilies": ["ForkAwesome", "OpenDyslexic", "soapbox"] }],
"no-descending-specificity": null, "no-descending-specificity": null,
"no-duplicate-selectors": null "no-duplicate-selectors": null,
"scss/at-rule-no-unknown": true
} }
} }

3
package.json
View file

@ -122,7 +122,6 @@
"sass-loader": "^10.0.0", "sass-loader": "^10.0.0",
"semver": "^7.3.2", "semver": "^7.3.2",
"stringz": "^2.0.0", "stringz": "^2.0.0",
"stylelint-config-standard": "^20.0.0",
"substring-trie": "^1.0.2", "substring-trie": "^1.0.2",
"tiny-queue": "^0.2.1", "tiny-queue": "^0.2.1",
"uglifyjs-webpack-plugin": "^2.2.0", "uglifyjs-webpack-plugin": "^2.2.0",
@ -152,7 +151,7 @@
"react-test-renderer": "^16.13.1", "react-test-renderer": "^16.13.1",
"redux-mock-store": "^1.5.4", "redux-mock-store": "^1.5.4",
"stylelint": "^13.7.2", "stylelint": "^13.7.2",
"stylelint-config-recommended-scss": "^4.2.0", "stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.18.0", "stylelint-scss": "^3.18.0",
"webpack-dev-server": "^3.5.1", "webpack-dev-server": "^3.5.1",
"yargs": "^16.0.3" "yargs": "^16.0.3"

7
yarn.lock
View file

@ -11350,13 +11350,6 @@ stylehacks@^4.0.0:
postcss "^7.0.0" postcss "^7.0.0"
postcss-selector-parser "^3.0.0" postcss-selector-parser "^3.0.0"
stylelint-config-recommended-scss@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-4.2.0.tgz#3ad3fc858215cfd16a0f90aecf1ac0ea8a3e6971"
integrity sha512-4bI5BYbabo/GCQ6LbRZx/ZlVkK65a1jivNNsD+ix/Lw0U3iAch+jQcvliGnnAX8SUPaZ0UqzNVNNAF3urswa7g==
dependencies:
stylelint-config-recommended "^3.0.0"
stylelint-config-recommended@^3.0.0: stylelint-config-recommended@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657" resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"