chore!: bump joi to v17 (#5973)

Author: haoqunjiang

docs/migrations/migrate-from-v4.md

@@ -74,3 +74,4 @@ Please consider switching to ESLint. You can check out [`tslint-to-eslint-config
 #### `@vue/cli-shared-utils`
 
 * Bump [chalk](https://github.com/chalk/chalk) from v2 to v4
+* Bump [joi](https://github.com/sideway/joi) from v15 (used to be `@hapi/joi`) to v17

packages/@vue/cli-service/lib/options.js

@@ -9,32 +9,39 @@ const schema = createSchema(joi => joi.object({
   runtimeCompiler: joi.boolean(),
   transpileDependencies: joi.array(),
   productionSourceMap: joi.boolean(),
-  parallel: joi.alternatives().try([
+  parallel: joi.alternatives().try(
     joi.boolean(),
     joi.number().integer()
-  ]),
+  ),
   devServer: joi.object(),
   pages: joi.object().pattern(
     /\w+/,
-    joi.alternatives().try([
+    joi.alternatives().try(
       joi.string().required(),
       joi.array().items(joi.string().required()),
 
       joi.object().keys({
-        entry: joi.alternatives().try([
+        entry: joi.alternatives().try(
           joi.string().required(),
           joi.array().items(joi.string().required())
-        ]).required()
+        ).required()
       }).unknown(true)
-    ])
+    )
   ),
-  crossorigin: joi.string().valid(['', 'anonymous', 'use-credentials']),
+  crossorigin: joi.string().valid('', 'anonymous', 'use-credentials'),
   integrity: joi.boolean(),
 
   // css
   css: joi.object({
-    // TODO: deprecate this after joi 16 release
-    modules: joi.boolean(),
+    modules:
+      joi.boolean()
+      .warning('deprecate.error', {
+        message: 'Please use `css.requireModuleExtension` instead.'
+      })
+      .message({
+        'deprecate.error':
+          'The {#label} option in vue.config.js is deprecated. {#message}'
+      }),
     requireModuleExtension: joi.boolean(),
     extract: joi.alternatives().try(joi.boolean(), joi.object()),
     sourceMap: joi.boolean(),
@@ -56,7 +63,7 @@ const schema = createSchema(joi => joi.object({
   ),
 
   // known runtime options for built-in plugins
-  lintOnSave: joi.any().valid([true, false, 'error', 'warning', 'default']),
+  lintOnSave: joi.any().valid(true, false, 'error', 'warning', 'default'),
   pwa: joi.object(),
 
   // 3rd party plugin options

packages/@vue/cli-shared-utils/lib/validate.js

@@ -1,24 +1,33 @@
 const { exit } = require('./exit')
 
 // proxy to joi for option validation
-exports.createSchema = fn => fn(require('@hapi/joi'))
+exports.createSchema = fn => {
+  const joi = require('joi')
+
+  let schema = fn(joi)
+  if (typeof schema === 'object' && typeof schema.validate !== 'function') {
+    schema = joi.object(schema)
+  }
+
+  return schema
+}
 
 exports.validate = (obj, schema, cb) => {
-  require('@hapi/joi').validate(obj, schema, {}, err => {
-    if (err) {
-      cb(err.message)
-      if (process.env.VUE_CLI_TEST) {
-        throw err
-      } else {
-        exit(1)
-      }
+  const { error } = schema.validate(obj)
+  if (error) {
+    cb(error.details[0].message)
+
+    if (process.env.VUE_CLI_TEST) {
+      throw error
+    } else {
+      exit(1)
     }
-  })
+  }
 }
 
 exports.validateSync = (obj, schema) => {
-  const result = require('@hapi/joi').validate(obj, schema)
-  if (result.error) {
-    throw result.error
+  const { error } = schema.validate(obj)
+  if (error) {
+    throw error
   }
 }

packages/@vue/cli-shared-utils/package.json

@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-shared-utils#readme",
   "dependencies": {
-    "@hapi/joi": "^15.0.1",
+    "joi": "^17.2.1",
     "chalk": "^4.1.0",
     "execa": "^1.0.0",
     "launch-editor": "^2.2.1",

packages/@vue/cli-ui/apollo-server/api/task.js

@@ -18,7 +18,7 @@ const schema = joi => ({
 })
 
 const describeSchema = createSchema(joi => ({
-  match: joi.alternatives().try(joi.object().type(RegExp), joi.func()).required().description('Match a npm script command'),
+  match: joi.alternatives().try(joi.object().instance(RegExp), joi.func()).required().description('Match a npm script command'),
   ...schema(joi)
 }))
 

packages/@vue/cli/lib/options.js

@@ -7,23 +7,52 @@ const { createSchema, validate } = require('@vue/cli-shared-utils/lib/validate')
 
 const rcPath = exports.rcPath = getRcPath('.vuerc')
 
-const presetSchema = createSchema(joi => joi.object().keys({
-  vueVersion: joi.string().only(['2', '3']),
-  bare: joi.boolean(),
-  useConfigFiles: joi.boolean(),
-  // TODO: Use warn for router and vuex once @hapi/joi v16 releases
-  router: joi.boolean(),
-  routerHistoryMode: joi.boolean(),
-  vuex: joi.boolean(),
-  cssPreprocessor: joi.string().only(['sass', 'dart-sass', 'node-sass', 'less', 'stylus']),
-  plugins: joi.object().required(),
-  configs: joi.object()
-}))
+const presetSchema = createSchema((joi) =>
+  joi
+    .object()
+    .keys({
+      vueVersion: joi.string().valid('2', '3'),
+      bare: joi.boolean(),
+      useConfigFiles: joi.boolean(),
+      router: joi
+        .boolean()
+        .warning('deprecate.error', {
+          message: 'Please use @vue/cli-plugin-router instead.'
+        })
+        .message({
+          'deprecate.error':
+            'The {#label} option in preset is deprecated. {#message}'
+        }),
+      routerHistoryMode: joi
+        .boolean()
+        .warning('deprecate.error', {
+          message: 'Please use @vue/cli-plugin-router instead.'
+        })
+        .message({
+          'deprecate.error':
+            'The {#label} option in preset is deprecated. {#message}'
+        }),
+      vuex: joi
+        .boolean()
+        .warning('deprecate.error', {
+          message: 'Please use @vue/cli-plugin-vuex instead.'
+        })
+        .message({
+          'deprecate.error':
+            'The {#label} option in preset is deprecated. {#message}'
+        }),
+      cssPreprocessor: joi
+        .string()
+        .valid('sass', 'dart-sass', 'node-sass', 'less', 'stylus'),
+      plugins: joi.object().required(),
+      configs: joi.object()
+    })
+)
 
 const schema = createSchema(joi => joi.object().keys({
   latestVersion: joi.string().regex(/^\d+\.\d+\.\d+(-(alpha|beta|rc)\.\d+)?$/),
   lastChecked: joi.date().timestamp(),
-  packageManager: joi.string().only(['yarn', 'npm', 'pnpm']),
+  packageManager: joi.string().valid('yarn', 'npm', 'pnpm'),
   useTaobaoRegistry: joi.boolean(),
   presets: joi.object().pattern(/^/, presetSchema)
 }))

yarn.lock

@@ -1175,7 +1175,7 @@
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz#6c9eafc78c1529248f8f4d92b0799a712b6052c6"
   integrity sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw==
 
-"@hapi/joi@^15.0.0", "@hapi/joi@^15.0.1":
+"@hapi/joi@^15.0.0":
   version "15.1.1"
   resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
   integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
@@ -5640,7 +5640,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -6713,13 +6713,13 @@ component-emitter@^1.2.1:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-compress-commons@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.1.tgz#c5fa908a791a0c71329fba211d73cd2a32005ea8"
-  integrity sha512-xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA==
+compress-commons@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz#d6896be386e52f37610cef9e6fa5defc58c31bd7"
+  integrity sha512-qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A==
   dependencies:
     buffer-crc32 "^0.2.13"
-    crc32-stream "^4.0.0"
+    crc32-stream "^4.0.1"
     normalize-path "^3.0.0"
     readable-stream "^3.6.0"
 
@@ -7113,20 +7113,21 @@ cosmiconfig@^6.0.0:
     path-type "^4.0.0"
     yaml "^1.7.2"
 
-crc32-stream@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.0.tgz#05b7ca047d831e98c215538666f372b756d91893"
-  integrity sha512-tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw==
+crc-32@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+  integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
   dependencies:
-    crc "^3.4.4"
-    readable-stream "^3.4.0"
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
 
-crc@^3.4.4:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
-  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
+crc32-stream@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz#0f047d74041737f8a55e86837a1b826bd8ab0067"
+  integrity sha512-FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw==
   dependencies:
-    buffer "^5.1.0"
+    crc-32 "^1.2.0"
+    readable-stream "^3.4.0"
 
 create-ecdh@^4.0.0:
   version "4.0.4"
@@ -8369,9 +8370,9 @@ ejs@^3.0.1:
     jake "^10.6.1"
 
 electron-to-chromium@^1.3.591:
-  version "1.3.599"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.599.tgz#3fbb004733f3c0dcf59934c8644ddf800b94443a"
-  integrity sha512-u6VGpFsIzSCNrWJb1I72SUypz3EGoBaiEgygoMkd0IOcGR3WF3je5VTx9OIRI9Qd8UOMHinLImyJFkYHTq6nsg==
+  version "1.3.600"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.600.tgz#eb6aa7233ca1fbf0fa9b5943c0f1061b54a433bf"
+  integrity sha512-QmdzrDk4eOoqkhld+XflF6znZHMFN120EfLdXgFP2TzvQuD6EABwKIjOIopx5hvVOIb1ELUPkEgs/rXo0iiXbw==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -9130,6 +9131,11 @@ exit-hook@^1.0.0:
   resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
   integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
 
+exit-on-epipe@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -12484,7 +12490,7 @@ jju@^1.1.0:
   resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
   integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
 
-joi@^17.1.1:
+joi@^17.1.1, joi@^17.2.1:
   version "17.3.0"
   resolved "https://registry.yarnpkg.com/joi/-/joi-17.3.0.tgz#f1be4a6ce29bc1716665819ac361dfa139fff5d2"
   integrity sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==
@@ -16532,6 +16538,11 @@ [email protected], pretty@^2.0.0:
     extend-shallow "^2.0.1"
     js-beautify "^1.6.12"
 
+printj@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+  integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+
 prismjs@^1.13.0, prismjs@^1.21.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.22.0.tgz#73c3400afc58a823dd7eed023f8e1ce9fd8977fa"
@@ -21529,10 +21540,10 @@ zepto@^1.2.0:
   integrity sha1-4Se9nmb9hGvl6rSME5SIL3wOT5g=
 
 zip-stream@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.2.tgz#3a20f1bd7729c2b59fd4efa04df5eb7a5a217d2e"
-  integrity sha512-TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a"
+  integrity sha512-a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw==
   dependencies:
     archiver-utils "^2.1.0"
-    compress-commons "^4.0.0"
+    compress-commons "^4.0.2"
     readable-stream "^3.6.0"