chore: update hapi (#2015)

Resolves #2008 for this module but a couple of dependencies are still using the old version and need to be upgraded. I've opened issues:

* libp2p/js-libp2p-webrtc-star#172
* ipfs/js-ipfsd-ctl#331

License: MIT
Signed-off-by: Alan Shaw <[email protected]>

Author: Alan Shaw

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",

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')

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')

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')

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')

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')

src/http/api/resources/name.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Joi = require('joi')
+const Joi = require('@hapi/joi')
 
 exports.resolve = {
   validate: {

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')

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')

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')

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')
 

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')