updated eslint

Author: foxhound87

demo/yarn.lock

@@ -2080,13 +2080,8 @@ hoek@2.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
 hoist-non-react-statics@^2.3.1:
-<<<<<<< Updated upstream
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
-=======
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
->>>>>>> Stashed changes
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
@@ -2657,21 +2652,6 @@ minimist@^1.2.0:
   dependencies:
     minimist "0.0.8"
 
-<<<<<<< Updated upstream
-mobx-react-devtools@^4.2.15:
-  version "4.2.15"
-  resolved "https://registry.yarnpkg.com/mobx-react-devtools/-/mobx-react-devtools-4.2.15.tgz#881c038fb83db4dffd1e72bbaf5374d26b2fdebb"
-
-mobx-react@^4.3.3:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-4.3.3.tgz#4ad76c03d1e942b431e942f9ea18df0756771655"
-  dependencies:
-    hoist-non-react-statics "^2.3.1"
-
-mobx@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/mobx/-/mobx-3.3.1.tgz#c38fc1a287a0dda3f5d4b85efe1137fedd9dcdf0"
-=======
 mobx-react-devtools@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/mobx-react-devtools/-/mobx-react-devtools-5.0.1.tgz#9473c85929b2fc0c95086430419028cebd96fb3b"
@@ -2685,7 +2665,6 @@ mobx-react@^5.0.0:
 mobx@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/mobx/-/mobx-4.2.0.tgz#ee0b0a4f3da2f4776225046ab208ac329a4841d4"
->>>>>>> Stashed changes
 
 ms@0.7.1:
   version "0.7.1"

package.json

@@ -53,14 +53,14 @@
     "match-media-mock": "0.1.0"
   },
   "peerDependencies": {
-    "mobx": "^4.0.0",
+    "mobx": "^2.5.0 || ^3.0.0 || ^4.0.0",
     "prop-types": "^15.6.0",
     "react": "^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
     "babel-cli": "6.22.0",
     "babel-core": "6.22.0",
-    "babel-eslint": "7.1.1",
+    "babel-eslint": "^8.2.3",
     "babel-loader": "6.2.10",
     "babel-plugin-add-module-exports": "0.2.1",
     "babel-plugin-transform-class-properties": "6.22.0",
@@ -76,11 +76,11 @@
     "cz-conventional-changelog": "1.2.0",
     "enzyme": "^3.1.0",
     "enzyme-adapter-react-16": "^1.0.1",
-    "eslint": "3.13.1",
-    "eslint-config-airbnb": "14.0.0",
-    "eslint-plugin-import": "2.2.0",
-    "eslint-plugin-jsx-a11y": "3.0.2",
-    "eslint-plugin-react": "6.9.0",
+    "eslint": "^4.19.1",
+    "eslint-config-airbnb": "^16.1.0",
+    "eslint-plugin-import": "^2.11.0",
+    "eslint-plugin-jsx-a11y": "^6.0.3",
+    "eslint-plugin-react": "^7.7.0",
     "husky": "^0.12.0",
     "jsdom": "^11.3.0",
     "json-loader": "0.5.4",

src/MatchMediaProvider.jsx

@@ -1,12 +1,15 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { toJS, set, action, runInAction } from 'mobx';
+import { toJS, extendObservable, set, action, runInAction } from 'mobx';
 import { matchMedia, setMatchMediaConfig } from './matchMedia';
 
 let breakpoints;
 
-export default class MatchMediaProvider extends Component {
+const setObservable = (observable, obj) => set
+  ? set(observable, obj)
+  : extendObservable(observable, obj);
 
+export default class MatchMediaProvider extends Component {
   static propTypes = {
     children: PropTypes.node,
     breakpoints: PropTypes.object,
@@ -42,7 +45,7 @@ export default class MatchMediaProvider extends Component {
 
   updateBreakpoints = action('update breakpoints', (key, val) => {
     const match = matchMedia(val).matches;
-    set(this.props.breakpoints, { [key]: match });
+    setObservable(this.props.breakpoints, { [key]: match });
   });
 
   render() {