Skip to content

Commit

Permalink
Move from @hapi/join to joi to avoid error on mixing different versio…
Browse files Browse the repository at this point in the history
…n of joi schemas (#187)

* Move from @hapi/join to joi to avoid "Cannot mix different versions of joi schemas"

* forgot to update enjoi
  • Loading branch information
alferpal authored Jan 31, 2021
1 parent cc09e61 commit dc2209e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const Package = require('../package.json');
const Joi = require('@hapi/joi');
const Joi = require('joi');
const Hoek = require('@hapi/hoek');
const Caller = require('./caller');
const Path = require('path');
Expand Down
2 changes: 1 addition & 1 deletion lib/validators.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const Enjoi = require('enjoi');
const Joi = require('@hapi/joi');
const Joi = require('joi');

const extensions = [
{ type: 'int64', base: Joi.string().regex(/^\d+$/) },
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
},
"dependencies": {
"@hapi/hoek": "^9.0.4",
"@hapi/joi": "^17.1.0",
"dot-prop": "^5.2.0",
"enjoi": "git://github.com/sprootshift/enjoi",
"enjoi": "^9.0.0",
"joi": "^17.1.0",
"js-yaml": "^3.11.0",
"merge-object-files": "^2.0.0",
"swagger-parser": "^9.0.1"
Expand All @@ -27,7 +27,7 @@
"@hapi/boom": "^9.1.0",
"@hapi/eslint-config-hapi": "^13.0.2",
"@hapi/eslint-plugin-hapi": "^4.3.5",
"@hapi/hapi": "^19.1.1",
"@hapi/hapi": "^20.0.3",
"eslint": "^6.8.0",
"nyc": "^15.0.0",
"tape": "^5.0.0"
Expand Down

0 comments on commit dc2209e

Please sign in to comment.