Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Support React 18 #655

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.

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
Closed
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9172654
Support React 18
snowystinger Jul 21, 2021
6456f4a
fix some more obvious cases
snowystinger Jul 21, 2021
0d82a5f
fix hydration
snowystinger Jul 21, 2021
81db73a
annotate a test so I can get help
snowystinger Jul 22, 2021
1f0bf1d
Will definitely need something like this in order to support 17 and 1...
snowystinger Jul 23, 2021
3cc6f2e
drop prepare
snowystinger Jul 23, 2021
15347e5
restore package.json
snowystinger Jul 23, 2021
25cfd74
restore test to passing but leave comment about 18
snowystinger Jul 23, 2021
668088b
Fix install script one last time
snowystinger Jul 23, 2021
8fa0041
add some shortcut scripts so it's easier to test locally
snowystinger Jul 23, 2021
c95ef45
remove invalid comma
snowystinger Jul 23, 2021
00526a8
add support for the minimum specified supported version as well as la...
snowystinger Jul 23, 2021
c060620
temporarily drop coverageThreshold
snowystinger Jul 23, 2021
d4ba70c
experimental tests should not block known quantities
snowystinger Jul 23, 2021
2b4a770
refactor: add createLegacyRoot to reduce uncovered code percentage
mpeyper Jul 24, 2021
ea9d4f9
chore: increase coverage threshold again
mpeyper Jul 24, 2021
274932b
Merge branch 'main' into react-18-upgrade
snowystinger Aug 2, 2021
9f296b1
Merge branch 'main' into react-18-upgrade
snowystinger Sep 1, 2021
07041f1
Merge branch 'main' into react-18-upgrade
snowystinger Dec 7, 2021
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
6 changes: 6 additions & 0 deletions .github/workflows/validate.yml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ jobs:
main:
# ignore all-contributors PRs
if: ${{ !contains(github.head_ref, 'all-contributors') }}
continue-on-error: ${{ contains(matrix.react, 'next') }}
strategy:
matrix:
node: [12.13, 12, 14, 16]
react: [16.9.0, ^16, ^17, next]

runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
Expand All @@ -37,6 +40,9 @@ jobs:
env:
HUSKY_SKIP_INSTALL: true

- name: Use React version
run: npm install --save-dev react@"${{ matrix.react }}" react-dom@"${{ matrix.react }}" react-test-renderer@"${{ matrix.react }}"

- name: ▶️ Run validate script
run: npm run validate

