From 3a05e9fa71ec8ac672362be5ff3f9a8ef9d6acd3 Mon Sep 17 00:00:00 2001 From: Andreas Lubbe Date: Fri, 1 May 2015 08:10:22 +0200 Subject: [PATCH 1/4] now works with recent node-sass versions --- lib/assets-compiler.js | 4 ++-- package.json | 38 +++++++++++++++++--------------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/lib/assets-compiler.js b/lib/assets-compiler.js index dc3c711..bcf7164 100644 --- a/lib/assets-compiler.js +++ b/lib/assets-compiler.js @@ -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); } diff --git a/package.json b/package.json index 48a5f90..56bf8df 100644 --- a/package.json +++ b/package.json @@ -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.6.1", "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" + "mocha": "1.8.1", + "node-sass": "^2.1.1", + "sass": "0.5.0", + "semicov": "0.1.1", + "should": "1.2.2", + "stylus": "0.32.1", + "supertest": "0.5.1" }, "repository": "", "keywords": [ @@ -41,15 +36,16 @@ "middleware" ], "author": "Sascha Gehlich ", - "contributors": [{ - "name": "Dmitry Erman", - "email": "dmitry.erman@gmail.com", - "web": "https://github.com/dmitrye" + "contributors": [ + { + "name": "Dmitry Erman", + "email": "dmitry.erman@gmail.com", + "web": "https://github.com/dmitrye" }, { - "name": "Henrik Myntti", - "email": "henrik.myntti@gmail.com", - "web": "https://github.com/hankeypancake" + "name": "Henrik Myntti", + "email": "henrik.myntti@gmail.com", + "web": "https://github.com/hankeypancake" } ], "license": "MIT" From 294178c7353f19320a861306fad3e3b760d191df Mon Sep 17 00:00:00 2001 From: Andreas Lubbe Date: Fri, 1 May 2015 08:18:58 +0200 Subject: [PATCH 2/4] updated coffee-script dev dependency --- package.json | 2 +- test/compilers.coffeescript.test.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 56bf8df..7ca5f4c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "uglify-js": ">= 2.2.5" }, "devDependencies": { - "coffee-script": "1.6.1", + "coffee-script": "^1.9.2", "compound": "1.x", "express": "3.x", "less": "1.3.3", diff --git a/test/compilers.coffeescript.test.js b/test/compilers.coffeescript.test.js index fbcd2dd..99d8ee8 100644 --- a/test/compilers.coffeescript.test.js +++ b/test/compilers.coffeescript.test.js @@ -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()); @@ -46,4 +46,4 @@ describe('assets-compiler', function() { }); -}); \ No newline at end of file +}); From 56608b833829ac696fa07aa9171f55d0004cc488 Mon Sep 17 00:00:00 2001 From: Andreas Lubbe Date: Fri, 1 May 2015 08:19:18 +0200 Subject: [PATCH 3/4] updated less and stylus dev dependency --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7ca5f4c..9662ec7 100644 --- a/package.json +++ b/package.json @@ -13,14 +13,14 @@ "coffee-script": "^1.9.2", "compound": "1.x", "express": "3.x", - "less": "1.3.3", - "mocha": "1.8.1", + "less": "^1.7.5", + "mocha": "^2.2.4", "node-sass": "^2.1.1", - "sass": "0.5.0", - "semicov": "0.1.1", - "should": "1.2.2", - "stylus": "0.32.1", - "supertest": "0.5.1" + "sass": "^0.5.0", + "semicov": "^0.1.1-2", + "should": "^6.0.1", + "stylus": "^0.51.1", + "supertest": "^0.15.0" }, "repository": "", "keywords": [ From 7af290f13ea4dad5f9ee34bee66596e83e2672b0 Mon Sep 17 00:00:00 2001 From: Andreas Lubbe Date: Fri, 1 May 2015 08:36:30 +0200 Subject: [PATCH 4/4] made package.json compatible with old npm versions --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 9662ec7..b141373 100644 --- a/package.json +++ b/package.json @@ -10,17 +10,17 @@ "uglify-js": ">= 2.2.5" }, "devDependencies": { - "coffee-script": "^1.9.2", + "coffee-script": "~1.9.2", "compound": "1.x", "express": "3.x", - "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" + "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": [