Merge pull request #89 from anru/patch-1

joshwnj · joshwnj · commit cb519ce24e91 · 2016-03-08T16:42:11.000+11:00
Pass correct `from` arg for resolved files
diff --git a/file-system-loader.js b/file-system-loader.js
@@ -72,6 +72,8 @@ var FileSystemLoader = (function () {
         if (newPath[0] !== '.' && newPath[0] !== '/') {
           try {
             fileRelativePath = nodeResolve.sync(newPath, { basedir: rootRelativeDir });
+            // in this case we need to actualize rootRelativePath too
+            rootRelativePath = _path2['default'].relative(_this.root, fileRelativePath);
           } catch (e) {}
         }
 

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ var FileSystemLoader = (function () {`
`72`	`72`	`if (newPath[0] !== '.' && newPath[0] !== '/') {`
`73`	`73`	`try {`
`74`	`74`	`fileRelativePath = nodeResolve.sync(newPath, { basedir: rootRelativeDir });`
	`75`	`+ // in this case we need to actualize rootRelativePath too`
	`76`	`+ rootRelativePath = _path2['default'].relative(_this.root, fileRelativePath);`
`75`	`77`	`} catch (e) {}`
`76`	`78`	`}`
`77`	`79`