Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to use external prop-types package #10

Merged
merged 2 commits into from
Aug 29, 2017
Merged

Update to use external prop-types package #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89736f8
add prop-types package
brucewpaul Aug 29, 2017
2e84dfc
update to use external prop-types package
brucewpaul Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
},
"homepage": "https://github.com/altjs/container",
"dependencies": {
"object.assign": "^4.0.1"
"object.assign": "^4.0.1",
"prop-types": "^15.5.10"
},
"devDependencies": {
"alt": "0.17.4",
Expand Down
5 changes: 3 additions & 2 deletions src/AltContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
* Full docs available at http://goatslacker.github.io/alt/
*/
import React from 'react'
import PropTypes from 'prop-types';
import assign from 'object.assign'

const id = it => it
Expand Down Expand Up @@ -116,11 +117,11 @@ const getStateFromStores = (props) => {
// what about propTypes?
class AltContainer extends React.Component {
static contextTypes = {
flux: React.PropTypes.object,
flux: PropTypes.object,
}

static childContextTypes = {
flux: React.PropTypes.object,
flux: PropTypes.object,
}

getChildContext() {
Expand Down
5 changes: 3 additions & 2 deletions src/mixinContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*eslint-disable*/
import assign from 'object.assign'
import PropTypes from 'prop-types';

const id = it => it

Expand All @@ -23,11 +24,11 @@ const mixinContainer = (React) => {

return {
contextTypes: {
flux: React.PropTypes.object
flux: PropTypes.object
},

childContextTypes: {
flux: React.PropTypes.object
flux: PropTypes.object
},

getChildContext() {
Expand Down