use allOf instead of "extendRefs: true" option

timse · timse · commit 6a7a7d563331 · 2017-02-02T22:54:20.000+11:00
this is recommended by @epoberezkin
diff --git a/lib/validateSchema.js b/lib/validateSchema.js
@@ -8,8 +8,7 @@ const Ajv = require("ajv");
 const ajv = new Ajv({
 	errorDataPath: "configuration",
 	allErrors: true,
-	verbose: true,
-	extendRefs: true
+	verbose: true
 });
 require("ajv-keywords")(ajv, ["instanceof"]);
 require("../schemas/ajv.absolutePath")(ajv);
diff --git a/schemas/webpackOptionsSchema.json b/schemas/webpackOptionsSchema.json
@@ -568,16 +568,22 @@
           ]
         },
         "exclude": {
-          "$ref": "#/definitions/ruleSet-condition",
-          "absolutePath": true
+          "allOf": [
+            {"$ref": "#/definitions/ruleSet-condition"},
+            {"absolutePath": true}
+          ]
         },
         "include": {
-          "$ref": "#/definitions/ruleSet-condition",
-          "absolutePath": true
+          "allOf": [
+            {"$ref": "#/definitions/ruleSet-condition"},
+            {"absolutePath": true}
+          ]
         },
         "issuer": {
-          "$ref": "#/definitions/ruleSet-condition",
-          "absolutePath": true
+          "allOf": [
+            {"$ref": "#/definitions/ruleSet-condition"},
+            {"absolutePath": true}
+          ]
         },
         "loader": {
           "anyOf": [
@@ -606,8 +612,10 @@
           "$ref": "#/definitions/ruleSet-query"
         },
         "resource": {
-          "$ref": "#/definitions/ruleSet-condition",
-          "absolutePath": true
+          "allOf": [
+            {"$ref": "#/definitions/ruleSet-condition"},
+            {"absolutePath": true}
+          ]
         },
         "resourceQuery": {
           "$ref": "#/definitions/ruleSet-condition"
@@ -616,8 +624,10 @@
           "$ref": "#/definitions/ruleSet-rules"
         },
         "test": {
-          "$ref": "#/definitions/ruleSet-condition",
-          "absolutePath": true
+          "allOf": [
+            {"$ref": "#/definitions/ruleSet-condition"},
+            {"absolutePath": true}
+          ]
         },
         "use": {
           "$ref": "#/definitions/ruleSet-use"
