From 27ad9e1cc038e780a72678aae0999850cace685d Mon Sep 17 00:00:00 2001
From: Antonino Porcino <nino.porcino@gmail.com>
Date: Fri, 1 Jan 2016 18:20:35 +0100
Subject: [PATCH 1/4] Deprecated esprima-fb, back to upstream esprima

---
 package.json          | 2 +-
 src/reactTemplates.js | 2 +-
 src/utils.js          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e0eeb20..ff26d62 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "cheerio": "^0.19.0",
     "css": "^2.2.1",
     "escodegen": "1.7.1",
-    "esprima-fb": "^15001.1001.0-dev-harmony-fb",
+    "esprima": "^2.7.1",
     "lodash": "^3.10.1",
     "optionator": "^0.8.0",
     "text-table": "^0.2.0"
diff --git a/src/reactTemplates.js b/src/reactTemplates.js
index fea65f4..2447018 100644
--- a/src/reactTemplates.js
+++ b/src/reactTemplates.js
@@ -1,7 +1,7 @@
 'use strict';
 var cheerio = require('cheerio');
 var _ = require('lodash');
-var esprima = require('esprima-fb');
+var esprima = require('esprima');
 var escodegen = require('escodegen');
 var reactDOMSupport = require('./reactDOMSupport');
 var reactNativeSupport = require('./reactNativeSupport');
diff --git a/src/utils.js b/src/utils.js
index 087f313..cd2f872 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,6 +1,6 @@
 'use strict';
 var _ = require('lodash');
-var esprima = require('esprima-fb');
+var esprima = require('esprima');
 var rtError = require('./RTCodeError');
 var RTCodeError = rtError.RTCodeError;
 

From f35bb9312a9d1ab0c218a788d55729413b93cc93 Mon Sep 17 00:00:00 2001
From: Antonino Porcino <nino.porcino@gmail.com>
Date: Fri, 1 Jan 2016 19:05:23 +0100
Subject: [PATCH 2/4] Fixed rt-repeat collection JS parsing

---
 src/reactTemplates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/reactTemplates.js b/src/reactTemplates.js
index fea65f4..a4e1108 100644
--- a/src/reactTemplates.js
+++ b/src/reactTemplates.js
@@ -346,7 +346,7 @@ function convertHtmlToReact(node, context) {
             data.item = arr[0].trim();
             data.collection = arr[1].trim();
             validateJS(data.item, node, context);
-            validateJS(data.collection, node, context);
+            validateJS("(" + data.collection + ")", node, context);
             stringUtils.addIfMissing(context.boundParams, data.item);
             stringUtils.addIfMissing(context.boundParams, `${data.item}Index`);
         }

From 9375b8e2d146d24c6ed6d4302e5549507395c585 Mon Sep 17 00:00:00 2001
From: Antonino Porcino <nino.porcino@gmail.com>
Date: Fri, 1 Jan 2016 19:22:35 +0100
Subject: [PATCH 3/4] Added test for rt-repeat over object literal collection

---
 test/data/repeat-literal-collection.rt      | 5 +++++
 test/data/repeat-literal-collection.rt.html | 1 +
 test/src/test.js                            | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 test/data/repeat-literal-collection.rt
 create mode 100644 test/data/repeat-literal-collection.rt.html

diff --git a/test/data/repeat-literal-collection.rt b/test/data/repeat-literal-collection.rt
new file mode 100644
index 0000000..ebc5fb6
--- /dev/null
+++ b/test/data/repeat-literal-collection.rt
@@ -0,0 +1,5 @@
+<div>
+  <div rt-repeat="items in {a:1, b:2}">
+    {items}
+  </div>
+</div>
\ No newline at end of file
diff --git a/test/data/repeat-literal-collection.rt.html b/test/data/repeat-literal-collection.rt.html
new file mode 100644
index 0000000..0364ab2
--- /dev/null
+++ b/test/data/repeat-literal-collection.rt.html
@@ -0,0 +1 @@
+<div><div>1</div><div>2</div></div>
\ No newline at end of file
diff --git a/test/src/test.js b/test/src/test.js
index fb412d6..ee25747 100644
--- a/test/src/test.js
+++ b/test/src/test.js
@@ -184,7 +184,7 @@ test('convert jsrt and test source results', function (t) {
 test('html tests', function (t) {
     var files = ['scope.rt', 'scope-trailing-semicolon.rt', 'scope-variable-references.rt', 'lambda.rt', 'eval.rt', 'props.rt', 'custom-element.rt', 'style.rt', 'concat.rt',
                  'js-in-attr.rt', 'props-class.rt', 'rt-class.rt', 'className.rt', 'svg.rt',
-                 'scope-evaluated-after-repeat.rt', 'scope-evaluated-after-repeat2.rt', 'scope-evaluated-after-if.rt', 'scope-obj.rt'
+                 'repeat-literal-collection.rt', 'scope-evaluated-after-repeat.rt', 'scope-evaluated-after-repeat2.rt', 'scope-evaluated-after-if.rt', 'scope-obj.rt'
     ];
     t.plan(files.length);
 

From 510d394e2b1d8ce3dded83c508e19cc8cbd21742 Mon Sep 17 00:00:00 2001
From: Antonino Porcino <nino.porcino@gmail.com>
Date: Sun, 3 Jan 2016 10:59:35 +0100
Subject: [PATCH 4/4] Updated escodegen, fixed es6 test

---
 package.json            | 2 +-
 test/data/div.rt.es6.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ff26d62..e2fd205 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "chalk": "^1.1.1",
     "cheerio": "^0.19.0",
     "css": "^2.2.1",
-    "escodegen": "1.7.1",
+    "escodegen": "^1.8.0",
     "esprima": "^2.7.1",
     "lodash": "^3.10.1",
     "optionator": "^0.8.0",
diff --git a/test/data/div.rt.es6.js b/test/data/div.rt.es6.js
index 4f40316..9c4e38c 100644
--- a/test/data/div.rt.es6.js
+++ b/test/data/div.rt.es6.js
@@ -2,4 +2,4 @@ import React from 'react/addons';
 import _ from 'lodash';
 export default function () {
     return React.createElement('div', {});
-};
\ No newline at end of file
+}
\ No newline at end of file