Skip to content

Commit

Permalink
Merge pull request #1103 from derkoe/react-18
Browse files Browse the repository at this point in the history
React 18 in peer-dependencies and use new API
  • Loading branch information
karldanninger committed Jul 5, 2022
2 parents c0deb76 + 2d1187c commit c12b94f
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
5 changes: 4 additions & 1 deletion example/src/App.test.js
@@ -1,9 +1,12 @@
import React from 'react'
import ReactDOM from 'react-dom'
import App from './App'
import { createRoot } from 'react-dom/client';


it('renders without crashing', () => {
const div = document.createElement('div')
ReactDOM.render(<App />, div)
const root = createRoot(div);
root.render(<App />)
ReactDOM.unmountComponentAtNode(div)
})
4 changes: 2 additions & 2 deletions example/src/index.js
@@ -1,7 +1,7 @@
import './index.css'

import React from 'react'
import ReactDOM from 'react-dom'
import App from './App'

ReactDOM.render(<App />, document.getElementById('root'))
const root = createRoot(document.getElementById('root'))
root.render(<App />)
8 changes: 4 additions & 4 deletions package.json
Expand Up @@ -33,8 +33,8 @@
"prop-types": "^15.7.2"
},
"peerDependencies": {
"react": "^16.0.0 || ^17.0.0",
"react-dom": "^16.0.0 || ^17.0.0"
"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
},
"devDependencies": {
"babel-eslint": "^10.0.3",
Expand All @@ -55,8 +55,8 @@
"microbundle-crl": "^0.13.10",
"npm-run-all": "^4.1.5",
"prettier": "^2.0.4",
"react": "^16.0.0 || ^17.0.2",
"react-dom": "^16.0.0 || ^17.0.2",
"react": "^16.0.0 || ^17.0.2 || ^18.0.0",
"react-dom": "^16.0.0 || ^17.0.2 || ^18.0.0",
"react-scripts": "^3.4.1"
},
"files": [
Expand Down
29 changes: 13 additions & 16 deletions yarn.lock
Expand Up @@ -9430,14 +9430,13 @@ react-dev-utils@^10.2.1:
strip-ansi "6.0.0"
text-table "0.2.0"

"react-dom@^16.0.0 || ^17.0.2":
version "17.0.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
"react-dom@^16.0.0 || ^17.0.2 || ^18.0.0":
version "18.0.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023"
integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler "^0.20.2"
scheduler "^0.21.0"

react-error-overlay@^6.0.7:
version "6.0.7"
Expand Down Expand Up @@ -9509,13 +9508,12 @@ react-scripts@^3.4.1:
optionalDependencies:
fsevents "2.1.2"

"react@^16.0.0 || ^17.0.2":
version "17.0.2"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
"react@^16.0.0 || ^17.0.2 || ^18.0.0":
version "18.0.0"
resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

read-pkg-up@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -10107,13 +10105,12 @@ saxes@^3.1.9:
dependencies:
xmlchars "^2.1.1"

scheduler@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
scheduler@^0.21.0:
version "0.21.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

schema-utils@^1.0.0:
version "1.0.0"
Expand Down

0 comments on commit c12b94f

Please sign in to comment.