Fix hapi dependencies to use new scoped @Hapi packages (#77)

* Fix hapi dependencies to use new scoped @Hapi packages * remove unintentional adding of package.json script for standard * Restore old formatting
hapijs · May 11, 2019 · fbb8367 · fbb8367
1 parent e5530ee
commit fbb8367
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/benchmarks/hapi-pino-extreme.js b/benchmarks/hapi-pino-extreme.js
@@ -2,7 +2,7 @@
 
 require('make-promises-safe')
 
-const Hapi = require('hapi')
+const Hapi = require('@hapi/hapi')
 
 async function start () {
   const server = Hapi.server({ port: 3000 })

diff --git a/benchmarks/hapi-pino-merge-hapi-log.js b/benchmarks/hapi-pino-merge-hapi-log.js
@@ -2,7 +2,7 @@
 
 require('make-promises-safe')
 
-const Hapi = require('hapi')
+const Hapi = require('@hapi/hapi')
 
 async function start () {
   const server = Hapi.server({ port: 3000 })

diff --git a/benchmarks/hapi-pino-no-merge-hapi-log.js b/benchmarks/hapi-pino-no-merge-hapi-log.js
@@ -2,7 +2,7 @@
 
 require('make-promises-safe')
 
-const Hapi = require('hapi')
+const Hapi = require('@hapi/hapi')
 
 async function start () {
   const server = Hapi.server({ port: 3000 })

diff --git a/benchmarks/hapi-pino.js b/benchmarks/hapi-pino.js
@@ -2,7 +2,7 @@
 
 require('make-promises-safe')
 
-const Hapi = require('hapi')
+const Hapi = require('@hapi/hapi')
 
 async function start () {
   const server = Hapi.server({ port: 3000 })

diff --git a/benchmarks/hapi-pure.js b/benchmarks/hapi-pure.js
@@ -2,7 +2,7 @@
 
 require('make-promises-safe')
 
-const Hapi = require('hapi')
+const Hapi = require('@hapi/hapi')
 
 async function start () {
   const server = Hapi.server({ port: 3000 })

diff --git a/example.js b/example.js
@@ -2,7 +2,7 @@
 
 require('make-promises-safe')
 
-const Hapi = require('hapi')
+const Hapi = require('@hapi/hapi')
 
 async function start () {
   // Create a server with a host and port

diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Hoek = require('hoek')
+const Hoek = require('@hapi/hoek')
 const pino = require('pino')
 const { stdSerializers } = pino
 const { serializersSym } = pino.symbols

diff --git a/package.json b/package.json
@@ -18,19 +18,19 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "code": "^5.2.4",
+    "@hapi/code": "^5.3.0",
     "coveralls": "^3.0.2",
     "flush-write-stream": "^1.0.3",
-    "hapi": "^18.0.0",
-    "lab": "^18.0.0",
+    "@hapi/hapi": "^18.2.0",
+    "@hapi/lab": "^18.1.0",
     "make-promises-safe": "^4.0.0",
     "pre-commit": "^1.1.2",
     "split2": "^3.0.0",
     "standard": "^12.0.0"
   },
   "dependencies": {
     "abstract-logging": "^1.0.0",
-    "hoek": "^6.1.2",
+    "@hapi/hoek": "^6.2.0",
     "pino": "^5.12.3",
     "pino-pretty": "^2.5.0"
   },

diff --git a/test.js b/test.js
@@ -1,8 +1,8 @@
 'use strict'
 
-const Code = require('code')
-const Lab = require('lab')
-const Hoek = require('hoek')
+const Code = require('@hapi/code')
+const Lab = require('@hapi/lab')
+const Hoek = require('@hapi/hoek')
 const split = require('split2')
 const writeStream = require('flush-write-stream')
 const promisify = require('util').promisify
@@ -17,7 +17,7 @@ const after = lab.after
 const afterEach = lab.afterEach
 const expect = Code.expect
 
-const Hapi = require('hapi')
+const Hapi = require('@hapi/hapi')
 const Pino = require('.')
 
 function getServer () {