Skip to content

Commit 97edb1a

Browse files
committed
Use object-assign lib rather than the React.js polyfill.
1 parent d310bba commit 97edb1a

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### v1.1.2 (9 April 2016)
2+
3+
* [UPGRADE] Use the `object-assign` lib, as [React 15 does](https://github.com/facebook/react/pull/6376), rather
4+
than `react/lib/Object.assign` which has been removed. (#14)
5+
16
### v1.1.1 (4 April 2016)
27

38
* [BUGFIX] Corrected the file name in the `main` field of package.json. (#13)

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"prepublish": "npm run build"
1515
},
1616
"dependencies": {
17+
"object-assign": "^4.0.1",
1718
"react-addons-css-transition-group": "^0.14.0"
1819
},
1920
"peerDependencies": {
@@ -29,7 +30,7 @@
2930
"del": "^2.0.2",
3031
"eslint": "^1.6.0",
3132
"eslint-plugin-react": "^3.5.1",
32-
"gulp": "^3.9.0",
33+
"gulp": "^3.9.1",
3334
"gulp-eslint": "^1.0.0",
3435
"gulp-flatten": "^0.2.0",
3536
"gulp-notify": "^2.2.0",

src/ReactCSSTransitionReplace.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import React from 'react';
88
import ReactDOM from 'react-dom';
9-
import objectAssign from 'react/lib/Object.assign';
9+
import objectAssign from 'object-assign';
1010

1111
import ReactCSSTransitionGroupChild from 'react/lib/ReactCSSTransitionGroupChild';
1212

0 commit comments

Comments
 (0)