Skip to content

Commit

Permalink
Merge pull request #6 from yeojz/feature/prop-types
Browse files Browse the repository at this point in the history
Update proptypes to independent package
  • Loading branch information
yeojz committed May 6, 2017
2 parents 68d7299 + 9d25824 commit d3add1c
Show file tree
Hide file tree
Showing 8 changed files with 3,478 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"jsx": true
}
},
"plugins": [
"react"
],
"extends": [
"eslint:recommended",
"plugin:react/recommended"
Expand Down
15 changes: 8 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing

[![PRs Welcome][pr-welcome-badge]][pr-welcome-badge]
[![PRs Welcome][pr-welcome-badge]][pr-welcome-link]

Thank you for opening (and reading) this document. :)
We are open to, and grateful for, any contributions made.
Expand Down Expand Up @@ -30,15 +30,16 @@ To continuously watch and run tests, run the following:

## Sending a Pull Request

If you send a pull request, please do it against the master branch. Please do no bump the version and tag your pull request with a v[number] as it corresponds to a release.
If you send a pull request, please do it against the master branch.
Please __DO NOT__ bump the version and/or tag your pull request with a `v[number]` as it corresponds to a release.

Before submitting a pull request, please make sure the following is done:

- Fork the repository and create your branch from master.
- If you've added code that should be tested, add tests!
- Ensure the test suite passes (`npm run test`).
- Make sure your code lints (`npm run lint`).
- Make sure coverage is decent (run `npm run coverage` after running `npm run test`)
- Fork the repository and create your branch from master.
- If you've added code that should be tested, add tests!
- Ensure the test suite passes (`npm run test`).
- Make sure your code lints (`npm run lint`).
- Make sure coverage is decent (run `npm run coverage` after running `npm run test`)

Thank you for contributing!

Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"eslint-plugin-react": "^6.10.0",
"mocha": "^3.2.0",
"nyc": "^10.1.2",
"prop-types": "^15.5.8",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
"react-dom": "^15.4.2",
Expand All @@ -58,6 +59,7 @@
"sinon": "^2.1.0"
},
"peerDependencies": {
"prop-types": "^15.5.8",
"react": "^0.14.0 || ^15.0.0",
"react-redux": "^5.0.0"
},
Expand Down
3 changes: 2 additions & 1 deletion src/FormattedMessage.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PropTypes} from 'react';
import React from 'react';
import PropTypes from 'prop-types';

const propTypes = {
id: PropTypes.string.isRequired,
Expand Down
3 changes: 2 additions & 1 deletion src/IntlProvider.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Children, PropTypes} from 'react';
import React, {Children} from 'react';
import PropTypes from 'prop-types';
import {injectIntl} from 'redux-intl-connect';
import {connect} from 'react-redux';

Expand Down
3 changes: 2 additions & 1 deletion src/Provider.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PropTypes} from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import {Provider as ReduxProvider} from 'react-redux';
import IntlProvider from './IntlProvider';

Expand Down
3 changes: 2 additions & 1 deletion src/injectIntl.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PropTypes} from 'react';
import React from 'react';
import PropTypes from 'prop-types';

const contextTypes = {
intl: PropTypes.object.isRequired
Expand Down

0 comments on commit d3add1c

Please sign in to comment.