Skip to content

React 18 upgrade #6772

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

Closed
tkajtoch wants to merge 9 commits into from
Closed

React 18 upgrade #6772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
37117e7
Upgrade to React 18.2 and fix enzyme tests to run with the new versio…
tkajtoch May 10, 2023
23fc05c
Fix types and tests to work with react 18
tkajtoch May 12, 2023
aa1fbfc
fix EuiPortal server-side rendering
tkajtoch May 12, 2023
8eec966
test: bump MutationObserver max listeners to 45
tkajtoch May 23, 2023
1504343
test(EuiIcon): disable EuiIcon test suite until it's fixed and works …
tkajtoch May 23, 2023
3dcaa4b
test: move TextEncoder declaration to setup/enzyme.js so it exists be…
tkajtoch May 23, 2023
1132237
add @cypress/react18 and fix cypress tests
tkajtoch May 24, 2023
4931698
revert selectable search change used for debugging
tkajtoch Jun 1, 2023
92d3c9f
update i18ntokens
tkajtoch Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .babelrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ module.exports = {
"corejs": !process.env.NO_COREJS_POLYFILL ? '3.6' : undefined,
"modules": process.env.BABEL_MODULES ? process.env.BABEL_MODULES === 'false' ? false : process.env.BABEL_MODULES : "commonjs" // babel's default is commonjs
}],
["@babel/typescript", { isTSX: true, allExtensions: true }],
"@babel/react",
["@babel/react", { runtime: 'classic' }],
["@babel/typescript", { isTSX: true, allExtensions: true, allowDeclareFields: true }],
Comment on lines +14 to +15
Copy link
Contributor

@cee-chen cee-chen Jun 1, 2023

Choose a reason for hiding this comment

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

This reminds me - I'm going to go ahead and merge latest main into the upstream feature branch. It's missing all the latest babel upgrades which is almost certainly going to affect yarn.lock at the very minimum

Copy link
Contributor

@cee-chen cee-chen Jun 1, 2023

Choose a reason for hiding this comment

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

alrighty, main is in - @tkajtoch please rebase/merge main into this PR/branch as well

Copy link
Member Author

@tkajtoch tkajtoch Jun 1, 2023

Choose a reason for hiding this comment

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

I'm on it!

Copy link
Contributor

@cee-chen cee-chen Jun 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Iiin hindsight, I realize is actually A Lot of conflicts/changes, especially with the #6809 (comment). 😅

@tkajtoch, if we're going to have to do major merge conflict resolution in any case, I'd like to talk about splitting this PR significantly more (especially since it's going into a feature branch and CI does not technically have to pass). Realistically, 120+ files touched and a 1-3k line diff is way too much for a single code review.

Can we split it up like so:

  • PR 1:
    • Initial React 18 package upgrade
    • Any related or required dependency upgrades (e.g. redux devtools)
    • Types fixes only, no test fixes, nothing has to be working
  • PR 2:
    • Non-portal Jest test fixes
    • Enyzme adapter workaround
    • Jest Emotion serializer update
  • PR 3:
    • Portal-specific workarounds/upgrades and test fixes
  • PR 4:
    • Cypress test fixes
  • I believe you have a few more PRs queued up after this

Having more atomic PRs will make it significantly easier for us to progress with confidence that our code is consistent and thoroughly reviewed rather than trying to wait until the end to QA it all together.

[
"@emotion/babel-preset-css-prop",
{
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/setup/mount.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import React from 'react';
import { mount as cypressMount } from 'cypress/react';
import { mount as cypressMount } from 'cypress/react18';
import { EuiProvider } from '../../../src';

Cypress.Commands.add('mount', (children) => {
Expand Down
Loading