add error for webpack#3556, add recommendations for errors (webpack#3563)

sokra · TheLarkInn · commit 8bc25f65e600 · 2016-12-23T12:25:39.000-06:00
diff --git a/lib/RuleSet.js b/lib/RuleSet.js
@@ -146,7 +146,7 @@ RuleSet.normalizeRule = function(rule, refs) {
 	}
 
 	if(rule.loader && rule.loaders)
-		throw new Error("Provided loader and loaders for rule");
+		throw new Error(RuleSet.buildErrorMessage(rule, new Error("Provided loader and loaders for rule (use only one of them)")));
 
 	var loader = rule.loaders || rule.loader;
 	if(typeof loader === "string" && !rule.options && !rule.query) {
@@ -160,10 +160,12 @@ RuleSet.normalizeRule = function(rule, refs) {
 			query: rule.query
 		});
 	} else if(loader && (rule.options || rule.query)) {
-		throw new Error("options/query cannot be used with loaders");
+		throw new Error(RuleSet.buildErrorMessage(rule, new Error("options/query cannot be used with loaders (use options for each array item)")));
 	} else if(loader) {
 		checkUseSource("loaders");
 		newRule.use = RuleSet.normalizeUse(loader);
+	} else if(rule.options || rule.query) {
+		throw new Error(RuleSet.buildErrorMessage(rule, new Error("options/query provided without loader (use loader + options)")));
 	}
 
 	if(rule.use) {
@@ -186,13 +188,13 @@ RuleSet.normalizeRule = function(rule, refs) {
 
 	function checkUseSource(newSource) {
 		if(useSource && useSource !== newSource)
-			throw new Error("Rule can only have one result source (provided " + newSource + " and " + useSource + ")");
+			throw new Error(RuleSet.buildErrorMessage(rule, new Error("Rule can only have one result source (provided " + newSource + " and " + useSource + ")")));
 		useSource = newSource;
 	}
 
 	function checkResourceSource(newSource) {
 		if(resourceSource && resourceSource !== newSource)
-			throw new Error("Rule can only have one resource source (provided " + newSource + " and " + resourceSource + ")");
+			throw new Error(RuleSet.buildErrorMessage(rule, new Error("Rule can only have one resource source (provided " + newSource + " and " + resourceSource + ")")));
 		resourceSource = newSource;
 	}
 
