Skip to content

now works with recent node-sass, also updated devDeps and coffee-script test #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

now works with recent node-sass, also updated devDeps and coffee-script test #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a05e9f
now works with recent node-sass versions
alubbe May 1, 2015
294178c
updated coffee-script dev dependency
alubbe May 1, 2015
56608b8
updated less and stylus dev dependency
alubbe May 1, 2015
7af290f
made package.json compatible with old npm versions
alubbe May 1, 2015
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
4 changes: 2 additions & 2 deletions lib/assets-compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ AssetsCompiler.prototype.addCompilers = function() {

this.add('scss', {
render: function(str, options, fn){
this.nodeSass = this.nodSass || require('node-sass');
this.nodeSass = this.nodeSass || require('node-sass');
try{
fn(null, this.nodeSass.renderSync({data: str}));
fn(null, this.nodeSass.renderSync({data: str}).css);
}catch (err) {
fn(err);
}
Expand Down
40 changes: 18 additions & 22 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,20 @@
"test": "make test"
},
"dependencies": {
"uglify-js":">= 2.2.5"
"uglify-js": ">= 2.2.5"
},
"devDependencies": {
"mocha": "1.8.1",
"should": "1.2.2",
"semicov": "0.1.1",
"supertest": "0.5.1",
"coffee-script": "~1.9.2",
"compound": "1.x",
"express": "3.x",

"stylus": "0.32.1",
"sass": "0.5.0",
"node-sass": "0.6.6",
"less": "1.3.3",
"coffee-script": "1.6.1"
},
"repository": {
"type": "git",
"url": "https://github.com/compoundjs/assets-compiler.git"
"less": "~1.7.5",
"mocha": "~2.2.4",
"node-sass": "~2.1.1",
"sass": "~0.5.0",
"semicov": "~0.1.1-2",
"should": "~6.0.1",
"stylus": "~0.51.1",
"supertest": "~0.15.0"
},
"repository": "",
"keywords": [
Expand All @@ -41,15 +36,16 @@
"middleware"
],
"author": "Sascha Gehlich <[email protected]>",
"contributors": [{
"name": "Dmitry Erman",
"email": "[email protected]",
"web": "https://github.com/dmitrye"
"contributors": [
{
"name": "Dmitry Erman",
"email": "[email protected]",
"web": "https://github.com/dmitrye"
},
{
"name": "Henrik Myntti",
"email": "[email protected]",
"web": "https://github.com/hankeypancake"
"name": "Henrik Myntti",
"email": "[email protected]",
"web": "https://github.com/hankeypancake"
}
],
"license": "MIT"
Expand Down
4 changes: 2 additions & 2 deletions test/compilers.coffeescript.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('assets-compiler', function() {
should.not.exist(err);

res.headers['content-type'].should.match(/^application\/javascript/);
res.headers['content-length'].should.equal('61');
res.headers['content-length'].should.equal('60');

res.text.should.equal(fs.readFileSync(app.root + '/public/javascripts/application.js').toString());

Expand All @@ -46,4 +46,4 @@ describe('assets-compiler', function() {

});

});
});