update peerDeps for redux@4, cleanup old test stuff, dep updates

modosc · Jul 8, 2018 · c465518 · c465518
1 parent cca0920
commit c465518
Showing 23 changed files with 2,825 additions and 1,220 deletions.
diff --git a/.babelrc b/.babelrc
@@ -13,9 +13,6 @@
     },
     "commonjs": {
       "plugins": ["add-module-exports", "@babel/plugin-transform-runtime", "@babel/plugin-proposal-object-rest-spread"]
-    },
-    "test": {
-      "plugins": ["add-module-exports",  "@babel/plugin-transform-runtime", "@babel/plugin-proposal-object-rest-spread", "./babel-plugin-arrow-function-coverage-fix.js"]
     }
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
 .DS_Store
+coverage/
diff --git a/babel-plugin-arrow-function-coverage-fix.js b/babel-plugin-arrow-function-coverage-fix.js
diff --git a/es/components.js b/es/components.js
diff --git a/es/components.js.map b/es/components.js.map
diff --git a/es/defaults.js.map b/es/defaults.js.map
diff --git a/es/index.js.map b/es/index.js.map
diff --git a/es/parser.js.map b/es/parser.js.map
diff --git a/es/redux.js b/es/redux.js
diff --git a/es/redux.js.map b/es/redux.js.map
diff --git a/lib/components.js b/lib/components.js
diff --git a/lib/components.js.map b/lib/components.js.map
diff --git a/lib/defaults.js.map b/lib/defaults.js.map
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/lib/parser.js.map b/lib/parser.js.map
diff --git a/lib/redux.js b/lib/redux.js
diff --git a/lib/redux.js.map b/lib/redux.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-responsive-redux",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "redux integration for react-responsive",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -49,7 +49,7 @@
     "@babel/preset-react": "^7.0.0-beta.35",
     "babel-core": "^7.0.0-0",
     "babel-eslint": "^8.0.0",
-    "babel-jest": "^22.1.0",
+    "babel-jest": "^23.2.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "chai": "^4.1.2",
     "chai-enzyme": "^1.0.0-beta.0",
@@ -58,23 +58,24 @@
     "enzyme": "^3.1.0",
     "enzyme-adapter-react-16": "^1.0.1",
     "eslint": "^4.6.1",
-    "eslint-config-airbnb": "^16.1.0",
-    "eslint-plugin-babel": "^4.1.2",
+    "eslint-config-airbnb": "^17.0.0",
+    "eslint-plugin-babel": "^5.1.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-jest": "^21.7.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.3.0",
-    "eslint-plugin-unicorn": "^3.0.1",
+    "eslint-plugin-unicorn": "^4.0.3",
     "github-changes": "^1.1.0",
+    "jest": "^23.3.0",
     "prop-types": "^15.5.0",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "react-redux": "^5.0.6",
     "react-test-renderer": "^16.0.0",
-    "redux": "^3.7.2",
+    "redux": "^4.0.0",
     "redux-test-utils": "^0.2.2",
     "rimraf": "^2.6.1",
-    "sinon": "^4.0.1"
+    "sinon": "^6.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.35",
@@ -89,7 +90,7 @@
     "prop-types": "^15.5.10",
     "react": "^15.6.1 || ^16.0.0",
     "react-redux": "^5.0.6",
-    "redux": "^3.7.2"
+    "redux": "^3.7.2 || ^4.0.0"
   },
   "jest": {
     "setupTestFrameworkScriptFile": "<rootDir>/test/setup.js"

diff --git a/src/components.js b/src/components.js
@@ -12,15 +12,19 @@ export const MediaQueryWrapper = (props = {}) => {
   } = props
   const values = { deviceWidth: fakeWidth, width: fakeWidth }
   return (
-    <MediaQuery {...other} {...{ values }} >
+    <MediaQuery {...other} {...{ values }}>
       {children}
     </MediaQuery>
   )
 }
 
 MediaQueryWrapper.propTypes = {
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  component: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.string]),
+  component: PropTypes.oneOfType([
+    PropTypes.node,
+    PropTypes.func,
+    PropTypes.string,
+  ]),
   dispatch: PropTypes.func.isRequired,
   fakeWidth: PropTypes.number.isRequired,
 }
@@ -30,18 +34,37 @@ MediaQueryWrapper.defaultProps = {
   component: 'div',
 }
 
-export const responsiveWrapper = (props = {}) =>
-  connect(state => ({ fakeWidth: state.responsive.fakeWidth, ...props }))(MediaQueryWrapper)
+export const responsiveWrapper = (props = {}) => connect(state => ({
+  fakeWidth: state.responsive.fakeWidth, ...props,
+}))(MediaQueryWrapper)
 
 export const XsScreen = responsiveWrapper({ maxWidth: breakPoints.sm - 1 })
