Merge remote-tracking branch 'origin/develop' into cucumber-js

Author: roschaefer

package.json

@@ -71,9 +71,9 @@
     "dauria": "~2.0.0",
     "email-templates": "2.6.0",
     "feathers-authentication-hooks": "~0.3.0",
-    "feathers-authentication-management": "~2.0.0",
+    "feathers-authentication-management": "~2.0.1",
     "feathers-blob": "~2.0.1",
-    "feathers-hooks-common": "~4.14.0",
+    "feathers-hooks-common": "~4.14.3",
     "feathers-logger": "0.3.2",
     "feathers-mailer": "~2.0.0",
     "feathers-memory": "~2.1.3",
@@ -116,7 +116,7 @@
     "istanbul": "1.1.0-alpha.1",
     "mocha": "~5.2.0",
     "node-fetch": "^2.1.2",
-    "nodemon": "~1.17.4",
+    "nodemon": "~1.18.0",
     "nyc": "^12.0.2",
     "wait-on": "~2.1.0"
   }

yarn.lock

@@ -324,7 +324,7 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0, ajv@^5.2.0, ajv@^5.2.3, ajv@^5.3.0, ajv@^5.5.2:
+ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0, ajv@^5.5.2:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -2104,15 +2104,15 @@ feathers-authentication-hooks@~0.3.0:
     debug "^3.1.0"
     lodash "^4.17.5"
 
-feathers-authentication-management@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/feathers-authentication-management/-/feathers-authentication-management-2.0.0.tgz#069d7b817e79b2e5ecb271196ac29b93914073c7"
+feathers-authentication-management@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/feathers-authentication-management/-/feathers-authentication-management-2.0.1.tgz#502c1d544329d57b1934dfe2639d394c694ae2a7"
   dependencies:
     "@feathersjs/authentication-local" "^1.0.4"
     "@feathersjs/errors" "^3.2.1"
     bcryptjs "^2.3.0"
     debug "^3.0.0"
-    feathers-hooks-common "^3.0.0"
+    feathers-hooks-common "^4.14.1"
 
 feathers-blob@~2.0.1:
   version "2.0.1"
@@ -2144,19 +2144,9 @@ feathers-hooks-common@^2.0.3:
     feathers-errors "^2.4.0"
     traverse "0.6.6"
 
-feathers-hooks-common@^3.0.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/feathers-hooks-common/-/feathers-hooks-common-3.10.0.tgz#2ae7dc54091ffa4609df8479c0bfa29dcd31d1a7"
-  dependencies:
-    ajv "^5.2.0"
-    debug "^3.0.0"
-    feathers-errors "^2.4.0"
-    feathers-hooks "^2.0.1"
-    traverse "^0.6.6"
-
-feathers-hooks-common@~4.14.0:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/feathers-hooks-common/-/feathers-hooks-common-4.14.1.tgz#d7b085a0d053b11a910b257d91d9390783564922"
+feathers-hooks-common@^4.14.1, feathers-hooks-common@~4.14.3:
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/feathers-hooks-common/-/feathers-hooks-common-4.14.3.tgz#e00793eed1a3f0a79a61fdf91918072a034c20fa"
   dependencies:
     "@feathers-plus/batch-loader" "^0.3.0"
     "@feathersjs/commons" "^1.4.0"
@@ -2175,13 +2165,6 @@ feathers-hooks@^1.5.0:
     feathers-hooks-common "^2.0.3"
     uberproto "^1.2.0"
 
-feathers-hooks@^2.0.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/feathers-hooks/-/feathers-hooks-2.1.2.tgz#f97af10f38621df816d754766c5c2e180b7df951"
-  dependencies:
-    feathers-commons "^0.8.6"
-    uberproto "^1.2.0"
-
 [email protected]:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/feathers-logger/-/feathers-logger-0.3.2.tgz#9b47f14b21e902ab0c18e70700f18268bbf13892"
@@ -4104,9 +4087,9 @@ nodemailer@^4.0.0:
   version "4.6.7"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-4.6.7.tgz#b68de7f36d65618bdeeeb76234e3547d51266373"
 
-nodemon@~1.17.4:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.17.5.tgz#e6a665c872fdf09d48bf2a81f3e85f8cfb39322a"
+nodemon@~1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.0.tgz#44b75d5f19065c47a262d4ab21990da3b6f8feae"
   dependencies:
     chokidar "^2.0.2"
     debug "^3.1.0"