Skip to content
This repository was archived by the owner on Feb 6, 2023. It is now read-only.

Bug/1668 #1691

Closed
wants to merge 2 commits into from
Closed

Bug/1668 #1691

wants to merge 2 commits into from

Conversation

ofhope
Copy link
Contributor

@ofhope ofhope commented Mar 14, 2018

Before submitting a pull request, please make sure the following is done...

  1. Fork the repo and create your branch from master.
  2. If you've added code that should be tested, add tests!
  3. If you've changed APIs, update the documentation.
  4. Ensure that:
  • The test suite passes (npm test)
  • Your code lints (npm run lint) and passes Flow (npm run flow)
  • You have followed the testing guidelines
  1. If you haven't already, complete the CLA.

Please use the simple form below as a guideline for describing your pull request.

Thanks for contributing to Draft.js!

Summary

Updating examples package.json to reference parent projects react & react dom versions. This ensures its kept in sync with the Draftjs version.

Test Plan

This commit updates example package.json. Not sure it is testable with jest. Unless its possible to detect when two versions of react are loaded.

@niveditc
Copy link
Contributor

niveditc commented Oct 5, 2018

@bambii7 - thank you for submitting this PR. Could you please rebase on master? Then I can merge this in.

@niveditc
Copy link
Contributor

niveditc commented Oct 7, 2018

Uh, now there are 105 commits here. You should submit only the commits that are specific to this PR.

Feel free to open a new PR with your changes if rebasing on master & resolving the merge conflicts is proving challenging!

@ofhope
Copy link
Contributor Author

ofhope commented Oct 7, 2018

Sorry @niveditc I rebased then pulled, think I needed to rebase then force push to keep HEAD in sync with upstream master. I'll see if I can correct.

@ofhope
Copy link
Contributor Author

ofhope commented Oct 8, 2018

@niveditc has this fixed the issue? I'm still a little fresh at submitting pull requests through a fork.

Copy link
Contributor

@niveditc niveditc left a comment

Choose a reason for hiding this comment

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

Looks good!

@niveditc
Copy link
Contributor

niveditc commented Oct 8, 2018

@bambii7 - awesome! One last thing - could you update the summary & test plan above? :)

@ofhope
Copy link
Contributor Author

ofhope commented Oct 8, 2018

@niveditc done, thank you for your patience :) I'm better equiped to deal with more issues now.

Copy link

@facebook-github-bot facebook-github-bot left a comment

Choose a reason for hiding this comment

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

niveditc is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

jdecked pushed a commit to twitter-forks/draft-js that referenced this pull request Oct 9, 2019
Summary:
**Summary**

Updating examples package.json to reference parent projects react & react dom versions. This ensures its kept in sync with the Draftjs version.

**Test Plan**

This commit updates example package.json. Not sure it is testable with jest. Unless its possible to detect when two versions of react are loaded.
Pull Request resolved: facebookarchive#1691

Differential Revision: D10247219

fbshipit-source-id: 462c3d64efdbaca00563a0110d511f1865860b71
alicayan008 pushed a commit to alicayan008/draft-js that referenced this pull request Jul 4, 2023
Summary:
**Summary**

Updating examples package.json to reference parent projects react & react dom versions. This ensures its kept in sync with the Draftjs version.

**Test Plan**

This commit updates example package.json. Not sure it is testable with jest. Unless its possible to detect when two versions of react are loaded.
Pull Request resolved: facebookarchive/draft-js#1691

Differential Revision: D10247219

fbshipit-source-id: 462c3d64efdbaca00563a0110d511f1865860b71
aforismesen added a commit to aforismesen/draft-js that referenced this pull request Jul 12, 2024
Summary:
**Summary**

Updating examples package.json to reference parent projects react & react dom versions. This ensures its kept in sync with the Draftjs version.

**Test Plan**

This commit updates example package.json. Not sure it is testable with jest. Unless its possible to detect when two versions of react are loaded.
Pull Request resolved: facebookarchive/draft-js#1691

Differential Revision: D10247219

fbshipit-source-id: 462c3d64efdbaca00563a0110d511f1865860b71
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants