Merge with facebook/create-react-app/master

[calebmshafer]

This the first time we're doing a merge from upstream so I wanted to layout the process I followed and I'll add it to our README if we all agree it's the right way to go.

1. Push upstream master to imodeljs master, there should never be any conflicts. (needs to be pushed by an admin but we should automate this at some point...)

   git remote add upstream https://github.com/facebook/create-react-app.git
   git fetch upstream
   git checkout master
   git merge upstream/master
   git push

2. Update imodeljs branch with new imodeljs master
   a.

   git checkout imodeljs
   git checkout -b merge-with-master
   git merge origin/master

   b. Resolve merge conflicts
   c. Set the version of react-scripts to -dev.0 of whatever is incoming from master
   c. Commit, push and open PR

The main reason I wanted to create a PR branch is to have a linear first-parent history for all explicit changes to our branch instead of directly pushing overtop of them all. That way it's an explicit merge commit instead of a fast-forward merge. Let me know what you think.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 55 committers have signed the CLA.

✅ calebmshafer
❌ braedongough
❌ MichaelDeBoey
❌ ai
❌ Dremora
❌ challet
❌ MostafaNawara
❌ mrmckeb
❌ charrondev
❌ iddan
❌ coryhouse
❌ sebmarkbage
❌ gaearon
❌ ianschmitz
❌ NMinhNguyen
❌ M165437
❌ StenAL
❌ alexkrolick
❌ MKorostoff
❌ hieuxlu
❌ shakib609
❌ jeremywadsack
❌ skovhus
❌ gnapse
❌ maazadeeb
❌ tanhauhau
❌ iansu
❌ nickmccurdy
❌ chybisov
❌ evankennedy
❌ samccone
❌ mhassan1
❌ favna
❌ housseindjirdeh
❌ atlanteh
❌ Timer
❌ sonicdoe
❌ availchet
❌ josenriagu
❌ burkeholland
❌ Rafael Quijada
❌ sakit0
❌ BMorearty
❌ klinem
❌ andycanderson
❌ pmmmwh
❌ jeffposnick
❌ merelinguist
❌ anuraaga
❌ ljosberinn
❌ JLHwung
❌ Lapz
❌ SimenB
❌ staff0rd
❌ chenxsan

---

Rafael Quijada seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[aruniverse]

I think the steps you've defined above is accurate and is what i was doing earlier on. We can probably set a chron job for pushing updates from upstream to master. How are you going to get around the issue above with the CLA? Do we want to setup a release pipeline for the dev builds of this before it gets merged in?

[calebmshafer]

I think the steps you've defined above is accurate and is what i was doing earlier on. We can probably set a chron job for pushing updates from upstream to master. How are you going to get around the issue above with the CLA? Do we want to setup a release pipeline for the dev builds of this before it gets merged in?

@aruniverse, I disabled CLA Assistant for this entire repo so that issue should be resolved for all future PRs. In terms of a dev release, yes I'd like to get one out so that we can start testing it. Let's wait to merge this into our branch until we're ready though, I guess that means releasing the -dev version from this PR. I'll get around to that after #9.

Also, at @wgoehrig's suggestion I'll probably update those steps to require updating master to the latest react-scripts git tag in the facebook/create-react-scripts repo. Still haven't figured out where they released the package from since it does show up on npmjs but just not directly on master.

[aruniverse]

Also, at @wgoehrig's suggestion I'll probably update those steps to require updating master to the latest react-scripts git tag in the facebook/create-react-scripts repo. Still haven't figured out where they released the package from since it does show up on npmjs but just not directly on master.

I didnt see an issue or pr branch where they did the release off of. Dan abramov mightve just done it himself locally. facebook#9470

[calebmshafer]

Closing this in favor of #22