Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 26 additions & 35 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var sass = require('node-sass');
var path = require('path');
var os = require('os');
var fs = require('fs');
var deasync = require('deasync');

// A typical sass error looks like this
var SassError = {
Expand Down Expand Up @@ -67,19 +68,17 @@ module.exports = function (content) {
* @returns {function}
*/
function getWebpackImporter() {
if (isSync) {
return function syncWebpackImporter(url, context) {
url = urlToRequest(url, context);
context = normalizeContext(context);

return syncResolve(self, url, context);
};
}
return function asyncWebpackImporter(url, context, done) {
return function syncWebpackImporter(url, context) {
url = urlToRequest(url, context);
context = normalizeContext(context);
var result = null;

asyncResolve(self, url, context, function(ret) {
result = ret;
});

asyncResolve(self, url, context, done);
deasync.loopWhile(function() {return result === null;});
return result;
};
}

Expand Down Expand Up @@ -137,34 +136,26 @@ module.exports = function (content) {
opt.importer = getWebpackImporter();


// start the actual rendering
if (isSync) {
try {
return sass.renderSync(opt).css.toString();
} catch (err) {
formatSassError(err);
throw err;
}
// do the actual rendering
var result;
try {
result = sass.renderSync(opt);
} catch (err) {
formatSassError(err);
throw err;
}
sass.render(opt, function onRender(err, result) {
if (err) {
formatSassError(err);
callback(err);
return;
}

if (result.map && result.map !== '{}') {
result.map = JSON.parse(result.map);
result.map.file = resourcePath;
// The first source is 'stdin' according to libsass because we've used the data input
// Now let's override that value with the correct relative path
result.map.sources[0] = path.relative(self.options.output.path, resourcePath);
} else {
result.map = null;
}
if (result.map && result.map !== '{}') {
result.map = JSON.parse(result.map);
result.map.file = resourcePath;
// The first source is 'stdin' according to libsass because we've used the data input
// Now let's override that value with the correct relative path
result.map.sources[0] = path.relative(self.options.output.path, resourcePath);
} else {
result.map = null;
}

callback(null, result.css.toString(), result.map);
});
callback(null, result.css.toString(), result.map);
};

/**
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sass-loader",
"version": "1.0.2",
"version": "1.0.4",
"description": "Sass loader for webpack",
"main": "index.js",
"scripts": {
Expand All @@ -26,6 +26,7 @@
"node-sass": "^3.1.0"
},
"dependencies": {
"deasync": "0.1.0",
"loader-utils": "^0.2.5"
},
"devDependencies": {
Expand Down