Skip to content

Commit aa5c103

Browse files
committed
support react 16
1 parent f19de88 commit aa5c103

File tree

4 files changed

+707
-349
lines changed

4 files changed

+707
-349
lines changed

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
## Change Log
2+
3+
### v0.2.0 (2017/10/04 16:43 +00:00)
4+
- [0e5d77c](https://github.com/modosc/react-responsive-redux/commit/0e5d77cdf684f0ab6d217a10ca331e93177cec83) support react 16 (@modosc)
5+
6+
### v0.1.2 (2017/09/13 21:01 +00:00)
7+
- [f19de88](https://github.com/modosc/react-responsive-redux/commit/f19de88205ad7cf033e805958a4b6518357dae29) add peerDeps in README.md (@modosc)
8+
9+
### v0.1.1 (2017/09/13 20:56 +00:00)
10+
- [2e7c59e](https://github.com/modosc/react-responsive-redux/commit/2e7c59e10717aa75bfcbc72a0dd5a0eafd4dab4c) make react-responsive an actual dep instead of a peerDep (@modosc)
11+
12+
### v0.1.0 (2017/09/13 20:32 +00:00)
13+
- [56bf7f1](https://github.com/modosc/react-responsive-redux/commit/56bf7f11bf297bc5953c70cbd56628876bcca916) initial version? (@modosc)
14+
- [7b17b7d](https://github.com/modosc/react-responsive-redux/commit/7b17b7d0cd995276e2a3405938e7db4fa9b101d0) make props.children optional, default to null (@modosc)
15+
- [e040cd9](https://github.com/modosc/react-responsive-redux/commit/e040cd940ce8a3657997f98c014699520240cedc) parser -> mobileParser (@modosc)
16+
- [92e7d57](https://github.com/modosc/react-responsive-redux/commit/92e7d57f22c4636da7c5d55028aee1631469895e) responsiveReducer -> reducer (@modosc)
17+
- [1a33477](https://github.com/modosc/react-responsive-redux/commit/1a33477a5171f79096924568e0e4c435a8ce7885) add eslint ruleset, fix test (@modosc)
18+
- [497728a](https://github.com/modosc/react-responsive-redux/commit/497728a07254127c4bd187a0f03e9250f5cbf9d8) simplify reducer (@modosc)
19+
- [8cb74f7](https://github.com/modosc/react-responsive-redux/commit/8cb74f729dcbb5e0c4713153646a6529ad644309) buildReducer -> buildResponsiveReducer (@modosc)
20+
- [fc5d392](https://github.com/modosc/react-responsive-redux/commit/fc5d3929cdebb44ce24ca843b1970b9d4bffdf98) no user specified breakpoints for now (@modosc)
21+
- [0128c23](https://github.com/modosc/react-responsive-redux/commit/0128c23a17312da393256ff6ddbf87c6f320b171) add component name (@modosc)
22+
- [372cc54](https://github.com/modosc/react-responsive-redux/commit/372cc546028fbf63030979f105db77c081da3723) bugs (@modosc)
23+
- [874d236](https://github.com/modosc/react-responsive-redux/commit/874d236d580ea204796837de9c3a54d45894f543) add-module-exports, not sure we need this anymore (@modosc)
24+
- [b977553](https://github.com/modosc/react-responsive-redux/commit/b977553339804f0f67dd69fd581dc38c7b4e3dd4) now with parser (@modosc)
25+
- [3ef699d](https://github.com/modosc/react-responsive-redux/commit/3ef699d9eb00ed083aae4c041d66c4844f6a835c) initial build working, tests next (@modosc)
26+
- [dba3b9e](https://github.com/modosc/react-responsive-redux/commit/dba3b9e2ecd78c5af7725011c44ca56c3bf22b01) initial commit (@modosc)

package.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-responsive-redux",
3-
"version": "0.1.2",
3+
"version": "0.2.0",
44
"description": "redux integration for react-responsive",
55
"main": "lib/index.js",
66
"module": "es/index.js",
@@ -30,7 +30,8 @@
3030
"clean": "rimraf lib es",
3131
"build": "npm run clean && npm run build:commonjs && npm run build:es",
3232
"build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib --source-maps",
33-
"build:es": "cross-env BABEL_ENV=es babel src --out-dir es --source-maps"
33+
"build:es": "cross-env BABEL_ENV=es babel src --out-dir es --source-maps",
34+
"changelog": "github-changes -o modosc -r react-responsive-redux -b master -f ./CHANGELOG.md --order-semver --use-commit-body"
3435
},
3536
"author": {
3637
"name": "jonathan schatz",
@@ -48,9 +49,10 @@
4849
"babel-preset-react": "^6.24.1",
4950
"babel-register": "^6.24.1",
5051
"chai": "^4.1.2",
51-
"chai-enzyme": "^0.8.0",
52+
"chai-enzyme": "^1.0.0-beta.0",
5253
"cross-env": "^5.0.5",
53-
"enzyme": "^2.9.1",
54+
"enzyme": "^3.1.0",
55+
"enzyme-adapter-react-16": "^1.0.1",
5456
"eslint": "^4.6.1",
5557
"eslint-config-airbnb": "^15.1.0",
5658
"eslint-mocha": "^0.3.0",
@@ -60,29 +62,30 @@
6062
"eslint-plugin-mocha": "^4.11.0",
6163
"eslint-plugin-react": "^7.3.0",
6264
"eslint-plugin-unicorn": "^2.1.2",
65+
"github-changes": "^1.1.0",
6366
"jsdom": "^11.2.0",
6467
"jsdom-global": "https://github.com/modosc/jsdom-global#jsdom-11",
65-
"mocha": "^3.2.0",
66-
"react": "^15.6.1",
67-
"react-dom": "^15.6.1",
68+
"mocha": "^4.0.0",
69+
"react": "^16.0.0",
70+
"react-dom": "^16.0.0",
6871
"react-redux": "^5.0.6",
69-
"react-test-renderer": "^15.6.1",
72+
"react-test-renderer": "^16.0.0",
7073
"redux": "^3.7.2",
7174
"redux-test-utils": "^0.1.2",
7275
"rimraf": "^2.6.1",
73-
"sinon": "^3.2.1"
76+
"sinon": "^4.0.1"
7477
},
7578
"dependencies": {
7679
"mobile-detect": "^1.3.7",
77-
"react-responsive": "^1.3.4"
80+
"react-responsive": "^1.3.4 || ^2.0.0"
7881
},
7982
"repository": {
8083
"type": "git",
8184
"url": "https://github.com/modosc/react-responsive-redux.git"
8285
},
8386
"peerDependencies": {
8487
"prop-types": "^15.5.10",
85-
"react": "^15.6.1",
88+
"react": "^15.6.1 || ^16.0.0",
8689
"react-redux": "^5.0.6",
8790
"redux": "^3.7.2"
8891
}

test/setup.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import chai from 'chai'
22
import chaiEnzyme from 'chai-enzyme'
3+
import Enzyme from 'enzyme'
4+
import Adapter from 'enzyme-adapter-react-16'
5+
6+
Enzyme.configure({ adapter: new Adapter() })
37

48
global.expect = chai.expect
59

0 commit comments

Comments
 (0)