File tree 1 file changed +4
-1
lines changed 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change 3
3
Author Tobias Koppers @sokra
4
4
*/
5
5
var path = require ( "path" ) ;
6
+ var assign = require ( 'object-assign' ) ;
6
7
var loaderUtils = require ( "loader-utils" ) ;
7
8
var processCss = require ( "./processCss" ) ;
8
9
var getImportPrefix = require ( "./getImportPrefix" ) ;
@@ -12,7 +13,9 @@ var compileExports = require("./compile-exports");
12
13
module . exports = function ( content , map ) {
13
14
if ( this . cacheable ) this . cacheable ( ) ;
14
15
var callback = this . async ( ) ;
15
- var query = loaderUtils . parseQuery ( this . query ) ;
16
+ var globalOptions = this . options . css || { } ;
17
+ var loaderOptions = loaderUtils . parseQuery ( this . query ) ;
18
+ var query = assign ( { } , globalOptions , loaderOptions ) ;
16
19
var root = query . root ;
17
20
var moduleMode = query . modules || query . module ;
18
21
var camelCaseKeys = query . camelCase || query . camelcase ;
You can’t perform that action at this time.
0 commit comments