diff --git a/.gitignore b/.gitignore index 65e2817e2d8c3bbdd0cc0821e98564e2a2f86289..10fbe19e7037d0782cd69e9e0b3fb0958600dd1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /node_modules +*.log /coverage /build /build-debug diff --git a/sitegin/nunjucks.js b/sitegin/nunjucks.js index 32fc645c7c90baaeef4e7a0cd64ecc714fcd46c7..bd929548ce9edfb7aad69954b1089063e8118095 100644 --- a/sitegin/nunjucks.js +++ b/sitegin/nunjucks.js @@ -52,7 +52,7 @@ env.addFilter('relURL', function(filename, dir){ var formats = {}; -module.exports = function(data, type) { +module.exports = function(data, type, config) { return new Promise(function(resolve, reject) { if(formats[type]) resolve(formats[type]); else { @@ -99,7 +99,12 @@ module.exports = function(data, type) { var promises = []; tmpls.forEach(function(o) { promises.push(new Promise(function(resolve, reject){ - o.tmpl.render(data, function(err, val) { + var param = Object.assign({}, data, { + config: Object.assign({}, data.config, { + baseurl: config ? config.options.baseurl : '' + }) + }) + o.tmpl.render(param, function(err, val) { if(err) { //reject(new Error('Error rendering template '+o.file)); reject(err); diff --git a/sitegin/theme.js b/sitegin/theme.js index dde9b8a7bde123885dda55798fca1406692dcc40..7fb86bf2b51b519d7302e868197c03e6f0725e2f 100644 --- a/sitegin/theme.js +++ b/sitegin/theme.js @@ -1,6 +1,7 @@ var jobs = require('./jobs'); -module.exports = function(obj) { +module.exports = function(_obj) { + var obj = _obj; console.log('Build step: Theme'); return new Promise(function(resolve,reject){ var todo = 0; @@ -10,7 +11,7 @@ module.exports = function(obj) { var runJob = function(obj, type) { todo++; - jobs.run('nunjucks', obj, type) + jobs.run('nunjucks', obj, type, _obj.config) .then(function(data) { if(!obj.rendered) obj.rendered = []; data.forEach(function(o){