From 0a02df1e3420bb78e70e65fc7139432320c50b73 Mon Sep 17 00:00:00 2001
From: Adam Bretz <arbretz@gmail.com>
Date: Fri, 4 Sep 2020 15:36:29 -0400
Subject: [PATCH] Move away from @hapi/joi (#190)

Closes #187
---
 lib/celebrate.js                          | 2 +-
 lib/index.d.ts                            | 2 +-
 lib/index.js                              | 2 +-
 lib/schema.js                             | 2 +-
 package.json                              | 3 +--
 test/__snapshots__/celebrate.test.js.snap | 6 +++---
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/celebrate.js b/lib/celebrate.js
index b35e7f2..15d75ad 100644
--- a/lib/celebrate.js
+++ b/lib/celebrate.js
@@ -1,5 +1,5 @@
 const HTTP = require('http');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const _ = require('lodash');
 const EscapeHtml = require('escape-html');
 const {
diff --git a/lib/index.d.ts b/lib/index.d.ts
index 2bdcbd9..6c89e1d 100644
--- a/lib/index.d.ts
+++ b/lib/index.d.ts
@@ -3,7 +3,7 @@ import {
     Root as joi,
     ValidationOptions,
     ValidationError,
-} from '@hapi/joi';
+} from 'joi';
 
 
 export declare enum Segments {
diff --git a/lib/index.js b/lib/index.js
index 64a3826..b3ac68e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,8 +1,8 @@
-const Joi = require('@hapi/joi');
 const {
   celebrate,
   celebrator,
   errors,
+  Joi,
 } = require('./celebrate');
 
 const {
diff --git a/lib/schema.js b/lib/schema.js
index b16e676..9625c89 100644
--- a/lib/schema.js
+++ b/lib/schema.js
@@ -1,5 +1,5 @@
 const HTTP = require('http');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const {
   segments,
   modes,
diff --git a/package.json b/package.json
index 9dc573c..bda674e 100644
--- a/package.json
+++ b/package.json
@@ -29,8 +29,7 @@
   },
   "homepage": "https://github.com/arb/celebrate#readme",
   "dependencies": {
-    "@hapi/joi": "17.x.x",
-    "@types/hapi__joi": "17.x.x",
+    "joi": "17.x.x",
     "escape-html": "1.0.3",
     "lodash": "4.17.x"
   },
diff --git a/test/__snapshots__/celebrate.test.js.snap b/test/__snapshots__/celebrate.test.js.snap
index 1c01ba2..8a011cb 100644
--- a/test/__snapshots__/celebrate.test.js.snap
+++ b/test/__snapshots__/celebrate.test.js.snap
@@ -18,7 +18,7 @@ Object {
       "keys": Array [
         "role",
       ],
-      "message": "\\"role\\" must be larger than or equal to 4",
+      "message": "\\"role\\" must be greater than or equal to 4",
       "source": "query",
     },
   },
@@ -36,7 +36,7 @@ Object {
         "role",
         "name",
       ],
-      "message": "\\"role\\" must be larger than or equal to 4. \\"name\\" is required",
+      "message": "\\"role\\" must be greater than or equal to 4. \\"name\\" is required",
       "source": "query",
     },
   },
@@ -53,7 +53,7 @@ Object {
       "keys": Array [
         "role",
       ],
-      "message": "\\"role\\" must be larger than or equal to 4",
+      "message": "\\"role\\" must be greater than or equal to 4",
       "source": "query",
     },
   },