Merge pull request #307 from thadk/linesbetween-bump-react-17.0.10

Bump react 17.0.2 and Gatsby

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x]
 
     steps:
     - uses: actions/checkout@v2

.node-version

@@ -0,0 +1 @@
+14

.travis.yml

@@ -1,3 +1,3 @@
 language: node_js
 node_js:
- - "lts/*"
+ - "node"

gatsby-config.js

@@ -14,7 +14,6 @@ module.exports = {
       },
     },
     `gatsby-transformer-sharp`,
-    `gatsby-plugin-sharp`,
     {
       resolve: `gatsby-plugin-manifest`,
       options: {
@@ -27,6 +26,7 @@ module.exports = {
         icon: `src/images/meta-img.png`, // This path is relative to the root of the site.
       },
     },
+    `gatsby-plugin-sharp`,
     // this (optional) plugin enables Progressive Web App + Offline functionality
     // To learn more, visit: https://gatsby.dev/offline
     `gatsby-plugin-offline`,

package.json

@@ -5,64 +5,60 @@
   "version": "0.5.0",
   "author": "Code for Boston <[email protected]>",
   "dependencies": {
-    "@emotion/core": "^10.0.10",
-    "@emotion/styled": "^10.0.10",
+    "@emotion/react": "^11.4.0",
+    "@emotion/styled": "^11.3.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.30",
     "@fortawesome/free-solid-svg-icons": "^5.14.0",
     "@fortawesome/react-fontawesome": "^0.1.11",
-    "@reach/router": "^1.3.3",
+    "@reach/router": "^1.3.4",
     "@types/jest": "^26.0.7",
     "@types/pdfjs-dist": "^2.1.3",
     "@types/react-datepicker": "^3.1.1",
-    "@types/react-helmet": "^6.1.0",
+    "@types/react-helmet": "^6.1.2",
     "@types/use-persisted-state": "^0.3.0",
     "babel-preset-gatsby": "^0.5.6",
     "caniuse-lite": "^1.0.30001198",
-    "core-js": "3.6.5",
+    "core-js": "3.15.2",
     "d3": "^6.2.0",
     "d3-format": "^1.4.3",
     "dayjs": "^1.8.15",
     "fast-xml-parser": "^3.12.16",
-    "gatsby": "^2.24.50",
-    "gatsby-cli": "^2.12.88",
-    "gatsby-image": "^2.4.16",
-    "gatsby-plugin-emotion": "^4.3.10",
-    "gatsby-plugin-google-analytics": "^2.3.13",
-    "gatsby-plugin-layout": "^1.3.10",
-    "gatsby-plugin-manifest": "^2.4.24",
-    "gatsby-plugin-offline": "^3.2.24",
-    "gatsby-plugin-react-helmet": "^3.3.10",
-    "gatsby-plugin-sharp": "^2.6.28",
-    "gatsby-plugin-typescript": "^2.4.18",
-    "gatsby-source-filesystem": "^2.3.25",
-    "gatsby-transformer-sharp": "^2.5.13",
+    "gatsby": "^3.9.1",
+    "gatsby-image": "^3.9.0",
+    "gatsby-plugin-emotion": "^6.9.0",
+    "gatsby-plugin-google-analytics": "^3.9.0",
+    "gatsby-plugin-layout": "^2.9.0",
+    "gatsby-plugin-manifest": "^3.9.0",
+    "gatsby-plugin-offline": "^4.9.0",
+    "gatsby-plugin-react-helmet": "^4.9.0",
+    "gatsby-plugin-sharp": "^3.9.0",
+    "gatsby-plugin-typescript": "^3.9.0",
+    "gatsby-source-filesystem": "^3.9.0",
+    "gatsby-transformer-sharp": "^3.9.0",
     "pdfjs-dist": "2.1.266",
     "prop-types": "^15.7.2",
     "rc-slider": "^8.7.1",
-    "react": "^16.13.1",
+    "react": "^17.0.1",
     "react-datepicker": "^3.1.3",
-    "react-dom": "^16.13.1",
-    "react-helmet": "^5.2.0",
-    "react-slick": "^0.25.2",
-    "sharp": "^0.26.0",
+    "react-dom": "^17.0.1",
+    "react-helmet": "^6.1.0",
+    "react-slick": "^0.28.1",
     "typescript": "^3.3.4000",
-    "use-persisted-state": "^0.3.0"
+    "use-persisted-state": "^0.3.3"
   },
   "devDependencies": {
     "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
     "@types/d3-format": "^2.0.0",
     "@types/node": "^14.0.14",
     "@types/rc-slider": "^8.6.5",
-    "@types/react": "^16.9.47",
-    "@types/react-dom": "^16.9.8",
+    "@types/react": "^17.0.1",
+    "@types/react-dom": "^17.0.1",
     "@types/react-slick": "^0.23.4",
-    "@typescript-eslint/eslint-plugin": "^2.15.0",
-    "@typescript-eslint/parser": "^2.15.0",
+    "@typescript-eslint/eslint-plugin": "^4.28.3",
+    "@typescript-eslint/parser": "^4.28.3",
     "babel-jest": "^26.3.0",
-    "babel-plugin-emotion": "^10.0.9",
-    "eslint": "^6.8.0",
-    "eslint-plugin-react": "^7.17.0",
-    "eslint-plugin-react-hooks": "^4.1.0",
+    "babel-plugin-emotion": "^11.0.0",
+    "eslint": "^7.30.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^24.9.0",
     "prettier": "^2.1.2",
@@ -86,5 +82,8 @@
   },
   "bugs": {
     "url": "https://github.com/codeforboston/windfall-elimination/issues"
+  },
+  "engines": {
+    "node": ">=0.12.13"
   }
-}
+}

src/components/radio-button.tsx

@@ -1,6 +1,6 @@
 import styled from "@emotion/styled";
 import { colors } from "../constants";
-import { ClassNames } from "@emotion/core";
+import { ClassNames } from "@emotion/react";
 import React, { ReactChildren } from "react";
 
 export const RadioButton = styled.input`