Skip to content

update to babel 6, add semicolons after static props to conform #36

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

Closed
bdefore wants to merge 1 commit into from
Closed

update to babel 6, add semicolons after static props to conform #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"stage": 0,
"loose": "all",
"presets": [
"es2015",
"stage-0",
"react"
]
}

10 changes: 5 additions & 5 deletions modules/AsyncProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ class AsyncPropsContainer extends React.Component {
static propTypes = {
Component: func.isRequired,
routerProps: object.isRequired
}
};

static contextTypes = {
asyncProps: object.isRequired
}
};

componentWillReceiveProps(nextProps) {
const paramsChanged = !shallowEqual(nextProps.routerProps.routeParams,
Expand Down Expand Up @@ -181,7 +181,7 @@ class AsyncProps extends React.Component {

static childContextTypes = {
asyncProps: object
}
};

static propTypes = {
components: array.isRequired,
Expand All @@ -193,7 +193,7 @@ class AsyncProps extends React.Component {
// server rendering
propsArray: array,
componentsArray: array
}
};

static defaultProps = {
onError(err) {
Expand All @@ -207,7 +207,7 @@ class AsyncProps extends React.Component {
render(props) {
return <RouterContext {...props} createElement={createElement}/>
}
}
};

constructor(props, context) {
super(props, context)
Expand Down
8 changes: 5 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@
"react-router": "2.0.0-rc4"
},
"devDependencies": {
"babel": "^5.8.34",
"babel-core": "^5.8.34",
"babel-cli": "^6.4.0",
"babel-eslint": "^3.1.23",
"babel-loader": "^5.4.0",
"babel-loader": "~6.2.1",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-0": "^6.3.13",
"eslint": "1.4.1",
"eslint-config-rackt": "1.0.0",
"eslint-plugin-react": "3.3.2",
Expand Down