From 8cbb121e3f58941898ba3fd4438a3c8065074651 Mon Sep 17 00:00:00 2001 From: Brian Donovan Date: Mon, 27 Oct 2014 20:28:08 -0700 Subject: [PATCH 1/5] Fix typo. --- lib/6to5/transformers/_alias-functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/6to5/transformers/_alias-functions.js b/lib/6to5/transformers/_alias-functions.js index d0895d8de5..7021c28efe 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) { From 32b5edb711e5b2d217d0365fc7c343e0839d287c Mon Sep 17 00:00:00 2001 From: Brian Donovan Date: Mon, 27 Oct 2014 20:28:31 -0700 Subject: [PATCH 2/5] Remove unused requires. --- benchmark/index.js | 3 --- bin/6to5-node | 1 - bin/6to5/index.js | 4 ---- 3 files changed, 8 deletions(-) diff --git a/benchmark/index.js b/benchmark/index.js index b849862b10..0a10350b09 100644 --- a/benchmark/index.js +++ b/benchmark/index.js @@ -9,11 +9,8 @@ var to5 = require("../lib/6to5"); 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) { diff --git a/bin/6to5-node b/bin/6to5-node index c79ce0e17d..c15cdf19bd 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/bin/6to5/index.js b/bin/6to5/index.js index 5500ff96fd..c4c34515a2 100755 --- a/bin/6to5/index.js +++ b/bin/6to5/index.js @@ -1,13 +1,9 @@ #!/usr/bin/env node var commander = require("commander"); -var sourceMap = require("source-map"); var transform = require("../../lib/6to5/transform"); -var chokidar = require("chokidar"); -var mkdirp = require("mkdirp"); var util2 = require("../../lib/6to5/util"); var util = require("./util"); -var path = require("path"); var fs = require("fs"); var _ = require("lodash"); From 4dc6147348935fbc71cc52f197cd4ee47c9987b3 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Wed, 29 Oct 2014 20:53:01 +1100 Subject: [PATCH 3/5] update acorn-recast --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 847c5b765e..19a5020b06 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "source-map-support": "0.2.7", "esutils": "1.1.4", "acorn-jsx": "https://github.com/sebmck/acorn-jsx/archive/master.tar.gz", - "acorn-recast": "0.8.0-3", + "acorn-recast": "0.8.0-4", "acorn-ast-types": "0.5.3-1" }, "devDependencies": { From 163c68dd6a3d04ad2d10ed19e9ee98b2c0a0c05d Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Wed, 29 Oct 2014 20:57:43 +1100 Subject: [PATCH 4/5] fix lint errors --- .jshintrc | 9 ++++++++- Makefile | 2 +- benchmark/index.js | 16 ++++++++-------- bin/6to5/file.js | 6 +++--- bin/6to5/index.js | 7 +++---- 5 files changed, 23 insertions(+), 17 deletions(-) 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 0a10350b09..c7d04b1b65 100644 --- a/benchmark/index.js +++ b/benchmark/index.js @@ -7,7 +7,7 @@ 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 path = require("path"); var fs = require("fs"); @@ -48,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 @@ -58,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; @@ -79,7 +79,7 @@ var compilers = { }, jstransform: { - compile: function (code, filename) { + compile: function (code) { return jsTrans.transform(jsTransVisitors, code).code; } } @@ -87,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)); @@ -159,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/file.js b/bin/6to5/file.js index 1afc7587a2..f59eb6d978 100644 --- a/bin/6to5/file.js +++ b/bin/6to5/file.js @@ -6,7 +6,7 @@ var util = require("./util"); var fs = require("fs"); var _ = require("lodash"); -module.exports = function (commander, filenames, opts) { +module.exports = function (commander, filenames) { var results = []; var buildResult = function () { @@ -48,7 +48,7 @@ module.exports = function (commander, filenames, opts) { return { map: map, code: code - } + }; }; var output = function () { @@ -101,7 +101,7 @@ module.exports = function (commander, filenames, opts) { }); _.each(_filenames, function (filename, i) { - results.push(util.compile(filename, { _noStrict: i != 0 })); + results.push(util.compile(filename, { _noStrict: +i !== 0 })); }); output(); diff --git a/bin/6to5/index.js b/bin/6to5/index.js index c4c34515a2..970dd331f2 100755 --- a/bin/6to5/index.js +++ b/bin/6to5/index.js @@ -2,8 +2,7 @@ var commander = require("commander"); var transform = require("../../lib/6to5/transform"); -var util2 = require("../../lib/6to5/util"); -var util = require("./util"); +var util = require("../../lib/6to5/util"); var fs = require("fs"); 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("-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("-b, --blacklist [blacklist]", "Blacklist of transformers to NOT 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", util.list); 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"); From ecedc23892c9f6f8f8b50c6a67fff5e16da19a60 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Wed, 29 Oct 2014 20:59:35 +1100 Subject: [PATCH 5/5] v1.10.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19a5020b06..d93e6307e2 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": {