@@ -12,6 +12,23 @@ const normalizeOptions = require('./normalizeOptions');
12
12
13
13
let nodeSassJobQueue = null ;
14
14
15
+ // Very hacky check
16
+ function hasGetResolve ( loaderContext ) {
17
+ return (
18
+ loaderContext . getResolve &&
19
+ // eslint-disable-next-line no-underscore-dangle
20
+ loaderContext . _compiler &&
21
+ // eslint-disable-next-line no-underscore-dangle
22
+ loaderContext . _compiler . resolverFactory &&
23
+ // eslint-disable-next-line no-underscore-dangle
24
+ loaderContext . _compiler . resolverFactory . _create &&
25
+ / c a c h e d C l e v e r M e r g e / . test (
26
+ // eslint-disable-next-line no-underscore-dangle
27
+ loaderContext . _compiler . resolverFactory . _create . toString ( )
28
+ )
29
+ ) ;
30
+ }
31
+
15
32
/**
16
33
* The sass-loader makes node-sass and dart-sass available to webpack modules.
17
34
*
@@ -37,8 +54,8 @@ function sassLoader(content) {
37
54
38
55
let resolve = pify ( this . resolve ) ;
39
56
40
- // Supported since v4.27 .0
41
- if ( this . getResolve ) {
57
+ // Supported since v4.36 .0
58
+ if ( hasGetResolve ( self ) ) {
42
59
resolve = this . getResolve ( {
43
60
mainFields : [ 'sass' , 'style' , '...' ] ,
44
61
extensions : [ '.scss' , '.sass' , '.css' , '...' ] ,
0 commit comments