File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change 33 Author Tobias Koppers @sokra
44*/
55var path = require ( "path" ) ;
6+ var assign = require ( 'object-assign' ) ;
67var loaderUtils = require ( "loader-utils" ) ;
78var processCss = require ( "./processCss" ) ;
89var getImportPrefix = require ( "./getImportPrefix" ) ;
@@ -12,7 +13,9 @@ var compileExports = require("./compile-exports");
1213module . exports = function ( content , map ) {
1314 if ( this . cacheable ) this . cacheable ( ) ;
1415 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 ) ;
1619 var root = query . root ;
1720 var moduleMode = query . modules || query . module ;
1821 var camelCaseKeys = query . camelCase || query . camelcase ;
You can’t perform that action at this time.
0 commit comments