From 6e1ef759ec1d018d9e33b8f424d8c1791fad7b58 Mon Sep 17 00:00:00 2001
From: Mike Nikles <mnikles@mobify.com>
Date: Sat, 30 Jan 2016 17:53:04 -0800
Subject: [PATCH] Upgrade React to the latest version

---
 .gitignore                  |  9 ++-------
 package.json                |  7 ++++---
 test/html-to-react-tests.js | 26 +++++++++++++-------------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ab763c..f0a6060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,4 @@
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
-
-# IDE files / folders
+npm-debug.log
 .idea
-
-# Test coverage
-coverage.html
\ No newline at end of file
+coverage.html
diff --git a/package.json b/package.json
index d6f0c3c..997728e 100644
--- a/package.json
+++ b/package.json
@@ -36,13 +36,14 @@
   },
   "dependencies": {
     "htmlparser2": "^3.8.3",
-    "lodash": "^3.9.3",
-    "react": "^0.13.3"
+    "lodash": "^3.9.3"
   },
   "devDependencies": {
     "blanket": "1.1.7",
     "coveralls": "^2.11.2",
     "mocha": "^2.2.5",
-    "mocha-lcov-reporter": "0.0.2"
+    "mocha-lcov-reporter": "0.0.2",
+    "react": "^0.14.7",
+    "react-dom": "^0.14.7"
   }
 }
diff --git a/test/html-to-react-tests.js b/test/html-to-react-tests.js
index b5c6681..2c1ed76 100644
--- a/test/html-to-react-tests.js
+++ b/test/html-to-react-tests.js
@@ -2,6 +2,7 @@
 
 var assert = require("assert");
 var React = require('react');
+var ReactDOMServer = require('react-dom/server')
 
 var Parser = require('../index').Parser;
 var ProcessNodeDefinitions = require('../index').ProcessNodeDefinitions;
@@ -14,7 +15,7 @@ describe('Html2React', function() {
             var htmlInput = '<p>Does this work?</p>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlInput);
         });
@@ -23,7 +24,7 @@ describe('Html2React', function() {
             var htmlInput = '<div><h1>Heading</h1></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlInput);
         });
@@ -32,7 +33,7 @@ describe('Html2React', function() {
             var htmlInput = '<div style="background-color: red;color: white;"></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlInput);
         });
@@ -42,7 +43,7 @@ describe('Html2React', function() {
             var htmlExpected = '<div></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlExpected);
         });
@@ -51,7 +52,7 @@ describe('Html2React', function() {
             var htmlInput = '<div data-test-attribute="data attribute value"></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlInput);
         });
@@ -60,7 +61,7 @@ describe('Html2React', function() {
             var htmlInput = '<div aria-labelledby="label1"></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlInput);
         });
@@ -69,7 +70,7 @@ describe('Html2React', function() {
             var htmlInput = '<div class="class-one"></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlInput);
         });
@@ -79,7 +80,7 @@ describe('Html2React', function() {
             var htmlInput = '<div><!-- This is a comment --></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlInput);
         });
@@ -90,7 +91,7 @@ describe('Html2React', function() {
             var htmlExpected = '<div></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlExpected);
         });
@@ -118,7 +119,7 @@ describe('Html2React', function() {
             var htmlExpected = '<div><p></p></div>';
 
             var reactComponent = parser.parse(htmlInput);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
 
             assert.equal(reactHtml, htmlExpected);
         });
@@ -162,7 +163,7 @@ describe('Html2React with custom processing instructions', function() {
                 processNode: processNodeDefinitions.processDefaultNode
             }];
             var reactComponent = parser.parseWithInstructions(htmlInput, isValidNode, processingInstructions);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
             assert.equal(reactHtml, htmlExpected);
         });
 
@@ -191,9 +192,8 @@ describe('Html2React with custom processing instructions', function() {
                     processNode: processNodeDefinitions.processDefaultNode
                 }];
             var reactComponent = parser.parseWithInstructions(htmlInput, isValidNode, processingInstructions);
-            var reactHtml = React.renderToStaticMarkup(reactComponent);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
             assert.equal(reactHtml, htmlExpected);
         });
     });
 });
-