assemble-render-file
Advanced tools
Comparing version 0.5.1 to 0.5.2
28
index.js
@@ -65,10 +65,4 @@ /*! | ||
// create the context to pass to templates | ||
var ctx = app.context(view, locals); | ||
ctx.engine = resolveEngine(app, ctx, engine); | ||
// set context on `view` so it's not re-merged by `compile` | ||
view._context = ctx; | ||
if (!ctx.engine && app.option('engineStrict') === false) { | ||
resolveEngine(app, locals, engine); | ||
if (!locals.engine && app.isFalse('engineStrict')) { | ||
next(null, view); | ||
@@ -79,3 +73,3 @@ return; | ||
// render the view | ||
app.render(view, ctx, function(err, res) { | ||
app.render(view, locals, function(err, res) { | ||
if (err) { | ||
@@ -98,10 +92,14 @@ err.view = view; | ||
function resolveEngine(app, ctx, engine) { | ||
ctx.engine = engine || ctx.engine; | ||
function resolveEngine(app, locals, engine) { | ||
if (typeof engine === 'string') { | ||
locals.engine = engine; | ||
return; | ||
} | ||
if (locals.engine) { | ||
return; | ||
} | ||
// allow a `noop` engine to be defined | ||
if (!ctx.engine && app.engines['.noop']) { | ||
ctx.engine = '.noop'; | ||
if (app.engines['.noop']) { | ||
locals.engine = '.noop'; | ||
} | ||
return ctx.engine; | ||
} | ||
@@ -108,0 +106,0 @@ |
{ | ||
"name": "assemble-render-file", | ||
"description": "Assemble plugin for rendering views in a vinyl pipeline.", | ||
"version": "0.5.1", | ||
"version": "0.5.2", | ||
"homepage": "https://github.com/assemble/assemble-render-file", | ||
@@ -6,0 +6,0 @@ "author": "Jon Schlinkert (https://github.com/jonschlinkert)", |
@@ -106,2 +106,2 @@ # assemble-render-file [![NPM version](https://img.shields.io/npm/v/assemble-render-file.svg?style=flat)](https://www.npmjs.com/package/assemble-render-file) [![NPM downloads](https://img.shields.io/npm/dm/assemble-render-file.svg?style=flat)](https://npmjs.org/package/assemble-render-file) [![Build Status](https://img.shields.io/travis/assemble/assemble-render-file.svg?style=flat)](https://travis-ci.org/assemble/assemble-render-file) | ||
_This file was generated by [verb](https://github.com/verbose/verb), v, on April 05, 2016._ | ||
_This file was generated by [verb](https://github.com/verbose/verb), v0.9.0, on April 11, 2016._ |
@@ -9,3 +9,2 @@ 'use strict'; | ||
var fn = require; | ||
require = utils; | ||
@@ -16,3 +15,3 @@ require('mixin-deep', 'merge'); | ||
utils.debug = require('debug')('base:assemble:assemble-render-file'); | ||
utils.debug = require('debug')('base:assemble:render-file'); | ||
@@ -19,0 +18,0 @@ /** |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
108
9458