Skip to content

Commit 0fb9cdb

Browse files
rodneyrehmrodneyrehm
committed
chore(dist): updating distributables to version 0.10.6
1 parent f91eed9 commit 0fb9cdb

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

‎dist/sass.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! sass.js - v0.10.5 (2cd3782) - built 2017-06-25
1+
/*! sass.js - v0.10.6 (f91eed9) - built 2017-07-28
22
providing libsass 3.4.5 (31573210)
33
via emscripten 1.37.0 ()
44
*/

‎dist/sass.node.js‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
/*! sass.js - v0.10.5 (2cd3782) - built 2017-06-25
1+
/*! sass.js - v0.10.6 (f91eed9) - built 2017-07-28
22
providing libsass 3.4.5 (31573210)
33
via emscripten 1.37.0 ()
44
*/
5-
var fs = require('fs');
65
var Sass = require('./sass.sync.js');
6+
var fs = require('fs');
7+
var path = require('path');
78

89
function fileExists(path) {
910
var stat = fs.statSync(path);
@@ -35,9 +36,7 @@ function importFileToSass(path, done) {
3536
}
3637

3738
function importerCallback(request, done) {
38-
// sass.js works in the "/sass/" directory, make that relative to CWD
39-
var requestedPath = request.resolved.replace(/^\/sass\//, '' );
40-
importFileToSass(requestedPath, done);
39+
importFileToSass(resolve(request), done);
4140
}
4241

4342
function compileFile(path, options, callback) {
@@ -52,6 +51,19 @@ function compileFile(path, options, callback) {
5251
});
5352
}
5453

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

‎dist/sass.sync.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/sass.worker.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/versions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"commit": "31573210"
99
},
1010
"sassjs": {
11-
"version": "0.10.5",
12-
"commit": "2cd3782",
11+
"version": "0.10.6",
12+
"commit": "f91eed9",
1313
"branch": "master"
1414
}
1515
}

0 commit comments

Comments
 (0)