Skip to content

Commit ed70275

Browse files
committed
Upgrade React version to 15.0.1.
1 parent c971491 commit ed70275

File tree

3 files changed

+25
-16
lines changed

3 files changed

+25
-16
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### v1.2.0-beta (18 April 2016)
2+
3+
* [UPGRADE] Add peer dependency `[email protected]`.
4+
*Note: When adding/removing content completely in rapid successions strange things happen with this change.
5+
(Thus beta status)*
6+
* [ENHANCEMENT] Add a `displayName` field.
7+
18
### v1.1.2 (9 April 2016)
29

310
* [UPGRADE] Use the `object-assign` lib, as [React 15 does](https://github.com/facebook/react/pull/6376), rather

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,32 @@
1515
},
1616
"dependencies": {
1717
"object-assign": "^4.0.1",
18-
"react-addons-css-transition-group": "^0.14.0"
18+
"react-addons-css-transition-group": "^15.0.1"
1919
},
2020
"peerDependencies": {
21-
"react": "^0.14.0",
22-
"react-dom": "^0.14.0"
21+
"react": "^0.14.0 || ^15.0.0",
22+
"react-dom": "^0.14.0 || ^15.0.0"
2323
},
2424
"devDependencies": {
25-
"babel": "^5.8.23",
26-
"babel-eslint": "^4.1.3",
27-
"babelify": "^6.3.0",
28-
"browser-sync": "^2.9.11",
25+
"babel": "^5.8.38",
26+
"babel-eslint": "^4.1.8",
27+
"babelify": "^6.4.0",
28+
"browser-sync": "^2.12.3",
2929
"browserify": "^11.2.0",
30-
"del": "^2.0.2",
31-
"eslint": "^1.6.0",
32-
"eslint-plugin-react": "^3.5.1",
30+
"del": "^2.2.0",
31+
"eslint": "^1.10.3",
32+
"eslint-plugin-react": "^3.16.1",
3333
"gulp": "^3.9.1",
34-
"gulp-eslint": "^1.0.0",
34+
"gulp-eslint": "^1.1.1",
3535
"gulp-flatten": "^0.2.0",
3636
"gulp-notify": "^2.2.0",
3737
"lodash.assign": "^3.2.0",
38-
"react": "^0.14.0",
39-
"react-bootstrap": "^0.27.1",
40-
"react-dom": "^0.14.0",
38+
"react": "^15.0.0",
39+
"react-bootstrap": "^0.27.3",
40+
"react-dom": "^15.0.0",
4141
"vinyl-buffer": "^1.0.0",
4242
"vinyl-source-stream": "^1.1.0",
43-
"watchify": "^3.4.0"
43+
"watchify": "^3.7.0"
4444
},
4545
"author": "Marnus Weststrate <[email protected]>",
4646
"contributors": [],

src/ReactCSSTransitionReplace.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ function createTransitionTimeoutPropValidator(transitionType) {
4040

4141
export default class ReactCSSTransitionReplace extends React.Component {
4242

43+
static displayName = 'ReactCSSTransitionReplace';
44+
4345
static propTypes = {
4446
transitionName: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.shape({
4547
enter: React.PropTypes.string,
@@ -166,7 +168,7 @@ export default class ReactCSSTransitionReplace extends React.Component {
166168

167169
this.setState(state);
168170
}
169-
};
171+
}
170172

171173
_wrapChild(child, moreProps) {
172174
// We need to provide this childFactory so that

0 commit comments

Comments
 (0)