Replace @hapi/joi with joi, in tests and libs

pinkeyAT · Aug 13, 2020 · a459163 · a459163
1 parent 703db91
commit a459163
Show file tree

Hide file tree

Showing 34 changed files with 76 additions and 51 deletions.
diff --git a/examples/assets/extendedjoi.js b/examples/assets/extendedjoi.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const customJoi = Joi.extend(joi => ({
   type: 'number',
   base: joi.number(),

diff --git a/examples/assets/routes-complex.js b/examples/assets/routes-complex.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const js2xmlparser = require('js2xmlparser');
 
 const sumModel = Joi.object({

diff --git a/examples/assets/routes-simple.js b/examples/assets/routes-simple.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const js2xmlparser = require('js2xmlparser');
 
 const sumModel = Joi.object({

diff --git a/examples/basic.js b/examples/basic.js
@@ -1,7 +1,7 @@
 // `jwt.js` - how to used in combination with JSON Web Tokens (JWT) `securityDefinition`
 
 const Hapi = require('@hapi/hapi');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Basic = require('@hapi/basic');
 const Blipp = require('blipp');
 const Inert = require('@hapi/inert');

diff --git a/examples/extend.js b/examples/extend.js
@@ -3,7 +3,7 @@
 // This only works at moment if you have a base JOI type like number.
 
 const Hapi = require('@hapi/hapi');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Blipp = require('blipp');
 const Inert = require('@hapi/inert');
 const Vision = require('@hapi/vision');

diff --git a/examples/simple.js b/examples/simple.js
@@ -1,5 +1,5 @@
 const Hapi = require('@hapi/hapi');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Blipp = require('blipp');
 const Inert = require('@hapi/inert');
 const Vision = require('@hapi/vision');

diff --git a/examples/swagger-client.js b/examples/swagger-client.js
@@ -1,7 +1,7 @@
 // `swagger-client.js` - how to plug-in to build an interface with `swagger-client`
 
 const Hapi = require('@hapi/hapi');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Swagger = require('swagger-client');
 const HapiSwagger = require('../');
 

diff --git a/examples/upload-file.js b/examples/upload-file.js
@@ -6,7 +6,7 @@ const Blipp = require('blipp');
 const Inert = require('@hapi/inert');
 const Vision = require('@hapi/vision');
 const Boom = require('@hapi/boom');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const HapiSwagger = require('../');
 

diff --git a/examples/versions.js b/examples/versions.js
@@ -8,7 +8,7 @@ console.log(
 // The routes are versioned ie '/api/v1/users' and '/api/v2/users'
 
 const Hapi = require('@hapi/hapi');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Blipp = require('blipp');
 const Inert = require('@hapi/inert');
 const Vision = require('@hapi/vision');

diff --git a/lib/builder.js b/lib/builder.js
@@ -1,5 +1,5 @@
 const Hoek = require('@hapi/hoek');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const JSONDeRef = require('json-schema-ref-parser');
 const Filter = require('../lib/filter');
 const Group = require('../lib/group');

diff --git a/lib/index.js b/lib/index.js
@@ -1,5 +1,5 @@
 const Hoek = require('@hapi/hoek');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Path = require('path');
 const { join, sep } = require('path');
 const Querystring = require('querystring');

diff --git a/lib/info.js b/lib/info.js
@@ -1,5 +1,5 @@
 const Hoek = require('@hapi/hoek');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const info = (module.exports = {});
 

diff --git a/lib/paths.js b/lib/paths.js
@@ -1,5 +1,5 @@
 const Hoek = require('@hapi/hoek');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const Parameters = require('../lib/parameters');
 const Definitions = require('../lib/definitions');

diff --git a/lib/tags.js b/lib/tags.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const tags = (module.exports = {});
 

diff --git a/lib/utilities.js b/lib/utilities.js
@@ -1,5 +1,5 @@
 const Hoek = require('@hapi/hoek');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const utilities = (module.exports = {});
 
 /**

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,7 +63,6 @@
     "@hapi/h2o2": "^8.2.0",
     "@hapi/hapi": "^19.0.2",
     "@hapi/inert": "^6.0.1",
-    "@hapi/joi": "17.x",
     "@hapi/lab": "^22.0.5",
     "@hapi/vision": "^6.0.0",
     "@hapi/wreck": "^17.0.0",
@@ -79,6 +78,7 @@
     "hapi-auth-bearer-token": "^6.1.1",
     "hapi-auth-jwt2": "^8.0.0",
     "husky": "^3.0.0",
+    "joi": "^17.2.0",
     "js2xmlparser": "^4.0.0",
     "jsonwebtoken": "^8.1.1",
     "lint-staged": "^9.4.0",

diff --git a/test/Integration/alternatives-test.js b/test/Integration/alternatives-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Validate = require('../../lib/validate.js');

diff --git a/test/Integration/authentication-test.js b/test/Integration/authentication-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Validate = require('../../lib/validate.js');

diff --git a/test/Integration/builder-test.js b/test/Integration/builder-test.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Code = require('@hapi/code');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');

diff --git a/test/Integration/cache-test.js b/test/Integration/cache-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 
 const Helper = require('../helper.js');

diff --git a/test/Integration/child-model.js b/test/Integration/child-model.js
@@ -1,6 +1,6 @@
 'use strict';
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Validate = require('../../lib/validate.js');

diff --git a/test/Integration/definitions-test.js b/test/Integration/definitions-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Validate = require('../../lib/validate.js');

diff --git a/test/Integration/dereference-test.js b/test/Integration/dereference-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Builder = require('../../lib/builder.js');
 const Helper = require('../helper.js');

diff --git a/test/Integration/file-test.js b/test/Integration/file-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Validate = require('../../lib/validate.js');

diff --git a/test/Integration/lout-test.js b/test/Integration/lout-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 

diff --git a/test/Integration/path-test.js b/test/Integration/path-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Hoek = require('@hapi/hoek');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');

diff --git a/test/Integration/plugin-test.js b/test/Integration/plugin-test.js
@@ -2,7 +2,7 @@ const Code = require('@hapi/code');
 const Hapi = require('@hapi/hapi');
 const Hoek = require('@hapi/hoek');
 const Inert = require('@hapi/inert');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Vision = require('@hapi/vision');
 const { resolve } = require('path');

diff --git a/test/Integration/proxy-test.js b/test/Integration/proxy-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Validate = require('../../lib/validate.js');

diff --git a/test/Integration/responses-tests.js b/test/Integration/responses-tests.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Defaults = require('../../lib/defaults.js');

diff --git a/test/Integration/security-test.js b/test/Integration/security-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Validate = require('../../lib/validate.js');

diff --git a/test/integration/debug-test.js b/test/integration/debug-test.js
@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Code = require('@hapi/code');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');

diff --git a/test/unit/property-test.js b/test/unit/property-test.js
@@ -1,6 +1,6 @@
 'use strict';
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Hoek = require('@hapi/hoek');
 const Helper = require('../helper.js');
@@ -236,7 +236,7 @@ lab.experiment('property - ', () => {
       'x',
       Joi.string().email({
         tlds: {
-          allow: ['example.com']
+          allow: ['com']
         },
         minDomainSegments: 2
       }),

diff --git a/test/unit/utilities-test.js b/test/unit/utilities-test.js
@@ -1,5 +1,5 @@
 const Code = require('@hapi/code');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Lab = require('@hapi/lab');
 const Helper = require('../helper.js');
 const Utilities = require('../../lib/utilities.js');