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 1f4f56a05c
commit e687d46de5
3 changed files with 5038 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5030
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

19
package.json
View File

@ -30,15 +30,8 @@
"@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 "@hapi/hoek": "9.x.x",
<<<<<<< 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",
>>>>>>> 66973ef ((flavor) objection v3.0.0)
"@hapi/lab": "24.x.x", "@hapi/lab": "24.x.x",
"@hapi/vision": "6.x.x", "@hapi/vision": "6.x.x",
"@hapipal/confidence": "6.x.x", "@hapipal/confidence": "6.x.x",
@ -49,16 +42,8 @@
"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 "hapi-swagger": "14.x.x",
<<<<<<< HEAD
"hapi-swagger": "14.x.x"
=======
"knex": "0.21.x", "knex": "0.21.x",
"sqlite3": "5.x.x" "sqlite3": "5.x.x"
>>>>>>> 66973ef ((flavor) objection v3.0.0)
=======
"knex": "0.21.x",
"sqlite3": "5.x.x"
>>>>>>> 66973ef ((flavor) objection v3.0.0)
} }
} }

6
server/manifest.js
View File

@ -36,10 +36,13 @@ module.exports = new Confidence.Store({
}, },
{ {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
plugin: './plugins/swagger' plugin: './plugins/swagger'
======= =======
======= =======
>>>>>>> 66973ef ((flavor) objection v3.0.0)
=======
>>>>>>> 66973ef ((flavor) objection v3.0.0) >>>>>>> 66973ef ((flavor) objection v3.0.0)
plugin: '@hapipal/schwifty', plugin: '@hapipal/schwifty',
options: { options: {
@ -63,6 +66,9 @@ module.exports = new Confidence.Store({
} }
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 66973ef ((flavor) objection v3.0.0)
=======
>>>>>>> 66973ef ((flavor) objection v3.0.0) >>>>>>> 66973ef ((flavor) objection v3.0.0)
======= =======
>>>>>>> 66973ef ((flavor) objection v3.0.0) >>>>>>> 66973ef ((flavor) objection v3.0.0)