fix: prefer scss, sass and css extension in resolving

Author: alexander-akait

lib/loader.js

@@ -3,7 +3,6 @@
 const path = require('path');
 
 const async = require('neo-async');
-const pify = require('pify');
 const semver = require('semver');
 
 const formatSassError = require('./formatSassError');
@@ -35,14 +34,19 @@ function sassLoader(content) {
     );
   }
 
+  let { resolve } = this;
+
+  // Supported since v4.27.0
+  if (this.getResolve) {
+    resolve = this.getResolve({
+      extensions: ['.scss', '.sass', '.css'],
+    });
+  }
+
   const options = normalizeOptions(
     this,
     content,
-    webpackImporter(
-      resourcePath,
-      pify(this.resolve.bind(this)),
-      addNormalizedDependency
-    )
+    webpackImporter(resourcePath, resolve, addNormalizedDependency)
   );
 
   // Skip empty files, otherwise it will stop webpack, see issue #21

package-lock.json

@@ -31,7 +31,6 @@
     "loader-utils": "^1.0.1",
     "lodash.tail": "^4.1.1",
     "neo-async": "^2.5.0",
-    "pify": "^4.0.1",
     "semver": "^5.5.0"
   },
   "devDependencies": {

package.json

@@ -295,7 +295,7 @@ implementations.forEach((implementation) => {
             // This number needs to be updated if imports.scss or any dependency of that changes.
             // Node Sass includes a duplicate entry, Dart Sass does not.
             sourceMap.sources.should.have.length(
-              implementation === nodeSass ? 11 : 10
+              implementation === nodeSass ? 12 : 11
             );
             sourceMap.sources.forEach((sourcePath) =>
               fs.existsSync(path.resolve(sourceMap.sourceRoot, sourcePath))

test/index.test.js

@@ -24,3 +24,5 @@
 @import ~module
 /* @import ~another */
 @import ~another
+// Should prefer `scss`
+@import "~@org/style"

test/node_modules/@org/style.js

@@ -24,3 +24,6 @@
 @import "~module";
 /* @import "~another"; */
 @import "~another";
+/* @import "~@org/style"; */
+// Should prefer `scss`
+@import "~@org/style";