Skip to content

Commit

Permalink
feat(package.json): upgrade to React@^0.14
Browse files Browse the repository at this point in the history
* Closes #127, #102
* Ref #116

BREAKING CHANGE
* __React@^0.14__: upgrade React in peerDependencies
	* add __react-dom@^0.14__ to peerDependencies
  • Loading branch information
tomchentw committed Oct 8, 2015
1 parent 21d649f commit 443a5fd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
21 changes: 12 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,22 @@
},
"homepage": "https://tomchentw.github.io/react-google-maps/",
"devDependencies": {
"babel": "^5.1.13",
"babel-core": "^5.1.13",
"babel-eslint": "^4.0.5",
"eslint": "^1.0.0",
"eslint-plugin-react": "^3.2.0",
"tomchentw-npm-dev": "^3.0.0",
"rimraf": "^2.4.3"
"babel": "^5.8.23",
"babel-core": "^5.8.25",
"babel-eslint": "^4.1.3",
"eslint": "^1.6.0",
"eslint-plugin-react": "^3.5.1",
"react": "^0.14.0",
"react-dom": "^0.14.0",
"rimraf": "^2.4.3",
"tomchentw-npm-dev": "^3.1.0"
},
"dependencies": {
"google-maps-infobox": "^1.1.13",
"invariant": "^2.1.0"
"invariant": "^2.1.1"
},
"peerDependencies": {
"react": "^0.13.0"
"react": "^0.14.0",
"react-dom": "^0.14.0"
}
}
1 change: 1 addition & 0 deletions src/creators/OverlayViewCreator.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export default class OverlayViewCreator extends Component {
};

overlayView._renderContent = function () {
// FIXME: React@0.14
React.render(
Children.only(this.get("children")),
this._containerElement
Expand Down
1 change: 1 addition & 0 deletions src/utils/setContentForOptionalReactElement.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ function renderElement (
prevContent = document.createElement("div");
}

// FIXME: React@0.14
React.render(contentElement, prevContent);
return prevContent;
}
Expand Down

0 comments on commit 443a5fd

Please sign in to comment.