File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -6,12 +6,16 @@ var loaderUtils = require("loader-utils");
6
6
var processCss = require ( "./processCss" ) ;
7
7
var getImportPrefix = require ( "./getImportPrefix" ) ;
8
8
var compileExports = require ( "./compile-exports" ) ;
9
+ var assign = require ( "object-assign" ) ;
9
10
10
11
11
12
module . exports = function ( content ) {
12
13
if ( this . cacheable ) this . cacheable ( ) ;
13
14
var callback = this . async ( ) ;
14
- var query = loaderUtils . parseQuery ( this . query ) ;
15
+ var loaderOptions = loaderUtils . parseQuery ( this . query ) ;
16
+ var configKey = loaderOptions . config || "cssLoader" ;
17
+ var globalOptions = this . options [ configKey ] || { } ;
18
+ var query = assign ( { } , globalOptions , loaderOptions ) ;
15
19
var moduleMode = query . modules || query . module ;
16
20
var camelCaseKeys = query . camelCase || query . camelcase ;
17
21
You can’t perform that action at this time.
0 commit comments