Merge remote-tracking branch 'upstream/master'

Author: zalmoxisus

.babelrc

@@ -1,4 +1,3 @@
 {
-  "plugins": ["transform-react-jsx"],
-  "presets": ["es2015", "stage-0"]
+  "presets": ["es2015-loose", "stage-0", "react"]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-devtools-log-monitor",
-  "version": "1.0.0-beta-3",
+  "version": "1.0.1",
   "description": "The default tree view monitor for Redux DevTools",
   "main": "lib/index.js",
   "scripts": {
@@ -31,16 +31,16 @@
   },
   "homepage": "https://github.com/gaearon/redux-devtools-log-monitor",
   "devDependencies": {
-    "babel-cli": "^6.1.2",
-    "babel-core": "^6.1.2",
-    "babel-eslint": "^4.1.4",
-    "babel-loader": "^6.0.1",
-    "babel-plugin-transform-react-jsx": "^6.0.18",
-    "babel-preset-es2015": "^6.1.2",
-    "babel-preset-stage-0": "^6.1.2",
+    "babel-cli": "^6.3.15",
+    "babel-core": "^6.1.20",
+    "babel-eslint": "^5.0.0-beta4",
+    "babel-loader": "^6.2.0",
+    "babel-preset-es2015-loose": "^6.1.3",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
     "eslint": "^0.23",
     "eslint-config-airbnb": "0.0.6",
-    "eslint-plugin-react": "^2.3.0",
+    "eslint-plugin-react": "^3.6.3",
     "expect": "^1.6.0",
     "mocha": "^2.2.5",
     "mocha-jsdom": "^1.0.0",
@@ -49,7 +49,7 @@
   },
   "peerDependencies": {
     "react": "^0.14.0",
-    "redux-devtools": "^3.0.0-beta-3"
+    "redux-devtools": "^3.0.0"
   },
   "dependencies": {
     "react-json-tree": "^0.3.0",

src/LogMonitor.js

@@ -39,8 +39,8 @@ const styles = {
   }
 };
 
-class LogMonitor extends Component {
-  static reducer = reducer;
+export default class LogMonitor extends Component {
+  static update = reducer;
 
   static propTypes = {
     dispatch: PropTypes.func,
@@ -234,5 +234,3 @@ class LogMonitor extends Component {
     );
   }
 }
-
-export default LogMonitor;

src/LogMonitorButton.js

@@ -20,7 +20,7 @@ const styles = {
   }
 };
 
-class LogMonitorButton extends React.Component {
+export default class LogMonitorButton extends React.Component {
   shouldComponentUpdate = shouldPureComponentUpdate;
 
   constructor(props) {
@@ -94,5 +94,3 @@ class LogMonitorButton extends React.Component {
     );
   }
 }
-
-export default LogMonitorButton;

src/LogMonitorEntry.js

@@ -13,7 +13,7 @@ const styles = {
   }
 };
 
-class LogMonitorEntry extends Component {
+export default class LogMonitorEntry extends Component {
   static propTypes = {
     state: PropTypes.object.isRequired,
     action: PropTypes.object.isRequired,
@@ -95,5 +95,3 @@ class LogMonitorEntry extends Component {
     );
   }
 }
-
-export default LogMonitorEntry;

src/LogMonitorEntryAction.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Component } from 'react';
 import JSONTree from 'react-json-tree';
 
 const styles = {
@@ -13,7 +13,7 @@ const styles = {
   }
 };
 
-class LogMonitorAction extends React.Component {
+export default class LogMonitorAction extends Component {
   renderPayload(payload) {
     return (
       <div style={{
@@ -42,5 +42,3 @@ class LogMonitorAction extends React.Component {
     );
   }
 }
-
-export default LogMonitorAction;

src/reducers.js

@@ -1,6 +1,6 @@
 import { UPDATE_SCROLL_TOP } from './actions';
 
-function initialScrollTop(state = 0, action, props) {
+function initialScrollTop(props, state = 0, action) {
   if (!props.preserveScrollTop) {
     return 0;
   }
@@ -10,8 +10,8 @@ function initialScrollTop(state = 0, action, props) {
     state;
 }
 
-export default function reducer(state = {}, action, props) {
+export default function reducer(props, state = {}, action) {
   return {
-    initialScrollTop: initialScrollTop(state.initialScrollTop, action, props)
+    initialScrollTop: initialScrollTop(props, state.initialScrollTop, action)
   };
 }