Merge branch 'eikaramba-patch-1'

Author: doowb

lib/consolidate.js

@@ -1611,7 +1611,7 @@ exports.marko = function(path, options, fn){
 
     try {
       var tmpl = cache(options) || cache(options, engine.load(path, options));
-      tmpl.render(options, fn)
+      tmpl.renderToString(options, fn)
     } catch (err) {
       fn(err);
     }
@@ -1626,10 +1626,11 @@ exports.marko.render = function(str, options, fn) {
   return promisify(fn, function (fn) {
     var engine = requires.marko || (requires.marko = require('marko'));
     options.writeToDisk = !!options.cache;
+    options.filename = options.filename || 'string.marko';
 
     try {
-      var tmpl = cache(options) || cache(options, engine.load('string.marko', str, options));
-      tmpl.render(options, fn)
+      var tmpl = cache(options) || cache(options, engine.load(options.filename, str, options));
+      tmpl.renderToString(options, fn)
     } catch (err) {
       fn(err);
     }

package.json

@@ -17,7 +17,7 @@
     "atpl": ">=0.7.6",
     "babel-core": "^6.7.6",
     "babel-preset-react": "^6.5.0",
-    "bracket-template": "^1.0.3",
+    "bracket-template": "^1.1.4",
     "coffee-script": "^1.11.1",
     "dot": "^1.0.1",
     "dust": "^0.3.0",