Merge branch 'react-17'

README.md

@@ -33,7 +33,7 @@ Currently deployment is manual, so the site may not reflect the latest changes.
 
 ### Standards
 
-* [Prettier](https://prettier.io/) v1 with single quotes
+* [Prettier](https://prettier.io/) v1 with single quotes (`yarn prettify`)
 * [EditorConfig](http://editorconfig.org/)
 * [Yarn](https://yarnpkg.com/en/)
 * [prop-types](https://github.com/facebook/prop-types)

package.json

@@ -8,11 +8,11 @@
     "lodash.chunk": "^4.2.0",
     "lodash.startswith": "^4.2.1",
     "prop-types": "^15.7.2",
-    "react": "^16.13.1",
-    "react-app-polyfill": "^1.0.6",
-    "react-dom": "^16.13.1",
+    "react": "^17.0.1",
+    "react-app-polyfill": "^2.0.0",
+    "react-dom": "^17.0.1",
     "react-redux": "^7.2.1",
-    "react-scripts": "3.4.3",
+    "react-scripts": "4.0.0",
     "react-select": "^3.1.0",
     "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.8",
@@ -25,13 +25,15 @@
     "test": "react-scripts test",
     "lint": "eslint \"src/**/*.js\"",
     "eject": "react-scripts eject",
-    "deploy": "yarn build && s3cmd sync build/* s3://truewill-embracer"
+    "deploy": "yarn build && s3cmd sync build/* s3://truewill-embracer",
+    "prettify": "prettier --write src/**/*.js"
   },
   "devDependencies": {
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.1.1",
     "deep-freeze": "^0.0.1",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.5",
-    "lodash.clonedeep": "^4.5.0"
+    "lodash.clonedeep": "^4.5.0",
+    "prettier": "1"
   },
   "browserslist": [
     ">0.2%",

src/components/StartingDots.test.js

@@ -41,7 +41,10 @@ it('should display only clear when no current value and none available', () => {
 it('should display only clear and other values when no current value', () => {
   const wrapper = shallow(
     <StartingDots
-      available={[{ dots: 4, count: 1 }, { dots: 3, count: 2 }]}
+      available={[
+        { dots: 4, count: 1 },
+        { dots: 3, count: 2 }
+      ]}
       onChange={noop}
     />
   );

src/constants/application.js

@@ -1,3 +1,3 @@
 // General application constants.
-export const version = '0.14.2';
+export const version = '0.14.3';
 export const docUrl = 'https://github.com/TrueWill/embracer';

src/containers/RitualsContainer.js

@@ -11,7 +11,4 @@ const mapDispatchToProps = {
   updateRituals
 };
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Rituals);
+export default connect(mapStateToProps, mapDispatchToProps)(Rituals);

src/containers/TraitCategoryContainer.js

@@ -40,7 +40,4 @@ const mapDispatchToProps = {
   purchaseOrUnpurchaseDot
 };
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(TraitCategory);
+export default connect(mapStateToProps, mapDispatchToProps)(TraitCategory);

src/reducers/attributesReducer.js

@@ -9,7 +9,10 @@ import {
 
 const isAttributes = category => category === 'attributes';
 
-export default (state = initialState.character.attributes, action) => {
+const attributesReducer = (
+  state = initialState.character.attributes,
+  action
+) => {
   let category, trait, dotsFromRank;
 
   switch (action.type) {
@@ -54,3 +57,5 @@ export default (state = initialState.character.attributes, action) => {
       return state;
   }
 };
+
+export default attributesReducer;

src/reducers/backgroundsReducer.js

@@ -9,7 +9,10 @@ import {
 
 const isBackgrounds = category => category === 'backgrounds';
 
-export default (state = initialState.character.backgrounds, action) => {
+const backgroundsReducer = (
+  state = initialState.character.backgrounds,
+  action
+) => {
   let category, trait, startingDots;
 
   switch (action.type) {
@@ -55,3 +58,5 @@ export default (state = initialState.character.backgrounds, action) => {
       return state;
   }
 };
+
+export default backgroundsReducer;

src/reducers/basicInfoReducer.js

@@ -1,7 +1,7 @@
 import initialState from './initialState';
 import * as types from '../constants/actionTypes';
 
-export default (state = initialState.character.basicInfo, action) => {
+const basicInfoReducer = (state = initialState.character.basicInfo, action) => {
   switch (action.type) {
     case types.UPDATE_ARCHETYPE:
       return { ...state, archetype: action.payload };
@@ -11,3 +11,5 @@ export default (state = initialState.character.basicInfo, action) => {
       return state;
   }
 };
+
+export default basicInfoReducer;

src/reducers/disciplinesReducer.js

@@ -37,7 +37,10 @@ const clearRitualTypeIfMagic = (trait, state) => {
   return state;
 };
 
-export default (state = initialState.character.disciplines, action) => {
+const disciplinesReducer = (
+  state = initialState.character.disciplines,
+  action
+) => {
   let category, trait, startingDots, affinity, maxDots, newState;
 
   switch (action.type) {
@@ -109,3 +112,5 @@ export default (state = initialState.character.disciplines, action) => {
       return state;
   }
 };
+
+export default disciplinesReducer;