-export const SmScreen = responsiveWrapper({ query: `(min-width: ${breakPoints.sm}px) and (max-width: ${breakPoints.md - 1}px)` })
-export const MdScreen = responsiveWrapper({ query: `(min-width: ${breakPoints.md}px) and (max-width: ${breakPoints.lg - 1}px)` })
-export const LgScreen = responsiveWrapper({ query: `(min-width: ${breakPoints.lg}px)` })
+export const SmScreen = responsiveWrapper({
+  query: `(min-width: ${breakPoints.sm}px) and (max-width: ${breakPoints.md
+    - 1}px)`,
+})
+export const MdScreen = responsiveWrapper({
+  query: `(min-width: ${breakPoints.md}px) and (max-width: ${breakPoints.lg
+    - 1}px)`,
+})
+export const LgScreen = responsiveWrapper({
+  query: `(min-width: ${breakPoints.lg}px)`,
+})
 
 export const XsScreenHidden = responsiveWrapper({ minWidth: breakPoints.sm })
-export const SmScreenHidden = responsiveWrapper({ query: `(max-width: ${breakPoints.sm - 1}px), (min-width: ${breakPoints.md}px)` })
-export const MdScreenHidden = responsiveWrapper({ query: `(max-width: ${breakPoints.md - 1}px), (min-width: ${breakPoints.lg}px)` })
-export const LgScreenHidden = responsiveWrapper({ maxWidth: breakPoints.lg - 1 })
+export const SmScreenHidden = responsiveWrapper({
+  query: `(max-width: ${breakPoints.sm - 1}px), (min-width: ${
+    breakPoints.md
+  }px)`,
+})
+export const MdScreenHidden = responsiveWrapper({
+  query: `(max-width: ${breakPoints.md - 1}px), (min-width: ${
+    breakPoints.lg
+  }px)`,
+})
+export const LgScreenHidden = responsiveWrapper({
+  maxWidth: breakPoints.lg - 1,
+})
 
 export { XsScreen as PhoneScreen }
 export { SmScreen as TabletScreen }

diff --git a/src/index.js b/src/index.js
@@ -1,9 +1,13 @@
 // explicitly naming exports because webpack doesn't tree-shake 'export * from'
 // correctly
-export { defaultSize, initialState, reducer, SET_MOBILE_DETECT, setMobileDetect } from './redux'
-export { MediaQueryWrapper, responsiveWrapper, PhoneScreen, TabletScreen,
+export {
+  defaultSize, initialState, reducer, SET_MOBILE_DETECT, setMobileDetect,
+} from './redux'
+export {
+  MediaQueryWrapper, responsiveWrapper, PhoneScreen, TabletScreen,
   DesktopScreen, MobileScreen, PhoneScreenHidden, TabletScreenHidden,
   DesktopScreenHidden, MobileScreenHidden, XsScreen, SmScreen, MdScreen,
-  LgScreen, XsScreenHidden, SmScreenHidden, MdScreenHidden, LgScreenHidden } from './components'
+  LgScreen, XsScreenHidden, SmScreenHidden, MdScreenHidden, LgScreenHidden,
+} from './components'
 export { breakPoints, defaultSizes } from './defaults'
 export { mobileParser } from './parser'
diff --git a/test/components.test.js b/test/components.test.js
@@ -2,10 +2,12 @@ import React from 'react'
 import { shallow, mount } from 'enzyme'
 import { createMockStore } from 'redux-test-utils'
 import MediaQuery from 'react-responsive'
-import { MediaQueryWrapper, responsiveWrapper, PhoneScreen, TabletScreen,
+import {
+  MediaQueryWrapper, responsiveWrapper, PhoneScreen, TabletScreen,
   MobileScreen, DesktopScreen, PhoneScreenHidden, TabletScreenHidden,
   DesktopScreenHidden, MobileScreenHidden, XsScreen, XsScreenHidden, SmScreen,
-  SmScreenHidden, MdScreen, MdScreenHidden, LgScreen, LgScreenHidden } from '../src'
+  SmScreenHidden, MdScreen, MdScreenHidden, LgScreen, LgScreenHidden,
+} from '../src'
 
 import { breakPoints } from '../src/defaults'
 

diff --git a/test/redux.test.js b/test/redux.test.js
@@ -1,4 +1,6 @@
-import { SET_MOBILE_DETECT, setMobileDetect, reducer, initialState, defaultSize, defaultSizes } from '../src'
+import {
+  SET_MOBILE_DETECT, setMobileDetect, reducer, initialState, defaultSize, defaultSizes,
+} from '../src'
 
 describe('redux', () => {
   describe('actions', () => {

diff --git a/yarn.lock b/yarn.lock