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

[post-snap] Merge OUFR and react-next into react #14688

Closed
6 tasks
JustSlone opened this issue Aug 21, 2020 · 1 comment
Closed
6 tasks

[post-snap] Merge OUFR and react-next into react #14688

JustSlone opened this issue Aug 21, 2020 · 1 comment

Comments

@JustSlone
Copy link
Collaborator

JustSlone commented Aug 21, 2020

(from @ecraig12345)

Part 1/4 in a series of changes that must happen in master after v7 development moves to a branch, but before beta publishing:

  1. (this) [post-snap] Merge OUFR and react-next into react #14688 OUFR/react-next merge
  2. Re-export date-time components from react #14679 Move date-time components
  3. Move @uifabric packages under @fluentui scope #13384 uifabric/fluentui package renames
  4. Set up beta releases #14689 set up beta releases

For version 8, we plan to merge office-ui-fabric-react (current code) and @fluentui/react-next (function component conversions and other breaking changes) into @fluentui/react. There will be no version 8 of office-ui-fabric-react, and no packages/office-ui-fabric-react in the master branch of the repo. (It will of course stay around in the 5/6/7 branches.)

The changes below may be done in multiple PRs to a staging branch.

  • Merge OUFR into react
  • Merge react-next into react (last chance to review FC changes)
  • Delete OUFR
  • Make react-next be a pure re-export package from react (and bump version to 9-alpha)
  • Update gitignore so that removed files don't come back in a bad merge
  • Update code references to OUFR or react-next (enough to build)
@JustSlone JustSlone added this to the v8: During Snap milestone Aug 21, 2020
@ecraig12345 ecraig12345 changed the title Merge OUFR and react-next into react (and cleanup of old names) [post-snap] Merge OUFR and react-next into react (and cleanup of old names) Aug 21, 2020
@ecraig12345 ecraig12345 changed the title [post-snap] Merge OUFR and react-next into react (and cleanup of old names) [post-snap 1] Merge OUFR and react-next into react (and cleanup of old names) Aug 21, 2020
@ecraig12345 ecraig12345 changed the title [post-snap 1] Merge OUFR and react-next into react (and cleanup of old names) [post-snap] Merge OUFR and react-next into react (and cleanup of old names) Aug 21, 2020
@ecraig12345 ecraig12345 changed the title [post-snap] Merge OUFR and react-next into react (and cleanup of old names) [post-snap] Merge OUFR and react-next into react Aug 21, 2020
This was referenced Aug 22, 2020
@ecraig12345
Copy link
Member

Closing in favor of #14789

@microsoft microsoft locked as resolved and limited conversation to collaborators Oct 1, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

No branches or pull requests

2 participants