Skip to content

React 18 concurrent render functions / removal of findDOMNode / test updates #2330

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
edkimmel wants to merge 6 commits into from
Closed

React 18 concurrent render functions / removal of findDOMNode / test updates #2330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb19e24
New react render / hydrate functions with callback support.
edkimmel Jul 6, 2022
d9a2703
Moving to react testing library render and act for react 18 concurren…
edkimmel Jul 6, 2022
b4bd844
Only support react 18, not both 17 and 18
edkimmel Jul 6, 2022
68ce4c6
Do not bump version
edkimmel Jul 7, 2022
3c5a6fe
npm install
edkimmel Jul 7, 2022
bfab947
Expose ability to unmount an application once ran
edkimmel Jul 11, 2022
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
2 changes: 1 addition & 1 deletion configs/.eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"settings": {
"react": {
"pragma": "React",
"version": "17.0",
"version": "18.0",
"flowVersion": "0.148.0" // Flow version
}
},
Expand Down
148 changes: 77 additions & 71 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@babel/preset-env": "^7.18.6",
"@babel/preset-flow": "^7.18.6",
"@babel/preset-react": "^7.18.6",
"@testing-library/react": "^12.1.5",
"@testing-library/react": "^13.3.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^28.1.2",
"babel-plugin-add-module-exports": "^1.0.4",
Expand Down
5 changes: 4 additions & 1 deletion packages/benchmarks/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,7 @@ const tests = {
}))
};

ReactDOM.render(<App tests={tests} />, document.querySelector('.root'));
const root = document.querySelector('.root');
const element = <App tests={tests} />;

ReactDOM.createRoot(root).render(element);
4 changes: 2 additions & 2 deletions packages/react-native-web-examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dependencies": {
"babel-plugin-react-native-web": "0.18.9",
"next": "^12.2.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-native-web": "0.18.9"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"registry": "https://registry.npmjs.org/"
},
"name": "react-native-web",
"version": "0.18.9",
"version": "0.18.4",
"description": "React Native for Web",
"module": "dist/index.js",
"main": "dist/cjs/index.js",
Expand Down Expand Up @@ -31,8 +31,8 @@
"styleq": "^0.1.2"
},
"peerDependencies": {
"react": "^17.0.2 || ^18.0.0",
"react-dom": "^17.0.2 || ^18.0.0"
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
"author": "Nicolas Gallagher",
"license": "MIT",
Expand Down
3 changes: 1 addition & 2 deletions packages/react-native-web/src/exports/ActivityIndicator/__tests__/index-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

import ActivityIndicator from '..';
import React from 'react';
import { act } from 'react-dom/test-utils';
import { createEventTarget } from 'dom-event-testing-library';
import { render } from '@testing-library/react';
import { act, render } from '@testing-library/react';

describe('components/ActivityIndicator', () => {
describe('prop "accessibilityLabel"', () => {
Expand Down
Loading