Update deps: hoek, code, lab. Closes #14

hapipal · Oct 29, 2019 · 2cc96fb · 2cc96fb
1 parent 5d8c889
commit 2cc96fb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 node_js:
   - "8"
   - "10"
-  - "11"
+  - "12"
   - "node"
 
 after_script: "npm run coveralls"
diff --git a/API.md b/API.md
@@ -141,7 +141,7 @@ server.ext([
             request.log(['my-plugin'], 'Someone knew a secret');
         }
 
-        return h.continue;        
+        return h.continue;
     }, {
         sandbox: 'plugin'
     })

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2018 Devin Ivy
+Copyright (c) 2017-2019 Devin Ivy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ Toys is a collection of utilities made to reduce common boilerplate in **hapi v1
 Below is an example featuring [`Toys.auth.strategy()`](API.md#toysauthstrategyserver-name-authenticate), [`Toys.reacher()`](API.md#toysreacherchain-options), and [`Toys.withRouteDefaults()`](API.md#toyswithroutedefaultsdefaults).  The [API Reference](API.md) is also filled with examples.
 
 ```js
-const Hapi = require('hapi');
-const Boom = require('boom');
+const Hapi = require('@hapi/hapi');
+const Boom = require('@hapi/boom');
 const Toys = require('toys');
 
 (async () => {

diff --git a/lib/index.js b/lib/index.js
@@ -230,7 +230,7 @@ module.exports = class Toys {
 
             return ref;
         };
-    };
+    }
 
     reacher(chain, options) {
 
@@ -457,20 +457,22 @@ internals.isRealm = (obj) => obj && obj.hasOwnProperty('pluginOptions') && obj.h
 
 internals.applyRouteDefaults = (defaults, options) => {
 
-    return Hoek.applyToDefaultsWithShallow(defaults, options, [
-        'options.bind',
-        'config.bind',
-        'options.validate.headers',
-        'config.validate.headers',
-        'options.validate.payload',
-        'config.validate.payload',
-        'options.validate.params',
-        'config.validate.params',
-        'options.validate.query',
-        'config.validate.query',
-        'options.response.schema',
-        'config.response.schema'
-    ]);
+    return Hoek.applyToDefaults(defaults, options, {
+        shallow: [
+            'options.bind',
+            'config.bind',
+            'options.validate.headers',
+            'config.validate.headers',
+            'options.validate.payload',
+            'config.validate.payload',
+            'options.validate.params',
+            'config.validate.params',
+            'options.validate.query',
+            'config.validate.query',
+            'options.response.schema',
+            'config.response.schema'
+        ]
+    });
 };
 
 internals.state = (realm, name) => {

diff --git a/package.json b/package.json
@@ -28,12 +28,12 @@
   },
   "homepage": "https://github.com/hapipal/toys#readme",
   "dependencies": {
-    "@hapi/hoek": "6.x.x"
+    "@hapi/hoek": "8.x.x"
   },
   "devDependencies": {
-    "@hapi/code": "5.x.x",
+    "@hapi/code": "6.x.x",
     "@hapi/hapi": "18.x.x",
-    "@hapi/lab": "18.x.x",
+    "@hapi/lab": "20.x.x",
     "coveralls": "3.x.x"
   }
 }