Upgrade dependecies

app/package.json

@@ -9,11 +9,24 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "react": "16.8",
+    "@material-ui/core": "^4.0.0-alpha.1",
+    "@material-ui/icons": "^3.0.2",
+    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/styles": "^3.0.0-alpha.10",
+    "compare-versions": "^3.4.0",
     "copy-text-to-clipboard": "^1.0.4",
     "diff": "^4.0.1",
     "electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist",
+    "get-value": "^3.0.1",
+    "js-base64": "^2.5.1",
+    "json-to-ast": "^2.1.0",
+    "lodash.debounce": "^4.0.8",
+    "lodash.throttle": "^4.1.1",
+    "moment": "^2.24.0",
+    "moving-average": "^1.0.0",
+    "number-abbreviate": "^2.0.0",
     "prismjs": "^1.15.0",
+    "react": "16.8",
     "react-ace": "^6.3.2",
     "react-dom": "^16.7.0",
     "react-redux": "^6.0.0",
@@ -23,22 +36,9 @@
     "redux": "^4.0.1",
     "redux-batched-actions": "^0.4.1",
     "redux-thunk": "^2.3.0",
-    "lodash.debounce": "^4.0.8",
-    "lodash.throttle": "^4.1.1",
-    "moment": "^2.24.0",
-    "moving-average": "^1.0.0",
-    "number-abbreviate": "^2.0.0",
-    "uuid": "^3.3.2",
     "sha1": "^1.1.1",
     "socket.io-client": "^2.2.0",
-    "compare-versions": "^3.4.0",
+    "uuid": "^3.3.2"
-    "get-value": "^3.0.1",
-    "js-base64": "^2.5.1",
-    "json-to-ast": "^2.1.0",
-    "@material-ui/core": "^4.0.0-alpha.1",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
-    "@material-ui/styles": "^3.0.0-alpha.10"
   },
   "devDependencies": {
     "@types/diff": "^4.0.1",
@@ -50,7 +50,6 @@
     "@types/react-dom": "^16.0.11",
     "@types/react-redux": "^6.0.12",
     "@types/react-resize-detector": "^3.1.0",
-    "@types/react-split-pane": "^0.1.67",
     "@types/sha1": "^1.1.1",
     "@types/socket.io-client": "^1.4.32",
     "@types/uuid": "^3.4.4",

app/src/components/Sidebar/CodeDiff.tsx

@@ -60,7 +60,7 @@ class CodeDiff extends React.Component<Props, {}> {
 
   public render() {
     const changes = diff.diffLines(this.props.previous, this.props.current)
-    const styledLines = Prism.highlight(this.props.current, Prism.languages.json).split('\n')
+    const styledLines = Prism.highlight(this.props.current, Prism.languages.json, 'json').split('\n')
 
     let lineNumber = 0
     const code = changes.map((change, key) => {
@@ -68,8 +68,8 @@ class CodeDiff extends React.Component<Props, {}> {
       const changedLines = change.count || 0
       if (hasStyledCode && this.props.language === 'json') {
         const currentLines = styledLines.slice(lineNumber, lineNumber + changedLines)
-        const lines = currentLines.map((l, idx) => {
+        const lines = currentLines.map((html: string, idx: number) => {
-          return <div key={`${key}-${idx}`} className={this.props.classes.line}><span className={this.cssClassForChange(change)} dangerouslySetInnerHTML={{ __html: l }} /></div>
+          return <div key={`${key}-${idx}`} className={this.props.classes.line}><span className={this.cssClassForChange(change)} dangerouslySetInnerHTML={{ __html: html }} /></div>
         })
         lineNumber += changedLines
 

app/src/index.tsx

@@ -1,25 +1,18 @@
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
+import amber from '@material-ui/core/colors/amber'
 import App from './App'
 import Demo from './components/Demo'
 import reducers, { AppState } from './reducers'
 import reduxThunk from 'redux-thunk'
+import teal from '@material-ui/core/colors/teal'
 import { applyMiddleware, compose, createStore } from 'redux'
 import { batchDispatchMiddleware } from 'redux-batched-actions'
-import { createMuiTheme, MuiThemeProvider, Theme } from '@material-ui/core/styles'
+import { connect, Provider } from 'react-redux'
-import { Provider, connect } from 'react-redux'
+import { createMuiTheme, Theme } from '@material-ui/core/styles'
+import { ThemeProvider } from '@material-ui/styles'
 import './tracking'
-import blue from '@material-ui/core/colors/blue'
+
-import red from '@material-ui/core/colors/red'
-import pink from '@material-ui/core/colors/pink'
-import orange from '@material-ui/core/colors/orange'
-import deepOrange from '@material-ui/core/colors/deepOrange'
-import indigo from '@material-ui/core/colors/indigo'
-import lime from '@material-ui/core/colors/lime'
-import green from '@material-ui/core/colors/green'
-import teal from '@material-ui/core/colors/teal'
-import amber from '@material-ui/core/colors/amber'
-import brown from '@material-ui/core/colors/brown'
 
 const composeEnhancers = /*(window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || */ compose
 const store = createStore(
@@ -46,11 +39,10 @@ function createTheme(type: 'light' | 'dark') {
         background: {
           default: '#fafafa',
         },
-        //primary: teal,
-        secondary: amber,
         primary: {
-          main: '#931e2e'
+          main: '#931e2e',
         },
+        secondary: amber,
         // error: red,
         action: {
           disabledBackground: '#fafafa',
@@ -62,10 +54,10 @@ function createTheme(type: 'light' | 'dark') {
 
 function ApplicationRenderer(props: {theme: 'light' | 'dark'}) {
   return (
-    <MuiThemeProvider theme={createTheme(props.theme)}>
+    <ThemeProvider theme={createTheme(props.theme)}>
       <App />
       <Demo />
-    </MuiThemeProvider>
+    </ThemeProvider>
   )
 }
 

package.json

@@ -93,7 +93,6 @@
     "electron-log": "^2.2.17",
     "electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist",
     "electron-updater": "^4.0.6",
-    "js-base64": "^2.5.1",
     "lowdb": "^1.0.0",
     "mqtt": "^2.18.8",
     "sha1": "^1.1.1"

tslint.json

@@ -9,6 +9,7 @@
     "jsx-no-lambda": false,
     "indent": [true, "spaces", 2],
     "import-name": false,
+    "no-submodule-imports": false,
     "variable-name": [true, "ban-keywords", "check-format", "allow-pascal-case"],
     "trailing-comma": [
       true,

yarn.lock

@@ -2090,11 +2090,6 @@ istanbul-reports@^2.0.1:
   dependencies:
     handlebars "^4.0.11"
 
-js-base64@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
-  integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
-
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"