cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify bin/6to5 util methods and fix double compilation bug with eval in 6to5-node

Browse Source
This commit is contained in:
Sebastian McKenzie 2014-10-18 15:46:15 +11:00
parent 435cd98480
commit 2be2e4e1ae
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/6to5-node
View File

@ -41,9 +41,7 @@ var _eval = function (code, filename) {
}; };
if (commander.eval) { if (commander.eval) {
var code = to5.transform(commander.eval, { filename: "eval" }).code; var result = _eval(commander.eval, "eval");
var result = _eval(code, "eval");
if (commander.print) console.log(result); if (commander.print) console.log(result);
} else { } else {
var filenames = commander.args; var filenames = commander.args;

2
bin/6to5/dir.js
View File

@ -13,7 +13,7 @@ module.exports = function (commander, filenames, opts) {
var write = function (src, relative) { var write = function (src, relative) {
var dest = path.join(commander.outDir, relative); var dest = path.join(commander.outDir, relative);
var data = util.compile(src, dest); var data = util.compile(src, { sourceMapName: dest });
var up = path.normalize(dest + "/.."); var up = path.normalize(dest + "/..");
mkdirp.sync(up); mkdirp.sync(up);

4
bin/6to5/file.js
View File

@ -100,8 +100,8 @@ module.exports = function (commander, filenames, opts) {
} }
}); });
_.each(_filenames, function (filename) { _.each(_filenames, function (filename, i) {
results.push(util.compile(filename)); results.push(util.compile(filename, { _noStrict: i != 0 }));
}); });
output(); output();

10
bin/6to5/util.js
View File

@ -9,9 +9,9 @@ exports.readdirFilter = function (filename) {
return readdir(filename).filter(util.canCompile); return readdir(filename).filter(util.canCompile);
}; };
exports.transform = function (filename, code, to) { exports.transform = function (filename, code, opts) {
var opts = _.extend({ filename: filename }, index.opts); opts = _.extend(opts || {}, index.opts);
if (to) opts.sourceMapName = to; opts.filename = filename;
var result = to5.transform(code, opts); var result = to5.transform(code, opts);
result.filename = filename; result.filename = filename;
@ -19,7 +19,7 @@ exports.transform = function (filename, code, to) {
return result; return result;
}; };
exports.compile = function (filename, to) { exports.compile = function (filename, opts) {
var code = fs.readFileSync(filename, "utf8"); var code = fs.readFileSync(filename, "utf8");
return exports.transform(filename, code, to); return exports.transform(filename, code, opts);
}; };