Use global options for localsLoader

Chaptykov · Chaptykov · commit 015ceb51f043 · 2016-09-06T18:39:36.000+07:00
diff --git a/lib/localsLoader.js b/lib/localsLoader.js
@@ -6,12 +6,16 @@ var loaderUtils = require("loader-utils");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
 var compileExports = require("./compile-exports");
+var assign = require("object-assign");
 
 
 module.exports = function(content) {
 	if(this.cacheable) this.cacheable();
 	var callback = this.async();
-	var query = loaderUtils.parseQuery(this.query);
+	var loaderOptions = loaderUtils.parseQuery(this.query);
+	var configKey = loaderOptions.config || "cssLoader";
+	var globalOptions = this.options[configKey] || {};
+	var query = assign({}, globalOptions, loaderOptions);
 	var moduleMode = query.modules || query.module;
 	var camelCaseKeys = query.camelCase || query.camelcase;
 
diff --git a/lib/processCss.js b/lib/processCss.js
@@ -140,10 +140,9 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 	var forceMinimize = query.minimize;
 	var minimize = typeof forceMinimize !== "undefined" ? !!forceMinimize : options.minimize;
 
-	if (!options.loaderContext.options) {
-		options.loaderContext.options = {};
-	}
-	options.loaderContext.options.customInterpolateName = query.customInterpolateName;
+	options.loaderContext.options = assign({}, options.loaderContext.options, {
+		customInterpolateName: query.customInterpolateName
+	});
 
 	var parserOptions = {
 		root: root,
