Merge remote-tracking branch 'acdlite/master'

redux-utilities · Jan 23, 2017 · 3df9bea · 3df9bea
2 parents 5216925 + 00c2b9b
commit 3df9bea
Show file tree

Hide file tree

Showing 5 changed files with 296 additions and 258 deletions.
diff --git a/.eslintrc → .eslintrc.js b/.eslintrc → .eslintrc.js
@@ -1,4 +1,4 @@
-{
+module.exports = {
   "extends": "eslint-config-airbnb-base",
   "env": {
     "mocha": true,
@@ -12,4 +12,4 @@
     "no-unused-expressions": 0,
     "import/no-extraneous-dependencies": ["error", {"devDependencies": ["!test/**/*.js"]}]
   }
-}
+};
diff --git a/.travis.yml b/.travis.yml
@@ -4,5 +4,7 @@ node_js:
   - "stable"
   - 6
   - 4
+
+cache: yarn
 
 after_success: "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls"
diff --git a/README.md b/README.md
@@ -54,11 +54,11 @@ An action MUST
 
 An action MAY
 
-- have a `error` property.
+- have an `error` property.
 - have a `payload` property.
 - have a `meta` property.
 
-An action MUST NOT include properties other than `type`, `payload`, and `error`, and `meta`.
+An action MUST NOT include properties other than `type`, `payload`, `error`, and `meta`.
 
 ### `type`
 

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "coveralls": "^2.11.15",
     "cross-env": "^3.1.3",
     "eslint": "^3.10.2",
-    "eslint-config-airbnb-base": "^10.0.1",
+    "eslint-config-airbnb-base": "^11.0.1",
     "eslint-plugin-import": "^2.2.0",
     "mocha": "^3.1.2",
     "nyc": "^10.0.0",