Merge pull request #2452 from TimothyGu/develop

Support ejs 2.0
pull/2453/head
John McLear 2015-01-11 17:19:54 +00:00
commit c106e71942
2 changed files with 2 additions and 2 deletions

View File

@ -114,7 +114,7 @@ exports.require = function (name, args, mod) {
args.e = exports; args.e = exports;
args.require = require; args.require = require;
var template = '<% e._init(buf); %>' + fs.readFileSync(ejspath).toString() + '<% e._exit(); %>'; var template = '<% e._init([__output]); %>' + fs.readFileSync(ejspath).toString() + '<% e._exit(); %>';
exports.info.args.push(args); exports.info.args.push(args);
exports.info.file_stack.push({path: ejspath, inherit: []}); exports.info.file_stack.push({path: ejspath, inherit: []});

View File

@ -28,7 +28,7 @@
"cheerio" : ">=0.18.0", "cheerio" : ">=0.18.0",
"async-stacktrace" : ">=0.0.2", "async-stacktrace" : ">=0.0.2",
"npm" : ">=2.1.x", "npm" : ">=2.1.x",
"ejs" : "~1.0.0", "ejs" : "^2.0.0",
"graceful-fs" : ">=3.0.4", "graceful-fs" : ">=3.0.4",
"slide" : ">=1.1.6", "slide" : ">=1.1.6",
"semver" : ">=2.3.0", "semver" : ">=2.3.0",