Allow relative paths in scoped packages

lennym · Nov 20, 2016 · ec16eb2 · ec16eb2
1 parent 9e27c84
commit ec16eb2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/lib/importer.js b/lib/importer.js
@@ -4,9 +4,10 @@ var findup = require('findup'),
 var local = require('./local');
 
 function find(dir, file, callback) {
-    var name;
+    var name, isScoped = false;
     if (file.split('/')[0][0] === '@') {
         name = file.split('/').slice(0, 2).join('/');
+        isScoped = true;
     } else {
         name = file.split('/')[0];
     }
@@ -36,7 +37,11 @@ function find(dir, file, callback) {
             }
         // if a full path is provided
         } else {
-            location = path.join('../', file);
+          if(isScoped) {
+            location = path.join('..', '..', file);
+          } else {
+            location = path.join('..', file);
+          }
         }
         callback(null, path.resolve(root, location));
     });

diff --git a/test/test-cases/scoped-packages-with-relative-path/index.scss b/test/test-cases/scoped-packages-with-relative-path/index.scss
@@ -0,0 +1 @@
+@import "@lennym/npm-sass-test-sass/child-file";
diff --git a/test/test-cases/scoped-packages-with-relative-path/package.json b/test/test-cases/scoped-packages-with-relative-path/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "npm-sass-test-npm-modules",
+  "version": "0.0.0",
+  "description": "sass compilation with npm aware include paths",
+  "dependencies": {
+    "@lennym/npm-sass-test-sass": "0.0.0"
+  }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@import "@lennym/npm-sass-test-sass/child-file";