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
10 changes: 7 additions & 3 deletions lib/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@ function sassLoader(content) {
sass = require("node-sass");
sassVersion = /^(\d+)/.exec(require("node-sass/package.json").version).pop();
} catch (e) {
throw new Error(
"Error loading `node-sass`: " + e
);
if (e.code === "MODULE_NOT_FOUND") {
throw new Error(
"Error loading `node-sass`: " + e
);
}

throw e;
}

if (Number(sassVersion) < 4) {
Expand Down
22 changes: 21 additions & 1 deletion test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,28 @@ describe("sass-loader", () => {
done();
});
});
it("should output a message when `node-sass` is an incompatible version", (done) => {
it("should output a message when `node-sass` throw other error", (done) => {
mockRequire.reRequire(pathToSassLoader);
const module = require("module");
const originalResolve = module._resolveFilename;

module._resolveFilename = function (filename) {
if (!filename.match(/node-sass/)) {
return originalResolve.apply(this, arguments);
}

throw new Error("Other error");
};
runWebpack({
entry: pathToSassLoader + "!" + pathToErrorFile
}, (err) => {
module._resolveFilename = originalResolve;
mockRequire.reRequire("node-sass");
err.message.should.match(/Other error/);
done();
});
});
it("should output a message when `node-sass` is an incompatible version", (done) => {
mockRequire("node-sass/package.json", { version: "3.0.0" });
runWebpack({
entry: pathToSassLoader + "!" + pathToErrorFile
Expand Down