fix sass importer, closed #78

egoist · Feb 27, 2018 · e7b435d · e7b435d
1 parent d65dd08
commit e7b435d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/sass-loader.js b/src/sass-loader.js
@@ -16,11 +16,11 @@ export default {
       data: code,
       indentedSyntax: /\.sass$/.test(this.id),
       sourceMap: this.sourceMap,
-      importer: [(url, prev, done) => {
-        if (!moduleRe.test(url)) return done({ file: prev })
+      importer: [(url, importer, done) => {
+        if (!moduleRe.test(url)) return done({ file: url })
 
         resolve(url.slice(1), {
-          basedir: path.dirname(this.id),
+          basedir: path.dirname(importer),
           extensions: ['.scss', '.sass', '.css']
         }, (err, id) => {
           if (err) {

diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
@@ -544,7 +544,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css = \\".a {\\\\n  color: pink; }\\\\n\\\\n.b {\\\\n  color: red; }\\\\n\\\\n.c {\\\\n  color: black; }\\\\n\\";
+var css = \\".a {\\\\n  color: pink; }\\\\n\\\\n.b {\\\\n  color: red; }\\\\n\\\\n.c {\\\\n  color: black; }\\\\n\\\\n.foo {\\\\n  color: magenta; }\\\\n\\";
 styleInject(css);
 "
 `;

diff --git a/test/fixtures/sass-import/foo.scss b/test/fixtures/sass-import/foo.scss
@@ -0,0 +1,3 @@
+.foo {
+  color: magenta;
+}
diff --git a/test/fixtures/sass-import/style.scss b/test/fixtures/sass-import/style.scss
@@ -1,3 +1,4 @@
 @import "~foo/bar/a";
 @import "~foo/bar/b";
 @import "~foo/bar/c";
+@import "foo.scss";