File tree Expand file tree Collapse file tree 4 files changed +30
-3
lines changed Expand file tree Collapse file tree 4 files changed +30
-3
lines changed Original file line number Diff line number Diff line change @@ -115,7 +115,14 @@ class WebpackConfig {
115
115
// Features/Loaders options
116
116
this . copyFilesConfigs = [ ] ;
117
117
this . sassOptions = {
118
- resolveUrlLoader : true
118
+ resolveUrlLoader : true ,
119
+ resolveUrlLoaderOptions : {
120
+ engine : 'postcss' ,
121
+ keepQuery : false ,
122
+ removeCR : false ,
123
+ debug : false ,
124
+ silent : false
125
+ }
119
126
} ;
120
127
this . preactOptions = {
121
128
preactCompat : false
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ module.exports = {
32
32
loader : 'resolve-url-loader' ,
33
33
options : {
34
34
sourceMap : webpackConfig . useSourceMaps ,
35
- removeCR : true
35
+ ... webpackConfig . sassOptions . resolveUrlLoaderOptions
36
36
}
37
37
} ) ;
38
38
}
Original file line number Diff line number Diff line change 43
43
"optimize-css-assets-webpack-plugin" : " ^5.0.1" ,
44
44
"pkg-up" : " ^1.0.0" ,
45
45
"pretty-error" : " ^2.1.1" ,
46
- "resolve-url-loader" : " ^3.1.0 " ,
46
+ "resolve-url-loader" : " ^3.0.1 " ,
47
47
"semver" : " ^5.5.0" ,
48
48
"style-loader" : " ^0.21.0" ,
49
49
"terser-webpack-plugin" : " ^1.1.0" ,
Original file line number Diff line number Diff line change @@ -65,6 +65,26 @@ describe('loaders/sass', () => {
65
65
cssLoader . getLoaders . restore ( ) ;
66
66
} ) ;
67
67
68
+ it ( 'getLoaders() with resolve-url-loader options' , ( ) => {
69
+ const config = createConfig ( ) ;
70
+ config . enableSassLoader ( ( ) => { } , {
71
+ resolveUrlLoaderOptions : {
72
+ removeCR : true
73
+ }
74
+ } ) ;
75
+
76
+ // make the cssLoader return nothing
77
+ sinon . stub ( cssLoader , 'getLoaders' )
78
+ . callsFake ( ( ) => [ ] ) ;
79
+
80
+ const actualLoaders = sassLoader . getLoaders ( config ) ;
81
+ expect ( actualLoaders ) . to . have . lengthOf ( 2 ) ;
82
+ expect ( actualLoaders [ 0 ] . loader ) . to . equal ( 'resolve-url-loader' ) ;
83
+ expect ( actualLoaders [ 0 ] . options . removeCR ) . to . be . true ;
84
+
85
+ cssLoader . getLoaders . restore ( ) ;
86
+ } ) ;
87
+
68
88
it ( 'getLoaders() without resolve-url-loader' , ( ) => {
69
89
const config = createConfig ( ) ;
70
90
config . enableSassLoader ( ( ) => { } , {
You can’t perform that action at this time.
0 commit comments