Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hapi dependencies to use new scoped @hapi packages #77

Merged
merged 4 commits into from
May 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/hapi-pino-extreme.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/hapi-pino-merge-hapi-log.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/hapi-pino-no-merge-hapi-log.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/hapi-pino.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/hapi-pure.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down
2 changes: 1 addition & 1 deletion example.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
8 changes: 4 additions & 4 deletions test.js
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 () {
Expand Down