From 4829e46ba893100c0e6229ef5fa0f685b1f060f2 Mon Sep 17 00:00:00 2001 From: Zack McCartney Date: Thu, 16 May 2019 18:07:54 -0400 Subject: [PATCH 1/2] Update deps, including new hapi scope --- .eslintrc.json | 4 ++-- package.json | 29 +++++++++++++++-------------- server/index.js | 2 +- server/plugins/swagger.js | 4 ++-- test/index.js | 4 ++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 9224c5b..01dbe63 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,6 @@ { - "extends": "eslint-config-hapi", + "extends": "@hapi/eslint-config-hapi", "parserOptions": { - "ecmaVersion": 9 + "ecmaVersion": 2019 } } diff --git a/package.json b/package.json index 63cad39..8270660 100644 --- a/package.json +++ b/package.json @@ -4,28 +4,29 @@ "main": "lib/index.js", "scripts": { "start": "node server", - "test": "lab -a code -I 'core,__core-js_shared__' -L", + "test": "lab -a @hapi/code -I 'core,__core-js_shared__' -L", "lint": "eslint ." }, "dependencies": { - "boom": "7.x.x", - "haute-couture": "3.x.x", - "joi": "14.x.x" + "@hapi/boom": "7.x.x", + "@hapi/joi": "15.x.x", + "haute-couture": "3.x.x" }, "devDependencies": { - "code": "5.x.x", + "@hapi/code": "5.x.x", + "@hapi/eslint-config-hapi": "12.x.x", + "@hapi/eslint-plugin-hapi": "4.x.x", + "@hapi/glue": "6.x.x", + "@hapi/hapi": "18.x.x", + "@hapi/inert": "5.x.x", + "@hapi/lab": "19.x.x", + "@hapi/vision": "5.x.x", "confidence": "4.x.x", - "dotenv": "6.x.x", + "dotenv": "8.x.x", "eslint": "5.x.x", - "eslint-config-hapi": "12.x.x", - "eslint-plugin-hapi": "4.x.x", - "glue": "5.x.x", - "hapi": "18.x.x", "hapi-swagger": "9.x.x", + "hpal": "2.x.x", "hpal-debug": "1.x.x", - "inert": "5.x.x", - "lab": "18.x.x", - "toys": "2.x.x", - "vision": "5.x.x" + "toys": "2.x.x" } } diff --git a/server/index.js b/server/index.js index 36cbab3..c6d9f9e 100644 --- a/server/index.js +++ b/server/index.js @@ -1,6 +1,6 @@ 'use strict'; -const Glue = require('glue'); +const Glue = require('@hapi/glue'); const Manifest = require('./manifest'); exports.deployment = async (start) => { diff --git a/server/plugins/swagger.js b/server/plugins/swagger.js index 768a391..cf64e1e 100644 --- a/server/plugins/swagger.js +++ b/server/plugins/swagger.js @@ -1,7 +1,7 @@ 'use strict'; -const Inert = require('inert'); -const Vision = require('vision'); +const Inert = require('@hapi/inert'); +const Vision = require('@hapi/vision'); const HapiSwagger = require('hapi-swagger'); const Package = require('../../package.json'); diff --git a/test/index.js b/test/index.js index 233da08..917ef22 100644 --- a/test/index.js +++ b/test/index.js @@ -2,8 +2,8 @@ // Load modules -const Code = require('code'); -const Lab = require('lab'); +const Code = require('@hapi/code'); +const Lab = require('@hapi/lab'); const Server = require('../server'); const Package = require('../package.json'); From 26f5bbf2b613940d46cf99f69512c3e64cf151a1 Mon Sep 17 00:00:00 2001 From: Devin Ivy Date: Fri, 21 Jun 2019 12:01:54 -0400 Subject: [PATCH 2/2] Upgrade to hapi-swagger v10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8270660..db65d9c 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "confidence": "4.x.x", "dotenv": "8.x.x", "eslint": "5.x.x", - "hapi-swagger": "9.x.x", + "hapi-swagger": "10.x.x", "hpal": "2.x.x", "hpal-debug": "1.x.x", "toys": "2.x.x"