Skip to content

Commit 5c4045a

Browse files
rtruongrodneyrehm
authored andcommitted
fix(sass.node): fixes issues #69 and #86 (#88)
1 parent db84b93 commit 5c4045a

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/sass.node.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
var fs = require('fs');
21
var Sass = require('./sass.sync.js');
2+
var fs = require('fs');
3+
var path = require('path');
34

45
function fileExists(path) {
56
var stat = fs.statSync(path);
@@ -31,9 +32,7 @@ function importFileToSass(path, done) {
3132
}
3233

3334
function importerCallback(request, done) {
34-
// sass.js works in the "/sass/" directory, make that relative to CWD
35-
var requestedPath = request.resolved.replace(/^\/sass\//, '' );
36-
importFileToSass(requestedPath, done);
35+
importFileToSass(resolve(request), done);
3736
}
3837

3938
function compileFile(path, options, callback) {
@@ -48,6 +47,19 @@ function compileFile(path, options, callback) {
4847
});
4948
}
5049

50+
function resolve(request) {
51+
// the request will not have the correct "resolved" path on Windows
52+
// see https://github.com/medialize/sass.js/issues/69
53+
// see https://github.com/medialize/sass.js/issues/86
54+
return path.normalize(
55+
path.join(
56+
// sass.js works in the "/sass/" directory, make that relative to CWD
57+
path.dirname(request.previous.replace(/^\/sass\//, '')),
58+
request.current
59+
)
60+
).replace(/\\/g, '/');
61+
}
62+
5163
compileFile.importFileToSass = importFileToSass;
5264
compileFile.Sass = Sass;
5365

0 commit comments

Comments
 (0)