Merge branch 'master' into greenkeeper/react-router-fetch-2.0.0

package.json

@@ -64,8 +64,8 @@
     "hapi": "^16.0.1",
     "react": "^15.3.0",
     "react-dom": "^15.3.0",
-    "react-router": "^3.0.0",
     "react-router-fetch": "^2.0.0",
+    "react-router": "^4.0.0",
     "react-redux": "^5.0.1",
     "redux": "^3.6.0"
   },
@@ -81,9 +81,9 @@
     "babel-runtime": "^6.11.6",
     "boom": "^4.2.0",
     "coveralls": "^2.11.15",
-    "cross-env": "^3.1.3",
+    "cross-env": "^4.0.0",
     "hapi": "^16.0.1",
-    "jest": "^18.0.0",
+    "jest": "^19.0.0",
     "nodemon": "^1.9.0",
     "npm-run-all": "^4.0.1",
     "onchange": "^3.2.0",
@@ -97,6 +97,6 @@
     "rimraf": "^2.5.4",
     "snazzy": "^5.0.0",
     "source-map-support": "^0.4.0",
-    "standard": "^8.6.0"
+    "standard": "^9.0.2"
   }
 }

src/plugin/index.js

@@ -66,7 +66,7 @@ function hapiReactReduxPlugin (server, options, next) {
           })
       } else {
       // no errors, no redirect, we just didn't match anything
-        this.response(Boom.notFound(`Unable to find maching route for ${this.request.raw.req.url}`))
+        this.response(Boom.notFound(`Unable to find matching route for ${this.request.raw.req.url}`))
       }
     })
   })