Merge branch 'next' into develop

# Conflicts:
#	package.json

Author: Mihkel Eidast

src/helpers/context-data.js

@@ -20,8 +20,8 @@ module.exports = function(fractal){
         if (!entity) {
             throw new Error(`Could not get context for component '${handle}' - component not found.`);
         }
-        const defaultContext = entity.isComponent ? entity.variants().default().context : entity.context;
-        return source.resolve(_.defaultsDeep(context || {}, defaultContext));
+        const defaultContext = entity.isComponent ? entity.variants().default().getContext() : entity.getContext();
+        return _.defaultsDeep(context || {}, defaultContext);
     };
 
 };

src/helpers/context.js

@@ -10,8 +10,8 @@ module.exports = function(fractal){
         if (!entity) {
             throw new Error(`Could not get context for component '${handle}' - component not found.`);
         }
-        const context = entity.isComponent ? entity.variants().default().context : entity.context;
-        return source.resolve(context).then(ctx => new Handlebars.SafeString(JSON.stringify(ctx, null, 4)));
+        const context = entity.isComponent ? entity.variants().default().getContext() : entity.getContext();
+        return new Handlebars.SafeString(JSON.stringify(context, null, 4));
     };
 
 };

src/helpers/render.js

@@ -24,20 +24,21 @@ module.exports = function(fractal){
         if (!entity) {
             throw new Error(`Could not render component '${handle}' - component not found.`);
         }
-        const defaultContext = entity.isComponent ? entity.variants().default().context : entity.context;
+        const defaultContext = entity.isComponent ? entity.variants().default().getContext() : entity.getContext();
         if (!context) {
             context = defaultContext;
         } else if (merge) {
             context = utils.defaultsDeep(context, defaultContext);
         }
-        
+
         return source.resolve(context).then(context => {
             // fix env for rendered components
             let env = JSON.parse(JSON.stringify(root._env));
             _.set(context, '_env', env);
 
-            return entity.render(context).then(html => new Handlebars.SafeString(html));
+            return entity.render(context).then(html => new Handlebars.SafeString(html)).catch(err => {});
         });
+
     };
 
 };