(Try to) Fix HyperLine on Hyper 2

package.json

@@ -34,6 +34,7 @@
     "opencollective": "^1.0.3",
     "prop-types": "^15.5.10",
     "public-ip": "^2.0.1",
+    "react": "^16.4.1",
     "spotify-node-applescript": "^1.1.0",
     "styled-jsx": "2.2.6",
     "systeminformation": "^3.4.1"
@@ -53,7 +54,6 @@
     "jest": "^20.0.4",
     "lint-staged": "^4.0.0",
     "prettier": "^1.5.2",
-    "prop-types": "^15.5.10",
     "webpack": "2.2.0-rc.1",
     "webpack-node-externals": "^1.3.3",
     "xo": "^0.18.2",

src/lib/core/hyperline.js

@@ -1,6 +1,5 @@
-import React from 'react'
+import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import Component from 'hyper/component'
 import decorate from 'hyper/decorate'
 
 class HyperLine extends Component {

src/lib/plugins/battery.js

@@ -1,8 +1,7 @@
 /* eslint no-undef: 0 */
 // Note: This is to stop XO from complaining about {navigator}
 
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import leftPad from 'left-pad'
 import BatteryIcon from './battery/battery-icon'
 

src/lib/plugins/battery/charging.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import SvgIcon from '../../utils/svg-icon'
 
 export default class Charging extends Component {

src/lib/plugins/battery/critical.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import SvgIcon from '../../utils/svg-icon'
 
 export default class Critical extends Component {

src/lib/plugins/battery/draining.js

@@ -1,6 +1,5 @@
-import React from 'react'
+import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import Component from 'hyper/component'
 import SvgIcon from '../../utils/svg-icon'
 
 export default class Draining extends Component {

src/lib/plugins/cpu.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import { currentLoad as cpuLoad } from 'systeminformation'
 import leftPad from 'left-pad'
 import SvgIcon from '../utils/svg-icon'

src/lib/plugins/docker.js

@@ -1,6 +1,5 @@
 import { exec as ex } from 'child_process'
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import SvgIcon from '../utils/svg-icon'
 
 class PluginIcon extends Component {

src/lib/plugins/git-status.js

@@ -1,7 +1,6 @@
 import exec from 'child_process'
 import shell from 'electron'
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 
 
 /*

src/lib/plugins/hostname.js

@@ -1,6 +1,5 @@
 import os from 'os'
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import SvgIcon from '../utils/svg-icon'
 
 class PluginIcon extends Component {

src/lib/plugins/ip.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import publicIp from 'public-ip'
 import SvgIcon from '../utils/svg-icon'
 

src/lib/plugins/memory.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import { mem as memoryData } from 'systeminformation'
 import leftPad from 'left-pad'
 import SvgIcon from '../utils/svg-icon'

src/lib/plugins/network.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import { networkStats } from 'systeminformation'
 import SvgIcon from '../utils/svg-icon'
 

src/lib/plugins/spotify.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import spotify from 'spotify-node-applescript'
 import SvgIcon from '../utils/svg-icon'
 

src/lib/plugins/time.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import moment from 'moment'
 import SvgIcon from '../utils/svg-icon'
 

src/lib/plugins/uptime.js

@@ -1,6 +1,5 @@
 import os from 'os'
-import React from 'react'
-import Component from 'hyper/component'
+import React, { Component } from 'react'
 import formatUptime from '../utils/time'
 import SvgIcon from '../utils/svg-icon'
 

src/lib/utils/svg-icon.js

@@ -1,6 +1,5 @@
-import React from 'react'
+import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import Component from 'hyper/component'
 
 export default class SvgIcon extends Component {
   static propTypes() {

webpack.config.js

@@ -10,7 +10,7 @@ module.exports = {
     libraryTarget: 'commonjs'
   },
   plugins: [ new webpack.DefinePlugin({ 'global.GENTLY': false }) ],
-  externals: [ nodeExternals(), 'hyper/component', 'hyper/notify', 'hyper/decorate', 'react' ],
+  externals: [ nodeExternals(), 'hyper/notify', 'hyper/decorate', 'react' ],
   module: {
     rules: [
       {