Merge pull request #21 from lookback/fix/libsass-bindings

johanbrook · johanbrook · commit 30ec6e6dd11e · 2015-06-16T11:09:25.000-07:00
Upgrade node-sass
diff --git a/example/.meteor/release b/example/.meteor/release
@@ -1 +1 @@
-METEOR@1.0.5
+METEOR@1.1.0.2
diff --git a/example/.meteor/versions b/example/.meteor/versions
@@ -1,8 +1,8 @@
 autopublish@1.0.3
-autoupdate@1.2.0
+autoupdate@1.2.1
 base64@1.0.3
 binary-heap@1.0.3
-blaze@2.1.0
+blaze@2.1.2
 blaze-tools@1.0.3
 boilerplate-generator@1.0.3
 callback-hook@1.0.3
@@ -19,28 +19,28 @@ htmljs@1.0.4
 http@1.1.0
 id-map@1.0.3
 insecure@1.0.3
-iron:controller@1.0.7
-iron:core@1.0.7
-iron:dynamic-template@1.0.7
-iron:layout@1.0.7
-iron:location@1.0.7
-iron:middleware-stack@1.0.7
-iron:router@1.0.7
-iron:url@1.0.7
+iron:controller@1.0.8
+iron:core@1.0.8
+iron:dynamic-template@1.0.8
+iron:layout@1.0.8
+iron:location@1.0.9
+iron:middleware-stack@1.0.9
+iron:router@1.0.9
+iron:url@1.0.9
 jquery@1.11.3_2
 json@1.0.3
 launch-screen@1.0.2
 livedata@1.0.13
 logging@1.0.7
 lookback:emails@0.4.1
-meteor@1.1.5
+meteor@1.1.6
 meteor-platform@1.2.2
 meteorhacks:ssr@2.1.2
-minifiers@1.1.4
-minimongo@1.0.7
+minifiers@1.1.5
+minimongo@1.0.8
 mobile-status-bar@1.0.3
 mongo@1.1.0
-observe-sequence@1.0.5
+observe-sequence@1.0.6
 ordered-dict@1.0.3
 random@1.0.3
 reactive-dict@1.1.0
@@ -50,9 +50,9 @@ retry@1.0.3
 routepolicy@1.0.5
 session@1.1.0
 spacebars@1.0.6
-spacebars-compiler@1.0.5
-templating@1.1.0
-tracker@1.0.6
+spacebars-compiler@1.0.6
+templating@1.1.1
+tracker@1.0.7
 ui@1.0.6
 underscore@1.0.3
 url@1.0.4
diff --git a/package.js b/package.js
@@ -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',
diff --git a/utils.coffee b/utils.coffee
@@ -82,9 +82,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}"

-Original file line number
+Diff line change
 [email protected]
 -[email protected].0
 +[email protected].1
 [email protected]
 [email protected]
 -[email protected].0
 +[email protected].2
 [email protected]
 [email protected]
 [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]
 [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]