Expand Down
7 changes: 4 additions & 3 deletions package.json
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"scripts": {
"setup": "npm install && npm run validate -s",
"validate": "kcd-scripts validate",
"prepare": "npm run build",
Copy link
Contributor Author

@snowystinger snowystinger Jul 23, 2021

Choose a reason for hiding this comment

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

I'm not sure what else we'll need to do now that I've removed this because of https://docs.npmjs.com/cli/v7/commands/npm-install

If the package being installed contains a prepare script, its dependencies and devDependencies will be installed, and the prepare script will be run, before the package is packaged and installed.

"build": "kcd-scripts build --out-dir lib && npm run generate:submodules",
"generate:submodules": "ts-node scripts/generate-submodules.ts",
"test": "kcd-scripts test",
Expand All @@ -43,7 +42,9 @@
"coverage": "codecov",
"docs:dev": "docz dev",
"docs:build": "docz build",
"contributors:add": "all-contributors add"
"contributors:add": "all-contributors add",
"install-16": "npm install --save-dev react@\"^16.9.0\" react-dom@\"^16.9.0\" react-test-renderer@\"^16.9.0\"",
"install-next": "npm install --save-dev react@next react-dom@next react-test-renderer@next"
},
"dependencies": {
"@babel/runtime": "^7.12.5",
Expand All @@ -64,7 +65,7 @@
"kcd-scripts": "11.2.0",
"prettier": "^2.2.1",
"react": "17.0.2",
"react-dom": "^17.0.1",
"react-dom": "17.0.2",
"react-test-renderer": "17.0.2",
"ts-node": "^10.0.0",
"typescript": "4.3.5"
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/resultHistory.test.ts
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('result history tests', () => {
rerender(2)

expect(result.error).toEqual(Error('expected'))
// double error thrown for dom, but not default or native...
expect(result.all).toEqual([0, 1, Error('expected')])

rerender(3)
Expand Down
10 changes: 5 additions & 5 deletions src/dom/pure.ts
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import * as ReactDOM from 'react-dom'
import { act } from 'react-dom/test-utils'

import { RendererProps, RendererOptions } from '../types/react'

import { createRenderHook } from '../core'
import { createTestHarness } from '../helpers/createTestHarness'
import { createRoot } from '../helpers/createRoot'

function createDomRenderer<TProps, TResult>(
rendererProps: RendererProps<TProps, TResult>,
{ wrapper }: RendererOptions<TProps>
) {
const container = document.createElement('div')
const testHarness = createTestHarness(rendererProps, wrapper)

const root = createRoot(container)
return {
render(props?: TProps) {
act(() => {
ReactDOM.render(testHarness(props), container)
root.render(testHarness(props))
})
},
rerender(props?: TProps) {
act(() => {
ReactDOM.render(testHarness(props), container)
root.render(testHarness(props))
})
},
unmount() {
act(() => {
ReactDOM.unmountComponentAtNode(container)
root.unmount()
})
},
act
Expand Down
30 changes: 30 additions & 0 deletions src/helpers/createRoot.ts
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import * as ReactDOM from 'react-dom'
import * as React from 'react'

/* istanbul ignore next */
function createLegacyRoot(container: Element): ReactDOM.Root {
return {
render(element: React.ReactElement) {
ReactDOM.render(element, container)
},
unmount() {
ReactDOM.unmountComponentAtNode(container)
}
}
}

/* istanbul ignore next */
export function createRoot(container: Element) {
return (ReactDOM.createRoot ? ReactDOM.createRoot : createLegacyRoot)(container)
}

/* istanbul ignore next */
export function hydrateLegacyRoot(container: Element, element: React.ReactElement): ReactDOM.Root {
ReactDOM.hydrate(element, container)
return createLegacyRoot(container)
}

/* istanbul ignore next */
export function hydrateRoot(container: Element, element: React.ReactElement) {
return (ReactDOM.hydrateRoot ? ReactDOM.hydrateRoot : hydrateLegacyRoot)(container, element)
}
28 changes: 14 additions & 14 deletions src/server/pure.ts
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import { RendererOptions, RendererProps } from '../types/react'

import { createRenderHook } from '../core'
import { createTestHarness } from '../helpers/createTestHarness'
import { hydrateRoot } from '../helpers/createRoot'

function createServerRenderer<TProps, TResult>(
rendererProps: RendererProps<TProps, TResult>,
{ wrapper }: RendererOptions<TProps>
) {
let renderProps: TProps | undefined
let container: HTMLDivElement | undefined
let serverOutput: string = ''
const testHarness = createTestHarness(rendererProps, wrapper, false)

let root: ReactDOM.Root | undefined
return {
render(props?: TProps) {
renderProps = props
Expand All @@ -28,30 +28,30 @@ function createServerRenderer<TProps, TResult>(
})
},
hydrate() {
if (container) {
if (root) {
throw new Error('The component can only be hydrated once')
} else {
container = document.createElement('div')
const container = document.createElement('div')
container.innerHTML = serverOutput
act(() => {
ReactDOM.hydrate(testHarness(renderProps), container!)
root = hydrateRoot(container, testHarness(renderProps))
})
}
},
rerender(props?: TProps) {
if (!container) {
throw new Error('You must hydrate the component before you can rerender')
}
act(() => {
ReactDOM.render(testHarness(props), container!)
if (!root) {
throw new Error('You must hydrate the component before you can rerender')
}
root.render(testHarness(props))
})
},
unmount() {
if (container) {
act(() => {
ReactDOM.unmountComponentAtNode(container!)
})
}
act(() => {
if (root) {
root.unmount()
}
})
},
act
}
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": "./node_modules/kcd-scripts/shared-tsconfig.json",
"compilerOptions": {
"target": "ES6"
"target": "ES6",
"types": ["node", "jest", "react/next", "react-dom/next"]
}
}

AltStyle によって変換されたページ (->オリジナル) /