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

Support React 18 in @uppy/react #3680

Merged
merged 12 commits into from
May 4, 2022
Merged

Support React 18 in @uppy/react #3680

merged 12 commits into from
May 4, 2022

Conversation

Murderlon
Copy link
Member

Closes #3645

@Murderlon Murderlon added the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 2, 2022
@github-actions github-actions bot removed the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 2, 2022
@Murderlon Murderlon marked this pull request as draft May 2, 2022 09:44
@Murderlon
Copy link
Member Author

Murderlon commented May 2, 2022 •
edited

Seems I need to refactor all React tests away from Enzyme, which doesn't support React 18, to React Testing Library.

See also: https://testing-library.com/docs/react-testing-library/migrate-from-enzyme

@Murderlon Murderlon added the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 3, 2022
@Murderlon
Merge branch 'main' into react-18
7280111 
* main:
  @uppy/google-drive: refactor to ESM (#3683)
  meta: harden linter rule for JSX/ESM validation (#3681)
  meta: harden linter rules for ESM/CJS validation (#3674)
@Murderlon
Copy link
Member Author

Murderlon commented May 3, 2022 •
edited

Update: I actually removed the unit tests because they introduce fragile tooling, overhead, and mostly because they test very trivial things. I moved the most important bits to e2e and removed the rest.

@Murderlon Murderlon marked this pull request as ready for review May 3, 2022 13:21
@github-actions github-actions bot removed the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 3, 2022
@Murderlon Murderlon added the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 3, 2022
@github-actions github-actions bot removed the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 3, 2022
@Murderlon
Copy link
Member Author

e2e fails on a unrelated test

@Murderlon
Merge branch 'main' into react-18
0652f4d 
* main:
  Make Cypress more stable & add e2e test for error events when upload fails (#3662)
  @uppy/webcam: refactor to ESM (#3686)
  @uppy/audio: fix types (#3689)
  Only deploy on companion changes (#3677)
  @uppy/image-editor: refactor to ESM (#3685)
  Add `save` translation to Spanish locale (#3678)
@Murderlon Murderlon added the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 4, 2022
@github-actions github-actions bot removed the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 4, 2022
@Murderlon Murderlon requested a review from aduh95 May 4, 2022 10:17
aduh95
aduh95 reviewed May 4, 2022
View reviewed changes
Copy link
Member

@aduh95 aduh95 left a comment

Choose a reason for hiding this comment

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

We probably need to also update it here:

uppy/packages/@uppy/react-native/package.json

Line 32 in 9fe0240

"react": "^16.0.0 || ^17.0.0",

e2e/clients/react/App.jsx Outdated Show resolved Hide resolved
@Murderlon Murderlon merged commit d42badf into main May 4, 2022
@Murderlon Murderlon deleted the react-18 branch May 4, 2022 15:38
@rgbskills
Copy link

Thank you so much for fixing this :)

@HuseIstvan
Copy link

You guys rock, thanks !

@Murderlon
Copy link
Member Author

We'll try to release it soon :)

@github-actions github-actions bot mentioned this pull request May 14, 2022
Merged
github-actions bot added a commit that referenced this pull request May 14, 2022
@github-actions
Release: uppy@2.10.0 (#3727)
74f3d4d 
| Package                | Version | Package                | Version |
| ---------------------- | ------- | ---------------------- | ------- |
| @uppy/audio            |   0.3.1 | @uppy/provider-views   |   2.1.0 |
| @uppy/aws-s3           |   2.1.0 | @uppy/react            |   2.2.0 |
| @uppy/aws-s3-multipart |   2.3.0 | @uppy/react-native     |   0.3.0 |
| @uppy/companion-client |   2.1.0 | @uppy/screen-capture   |   2.1.0 |
| @uppy/core             |   2.2.0 | @uppy/status-bar       |   2.2.0 |
| @uppy/dashboard        |   2.2.0 | @uppy/svelte           |   1.0.8 |
| @uppy/drag-drop        |   2.1.0 | @uppy/transloadit      |   2.2.0 |
| @uppy/file-input       |   2.1.0 | @uppy/tus              |   2.3.0 |
| @uppy/google-drive     |   2.1.0 | @uppy/url              |   2.1.0 |
| @uppy/image-editor     |   1.2.0 | @uppy/webcam           |   2.2.0 |
| @uppy/instagram        |   2.1.0 | @uppy/xhr-upload       |   2.1.0 |
| @uppy/locales          |   2.1.0 | @uppy/zoom             |   1.1.0 |
| @uppy/onedrive         |   2.1.0 | @uppy/robodog          |   2.6.0 |
| @uppy/progress-bar     |   2.1.0 | uppy                   |  2.10.0 |

- @uppy/audio: fix types (Merlijn Vos / #3689)
- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/core,@uppy/react,@uppy/transloadit,@uppy/tus,@uppy/xhr-upload: proposal: Cancel assemblies optional (Mikael Finstad / #3575)
- @uppy/aws-s3-multipart: export interface AwsS3MultipartOptions (Matteo Padovano / #3709)
- @uppy/companion-client: refactor to ESM (Antoine du Hamel / #3693)
- @uppy/companion: Only deploy on companion changes (kiloreux / #3677)
- @uppy/core: add definition for addFiles method (Matteo Padovano / #3556)
- @uppy/core: wrap plugins in div.uppy-Root and set dir attrubute in UIPlugin (Artur Paikin / #3692)
- @uppy/google-drive: refactor to ESM (Antoine du Hamel / #3683)
- @uppy/image-editor: refactor to ESM (Antoine du Hamel / #3685)
- @uppy/instagram: refactor to ESM (Antoine du Hamel / #3696)
- @uppy/locales: Add `save` translation to Spanish locale (Juan Carlos Alonso / #3678)
- @uppy/locales: refactor to ESM (Antoine du Hamel / #3707)
- @uppy/onedrive: refactor to ESM (Antoine du Hamel / #3694)
- @uppy/progress-bar: refactor to ESM (Antoine du Hamel / #3706)
- @uppy/provider-views: refactor to ESM (Antoine du Hamel / #3715)
- @uppy/react: Support React 18 in @uppy/react (Merlijn Vos / #3680)
- @uppy/screen-capture: refactor to ESM (Antoine du Hamel / #3698)
- @uppy/status-bar: refactor to ESM (Antoine du Hamel / #3697)
- @uppy/transloadit: add rate limiting for assembly creation and status polling (Antoine du Hamel / #3718)
- @uppy/tus: refactor to ESM (Antoine du Hamel / #3724)
- @uppy/url: refactor to ESM (Antoine du Hamel / #3713)
- @uppy/webcam: refactor to ESM (Antoine du Hamel / #3686)
- @uppy/xhr-upload: refactor to ESM (Antoine du Hamel / #3695)
- @uppy/zoom: refactor to ESM (Antoine du Hamel / #3699)
- meta: e2e: fix failing test (Antoine du Hamel / #3722)
- test: harden linter rule for JSX/ESM validation (Antoine du Hamel / #3681)
- test: harden linter rules for ESM/CJS validation (Antoine du Hamel / #3674)
- test: Increase retries to trigger longer retryDelay in tus (Artur Paikin / #3726)
- test: Remove `it.only` from e2e test (Merlijn Vos / #3690)
- tests: Make Cypress more stable & add e2e test for error events when upload fails (Merlijn Vos / #3662)
@spaenleh spaenleh mentioned this pull request Jun 3, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aduh95 aduh95 aduh95 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

React 18 is not compatible with @uppy/react
4 participants
@Murderlon @rgbskills @HuseIstvan @aduh95