From 31febc5d08d8cea6c4f7c34d3e794a9812b0b2d3 Mon Sep 17 00:00:00 2001
From: rt2zz <zack@root-two.com>
Date: Wed, 31 Jan 2018 23:52:35 -0800
Subject: [PATCH 1/2] (general): bump deps, cleanup, prettierrc

---
 .prettierrc                                |  4 ++++
 package.json                               | 18 +++++++++---------
 src/integration/getStoredStateMigrateV4.js |  2 +-
 src/persistCombineReducers.js              |  5 ++++-
 src/purgeStoredState.js                    |  6 +++---
 5 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 .prettierrc

diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..34af19f42
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+parser: flow
+semi: false
+trailingComma: es5
+singleQuote: true
diff --git a/package.json b/package.json
index 672df34e3..41aed9f70 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "flow-copy": "flow-copy-source src es && flow-copy-source src lib",
     "precommit": "lint-staged",
     "prepublishOnly": "npm run clean && npm run build",
-    "test": "BABEL_ENV=commonjs ava"
+    "test": "flow && BABEL_ENV=commonjs ava"
   },
   "lint-staged": {
     "src/**/*.js": [
@@ -40,7 +40,7 @@
     "babel": "inherit"
   },
   "devDependencies": {
-    "ava": "^0.19.1",
+    "ava": "^0.25.0",
     "babel-cli": "^6.26.0",
     "babel-eslint": "^8.0.1",
     "babel-plugin-transform-class-properties": "^6.24.1",
@@ -51,19 +51,19 @@
     "babel-preset-flow": "^6.23.0",
     "babel-register": "^6.24.1",
     "cross-env": "^5.0.1",
-    "eslint": "^4.8.0",
-    "eslint-plugin-flowtype": "^2.30.4",
+    "eslint": "^4.16.0",
+    "eslint-plugin-flowtype": "^2.42.0",
     "eslint-plugin-import": "^2.2.0",
     "flow-bin": "^0.64.0",
-    "flow-copy-source": "^1.1.0",
-    "husky": "^0.13.3",
-    "lint-staged": "^3.4.0",
+    "flow-copy-source": "^1.2.2",
+    "husky": "^0.14.3",
+    "lint-staged": "^6.1.0",
     "lodash": "^4.17.4",
     "prettier": "^1.4.4",
     "redux": "^3.6.0",
-    "redux-mock-store": "^1.2.3",
+    "redux-mock-store": "^1.5.1",
     "rimraf": "^2.6.1",
-    "sinon": "^2.3.2",
+    "sinon": "^4.2.2",
     "storage-memory": "0.0.2"
   },
   "peerDependencies": {
diff --git a/src/integration/getStoredStateMigrateV4.js b/src/integration/getStoredStateMigrateV4.js
index 03ea063df..4f09b3dd7 100644
--- a/src/integration/getStoredStateMigrateV4.js
+++ b/src/integration/getStoredStateMigrateV4.js
@@ -152,7 +152,7 @@ function getStoredStateV4(v4Config: V4Config) {
       try {
         let data = serialized ? deserializer(serialized) : undefined
         state = transforms.reduceRight((subState, transformer) => {
-          return transformer.out(subState, key)
+          return transformer.out(subState, key, {})
         }, data)
       } catch (err) {
         if (process.env.NODE_ENV !== 'production')
diff --git a/src/persistCombineReducers.js b/src/persistCombineReducers.js
index 3db95eaab..a4b8cc5da 100644
--- a/src/persistCombineReducers.js
+++ b/src/persistCombineReducers.js
@@ -17,6 +17,9 @@ export default function persistCombineReducers(
   config: PersistConfig,
   reducers: Reducers
 ): Reducer {
-  config.stateReconciler = config.stateReconciler === undefined ? autoMergeLevel2 : config.stateReconciler
+  config.stateReconciler =
+    config.stateReconciler === undefined
+      ? autoMergeLevel2
+      : config.stateReconciler
   return persistReducer(config, combineReducers(reducers))
 }
diff --git a/src/purgeStoredState.js b/src/purgeStoredState.js
index c780f88d0..e6619a893 100644
--- a/src/purgeStoredState.js
+++ b/src/purgeStoredState.js
@@ -6,9 +6,9 @@ import { KEY_PREFIX } from './constants'
 
 export default function purgeStoredState(config: PersistConfig) {
   const storage = config.storage
-  const storageKey = `${config.keyPrefix !== undefined
-    ? config.keyPrefix
-    : KEY_PREFIX}${config.key}`
+  const storageKey = `${
+    config.keyPrefix !== undefined ? config.keyPrefix : KEY_PREFIX
+  }${config.key}`
   return storage.removeItem(storageKey, warnIfRemoveError)
 }
 

From 01d9f754c12bf4f58d385247d70c1177eb65b63e Mon Sep 17 00:00:00 2001
From: rt2zz <zack@root-two.com>
Date: Wed, 31 Jan 2018 23:53:24 -0800
Subject: [PATCH 2/2] more

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 41aed9f70..d1845f4ae 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "husky": "^0.14.3",
     "lint-staged": "^6.1.0",
     "lodash": "^4.17.4",
-    "prettier": "^1.4.4",
+    "prettier": "^1.10.2",
     "redux": "^3.6.0",
     "redux-mock-store": "^1.5.1",
     "rimraf": "^2.6.1",