Skip to content

Commit

Permalink
Update deps. Closes #185
Browse files Browse the repository at this point in the history
  • Loading branch information
hueniverse committed Aug 15, 2019
1 parent ea346d5 commit 39c5fcb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ install:
- "npm install hapi@$HAPI_VERSION"

env:
- HAPI_VERSION="17"
- HAPI_VERSION="18"

os:
Expand Down
4 changes: 2 additions & 2 deletions lib/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = class Manager {

// Clone options

const defaults = Hoek.applyToDefaultsWithShallow(internals.defaults, options, ['engines', 'context']);
const defaults = Hoek.applyToDefaults(internals.defaults, options, { shallow: ['engines', 'context'] });
delete defaults.engines;
delete defaults.defaultExtension;

Expand Down Expand Up @@ -79,7 +79,7 @@ module.exports = class Manager {
Joi.assert(config, Schemas.view);

engine.module = config.module;
engine.config = Hoek.applyToDefaultsWithShallow(defaults, config, ['module']);
engine.config = Hoek.applyToDefaults(defaults, config, { shallow: ['module'] });
}

engine.suffix = '.' + extension;
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"dependencies": {
"@hapi/boom": "7.x.x",
"@hapi/bounce": "1.x.x",
"@hapi/hoek": "6.x.x",
"@hapi/hoek": "8.x.x",
"@hapi/joi": "15.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",
"babel-core": "6.x.x",
"babel-plugin-transform-react-jsx": "6.x.x",
"coveralls": "3.x.x",
Expand Down

0 comments on commit 39c5fcb

Please sign in to comment.