Switch to @hapi/joi (#2047)

GoogleChrome · May 1, 2019 · 23af8ac · 23af8ac
1 parent 21b9fb9
commit 23af8ac
Show file tree

Hide file tree

Showing 9 changed files with 274 additions and 282 deletions.
diff --git a/packages/workbox-build/package-lock.json b/packages/workbox-build/package-lock.json
diff --git a/packages/workbox-build/package.json b/packages/workbox-build/package.json
@@ -21,10 +21,10 @@
   "homepage": "https://github.com/GoogleChrome/workbox",
   "dependencies": {
     "@babel/runtime": "^7.3.4",
+    "@hapi/joi": "^15.0.0",
     "common-tags": "^1.8.0",
     "fs-extra": "^4.0.2",
     "glob": "^7.1.3",
-    "joi": "^14.3.1",
     "lodash.template": "^4.4.0",
     "pretty-bytes": "^5.1.0",
     "stringify-object": "^3.3.0",

diff --git a/packages/workbox-build/src/entry-points/options/base-schema.js b/packages/workbox-build/src/entry-points/options/base-schema.js
@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-const joi = require('joi');
+const joi = require('@hapi/joi');
 
 const defaults = require('./defaults');
 const regExpObject = require('./reg-exp-object');

diff --git a/packages/workbox-build/src/entry-points/options/common-generate-schema.js b/packages/workbox-build/src/entry-points/options/common-generate-schema.js
@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-const joi = require('joi');
+const joi = require('@hapi/joi');
 
 const baseSchema = require('./base-schema');
 const defaults = require('./defaults');

diff --git a/packages/workbox-build/src/entry-points/options/generate-sw-schema.js b/packages/workbox-build/src/entry-points/options/generate-sw-schema.js
@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-const joi = require('joi');
+const joi = require('@hapi/joi');
 
 const commonGenerateSchema = require('./common-generate-schema');
 const defaults = require('./defaults');

diff --git a/packages/workbox-build/src/entry-points/options/generate-sw-string-schema.js b/packages/workbox-build/src/entry-points/options/generate-sw-string-schema.js
@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-const joi = require('joi');
+const joi = require('@hapi/joi');
 
 const commonGenerateSchema = require('./common-generate-schema');
 

diff --git a/packages/workbox-build/src/entry-points/options/get-manifest-schema.js b/packages/workbox-build/src/entry-points/options/get-manifest-schema.js
@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-const joi = require('joi');
+const joi = require('@hapi/joi');
 
 const baseSchema = require('./base-schema');
 

diff --git a/packages/workbox-build/src/entry-points/options/inject-manifest-schema.js b/packages/workbox-build/src/entry-points/options/inject-manifest-schema.js
@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-const joi = require('joi');
+const joi = require('@hapi/joi');
 
 const baseSchema = require('./base-schema');
 const defaults = require('./defaults');

diff --git a/packages/workbox-build/src/entry-points/options/reg-exp-object.js b/packages/workbox-build/src/entry-points/options/reg-exp-object.js
@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-const joi = require('joi');
+const joi = require('@hapi/joi');
 
 module.exports = joi.object().type(RegExp)
     .error(() => 'the value must be a RegExp');