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.

Sign up for GitHub

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

Jump to bottom

Merge with upstream 4.0.3 #35

Merged
merged 177 commits into from
Jun 29, 2021
Merged

Merge with upstream 4.0.3 #35

merged 177 commits into from
Jun 29, 2021

Conversation

aruniverse
Copy link
Member

@aruniverse aruniverse commented Mar 9, 2021 •
edited
Loading

only conflicts/changes required were with the following files:

  • packages\react-scripts\package.json
  • packages\react-scripts\config\webpack.config.js
  • packages\react-scripts\scripts\build.js
  • packages\react-scripts\scripts\utils\createJestConfig.js
  • packages\react-scripts\README-imodeljs.md

Diff between upstream and our imjs fork: master...imodeljs:sync/4.0.3
Diff between our cra fork 3.x and 4.0 (this pr): 3.x...imodeljs:sync/4.0.3

Note, the only real change betwween 3.x and 4.0.3 is 41a57a9, which bumps the ver of ts-jest

MichaelDeBoey and others added 30 commits March 24, 2020 09:10
@MichaelDeBoey
Update template tests (facebook#8705)
79dbc33
@braedongough
Bump TypeScript template to 3.8 (facebook#8713)
edc671e
@ai
Add .cjs and .mjs files support to test runner (facebook#8768)
bc41892
@Dremora
Use simplified import of @testing-library/jest-dom (facebook#8763)
56d34c0
@iddan
Include absoluteRuntime in babel preset docs (facebook#5847)
c7352c7
@challet
Specify what files are served form a bare local copy (facebook#8749)
4cbb003
@mrmckeb
fix: handle templates without main package field (facebook#8734)
e0b179c
@charrondev @ianschmitz
Add experimental react-refresh support (facebook#8582)
c5b96c2 
Co-authored-by: Ian Schmitz <ianschmitz@gmail.com>
@MostafaNawara
Add setupTests.js to the list of generated files (facebook#8791)
53cace5
@coryhouse
Simplify wording in setting-up-your-editor.md (facebook#8684)
f0f4d5b
@M165437
Update url to see prettier in action (facebook#8610)
d80e533
@dependabot
Bump acorn from 6.4.0 to 6.4.1 in /docusaurus/website (facebook#8656)
a4fa63f 
Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](acornjs/acorn@6.4.0...6.4.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sebmarkbage
Don't use webpack multi entry unnecessarily (facebook#8834)
e89f153 
Passing an array with a single entry is not equivalent. This causes Webpack
to generate another wrapper module around the entry. This is just
unnecessary overhead and bytes.
@NMinhNguyen
Widen eslint-config-react-app peer dependency versions (facebook#8892)
855a984 
See facebook#7790 for a previous similar PR.
@gaearon
Revert "Replace favicon in templates (facebook#8194)" (facebook#8925)
3771237 
This reverts commit c03bb36.
@ianschmitz
Minor/patch dependency upgrades (facebook#8947)
9cc1bdf
@skovhus @ianschmitz
Upgrade to Jest 25 (facebook#8362)
9904075 
Co-authored-by: Ian Schmitz <ianschmitz@gmail.com>
@ianschmitz
Drop Node 8 support (facebook#8948)
8b0d21f
@gaearon
Bump React Hooks ESLint plugin to 4.0.0 (facebook#8939)
fa93437
@StenAL
Update build script deployment URL (facebook#8651)
99f1b6b
@jeremywadsack
Do not check for interactive session to shut down dev server (faceboo…
2975939 
…k#8845)
@MKorostoff
Support source maps for scss in dev environments (facebook#8638)
b37cff9
@hieuxlu
Skip stdin resuming to support lerna parallel (facebook#8700)
790fba9
@alexkrolick
Set resetMocks to true by default in jest config (facebook#7899)
4974a20
@shakib609
Add import/no-anonymous-default-export lint rule (facebook#8926)
3c2f2d4
@gnapse @ianschmitz
Upgrade testing-library packages (facebook#8406)
5d437b8 
Co-authored-by: Ian Schmitz <ianschmitz@gmail.com>
@chybisov
Bump style-loader to 1.2.1 (facebook#8891)
5a019e6
@mrmckeb
Support devDependencies in templates (facebook#8838)
2473a73
@tanhauhau
fix react-refresh babel plugin not applied (facebook#8952)
62e8e3d
@maazadeeb
Add a VSCode tip in the CSS reset section (facebook#8246)
6a7aaa2
@aruniverse aruniverse mentioned this pull request Mar 9, 2021
Closed
@aruniverse
Copy link
Member Author

We need to make a 3.x branch before we merge this into imodeljs

@aruniverse aruniverse mentioned this pull request Mar 11, 2021
Merged
@calebmshafer
Copy link
Member

@aruniverse this looks great. Thanks for picking it up!

Definitely agree that we need a release branch for 3.x as we will/should continue to support it for iModel.js as it doesn't look like there is anything incompatible. Is that your impression as well?

However, the only reason I see people not doing it is the requirement to move up to ESLint 7.x, whereas iModel.js supports both 6.x and 7.x. Any others?

I do want to see why all of the tests fail again :) I really dislike all the red but not needed for this PR.

I'll give it a test run this weekend with the iTwin Viewer CRA template to see how things go.

@calebmshafer calebmshafer mentioned this pull request Mar 15, 2021
Closed
@calebmshafer
Copy link
Member

@aruniverse, quick update. I merged the other PR for 3.x and then started testing this one out. Other than the iModel.js repo, I tried it with the Desktop Starter. Everything appears to be working well.

I haven't created the release branch yet for 3.x but I was going to name it imodeljs/3.x.

@aruniverse
Copy link
Member Author

Definitely agree that we need a release branch for 3.x as we will/should continue to support it for iModel.js as it doesn't look like there is anything incompatible. Is that your impression as well?

Yea that's my impression as well, imo the major ver bump to cra 4.0 is relatively minor compared to bumping imjs versions, where most of the changes on upstreams end should be compatible with what users have now. Might be an issue if users are pinning down their @types/react version to an earlier version and are using react@16.14.0 because of missing types for the new jsx-transform. (this is what happened in core, but able to get around this by disabling the transform)

However, the only reason I see people not doing it is the requirement to move up to ESLint 7.x, whereas iModel.js supports both 6.x and 7.x. Any others?

If consumers are using jest, they'll need to bump to atleast ts v3.8, but hopefully thats pretty minor too.

Highlight of changes in upstream 4.0: https://github.com/facebook/create-react-app/releases/tag/v4.0.0
https://reactjs.org/blog/2020/10/20/react-v17.html
https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-0.html
https://eslint.org/docs/user-guide/migrating-to-7.0.0
https://jestjs.io/blog/2020/05/05/jest-26
https://jestjs.io/blog/2020/01/21/jest-25

@calebmshafer
Copy link
Member

@aruniverse looks like there hasn't been any other releases from CRA since this one. I'm going to go ahead and create the imodeljs/3.x branch now from the latest 3.4.11 release. Then we can go from there.

aruniverse and others added 2 commits June 14, 2021 09:37
@aruniverse
switch to using new CopyStaticAssetsPlugin
9b89b88
@aruniverse
use copy-webpack-plugin to deliver all static assets (#37)
bef7a4a 
* use CopyStaticAssetsPlugin  from bentley/webpack-tools-core that uses copy-webpack-plugin under the hood to deliver all static assets. this also works with the dev server, so strings should finally be localized there!

Co-authored-by: Arun George <aruniverse@users.noreply.github.com>
@calebmshafer
Copy link
Member

@aruniverse lets go ahead and merge this PR this week. I have created the 3.x branch for all future releasing so this should be clear to merge.

We still need to figure out the issue with the latest change to the copy webpack plugin. That is still holding up the official usage of it in the imodeljs repo. Have yo made any progress on it? If not, maybe @wgoehrig and I can help this week.

@aruniverse
Copy link
Member Author

We still need to figure out the issue with the latest change to the copy webpack plugin. That is still holding up the official usage of it in the imodeljs repo.

Yea i was just thinking about this, and pinged you on the side haha
I haven't made any progress on it since i returned for vacation. Will return to investigating it tomorrow, and most likely creating an issue in that pkg's repo

@calebmshafer
Copy link
Member

@aruniverse sounds good, I'm thinking we just back out the update for now or make it optional behind a flag.

@calebmshafer @aruniverse
Default to new CopyStaticAssetsPlugin, and provide flag to revert bac…
45b126c 
…k to old plugin. 3.4.13 (#45)

* Add a flag called DISABLE_NEW_ASSET_COPY to turn off new asset copying plugin

* Bump version 3.4.13
calebmshafer
calebmshafer approved these changes Jun 29, 2021
View reviewed changes
Copy link
Member

@calebmshafer calebmshafer left a comment

Choose a reason for hiding this comment

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

I think the process we laid out before is to make a merge commit here rather than squash so let me know when you're ready.

I'd say just remove the -dev and we're set

@calebmshafer calebmshafer merged commit d976aca into imodeljs Jun 29, 2021
@calebmshafer calebmshafer deleted the sync/4.0.3 branch June 29, 2021 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@calebmshafer calebmshafer calebmshafer approved these changes

@jason-crow jason-crow Awaiting requested review from jason-crow

@wgoehrig wgoehrig Awaiting requested review from wgoehrig wgoehrig is a code owner

@MichaelBelousov MichaelBelousov Awaiting requested review from MichaelBelousov

@kckst8 kckst8 Awaiting requested review from kckst8

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.