diff --git a/.jshintrc b/.jshintrc index f01e5db809..84b94e7dd8 100644 --- a/.jshintrc +++ b/.jshintrc @@ -17,5 +17,12 @@ "loopfunc": true, "white": true, "maxparams": 5, - "maxdepth": 4 + "maxdepth": 4, + + "globals": { + "suite": true, + "set": true, + "before": true, + "bench": true + } } diff --git a/Makefile b/Makefile index 9b9c7e2724..1bb6873b93 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ bench: node node_modules/matcha/bin/_matcha test: - $(JSHINT_CMD) lib bin benchmark + $(JSHINT_CMD) lib bin benchmark/index.js $(MOCHA_CMD) test-cov: diff --git a/benchmark/index.js b/benchmark/index.js index b849862b10..c7d04b1b65 100644 --- a/benchmark/index.js +++ b/benchmark/index.js @@ -7,13 +7,10 @@ var es6now = require("es6now"); var esnext = require("esnext"); var to5 = require("../lib/6to5"); -var uglify = require("uglify-js"); +//var uglify = require("uglify-js"); var matcha = require("matcha"); -var stream = require("stream"); var path = require("path"); -var zlib = require("zlib"); var fs = require("fs"); -var vm = require("vm"); var _ = require("lodash"); var readResolve = function (filename) { @@ -51,7 +48,7 @@ var compilers = { traceur: { runtime: readResolve("traceur/bin/traceur-runtime.js"), - compile: function (code, filename) { + compile: function (code) { return traceur.compile(code, { modules: "commonjs", experimental: true @@ -61,20 +58,20 @@ var compilers = { esnext: { runtime: readResolve("esnext/node_modules/regenerator/runtime.js") || readResolve("regenerator/runtime.js"), - compile: function (code, filename) { + compile: function (code) { return esnext.compile(code).code; } }, es6now: { runtime: readResolve("es6now/runtime/ES6.js"), - compile: function (code, filename) { + compile: function (code) { return es6now.translate(code); } }, "es6-transpiler": { - compile: function (code, filename) { + compile: function (code) { var result = es6tr.run({ src: code }); if (result.errors.length) throw new Error(result.join("; ")); return result.src; @@ -82,7 +79,7 @@ var compilers = { }, jstransform: { - compile: function (code, filename) { + compile: function (code) { return jsTrans.transform(jsTransVisitors, code).code; } } @@ -90,7 +87,7 @@ var compilers = { // versions -var uglifyTitle = "uglify v" + getVersion("uglify-js"); +//var uglifyTitle = "uglify v" + getVersion("uglify-js"); _.each(compilers, function (compiler, name) { compiler.title = name + " v" + (compiler.version || getVersion(name)); @@ -162,7 +159,7 @@ _.each(fs.readdirSync(__dirname + "/fixtures"), function (name) { }); }); - _.each(compilers, function (compiler, name) { + _.each(compilers, function (compiler) { bench(compiler.title, function () { compiler.compile(code, loc); }); diff --git a/bin/6to5-node b/bin/6to5-node index 9f28c46e90..e473816114 100755 --- a/bin/6to5-node +++ b/bin/6to5-node @@ -1,7 +1,6 @@ #!/usr/bin/env node var commander = require("commander"); -var Module = require("module"); var util = require("../lib/6to5/util"); var path = require("path"); var repl = require("repl"); diff --git a/lib/6to5/transformers/_alias-functions.js b/lib/6to5/transformers/_alias-functions.js index 36e787dec2..18615572fd 100644 --- a/lib/6to5/transformers/_alias-functions.js +++ b/lib/6to5/transformers/_alias-functions.js @@ -15,7 +15,7 @@ var go = function (getBody, node, file) { }; // traverse the function and find all alias functions so we can alias - // arguments and this if neccesary + // arguments and this if necessary traverse(node, function (node) { var _aliasFunction = node._aliasFunction; if (!_aliasFunction) { diff --git a/package.json b/package.json index dce4b6993f..014d932fcf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "6to5", "description": "Turn ES6 code into readable vanilla ES5 with source maps", - "version": "1.10.6", + "version": "1.10.7", "author": "Sebastian McKenzie ", "homepage": "https://github.com/sebmck/6to5", "repository": {