Skip to content
This repository was archived by the owner on Jan 22, 2021. It is now read-only.

Upgrade node-sass #21

Merged
merged 3 commits into from
Jun 16, 2015
Merged
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
2 changes: 1 addition & 1 deletion example/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.0.5
METEOR@1.1.0.2
34 changes: 17 additions & 17 deletions example/.meteor/versions
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected].0
[email protected].2
[email protected]
[email protected]
[email protected]
Expand All @@ -19,28 +19,28 @@ [email protected]
[email protected]
[email protected]
[email protected]
iron:[email protected].7
iron:[email protected].7
iron:[email protected].7
iron:[email protected].7
iron:[email protected].7
iron:[email protected].7
iron:[email protected].7
iron:[email protected].7
iron:[email protected].8
iron:[email protected].8
iron:[email protected].8
iron:[email protected].8
iron:[email protected].9
iron:[email protected].9
iron:[email protected].9
iron:[email protected].9
[email protected]_2
[email protected]
[email protected]
[email protected]
[email protected]
lookback:[email protected]
[email protected].5
[email protected].6
[email protected]
meteorhacks:[email protected]
[email protected].4
[email protected].7
[email protected].5
[email protected].8
[email protected]
[email protected]
[email protected].5
[email protected].6
[email protected]
[email protected]
[email protected]
Expand All @@ -50,9 +50,9 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].5
[email protected].0
[email protected].6
[email protected].6
[email protected].1
[email protected].7
[email protected]
[email protected]
[email protected]
Expand Down
5 changes: 3 additions & 2 deletions package.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ Package.describe({
});

Npm.depends({
'node-sass': '2.0.0',
'node-sass': '3.2.0',
'juice': '1.0.0'
});

Package.onUse(function(api) {
api.versionsFrom('0.9.3');

api.versionsFrom('1.0.4');

api.use([
'check',
Expand Down
8 changes: 3 additions & 5 deletions utils.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ share.MailerUtils =
file = path.join(ROOT, scss)

try
return sass.renderSync(file: file, sourceMap: false).css
return sass.renderSync(file: file, sourceMap: false).css.toString()
catch ex
# `ex` is somehow a JSON string.
e = JSON.parse(ex)
console.error 'Sass failed to compile: ' + e.message
console.error 'In ' + (e.file or scss)
console.error 'Sass failed to compile: ' + ex.message
console.error "In #{ex.file or scss} at line #{ex.line}, column #{ex.column}"