File tree 2 files changed +8
-1
lines changed
packages/@vue/cli-service 2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -347,7 +347,8 @@ test('scss loaderOptions', () => {
347
347
prependData : sassData
348
348
} ,
349
349
scss : {
350
- prependData : scssData
350
+ prependData : scssData ,
351
+ webpackImporter : false
351
352
}
352
353
}
353
354
}
@@ -365,6 +366,9 @@ test('scss loaderOptions', () => {
365
366
} ,
366
367
sourceMap : false
367
368
} )
369
+
370
+ // should not merge scss options into default sass config
371
+ expect ( findOptions ( config , 'sass' , 'sass' ) ) . not . toHaveProperty ( 'webpackImporter' )
368
372
} )
369
373
370
374
test ( 'should use dart sass implementation whenever possible' , ( ) => {
Original file line number Diff line number Diff line change @@ -187,11 +187,13 @@ module.exports = (api, rootOptions) => {
187
187
createCSSRule ( 'css' , / \. c s s $ / )
188
188
createCSSRule ( 'postcss' , / \. p ( o s t ) ? c s s $ / )
189
189
createCSSRule ( 'scss' , / \. s c s s $ / , 'sass-loader' , Object . assign (
190
+ { } ,
190
191
defaultSassLoaderOptions ,
191
192
loaderOptions . scss || loaderOptions . sass
192
193
) )
193
194
if ( sassLoaderVersion < 8 ) {
194
195
createCSSRule ( 'sass' , / \. s a s s $ / , 'sass-loader' , Object . assign (
196
+ { } ,
195
197
defaultSassLoaderOptions ,
196
198
{
197
199
indentedSyntax : true
@@ -200,6 +202,7 @@ module.exports = (api, rootOptions) => {
200
202
) )
201
203
} else {
202
204
createCSSRule ( 'sass' , / \. s a s s $ / , 'sass-loader' , Object . assign (
205
+ { } ,
203
206
defaultSassLoaderOptions ,
204
207
loaderOptions . sass ,
205
208
{
You can’t perform that action at this time.
0 commit comments