update dependencies

Author: Raice Hannay

Diff for: jest.config.js

@@ -6,15 +6,15 @@ module.exports = {
       branches: 100,
       functions: 100,
       lines: 100,
-      statements: 100
-    }
+      statements: 100,
+    },
   },
   globals: {
     "ts-jest": {
       tsConfig: {
-        target: "es6"
-      }
-    }
+        target: "es6",
+      },
+    },
   },
   moduleDirectories: ["node_modules"],
   preset: "ts-jest",
@@ -25,7 +25,7 @@ module.exports = {
   testMatch: ["**/*.test.{ts,tsx}"],
   testURL: "http://localhost",
   transformIgnorePatterns: [
-    "/node_modules/(?!intl-messageformat|intl-messageformat-parser).+\\.js$"
+    "/node_modules/(?!intl-messageformat|intl-messageformat-parser).+\\.js$",
   ],
-  verbose: true
+  verbose: true,
 };

Diff for: package.json

@@ -3,7 +3,7 @@
   "author": "Raice Hannay <[email protected]>",
   "description": "A set of classes to make setting up React components for unit tests easy.",
   "license": "ISC",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "keywords": [
     "component",
     "enzyme",
@@ -62,38 +62,38 @@
     }
   },
   "devDependencies": {
-    "@types/enzyme": "^3.10.3",
-    "@types/enzyme-adapter-react-16": "^1.0.5",
-    "@types/jest": "^24.0.23",
-    "@types/react": "^16.9.15",
-    "@types/react-redux": "^7.1.5",
-    "@typescript-eslint/eslint-plugin": "^2.22.0",
-    "cross-env": "^6.0.3",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.15.1",
-    "enzyme-to-json": "^3.4.3",
+    "@types/enzyme": "^3.10.5",
+    "@types/enzyme-adapter-react-16": "^1.0.6",
+    "@types/jest": "^25.1.4",
+    "@types/react": "^16.9.31",
+    "@types/react-redux": "^7.1.7",
+    "@typescript-eslint/eslint-plugin": "^2.26.0",
+    "cross-env": "^7.0.2",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.2",
+    "enzyme-to-json": "^3.4.4",
     "eslint": "^6.8.0",
-    "eslint-config-voodoocreation": "^1.0.8",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jest": "^23.8.1",
+    "eslint-config-voodoocreation": "^1.1.1",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-jest": "^23.8.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-prefer-arrow": "^1.1.7",
-    "eslint-plugin-react": "^7.18.3",
-    "eslint-plugin-react-hooks": "^2.5.0",
-    "jest": "^24.9.0",
+    "eslint-plugin-react": "^7.19.0",
+    "eslint-plugin-react-hooks": "^3.0.0",
+    "jest": "^25.2.4",
     "npm-run-all": "^4.1.5",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "react-intl": "^3.9.1",
-    "react-redux": "^7.1.3",
-    "redux": "^4.0.4",
-    "ts-jest": "^24.2.0",
-    "typescript": "^3.7.3",
+    "prettier": "^2.0.2",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-intl": "^4.3.1",
+    "react-redux": "^7.2.0",
+    "redux": "^4.0.5",
+    "ts-jest": "^25.3.0",
+    "typescript": "^3.8.3",
     "typescript-fsa": "^3.0.0",
     "typescript-fsa-reducers": "^1.2.1"
   },
   "dependencies": {
-    "ts-deepmerge": "^1.0.4"
+    "ts-deepmerge": "^1.0.5"
   }
 }

Diff for: src/Wrapper.test.tsx

