Skip to content

Commit

Permalink
feat: mobx 5 support
Browse files Browse the repository at this point in the history
  • Loading branch information
foxhound87 committed Jul 24, 2018
1 parent 88b24c9 commit a95faee
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 25 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
/node_modules
/umd
npm-debug.log
.nyc_output
yarn-error.log
coverage.lcov
codecov.yml
yarn.lock
.nyc_output
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
sudo: false
language: node_js
cache:
yarn: true
directories:
- node_modules
notifications:
email: false
node_js:
- 8
- '8'
before_install:
- npm i -g npm@^3.0.0
before_script:
- npm prune
install:
- npm install
script:
- npm run cover
- npm run coverage:check
Expand Down
6 changes: 3 additions & 3 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"basscss-colors": "2.2.0",
"classnames": "2.2.5",
"font-awesome": "4.7.0",
"mobx": "4.2.0",
"mobx-react": "^5.0.0",
"mobx-react-devtools": "^5.0.1",
"mobx": "^5.0.3",
"mobx-react": "^5.2.3",
"mobx-react-devtools": "^6.0.1",
"prop-types": "^15.6.0",
"react": "^16.0.0",
"react-dom": "^16.0.0"
Expand Down
31 changes: 18 additions & 13 deletions demo/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2079,9 +2079,9 @@ [email protected]:
version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"

hoist-non-react-statics@^2.3.1:
version "2.5.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
hoist-non-react-statics@^2.5.0:
version "2.5.5"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"

home-or-tmp@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -2652,19 +2652,20 @@ minimist@^1.2.0:
dependencies:
minimist "0.0.8"

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"
mobx-react-devtools@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/mobx-react-devtools/-/mobx-react-devtools-6.0.1.tgz#24fdb14349e1b0b5a014d7c031cfe8188ed9c418"

mobx-react@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.0.0.tgz#8d5a33be376fa22b184a6f555d40a6a3a8459a16"
mobx-react@^5.2.3:
version "5.2.3"
resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.2.3.tgz#cdf6141c2fe63377c5813cbd254e8ce0d4676631"
dependencies:
hoist-non-react-statics "^2.3.1"
hoist-non-react-statics "^2.5.0"
react-lifecycles-compat "^3.0.2"

mobx@4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/mobx/-/mobx-4.2.0.tgz#ee0b0a4f3da2f4776225046ab208ac329a4841d4"
mobx@^5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.0.3.tgz#53b97f2a0f9b0dd7774c96249f81bf2d513d8e1c"

[email protected]:
version "0.7.1"
Expand Down Expand Up @@ -3390,6 +3391,10 @@ react-dom@^16.0.0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react-lifecycles-compat@^3.0.2:
version "3.0.4"
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"

react@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mobx-react-matchmedia",
"license": "MIT",
"version": "0.0.0-semantically-released",
"version": "0.0.0-development",
"author": "Claudio Savino <[email protected]> (https://twitter.com/foxhound87)",
"description": "A React HOC with mediaqueries for responsive layout.",
"homepage": "https://www.npmjs.com/package/mobx-react-matchmedia",
Expand All @@ -25,7 +25,7 @@
"cover": "nyc npm test",
"coverage:check": "nyc check-coverage --satements 25 --branches 0 --functions 0 --lines 30",
"coverage:report": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
"semantic-release": "semantic-release"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -53,7 +53,7 @@
"match-media-mock": "0.1.0"
},
"peerDependencies": {
"mobx": "^2.5.0 || ^3.0.0 || ^4.0.0",
"mobx": "^2.5.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
"prop-types": "^15.6.0",
"react": "^15.0.0 || ^16.0.0"
},
Expand Down Expand Up @@ -84,14 +84,14 @@
"husky": "^0.12.0",
"jsdom": "^11.3.0",
"json-loader": "0.5.4",
"mobx": "4.2.0",
"mobx": "^5.0.3",
"mocha": "3.2.0",
"npm-run-all": "4.0.1",
"nyc": "10.1.2",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"semantic-release": "^8.0.3",
"semantic-release": "^15.8.1",
"webpack": "1.14.0"
}
}

0 comments on commit a95faee

Please sign in to comment.