chore: add plugins as known valid options and concat with instance

gatsbyjs · Sep 19, 2019 · f0ef733 · f0ef733
1 parent 01f4b8f
commit f0ef733
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/packages/gatsby/src/utils/validate-plugin-options.js b/packages/gatsby/src/utils/validate-plugin-options.js
@@ -1,9 +1,24 @@
+const Joi = require(`@hapi/joi`)
+
+const baseSchema = Joi.object().keys({
+  plugins: Joi.array(
+    Joi.alternatives(
+      Joi.string(),
+      Joi.object().keys({
+        resolve: Joi.string().required(),
+        options: Joi.object()
+          .keys()
+          .unknown(),
+      })
+    )
+  ),
+})
+
 exports.validatePluginOptions = (res, options = {}) => {
   let chain = Promise.resolve(res)
   if (res && res.validate) {
-    chain = res.validate(options, {
+    chain = baseSchema.concat(res).validate(options, {
       abortEarly: false,
-      allowUnknown: true,
     })
   }
   return chain