diff --git a/package.json b/package.json index eb848b81aa..b892e1662a 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "./src/core/runtime/repo-nodejs.js": "./src/core/runtime/repo-browser.js", "./src/core/runtime/ipld-nodejs.js": "./src/core/runtime/ipld-browser.js", "./test/utils/create-repo-nodejs.js": "./test/utils/create-repo-browser.js", - "stream": "readable-stream", - "joi": "joi-browser" + "stream": "readable-stream" }, "browser-all-ipld-formats": { "./src/core/runtime/ipld-browser.js": "./src/core/runtime/ipld-browser-all.js" @@ -83,6 +82,8 @@ "stream-to-promise": "^2.2.0" }, "dependencies": { + "@hapi/hapi": "^18.3.1", + "@hapi/joi": "^15.0.1", "async": "^2.6.1", "bignumber.js": "^8.0.2", "binary-querystring": "~0.1.2", @@ -103,8 +104,7 @@ "fsm-event": "^2.1.0", "get-folder-size": "^2.0.0", "glob": "^7.1.3", - "hapi": "^18.0.0", - "hapi-pino": "^5.2.0", + "hapi-pino": "^5.4.1", "human-to-milliseconds": "^1.0.0", "interface-datastore": "~0.6.0", "ipfs-bitswap": "~0.23.0", @@ -131,7 +131,6 @@ "is-pull-stream": "~0.0.0", "is-stream": "^1.1.0", "iso-url": "~0.4.6", - "joi": "^14.3.0", "just-flatten-it": "^2.1.0", "just-safe-set": "^2.1.0", "libp2p": "~0.25.0", diff --git a/src/http/api/resources/bitswap.js b/src/http/api/resources/bitswap.js index 8dcc13c51b..3b853f6d99 100644 --- a/src/http/api/resources/bitswap.js +++ b/src/http/api/resources/bitswap.js @@ -1,6 +1,6 @@ 'use strict' -const Joi = require('joi') +const Joi = require('@hapi/joi') const multibase = require('multibase') const { cidToString } = require('../../../utils/cid') const { parseKey } = require('./block') diff --git a/src/http/api/resources/block.js b/src/http/api/resources/block.js index 5666a31ca5..47ec98394f 100644 --- a/src/http/api/resources/block.js +++ b/src/http/api/resources/block.js @@ -2,7 +2,7 @@ const CID = require('cids') const multipart = require('ipfs-multipart') -const Joi = require('joi') +const Joi = require('@hapi/joi') const multibase = require('multibase') const Boom = require('boom') const { cidToString } = require('../../../utils/cid') diff --git a/src/http/api/resources/dag.js b/src/http/api/resources/dag.js index 325588f646..eaed94bdda 100644 --- a/src/http/api/resources/dag.js +++ b/src/http/api/resources/dag.js @@ -4,7 +4,7 @@ const promisify = require('promisify-es6') const CID = require('cids') const multipart = require('ipfs-multipart') const mh = require('multihashes') -const Joi = require('joi') +const Joi = require('@hapi/joi') const multibase = require('multibase') const Boom = require('boom') const debug = require('debug') diff --git a/src/http/api/resources/dht.js b/src/http/api/resources/dht.js index 8e1aecba18..bd9ae36429 100644 --- a/src/http/api/resources/dht.js +++ b/src/http/api/resources/dht.js @@ -1,6 +1,6 @@ 'use strict' -const Joi = require('joi') +const Joi = require('@hapi/joi') const Boom = require('boom') const CID = require('cids') diff --git a/src/http/api/resources/files-regular.js b/src/http/api/resources/files-regular.js index 8e0c76e2c4..1eb7da61d5 100644 --- a/src/http/api/resources/files-regular.js +++ b/src/http/api/resources/files-regular.js @@ -10,7 +10,7 @@ const toPull = require('stream-to-pull-stream') const pushable = require('pull-pushable') const toStream = require('pull-stream-to-stream') const abortable = require('pull-abortable') -const Joi = require('joi') +const Joi = require('@hapi/joi') const Boom = require('boom') const ndjson = require('pull-ndjson') const { PassThrough } = require('readable-stream') diff --git a/src/http/api/resources/name.js b/src/http/api/resources/name.js index 9a4182f42e..7c8206444c 100644 --- a/src/http/api/resources/name.js +++ b/src/http/api/resources/name.js @@ -1,6 +1,6 @@ 'use strict' -const Joi = require('joi') +const Joi = require('@hapi/joi') exports.resolve = { validate: { diff --git a/src/http/api/resources/object.js b/src/http/api/resources/object.js index b3f6162d4b..6480141510 100644 --- a/src/http/api/resources/object.js +++ b/src/http/api/resources/object.js @@ -8,7 +8,7 @@ const { DAGNode, DAGLink } = dagPB const calculateCid = promisify(dagPB.util.cid) const deserialize = promisify(dagPB.util.deserialize) const createDagNode = promisify(DAGNode.create) -const Joi = require('joi') +const Joi = require('@hapi/joi') const multibase = require('multibase') const Boom = require('boom') const { cidToString } = require('../../../utils/cid') diff --git a/src/http/api/resources/pin.js b/src/http/api/resources/pin.js index 63ab61bf72..f0fe4ec736 100644 --- a/src/http/api/resources/pin.js +++ b/src/http/api/resources/pin.js @@ -1,7 +1,7 @@ 'use strict' const multibase = require('multibase') -const Joi = require('joi') +const Joi = require('@hapi/joi') const Boom = require('boom') const isIpfs = require('is-ipfs') const { cidToString } = require('../../../utils/cid') diff --git a/src/http/api/resources/ping.js b/src/http/api/resources/ping.js index 01e8bc3bbc..dea0af86dd 100644 --- a/src/http/api/resources/ping.js +++ b/src/http/api/resources/ping.js @@ -1,6 +1,6 @@ 'use strict' -const Joi = require('joi') +const Joi = require('@hapi/joi') const pull = require('pull-stream') const ndjson = require('pull-ndjson') const { PassThrough } = require('readable-stream') diff --git a/src/http/api/resources/resolve.js b/src/http/api/resources/resolve.js index 8984f2c1b5..e55455cd9b 100644 --- a/src/http/api/resources/resolve.js +++ b/src/http/api/resources/resolve.js @@ -1,6 +1,6 @@ 'use strict' -const Joi = require('joi') +const Joi = require('@hapi/joi') const debug = require('debug') const multibase = require('multibase') diff --git a/src/http/index.js b/src/http/index.js index b46448ef8a..38a9982e67 100644 --- a/src/http/index.js +++ b/src/http/index.js @@ -1,6 +1,6 @@ 'use strict' -const Hapi = require('hapi') +const Hapi = require('@hapi/hapi') const Pino = require('hapi-pino') const debug = require('debug') const multiaddr = require('multiaddr')