From acc674c0e7fe12768984ce7b0aafa5c1cc207016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Fri, 31 Jul 2020 22:15:09 +0200 Subject: [PATCH] fix: replace @hapi/joi with joi --- lib/routes/admin-api/context-schema.js | 2 +- lib/routes/admin-api/feature-schema.js | 2 +- lib/routes/admin-api/metrics-schema.js | 2 +- lib/routes/admin-api/strategy-schema.js | 2 +- lib/routes/admin-api/util.js | 2 +- lib/routes/client-api/metrics-schema.js | 2 +- lib/routes/client-api/register-schema.js | 2 +- lib/state-service.js | 2 +- lib/user.js | 2 +- package.json | 2 +- yarn.lock | 30 ++++++++++++------------ 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/routes/admin-api/context-schema.js b/lib/routes/admin-api/context-schema.js index 36e6c8db33..e3b8fc16bc 100644 --- a/lib/routes/admin-api/context-schema.js +++ b/lib/routes/admin-api/context-schema.js @@ -1,6 +1,6 @@ 'use strict'; -const joi = require('@hapi/joi'); +const joi = require('joi'); const { nameType } = require('./util'); const nameSchema = joi.object().keys({ name: nameType }); diff --git a/lib/routes/admin-api/feature-schema.js b/lib/routes/admin-api/feature-schema.js index e474bb75cf..d71088fc74 100644 --- a/lib/routes/admin-api/feature-schema.js +++ b/lib/routes/admin-api/feature-schema.js @@ -1,6 +1,6 @@ 'use strict'; -const joi = require('@hapi/joi'); +const joi = require('joi'); const { nameType } = require('./util'); const nameSchema = joi.object().keys({ name: nameType }); diff --git a/lib/routes/admin-api/metrics-schema.js b/lib/routes/admin-api/metrics-schema.js index 087d812af1..e6ca5b57f7 100644 --- a/lib/routes/admin-api/metrics-schema.js +++ b/lib/routes/admin-api/metrics-schema.js @@ -1,6 +1,6 @@ 'use strict'; -const joi = require('@hapi/joi'); +const joi = require('joi'); const { nameType } = require('./util'); const applicationSchema = joi diff --git a/lib/routes/admin-api/strategy-schema.js b/lib/routes/admin-api/strategy-schema.js index 90feea36d9..a1ed614c56 100644 --- a/lib/routes/admin-api/strategy-schema.js +++ b/lib/routes/admin-api/strategy-schema.js @@ -1,6 +1,6 @@ 'use strict'; -const joi = require('@hapi/joi'); +const joi = require('joi'); const { nameType } = require('./util'); const strategySchema = joi.object().keys({ diff --git a/lib/routes/admin-api/util.js b/lib/routes/admin-api/util.js index 08787ae6d6..6d4ad7c9c9 100644 --- a/lib/routes/admin-api/util.js +++ b/lib/routes/admin-api/util.js @@ -1,6 +1,6 @@ 'use strict'; -const joi = require('@hapi/joi'); +const joi = require('joi'); const customJoi = joi.extend(j => ({ type: 'isUrlFriendly', diff --git a/lib/routes/client-api/metrics-schema.js b/lib/routes/client-api/metrics-schema.js index 5884705e0c..425b9b754a 100644 --- a/lib/routes/client-api/metrics-schema.js +++ b/lib/routes/client-api/metrics-schema.js @@ -1,6 +1,6 @@ 'use strict'; -const joi = require('@hapi/joi'); +const joi = require('joi'); const countSchema = joi .object() diff --git a/lib/routes/client-api/register-schema.js b/lib/routes/client-api/register-schema.js index 4a90f8089c..9d0997cd11 100644 --- a/lib/routes/client-api/register-schema.js +++ b/lib/routes/client-api/register-schema.js @@ -1,6 +1,6 @@ 'use strict'; -const joi = require('@hapi/joi'); +const joi = require('joi'); const clientRegisterSchema = joi .object() diff --git a/lib/state-service.js b/lib/state-service.js index afbe6d6d01..5a7b203ffe 100644 --- a/lib/state-service.js +++ b/lib/state-service.js @@ -1,6 +1,6 @@ 'use strict'; -const joi = require('@hapi/joi'); +const joi = require('joi'); const fs = require('fs'); const mime = require('mime'); const YAML = require('js-yaml'); diff --git a/lib/user.js b/lib/user.js index bb6cec8064..b87c088663 100644 --- a/lib/user.js +++ b/lib/user.js @@ -1,7 +1,7 @@ 'use strict'; const gravatarUrl = require('gravatar-url'); -const Joi = require('@hapi/joi'); +const Joi = require('joi'); module.exports = class User { constructor({ diff --git a/package.json b/package.json index a82c6231ad..6810a7d851 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ ] }, "dependencies": { - "@hapi/joi": "^17.1.0", "async": "^3.1.0", "compression": "^1.7.3", "cookie-parser": "^1.4.4", @@ -75,6 +74,7 @@ "errorhandler": "^1.5.1", "express": "^4.17.1", "gravatar-url": "^3.1.0", + "joi": "^17.1.1", "js-yaml": "^3.12.2", "knex": "0.20.10", "log4js": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index 61498df766..afcc55ed0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -135,10 +135,10 @@ dependencies: arrify "^1.0.1" -"@hapi/address@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.0.tgz#36affb4509b5a6adc628bcc394450f2a7d51d111" - integrity sha512-GDDpkCdSUfkQCznmWUHh9dDN85BWf/V8TFKQ2JLuHdGB4Yy3YTEGBzZxoBNxfNBEvreSR/o+ZxBBSNNEVzY+lQ== +"@hapi/address@^4.0.1": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz#d60c5c0d930e77456fdcde2598e77302e2955e1d" + integrity sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ== dependencies: "@hapi/hoek" "^9.0.0" @@ -152,17 +152,6 @@ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.0.3.tgz#e49e637d5de8faa4f0d313c2590b455d7c00afd7" integrity sha512-jKtjLLDiH95b002sJVc5c74PE6KKYftuyVdVmsuYId5stTaWcRFqE+5ukZI4gDUKjGn8wv2C3zPn3/nyjEI7gg== -"@hapi/joi@^17.1.0": - version "17.1.0" - resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.0.tgz#cc4000b6c928a6a39b9bef092151b6bdee10ce55" - integrity sha512-ob67RcPlwRWxBzLCnWvcwx5qbwf88I3ykD7gcJLWOTRfLLgosK7r6aeChz4thA3XRvuBfI0KB1tPVl2EQFlPXw== - dependencies: - "@hapi/address" "^4.0.0" - "@hapi/formula" "^2.0.0" - "@hapi/hoek" "^9.0.0" - "@hapi/pinpoint" "^2.0.0" - "@hapi/topo" "^5.0.0" - "@hapi/pinpoint@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz#805b40d4dbec04fc116a73089494e00f073de8df" @@ -3038,6 +3027,17 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" +joi@^17.1.1: + version "17.1.1" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.1.1.tgz#b7339e8a509510a04ce9cdeccb35a6e188080287" + integrity sha512-fww3Ae9cRyj6yHy90cpxvL2y39V5JCY2KaXV3KfALhoFfFcAuyQBPOq+2q6EZ2QNMn1FhkDy+eRkGVG7J+BvyA== + dependencies: + "@hapi/address" "^4.0.1" + "@hapi/formula" "^2.0.0" + "@hapi/hoek" "^9.0.0" + "@hapi/pinpoint" "^2.0.0" + "@hapi/topo" "^5.0.0" + js-string-escape@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"