Merge aedc3b5 into 1323f96

lib/plugins/helper/to_array.js

@@ -0,0 +1,16 @@
+'use strict';
+
+var isObject = require('lodash/isObject.js');
+var _toArray = require('lodash/toArray.js');
+
+function toArray(value) {
+  if (isObject(value) && typeof value.toArray === 'function') {
+    return value.toArray();
+  } else if (Array.isArray(value)) {
+    return value;
+  }
+
+  return toArray(value);
+}
+
+module.exports = toArray;

lib/plugins/renderer/index.js

@@ -12,7 +12,11 @@ module.exports = ctx => {
 
   renderer.register('json', 'json', require('./json'), true);
 
-  renderer.register('swig', 'html', require('./swig'), true);
+  const nunjucks = require('./nunjucks');
+
+  renderer.register('nunjucks', 'html', nunjucks, true);
+  renderer.register('njk', 'html', nunjucks, true);
+  renderer.register('j2', 'html', nunjucks, true);
 
   const yaml = require('./yaml');
 

lib/plugins/renderer/nunjucks.js

@@ -0,0 +1,37 @@
+'use strict';
+
+var nunjucks = require('nunjucks');
+var fs = require('hexo-fs');
+var toArray = require('../helper/to_array');
+
+var env = nunjucks.configure({
+  noCache: true,
+  autoescape: false,
+  throwOnUndefined: false,
+  trimBlocks: false,
+  lstripBlocks: false
+});
+
+env.addFilter('toArray', toArray);
+
+function nunjucksRenderer(data, locals) {
+  if ('text' in data) {
+    return nunjucks.renderString(data.text, locals);
+  }
+
+  return nunjucks.render(data.path, locals);
+}
+
+nunjucksRenderer.compile = function(data) {
+  var compiled;
+
+  if ('text' in data) {
+    compiled = nunjucks.compile(data.text);
+  } else {
+    compiled = nunjucks.compile(fs.readFileSync(data.path));
+  }
+
+  return compiled.render.bind(compiled);
+};
+
+module.exports = nunjucksRenderer;