Cemal
/
iut-hapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package

master
Devin Ivy 2021-04-11 23:24:33 -04:00 committed by cemal
parent 9ee8f219af
commit 1f4f56a05c
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package.json
View File

@ -30,8 +30,12 @@
"@hapi/eslint-plugin-hapi": "4.x.x", "@hapi/eslint-plugin-hapi": "4.x.x",
"@hapi/glue": "8.x.x", "@hapi/glue": "8.x.x",
"@hapi/hapi": "20.x.x", "@hapi/hapi": "20.x.x",
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"@hapi/inert": "6.x.x", "@hapi/inert": "6.x.x",
=======
"@hapi/hoek": "9.x.x",
>>>>>>> 66973ef ((flavor) objection v3.0.0)
======= =======
"@hapi/hoek": "9.x.x", "@hapi/hoek": "9.x.x",
>>>>>>> 66973ef ((flavor) objection v3.0.0) >>>>>>> 66973ef ((flavor) objection v3.0.0)
@ -45,8 +49,13 @@
"dotenv": "8.x.x", "dotenv": "8.x.x",
"eslint": "7.x.x", "eslint": "7.x.x",
"exiting": "6.x.x", "exiting": "6.x.x",
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"hapi-swagger": "14.x.x" "hapi-swagger": "14.x.x"
=======
"knex": "0.21.x",
"sqlite3": "5.x.x"
>>>>>>> 66973ef ((flavor) objection v3.0.0)
======= =======
"knex": "0.21.x", "knex": "0.21.x",
"sqlite3": "5.x.x" "sqlite3": "5.x.x"

6
server/manifest.js
View File

@ -35,9 +35,12 @@ module.exports = new Confidence.Store({
options: {} options: {}
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
plugin: './plugins/swagger' plugin: './plugins/swagger'
======= =======
=======
>>>>>>> 66973ef ((flavor) objection v3.0.0)
plugin: '@hapipal/schwifty', plugin: '@hapipal/schwifty',
options: { options: {
$filter: 'NODE_ENV', $filter: 'NODE_ENV',
@ -59,6 +62,9 @@ module.exports = new Confidence.Store({
migrateOnStart: false migrateOnStart: false
} }
} }
<<<<<<< HEAD
>>>>>>> 66973ef ((flavor) objection v3.0.0)
=======
>>>>>>> 66973ef ((flavor) objection v3.0.0) >>>>>>> 66973ef ((flavor) objection v3.0.0)
}, },
{ {