@@ -7,7 +7,7 @@ import Wrapper from "./Wrapper";
 describe("Wrapper", () => {
   describe("when using the different render methods", () => {
     const component = new Wrapper(Dummy).withDefaultProps({
-      value: "Default value"
+      value: "Default value",
     });
 
     describe("when using 'shallow'", () => {
@@ -93,7 +93,7 @@ describe("Wrapper", () => {
 
   describe("when using the props API", () => {
     const component = new Wrapper(Dummy).withDefaultProps({
-      value: "Default value"
+      value: "Default value",
     });
 
     it("renders with default props correctly", () => {
@@ -106,7 +106,7 @@ describe("Wrapper", () => {
     it("renders with test-specific props correctly", () => {
       const wrapper = component
         .withProps({
-          value: "Test value"
+          value: "Test value",
         })
         .render();
 

Diff for: src/Wrapper.tsx

@@ -54,7 +54,7 @@ export default class Wrapper<
 
     const props = this.defineProps() as P;
     const wrapper = mount<P>(<this.Component {...props} />, {
-      wrappingComponent: this.WrappingComponent
+      wrappingComponent: this.WrappingComponent,
     });
 
     this.reset();
@@ -108,7 +108,7 @@ export default class Wrapper<
     this.mergedProps = {
       ...this.defaultProps,
       ...this.scenarioProps,
-      children: this.scenarioChildren || this.defaultChildren
+      children: this.scenarioChildren || this.defaultChildren,
     };
 
     return this.mergedProps;

Diff for: src/WrapperWithIntl.test.tsx

@@ -3,19 +3,16 @@ import Wrapper, { messages } from "../test/TestWrapperWithIntl";
 
 describe("WrapperWithIntl", () => {
   const component = new Wrapper(IntlDummy).withDefaultProps({
-    value: "Default value"
+    value: "Default value",
   });
 
   describe("when using the 'shallow' method", () => {
     const wrapper = component.shallow();
 
     it("renders the correct BUTTON message", () => {
-      expect(
-        wrapper
-          .render()
-          .find(".Dummy--button")
-          .text()
-      ).toBe(messages.BUTTON);
+      expect(wrapper.render().find(".Dummy--button").text()).toBe(
+        messages.BUTTON
+      );
     });
   });
 

Diff for: src/WrapperWithIntl.tsx

@@ -14,7 +14,7 @@ export default abstract class WrapperWithIntl<
       defaultLocale: "en",
       locale: navigator.language,
       messages: {},
-      ...this.intlProviderProps
+      ...this.intlProviderProps,
     };
   }
 

Diff for: src/WrapperWithRedux.test.tsx

@@ -6,8 +6,8 @@ import Wrapper from "../test/TestWrapperWithRedux";
 
 const initialState = {
   test: {
-    value: "Default value"
-  }
+    value: "Default value",
+  },
 };
 
 const component = new Wrapper(ConnectedDummy).withDefaultReduxState(
@@ -56,8 +56,8 @@ describe("WrapperWithRedux", () => {
       const wrapper = component
         .withReduxState({
           test: {
-            value: "Test value"
-          }
+            value: "Test value",
+          },
         })
         .mount();
 
@@ -173,8 +173,8 @@ describe("WrapperWithRedux", () => {
     it("updates the store", () => {
       expect(wrapper.store.getState()).toEqual({
         test: {
-          value: payload
-        }
+          value: payload,
+        },
       });
     });
 

Diff for: src/WrapperWithRedux.tsx

@@ -53,7 +53,7 @@ export default abstract class WrapperWithRedux<
     const wrapper: TWrapperWithStore<P, S> = mount<P>(
       <this.Component {...props} />,
       {
-        wrappingComponent: this.WrappingComponent
+        wrappingComponent: this.WrappingComponent,
       }
     );
 
@@ -88,11 +88,11 @@ export default abstract class WrapperWithRedux<
 
   protected beforeMount = () => {
     this.reduxStore = this.createStore(this.mergedReduxState, [
-      this.reduxHistoryMiddleware
+      this.reduxHistoryMiddleware,
     ]);
   };
 
-  protected reduxHistoryMiddleware: Middleware = () => next => action => {
+  protected reduxHistoryMiddleware: Middleware = () => (next) => (action) => {
     this.dispatchedActions.push(action);
     return next(action);
   };

Diff for: test/Dummy.tsx

@@ -31,7 +31,7 @@ export class Dummy extends React.Component<IProps> {
 
 export const ConnectedDummy = connect(
   (state: TStoreState) => ({
-    value: state.test.value
+    value: state.test.value,
   }),
   actions
 )(Dummy);

Diff for: test/IntlDummy.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import {
   FormattedMessage,
   injectIntl,
-  WrappedComponentProps
+  WrappedComponentProps,
 } from "react-intl";
 import { connect } from "react-redux";
 
@@ -39,7 +39,7 @@ export const IntlDummy = injectIntl(Dummy);
 export const ConnectedDummy = injectIntl(
   connect(
     (state: TStoreState) => ({
-      value: state.test.value
+      value: state.test.value,
     }),
     actions
   )(Dummy)

Diff for: test/TestWrapperWithIntl.tsx

@@ -4,14 +4,14 @@ import { IntlConfig } from "react-intl";
 import WrapperWithIntl from "../src/WrapperWithIntl";
 
 export const messages = {
-  BUTTON: "Button"
+  BUTTON: "Button",
 };
 
 export default class TestWrapperWithIntl<
   C extends React.ComponentType<any>,
   P extends React.ComponentProps<C> = React.ComponentProps<C>
 > extends WrapperWithIntl<C, P> {
   protected intlProviderProps: Partial<IntlConfig> = {
-    messages
+    messages,
   };
 }

Diff for: test/reducer.ts

@@ -8,21 +8,21 @@ export interface ITestState {
 }
 
 const testInitialState: ITestState = {
-  value: ""
+  value: "",
 };
 
 const testReducer = reducerWithInitialState(testInitialState).case(
   actions.setValue,
   (state, payload) => ({
     ...state,
-    value: payload
+    value: payload,
   })
 );
 
 export const initialState = {
-  test: testInitialState
+  test: testInitialState,
 };
 
 export default combineReducers({
-  test: testReducer
+  test: testReducer,
 });

Diff for: test/store.ts

@@ -3,8 +3,9 @@ import {
   compose,
   createStore as reduxStore,
   DeepPartial,
-  Middleware
+  Middleware,
 } from "redux";
+import merge from "ts-deepmerge";
 
 import rootReducer, { initialState as rootInitialState } from "./reducer";
 
@@ -16,6 +17,6 @@ export const createStore = (
 ) =>
   reduxStore(
     rootReducer,
-    initialState,
+    merge(rootInitialState, initialState),
     compose(applyMiddleware(...middlewares))
   );