diff --git a/lib/loader.js b/lib/loader.js index 7574ba15..c3c3e22a 100644 --- a/lib/loader.js +++ b/lib/loader.js @@ -3,6 +3,7 @@ Author Tobias Koppers @sokra */ var path = require("path"); +var assign = require("object-assign"); var loaderUtils = require("loader-utils"); var processCss = require("./processCss"); var getImportPrefix = require("./getImportPrefix"); @@ -12,7 +13,10 @@ var compileExports = require("./compile-exports"); module.exports = function(content, map) { 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 root = query.root; var moduleMode = query.modules || query.module; var camelCaseKeys = query.camelCase || query.camelcase; diff --git a/lib/localsLoader.js b/lib/localsLoader.js index c1982a48..fa11ab5f 100644 --- 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 index 53bfac98..04dd12b6 100644 --- a/lib/processCss.js +++ b/lib/processCss.js @@ -140,6 +140,10 @@ module.exports = function processCss(inputSource, inputMap, options, callback) { var forceMinimize = query.minimize; var minimize = typeof forceMinimize !== "undefined" ? !!forceMinimize : options.minimize; + options.loaderContext.options = assign({}, options.loaderContext.options, { + customInterpolateName: query.customInterpolateName + }); + var parserOptions = { root: root, mode: options.mode,