From 2fa36b30d5307fde29bd032076c1bb556c06a48e Mon Sep 17 00:00:00 2001 From: James Kyle Date: Thu, 30 Oct 2014 17:46:08 -0700 Subject: [PATCH 1/4] Add ?branch=master to Travis CI badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d325b41181..684c31e8af 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- Travis Status + Travis Status From 530ad78428c859d2cc8919abad66f2490c42cb41 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 31 Oct 2014 11:51:49 +1100 Subject: [PATCH 2/4] fix & html entity in travis badge branch url - thanks @davidchambers --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 684c31e8af..c62ac45f67 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- Travis Status + Travis Status From 251e4d01c88c0c1459d5804002327ae16d48761a Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 31 Oct 2014 21:38:22 +1100 Subject: [PATCH 3/4] join together declarations in destructuring to return a single node if possible - fixes #113 --- lib/6to5/transformers/destructuring.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/6to5/transformers/destructuring.js b/lib/6to5/transformers/destructuring.js index 4ce26b813f..8dad74e99a 100644 --- a/lib/6to5/transformers/destructuring.js +++ b/lib/6to5/transformers/destructuring.js @@ -148,5 +148,22 @@ exports.VariableDeclaration = function (node, parent, file) { } }); + if (parent.type !== "Program" && parent.type !== "BlockStatement") { + var declar; + + _.each(nodes, function (node) { + declar = declar || b.variableDeclaration(node.kind, []); + + if (node.type !== "VariableDeclaration" && declar.kind !== node.kind) { + throw util.errorWithNode(node, "Cannot use this node within the current parent"); + } + + declar.declarations = declar.declarations.concat(node.declarations); + }); + + return declar; + } + return nodes; }; + From 115dca56b65217ddc87cc442b90865ded89a5010 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 31 Oct 2014 21:39:17 +1100 Subject: [PATCH 4/4] v1.10.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a1dab4a3be..db53c40b28 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.8", + "version": "1.10.9", "author": "Sebastian McKenzie ", "homepage": "https://github.com/sebmck/6to5", "repository": {