From dd8a96d1b6b7a14c079cbeb199f776150773effa Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Sat, 4 May 2019 00:21:37 +0800
Subject: [PATCH] chore: joi -> @hapi/joi

(cherry picked from commit f99645cfcd47269eeb1fff4284d0c2a0996ec07d)
---
 packages/@vue/cli-shared-utils/lib/validate.js | 6 +++---
 packages/@vue/cli-shared-utils/package.json    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@vue/cli-shared-utils/lib/validate.js b/packages/@vue/cli-shared-utils/lib/validate.js
index 995a2cc02..bb2b27754 100644
--- a/packages/@vue/cli-shared-utils/lib/validate.js
+++ b/packages/@vue/cli-shared-utils/lib/validate.js
@@ -1,10 +1,10 @@
 const { exit } = require('./exit')
 
 // proxy to joi for option validation
-exports.createSchema = fn => fn(require('joi'))
+exports.createSchema = fn => fn(require('@hapi/joi'))
 
 exports.validate = (obj, schema, cb) => {
-  require('joi').validate(obj, schema, {}, err => {
+  require('@hapi/joi').validate(obj, schema, {}, err => {
     if (err) {
       cb(err.message)
       if (process.env.VUE_CLI_TEST) {
@@ -17,7 +17,7 @@ exports.validate = (obj, schema, cb) => {
 }
 
 exports.validateSync = (obj, schema) => {
-  const result = require('joi').validate(obj, schema)
+  const result = require('@hapi/joi').validate(obj, schema)
   if (result.error) {
     throw result.error
   }
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 58533c1f8..f66a419c0 100644
--- a/packages/@vue/cli-shared-utils/package.json
+++ b/packages/@vue/cli-shared-utils/package.json
@@ -20,9 +20,9 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-shared-utils#readme",
   "dependencies": {
+    "@hapi/joi": "^15.0.1",
     "chalk": "^2.4.1",
     "execa": "^1.0.0",
-    "joi": "^14.3.0",
     "launch-editor": "^2.2.1",
     "lru-cache": "^5.1.1",
     "node-ipc": "^9.1.1",