Skip to content

Commit 0cab4f0

Browse files
author
Zack Story
authored
(general): bump deps, cleanup, prettierrc (#694)
* (general): bump deps, cleanup, prettierrc * more
1 parent 0db73d3 commit 0cab4f0

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

.prettierrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
parser: flow
2+
semi: false
3+
trailingComma: es5
4+
singleQuote: true

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"flow-copy": "flow-copy-source src es && flow-copy-source src lib",
1919
"precommit": "lint-staged",
2020
"prepublishOnly": "npm run clean && npm run build",
21-
"test": "BABEL_ENV=commonjs ava"
21+
"test": "flow && BABEL_ENV=commonjs ava"
2222
},
2323
"lint-staged": {
2424
"src/**/*.js": [
@@ -40,7 +40,7 @@
4040
"babel": "inherit"
4141
},
4242
"devDependencies": {
43-
"ava": "^0.19.1",
43+
"ava": "^0.25.0",
4444
"babel-cli": "^6.26.0",
4545
"babel-eslint": "^8.0.1",
4646
"babel-plugin-transform-class-properties": "^6.24.1",
@@ -51,19 +51,19 @@
5151
"babel-preset-flow": "^6.23.0",
5252
"babel-register": "^6.24.1",
5353
"cross-env": "^5.0.1",
54-
"eslint": "^4.8.0",
55-
"eslint-plugin-flowtype": "^2.30.4",
54+
"eslint": "^4.16.0",
55+
"eslint-plugin-flowtype": "^2.42.0",
5656
"eslint-plugin-import": "^2.2.0",
5757
"flow-bin": "^0.64.0",
58-
"flow-copy-source": "^1.1.0",
59-
"husky": "^0.13.3",
60-
"lint-staged": "^3.4.0",
58+
"flow-copy-source": "^1.2.2",
59+
"husky": "^0.14.3",
60+
"lint-staged": "^6.1.0",
6161
"lodash": "^4.17.4",
62-
"prettier": "^1.4.4",
62+
"prettier": "^1.10.2",
6363
"redux": "^3.6.0",
64-
"redux-mock-store": "^1.2.3",
64+
"redux-mock-store": "^1.5.1",
6565
"rimraf": "^2.6.1",
66-
"sinon": "^2.3.2",
66+
"sinon": "^4.2.2",
6767
"storage-memory": "0.0.2"
6868
},
6969
"peerDependencies": {

src/integration/getStoredStateMigrateV4.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function getStoredStateV4(v4Config: V4Config) {
152152
try {
153153
let data = serialized ? deserializer(serialized) : undefined
154154
state = transforms.reduceRight((subState, transformer) => {
155-
return transformer.out(subState, key)
155+
return transformer.out(subState, key, {})
156156
}, data)
157157
} catch (err) {
158158
if (process.env.NODE_ENV !== 'production')

src/persistCombineReducers.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ export default function persistCombineReducers(
1717
config: PersistConfig,
1818
reducers: Reducers
1919
): Reducer {
20-
config.stateReconciler = config.stateReconciler === undefined ? autoMergeLevel2 : config.stateReconciler
20+
config.stateReconciler =
21+
config.stateReconciler === undefined
22+
? autoMergeLevel2
23+
: config.stateReconciler
2124
return persistReducer(config, combineReducers(reducers))
2225
}

src/purgeStoredState.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import { KEY_PREFIX } from './constants'
66

77
export default function purgeStoredState(config: PersistConfig) {
88
const storage = config.storage
9-
const storageKey = `${config.keyPrefix !== undefined
10-
? config.keyPrefix
11-
: KEY_PREFIX}${config.key}`
9+
const storageKey = `${
10+
config.keyPrefix !== undefined ? config.keyPrefix : KEY_PREFIX
11+
}${config.key}`
1212
return storage.removeItem(storageKey, warnIfRemoveError)
1313
}
1414

0 commit comments

Comments
 (0)