diff --git a/.stylelintrc b/.stylelintrc index 0240c091..80b5ff7f 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,5 +1,5 @@ { - "extends": "stylelint-config-standard", + "extends": "stylelint-config-recommended-scss", "rules": { "no-descending-specificity": null, "no-empty-source": null diff --git a/package.json b/package.json index eae10380..9cdf05be 100644 --- a/package.json +++ b/package.json @@ -269,8 +269,9 @@ "spectron": "^4.0.0", "style-loader": "^0.23.0", "stylelint": "^9.6.0", - "stylelint-config-standard": "^18.2.0", + "stylelint-config-recommended-scss": "^3.2.0", "stylelint-formatter-pretty": "^1.0.3", + "stylelint-scss": "^3.3.1", "url-loader": "^1.1.1", "webpack": "^4.20.2", "webpack-bundle-analyzer": "^3.0.2", @@ -304,7 +305,6 @@ "react-inlinesvg": "^0.8.1", "react-intl": "^2.7.0", "react-intl-redux": "^2.0.2", - "react-modal": "^3.6.1", "react-redux": "^5.0.7", "react-router-dom": "^4.3.1", "react-router-redux": "^5.0.0-alpha.9", diff --git a/yarn.lock b/yarn.lock index 1d11b294..8b052729 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3940,6 +3940,10 @@ cssesc@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" +cssesc@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-1.0.1.tgz#ef7bd8d0229ed6a3a7051ff7771265fe7330e0a8" + cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": version "0.3.2" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b" @@ -5103,10 +5107,6 @@ execall@^1.0.0: dependencies: clone-regexp "^1.0.0" -exenv@^1.2.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d" - exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" @@ -5375,7 +5375,7 @@ fbjs-scripts@^1.0.1: semver "^5.1.0" through2 "^2.0.0" -fbjs@^0.8.16, fbjs@^0.8.9: +fbjs@^0.8.16: version "0.8.16" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" dependencies: @@ -10099,6 +10099,14 @@ postcss-selector-parser@^3.1.0: indexes-of "^1.0.1" uniq "^1.0.1" +postcss-selector-parser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-4.0.0.tgz#50c6570f40579036d8e63f23e6c0626fe5743527" + dependencies: + cssesc "^1.0.1" + indexes-of "^1.0.1" + uniq "^1.0.1" + postcss-styled@>=0.34.0, postcss-styled@^0.34.0: version "0.34.0" resolved "https://registry.yarnpkg.com/postcss-styled/-/postcss-styled-0.34.0.tgz#07d47bcb13707289782aa058605fd9feaf84391d" @@ -10279,13 +10287,6 @@ promzard@^0.3.0: dependencies: read "1" -prop-types@^15.5.10: - version "15.5.10" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" @@ -10598,19 +10599,10 @@ react-is@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.5.2.tgz#e2a7b7c3f5d48062eb769fcb123505eb928722e3" -react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4: +react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" -react-modal@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.6.1.tgz#54d27a1ec2b493bbc451c7efaa3557b6af82332d" - dependencies: - exenv "^1.2.0" - prop-types "^15.5.10" - react-lifecycles-compat "^3.0.0" - warning "^3.0.0" - react-redux@^5.0.7: version "5.0.7" resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8" @@ -12212,16 +12204,16 @@ style-search@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" -stylelint-config-recommended@^2.1.0: +stylelint-config-recommended-scss@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-3.2.0.tgz#5761be65e28b58fa6a4a628b71291e83e921d10f" + dependencies: + stylelint-config-recommended "^2.0.0" + +stylelint-config-recommended@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.1.0.tgz#f526d5c771c6811186d9eaedbed02195fee30858" -stylelint-config-standard@^18.2.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-18.2.0.tgz#6283149aba7f64f18731aef8f0abfb35cf619e06" - dependencies: - stylelint-config-recommended "^2.1.0" - stylelint-formatter-pretty@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/stylelint-formatter-pretty/-/stylelint-formatter-pretty-1.0.3.tgz#a6b43c3f3a13206bdfb777d0da8cefc6c76c36c3" @@ -12232,6 +12224,16 @@ stylelint-formatter-pretty@^1.0.3: plur "^2.1.2" string-width "^2.0.0" +stylelint-scss@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.3.1.tgz#5061bca7cc586eb05972caa31b5e627fa3296235" + dependencies: + lodash "^4.17.10" + postcss-media-query-parser "^0.2.3" + postcss-resolve-nested-selector "^0.1.1" + postcss-selector-parser "^4.0.0" + postcss-value-parser "^3.3.0" + stylelint@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.6.0.tgz#f0b366f33b6ccf3e5096d60722ed27b6470b41d8"