replace lodash.merge with merge-deep

Author: Raice Hannay

docs/WrapperWithRedux.md

@@ -4,10 +4,10 @@
 This abstract class has a `WrappingComponent` defined which wraps the component in a Redux `Provider`,
 passing in the return value from the `createStore` method.
 
-To use this class, you have to extend it and define your own `createStore` method to return an
-instance of your Redux store, using the `initialState` and `middlewares` that this class provides -
-it is important to ensure that your store uses these, because if it disregards them, none of the
-methods this class provides will function.
+To use this class, you have to extend it, pass in your store state type in the class declaration and
+define your own `createStore` method to return an instance of your Redux store, using the
+`initialState` and `middlewares` that this class provides - it is important to ensure that your
+store uses these, because if it disregards them, none of the methods this class provides will function.
 
 
 Public read-only properties
@@ -50,7 +50,7 @@ import * as React from "react";
 import { IntlConfig } from "react-intl";
 import { WrapperWithRedux as BaseWrapper } from "react-test-wrapper";
 
-import { createStore } from "../store/createStore";
+import { createStore, TStoreState } from "../store";
 
 class Wrapper<
   C extends React.ComponentType<any>,

global.d.ts

@@ -0,0 +1 @@
+declare module "merge-deep";

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": "1.0.0",
+  "version": "1.0.1",
   "keywords": [
     "component",
     "enzyme",
@@ -88,6 +88,6 @@
     "typescript-fsa-reducers": "^1.2.1"
   },
   "dependencies": {
-    "lodash.merge": "^4.6.2"
+    "merge-deep": "^3.0.2"
   }
 }

src/WrapperWithRedux.tsx

@@ -1,4 +1,4 @@
-import merge from "lodash.merge";
+import merge from "merge-deep";
 import * as React from "react";
 import { Provider } from "react-redux";
 import { AnyAction, DeepPartial, Middleware, Store } from "redux";

tsconfig.json

@@ -17,6 +17,6 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true
   },
-  "include": ["./src/index.ts"],
+  "include": ["./global.d.ts", "./src/index.ts"],
   "exclude": ["**/coverage/*", "**/dist/*", "**/node_modules/*"]
 }