Use resoucePath for custom importers

Fixes #234
webpack-contrib · Aug 10, 2016 · fd6be1f · fd6be1f
1 parent 11aaf06
commit fd6be1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -245,7 +245,13 @@ module.exports = function (content) {
     }
 
     // Allow passing custom importers to `node-sass`. Accepts `Function` or an array of `Function`s.
-    sassOptions.importer = sassOptions.importer ? [].concat(sassOptions.importer) : [];
+    sassOptions.importer = sassOptions.importer ? [].concat(sassOptions.importer).map(function(importer) {
+            return function(url, prev, done) {
+                return importer(url, prev === 'stdin' ? resourcePath : prev, done);
+            };
+        })
+        : []
+    ;
     sassOptions.importer.push(getWebpackImporter());
 
     // `node-sass` uses `includePaths` to resolve `@import` paths. Append the currently processed file.

diff --git a/test/tools/customImporter.js b/test/tools/customImporter.js
@@ -2,8 +2,9 @@
 
 var should = require('should');
 
-function customImporter(path) {
+function customImporter(path, prev) {
     path.should.equal('import-with-custom-logic');
+    prev.match(process.cwd() + '/test/(sass|scss)/custom-importer.(scss|sass)').should.not.equal(null);
     return customImporter.returnValue;
 }
 customImporter.returnValue = {