Merge branch 'master' into greenkeeper/babel-eslint-8.0.0

Author: iansinnott

index.js

@@ -1,8 +1,8 @@
 /* eslint-disable vars-on-top, no-var, prefer-template */
-var isRegExp = require('lodash.isregexp');
-var escapeRegExp = require('lodash.escaperegexp');
-var isString = require('lodash.isstring');
-var flatten = require('lodash.flatten');
+var isRegExp = require('lodash/isRegExp');
+var escapeRegExp = require('lodash/escapeRegExp');
+var isString = require('lodash/isString');
+var flatten = require('lodash/flatten');
 
 /**
  * Given a string, replace every substring that is matched by the `match` regex

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-string-replace",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "String#replace for React components",
   "license": "MIT",
   "main": "index.js",
@@ -31,14 +31,11 @@
     "replace"
   ],
   "dependencies": {
-    "lodash.escaperegexp": "^4.1.1",
-    "lodash.flatten": "^4.2.0",
-    "lodash.isregexp": "^4.0.1",
-    "lodash.isstring": "^4.0.1"
+    "lodash": "^4.17.4"
   },
   "devDependencies": {
-    "ava": "^0.20.0",
     "babel-eslint": "^8.0.0",
+    "ava": "^0.23.0",
     "eslint": "^3.10.2",
     "eslint-config-iansinnott": "^1.0.1",
     "eslint-config-zen": "^3.0.0",