handling html entities properly

Author: nickrfer

app/components/SvnRevisionList.js

@@ -68,8 +68,10 @@ export default class SvnRevisionList extends Component {
       console.log('Patch result: ');
 
       const diff2HtmlConfig = { inputFormat: 'diff',
-        outputFormat: 'line-by-line',
-        showFiles: true
+        outputFormat: 'side-by-side',
+        showFiles: true,
+        matching: 'words',
+        synchronisedScroll: true
       };
 
       console.log('Diff2Html result: ');
@@ -121,9 +123,7 @@ export default class SvnRevisionList extends Component {
         <ul>
           {rows}
         </ul>
-        <div className="diff-container">
-          { ReactHtmlParser(this.state.prettyDiffHtml) }
-        </div>
+        <div className="diff-container" dangerouslySetInnerHTML={{ __html: this.state.prettyDiffHtml }} />
       </div>
     );
   }

app/main.prod.js

@@ -123,95 +123,94 @@
     "babel-core": "^6.24.1",
     "babel-eslint": "^7.2.3",
     "babel-jest": "^20.0.3",
-    "babel-loader": "^7.0.0",
+    "babel-loader": "^7.1.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-dynamic-import-webpack": "^1.0.1",
     "babel-plugin-flow-runtime": "^0.11.1",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-es2015-classes": "^6.24.1",
-    "babel-polyfill": "^6.23.0",
     "babel-preset-env": "^1.5.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-react-hmre": "^1.1.1",
     "babel-preset-react-optimize": "^1.0.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-register": "^6.24.1",
-    "babili-webpack-plugin": "^0.1.1",
-    "chalk": "^1.1.3",
-    "concurrently": "^3.4.0",
+    "babili-webpack-plugin": "^0.1.2",
+    "chalk": "^2.0.1",
+    "concurrently": "^3.5.0",
     "cross-env": "^5.0.0",
     "cross-spawn": "^5.1.0",
     "css-loader": "^0.28.3",
-    "devtron": "^1.4.0",
     "electron": "^1.6.10",
-    "electron-builder": "^18.0.1",
+    "electron-builder": "^19.8.0",
     "electron-devtools-installer": "^2.2.0",
-    "enzyme": "^2.8.2",
+    "enzyme": "^2.9.1",
     "enzyme-to-json": "^1.5.1",
     "eslint": "^3.19.0",
     "eslint-config-airbnb": "^15.0.1",
     "eslint-formatter-pretty": "^1.1.0",
-    "eslint-import-resolver-webpack": "^0.8.1",
-    "eslint-plugin-compat": "^1.0.3",
+    "eslint-import-resolver-webpack": "^0.8.3",
+    "eslint-plugin-compat": "^1.0.4",
     "eslint-plugin-flowtype": "^2.33.0",
     "eslint-plugin-flowtype-errors": "^3.3.0",
-    "eslint-plugin-import": "^2.3.0",
+    "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-jest": "^20.0.3",
     "eslint-plugin-jsx-a11y": "^5.0.3",
     "eslint-plugin-promise": "^3.5.0",
-    "eslint-plugin-react": "^7.0.1",
+    "eslint-plugin-react": "^7.1.0",
     "express": "^4.15.3",
     "extract-text-webpack-plugin": "^2.1.0",
-    "fbjs-scripts": "^0.7.1",
+    "fbjs-scripts": "^0.8.0",
     "file-loader": "^0.11.1",
-    "flow-bin": "^0.47.0",
-    "flow-runtime": "^0.12.0",
+    "flow-bin": "^0.48.0",
+    "flow-runtime": "^0.13.0",
     "flow-typed": "^2.1.2",
-    "html-webpack-plugin": "^2.28.0",
+    "html-webpack-plugin": "^2.29.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^20.0.4",
     "jsdom": "^11.0.0",
     "minimist": "^1.2.0",
     "node-sass": "^4.5.3",
-    "react-addons-test-utils": "^15.5.1",
-    "react-test-renderer": "^15.5.4",
+    "react-addons-test-utils": "^15.6.0",
+    "react-test-renderer": "^15.6.1",
     "redux-logger": "^3.0.6",
     "rimraf": "^2.6.1",
-    "sass-loader": "^6.0.5",
-    "sinon": "^2.3.1",
+    "sass-loader": "^6.0.6",
+    "sinon": "^2.3.5",
     "spectron": "^3.7.0",
     "style-loader": "^0.18.1",
-    "stylefmt": "^5.3.2",
-    "stylelint": "^7.10.1",
+    "stylefmt": "^6.0.0",
+    "stylelint": "^7.12.0",
     "stylelint-config-standard": "^16.0.0",
     "url-loader": "^0.5.8",
-    "webpack": "^2.6.1",
+    "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-dev-server": "^2.4.5",
+    "webpack-dev-server": "^2.5.0",
     "webpack-merge": "^4.1.0"
   },
   "dependencies": {
-    "electron-debug": "^1.1.0",
+    "devtron": "^1.4.0",
+    "electron-debug": "^1.2.0",
     "font-awesome": "^4.7.0",
-    "history": "^4.6.1",
+    "history": "^4.6.3",
     "prop-types": "^15.5.10",
-    "react": "^15.5.4",
+    "react": "^15.6.1",
     "react-datepicker": "^0.47.0",
-    "react-dom": "^15.5.4",
+    "react-dom": "^15.6.1",
     "react-hot-loader": "3.0.0-beta.6",
     "react-html-parser": "^1.0.3",
     "react-redux": "^5.0.5",
     "react-router": "^4.1.1",
     "react-router-dom": "^4.1.1",
     "react-router-redux": "^5.0.0-alpha.6",
-    "redux": "^3.6.0",
+    "redux": "^3.7.1",
     "redux-thunk": "^2.2.0",
     "source-map-support": "^0.4.15"
   },
   "devEngines": {
-    "node": ">=6.x",
-    "npm": ">=3.x",
+    "node": ">=7.x",
+    "npm": ">=4.x",
     "yarn": ">=0.21.3"
   }
 }