diff --git a/public-dashboard-client/package.json b/public-dashboard-client/package.json index 5271afd4..585d6388 100644 --- a/public-dashboard-client/package.json +++ b/public-dashboard-client/package.json @@ -16,7 +16,6 @@ "test": "react-scripts test" }, "dependencies": { - "//": "TODO(#236): unpin & upgrade styled-components after bugfix", "@accessible/slider": "^2.0.2", "@reach/auto-id": "^0.11.2", "@reach/menu-button": "^0.10.5", @@ -55,27 +54,27 @@ "topojson": "^3.0.2" }, "devDependencies": { - "@recidiviz/eslint-config": "file:.yalc/@recidiviz/eslint-config", + "@recidiviz/eslint-config": "^1.0.0", "@testing-library/dom": "^7.26.3", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^12.1.10", - "@typescript-eslint/parser": "^4.4.0", "@typescript-eslint/eslint-plugin": "^4.4.0", + "@typescript-eslint/parser": "^4.4.0", + "babel-eslint": "^10.0.0", "eslint": "^6.6.0", + "eslint-config-react-app": "^6.0.0", "eslint-import-resolver-typescript": "^2.3.0", + "eslint-plugin-flowtype": "^5.2.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-prettier": "^3.1.4", "eslint-plugin-react": "^7.23.1", - "eslint-config-react-app": "^6.0.0", "eslint-plugin-react-hooks": "^4.2.0", "eslint-plugin-simple-import-sort": "^7.0.0", - "babel-eslint": "^10.0.0", - "prettier": "^2.2.1", - "eslint-plugin-flowtype": "^5.2.0", "jest-date-mock": "^1.0.8", - "lint-staged": ">=10" + "lint-staged": ">=10", + "prettier": "^2.2.1" }, "browserslist": { "production": [ diff --git a/spotlight-api/package.json b/spotlight-api/package.json index df700669..d35e70d0 100644 --- a/spotlight-api/package.json +++ b/spotlight-api/package.json @@ -26,16 +26,16 @@ "morgan": "^1.10.0" }, "devDependencies": { - "@recidiviz/eslint-config": "file:.yalc/@recidiviz/eslint-config", - "@typescript-eslint/parser": "^4.4.0", + "@recidiviz/eslint-config": "^1.0.0", "@typescript-eslint/eslint-plugin": "^4.4.0", + "@typescript-eslint/parser": "^4.4.0", "eslint": "^6.6.0", + "eslint-config-react-app": "^6.0.0", "eslint-import-resolver-typescript": "^2.3.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-prettier": "^3.1.4", "eslint-plugin-react": "^7.23.1", - "eslint-config-react-app": "^6.0.0", "eslint-plugin-react-hooks": "^4.2.0", "eslint-plugin-simple-import-sort": "^7.0.0", "jest": "24.9.0", diff --git a/spotlight-client/package.json b/spotlight-client/package.json index 81891517..6a8a31c8 100644 --- a/spotlight-client/package.json +++ b/spotlight-client/package.json @@ -95,7 +95,7 @@ "wait-for-localhost": "^3.3.0" }, "devDependencies": { - "@recidiviz/eslint-config": "file:.yalc/@recidiviz/eslint-config", + "@recidiviz/eslint-config": "^1.0.0", "@segment/analytics.js-core": "^4.1.5", "@testing-library/jest-dom": "^5.11.1", "@testing-library/react": "^11.1.1", diff --git a/yarn.lock b/yarn.lock index c90d37ce..207e958e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1774,22 +1774,10 @@ styled-components "^5.2.1" web-vitals "^1.0.1" -"@recidiviz/eslint-config@file:public-dashboard-client/.yalc/@recidiviz/eslint-config": - version "1.0.0" - dependencies: - eslint-config-airbnb "^18.2.0" - eslint-config-prettier "^8.1.0" - prettier "^2.2.1" - -"@recidiviz/eslint-config@file:spotlight-api/.yalc/@recidiviz/eslint-config": - version "1.0.0" - dependencies: - eslint-config-airbnb "^18.2.0" - eslint-config-prettier "^8.1.0" - prettier "^2.2.1" - -"@recidiviz/eslint-config@file:spotlight-client/.yalc/@recidiviz/eslint-config": +"@recidiviz/eslint-config@^1.0.0": version "1.0.0" + resolved "https://registry.yarnpkg.com/@recidiviz/eslint-config/-/eslint-config-1.0.0.tgz#cdfcb43cb4c85ebf45a2cb8150ce68154781f2ed" + integrity sha512-c4KO1+LKwg47rsHlvxR6KuGTIcXf0w6KvOiXA+eVVpX2qKQf2Vxmzg1n37iUe59oYobmf9+29yGeMPMdF17/8g== dependencies: eslint-config-airbnb "^18.2.0" eslint-config-prettier "^8.1.0" @@ -3558,10 +3546,10 @@ babel-plugin-named-asset-import@^0.3.6: resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd" integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw== -"babel-plugin-styled-components@>= 1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz#5296a9e557d736c3186be079fff27c6665d63d76" - integrity sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA== +"babel-plugin-styled-components@>= 1", "babel-plugin-styled-components@>= 1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz#1dec1676512177de6b827211e9eda5a30db4f9b9" + integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA== dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-module-imports" "^7.0.0" @@ -14640,16 +14628,16 @@ styled-components@5.1.1: supports-color "^5.5.0" styled-components@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.1.tgz#6ed7fad2dc233825f64c719ffbdedd84ad79101a" - integrity sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ== + version "5.2.3" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.3.tgz#752669fd694aac10de814d96efc287dde0d11385" + integrity sha512-BlR+KrLW3NL1yhvEB+9Nu9Dt51CuOnHoxd+Hj+rYPdtyR8X11uIW9rvhpy3Dk4dXXBsiW1u5U78f00Lf/afGoA== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/traverse" "^7.4.5" "@emotion/is-prop-valid" "^0.8.8" "@emotion/stylis" "^0.8.4" "@emotion/unitless" "^0.7.4" - babel-plugin-styled-components ">= 1" + babel-plugin-styled-components ">= 1.12.0" css-to-react-native "^3.0.0" hoist-non-react-statics "^3.0.0" shallowequal "^1.1.0"