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.

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 for React 16 #16

Merged
merged 3 commits into from
Sep 28, 2017
Merged

Update for React 16 #16

merged 3 commits into from
Sep 28, 2017

Conversation

shiawuen
Copy link
Contributor

Hi submitting this to make it work with React 16

@emilyrohrbough
Copy link

Closes #15

"react": "^15.5.0",
"react-dom": "^15.5.0"
"react": "^16.0.0",
"react-dom": "^16.0.0"
},

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add react and react-dom peerDependencies of 0.14.x || ^15.0.0 || ^16.0.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Collaborator

@davidtheclark davidtheclark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @shiawuen and @emilyrohrbough!

One question to sort out, then we can merge and release.

@@ -68,6 +68,9 @@
]
},
"jest": {
"setupFiles": [
"<rootDir>/test/__mocks__/requestAnimationFrame.js"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shiawuen Why was it necessary to add this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

React also depends on requestAnimationFrame (even in test environments).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, thanks!

@davidtheclark davidtheclark merged commit 61f888f into focus-trap:master Sep 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants