fix lint errors

This commit is contained in:
Sebastian McKenzie 2014-10-29 20:57:43 +11:00
parent 4dc6147348
commit 163c68dd6a
5 changed files with 23 additions and 17 deletions

View File

@ -17,5 +17,12 @@
"loopfunc": true, "loopfunc": true,
"white": true, "white": true,
"maxparams": 5, "maxparams": 5,
"maxdepth": 4 "maxdepth": 4,
"globals": {
"suite": true,
"set": true,
"before": true,
"bench": true
}
} }

View File

@ -14,7 +14,7 @@ bench:
node node_modules/matcha/bin/_matcha node node_modules/matcha/bin/_matcha
test: test:
$(JSHINT_CMD) lib bin benchmark $(JSHINT_CMD) lib bin benchmark/index.js
$(MOCHA_CMD) $(MOCHA_CMD)
test-cov: test-cov:

View File

@ -7,7 +7,7 @@ var es6now = require("es6now");
var esnext = require("esnext"); var esnext = require("esnext");
var to5 = require("../lib/6to5"); var to5 = require("../lib/6to5");
var uglify = require("uglify-js"); //var uglify = require("uglify-js");
var matcha = require("matcha"); var matcha = require("matcha");
var path = require("path"); var path = require("path");
var fs = require("fs"); var fs = require("fs");
@ -48,7 +48,7 @@ var compilers = {
traceur: { traceur: {
runtime: readResolve("traceur/bin/traceur-runtime.js"), runtime: readResolve("traceur/bin/traceur-runtime.js"),
compile: function (code, filename) { compile: function (code) {
return traceur.compile(code, { return traceur.compile(code, {
modules: "commonjs", modules: "commonjs",
experimental: true experimental: true
@ -58,20 +58,20 @@ var compilers = {
esnext: { esnext: {
runtime: readResolve("esnext/node_modules/regenerator/runtime.js") || readResolve("regenerator/runtime.js"), runtime: readResolve("esnext/node_modules/regenerator/runtime.js") || readResolve("regenerator/runtime.js"),
compile: function (code, filename) { compile: function (code) {
return esnext.compile(code).code; return esnext.compile(code).code;
} }
}, },
es6now: { es6now: {
runtime: readResolve("es6now/runtime/ES6.js"), runtime: readResolve("es6now/runtime/ES6.js"),
compile: function (code, filename) { compile: function (code) {
return es6now.translate(code); return es6now.translate(code);
} }
}, },
"es6-transpiler": { "es6-transpiler": {
compile: function (code, filename) { compile: function (code) {
var result = es6tr.run({ src: code }); var result = es6tr.run({ src: code });
if (result.errors.length) throw new Error(result.join("; ")); if (result.errors.length) throw new Error(result.join("; "));
return result.src; return result.src;
@ -79,7 +79,7 @@ var compilers = {
}, },
jstransform: { jstransform: {
compile: function (code, filename) { compile: function (code) {
return jsTrans.transform(jsTransVisitors, code).code; return jsTrans.transform(jsTransVisitors, code).code;
} }
} }
@ -87,7 +87,7 @@ var compilers = {
// versions // versions
var uglifyTitle = "uglify v" + getVersion("uglify-js"); //var uglifyTitle = "uglify v" + getVersion("uglify-js");
_.each(compilers, function (compiler, name) { _.each(compilers, function (compiler, name) {
compiler.title = name + " v" + (compiler.version || getVersion(name)); compiler.title = name + " v" + (compiler.version || getVersion(name));
@ -159,7 +159,7 @@ _.each(fs.readdirSync(__dirname + "/fixtures"), function (name) {
}); });
}); });
_.each(compilers, function (compiler, name) { _.each(compilers, function (compiler) {
bench(compiler.title, function () { bench(compiler.title, function () {
compiler.compile(code, loc); compiler.compile(code, loc);
}); });

View File

@ -6,7 +6,7 @@ var util = require("./util");
var fs = require("fs"); var fs = require("fs");
var _ = require("lodash"); var _ = require("lodash");
module.exports = function (commander, filenames, opts) { module.exports = function (commander, filenames) {
var results = []; var results = [];
var buildResult = function () { var buildResult = function () {
@ -48,7 +48,7 @@ module.exports = function (commander, filenames, opts) {
return { return {
map: map, map: map,
code: code code: code
} };
}; };
var output = function () { var output = function () {
@ -101,7 +101,7 @@ module.exports = function (commander, filenames, opts) {
}); });
_.each(_filenames, function (filename, i) { _.each(_filenames, function (filename, i) {
results.push(util.compile(filename, { _noStrict: i != 0 })); results.push(util.compile(filename, { _noStrict: +i !== 0 }));
}); });
output(); output();

View File

@ -2,8 +2,7 @@
var commander = require("commander"); var commander = require("commander");
var transform = require("../../lib/6to5/transform"); var transform = require("../../lib/6to5/transform");
var util2 = require("../../lib/6to5/util"); var util = require("../../lib/6to5/util");
var util = require("./util");
var fs = require("fs"); var fs = require("fs");
var _ = require("lodash"); var _ = require("lodash");
@ -13,8 +12,8 @@ commander.option("-f, --filename [filename]", "Filename to use when reading from
commander.option("-w, --watch", "Recompile files on changes"); commander.option("-w, --watch", "Recompile files on changes");
commander.option("-m, --modules [modules]", "Module formatter type to use [common]", "common"); commander.option("-m, --modules [modules]", "Module formatter type to use [common]", "common");
commander.option("-w, --whitelist [whitelist]", "Whitelist of transformers to ONLY use", util2.list); commander.option("-w, --whitelist [whitelist]", "Whitelist of transformers to ONLY use", util.list);
commander.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NOT use", util2.list); commander.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NOT use", util.list);
commander.option("-o, --out-file [out]", "Compile all input files into a single file"); commander.option("-o, --out-file [out]", "Compile all input files into a single file");
commander.option("-d, --out-dir [out]", "Compile an input directory of modules into an output directory"); commander.option("-d, --out-dir [out]", "Compile an input directory of modules into an output directory");