Merge branch 'master' into visitor-update

2014-12-27 13:30:20 -06:00
parent be0ba75925 b764fb1ded
commit ec798a7c44
5 changed files with 34 additions and 20 deletions
@@ -1,9 +1,13 @@
 /*global CompilerContext, Handlebars */
-var SourceMap = require('source-map'),
-      SourceMapConsumer = SourceMap.SourceMapConsumer;
+try {
+  var SourceMap = require('source-map'),
+        SourceMapConsumer = SourceMap.SourceMapConsumer;
+} catch (err) {
+  /* NOP for in browser */
+}

 describe('source-map', function() {
-  if (!Handlebars.precompile) {
+  if (!Handlebars.precompile || !SourceMap) {
    return;
  }