Skip to content

Commit 153d572

Browse files
authored
chore: use React v18 as the default target for development (#810)
* chore: use React v18 as the default target for development * chore: install @testing-library/react@alpha
1 parent 9923217 commit 153d572

File tree

3 files changed

+28
-33
lines changed

3 files changed

+28
-33
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ jobs:
1414
# Otherwise how would we know if a specific React version caused the failure?
1515
fail-fast: false
1616
matrix:
17-
REACT_DIST: [16, 17, next]
18-
# Unstable release channel so let's not block a potential release of `react-transition-group`
19-
continue-on-error: ${{ matrix.REACT_DIST == 'next' }}
17+
REACT_DIST: [16, 17, 18]
2018
steps:
2119
- uses: actions/checkout@v2
2220
- name: Use Node.js 14
@@ -26,8 +24,8 @@ jobs:
2624
cache: 'npm'
2725
- run: yarn
2826
- run: yarn add react@${{ matrix.REACT_DIST }} react-dom@${{ matrix.REACT_DIST }}
29-
- run: yarn add @testing-library/react@alpha
30-
if: matrix.REACT_DIST == 'next'
27+
- run: yarn add @testing-library/react@12
28+
if: matrix.REACT_DIST == '17' || matrix.REACT_DIST == '16'
3129
- run: yarn --cwd www
3230
# Test whether the web page can be built successfully or not
3331
- run: yarn --cwd www build

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"@semantic-release/npm": "^7.0.5",
8181
"@storybook/addon-actions": "^6.3.4",
8282
"@storybook/react": "^6.3.4",
83-
"@testing-library/react": "^12.1.4",
83+
"@testing-library/react": "alpha",
8484
"@typescript-eslint/eslint-plugin": "^4.26.1",
8585
"astroturf": "^0.10.4",
8686
"babel-eslint": "^10.1.0",
@@ -99,8 +99,8 @@
9999
"jest": "^25.3.0",
100100
"npm-run-all": "^4.1.5",
101101
"prettier": "^2.3.1",
102-
"react": "^17.0.1",
103-
"react-dom": "^17.0.1",
102+
"react": "^18.0.0",
103+
"react-dom": "^18.0.0",
104104
"release-script": "^1.0.2",
105105
"rimraf": "^3.0.2",
106106
"rollup": "^2.6.1",

yarn.lock

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3492,10 +3492,10 @@
34923492
resolve-from "^5.0.0"
34933493
store2 "^2.12.0"
34943494

3495-
"@testing-library/dom@^8.0.0":
3496-
version "8.11.3"
3497-
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.11.3.tgz#38fd63cbfe14557021e88982d931e33fb7c1a808"
3498-
integrity sha512-9LId28I+lx70wUiZjLvi1DB/WT2zGOxUh46glrSNMaWVx849kKAluezVzZrXJfTKKoQTmEOutLes/bHg4Bj3aA==
3495+
"@testing-library/dom@^8.5.0":
3496+
version "8.12.0"
3497+
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.12.0.tgz#fef5e545533fb084175dda6509ee71d7d2f72e23"
3498+
integrity sha512-rBrJk5WjI02X1edtiUcZhgyhgBhiut96r5Jp8J5qktKdcvLcZpKDW8i2hkGMMItxrghjXuQ5AM6aE0imnFawaw==
34993499
dependencies:
35003500
"@babel/code-frame" "^7.10.4"
35013501
"@babel/runtime" "^7.12.5"
@@ -3506,13 +3506,13 @@
35063506
lz-string "^1.4.4"
35073507
pretty-format "^27.0.2"
35083508

3509-
"@testing-library/react@^12.1.4":
3510-
version "12.1.4"
3511-
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.4.tgz#09674b117e550af713db3f4ec4c0942aa8bbf2c0"
3512-
integrity sha512-jiPKOm7vyUw311Hn/HlNQ9P8/lHNtArAx0PisXyFixDDvfl8DbD6EUdbshK5eqauvBSvzZd19itqQ9j3nferJA==
3509+
"@testing-library/react@alpha":
3510+
version "13.0.0-alpha.7"
3511+
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.0.0-alpha.7.tgz#0537af3a8d45edd925fd0275aee7d409285ef1fe"
3512+
integrity sha512-8Y1PvFczthSeow1WZ0Cq6WbOzpVGLGyEQTr+lL6BwXqAf2IykVY8ZN8V21Ch1cTlbZuZJI5UV3gOyrOHrw9YZQ==
35133513
dependencies:
35143514
"@babel/runtime" "^7.12.5"
3515-
"@testing-library/dom" "^8.0.0"
3515+
"@testing-library/dom" "^8.5.0"
35163516
"@types/react-dom" "*"
35173517

35183518
"@tootallnate/once@1":
@@ -14354,14 +14354,13 @@ react-docgen@^5.0.0:
1435414354
node-dir "^0.1.10"
1435514355
strip-indent "^3.0.0"
1435614356

14357-
react-dom@^17.0.1:
14358-
version "17.0.1"
14359-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
14360-
integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
14357+
react-dom@^18.0.0:
14358+
version "18.0.0"
14359+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023"
14360+
integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==
1436114361
dependencies:
1436214362
loose-envify "^1.1.0"
14363-
object-assign "^4.1.1"
14364-
scheduler "^0.20.1"
14363+
scheduler "^0.21.0"
1436514364

1436614365
react-draggable@^4.4.3:
1436714366
version "4.4.3"
@@ -14473,13 +14472,12 @@ react-textarea-autosize@^8.3.0:
1447314472
use-composed-ref "^1.0.0"
1447414473
use-latest "^1.0.0"
1447514474

14476-
react@^17.0.1:
14477-
version "17.0.1"
14478-
resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
14479-
integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
14475+
react@^18.0.0:
14476+
version "18.0.0"
14477+
resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
14478+
integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==
1448014479
dependencies:
1448114480
loose-envify "^1.1.0"
14482-
object-assign "^4.1.1"
1448314481

1448414482
read-chunk@^1.0.1:
1448514483
version "1.0.1"
@@ -15252,13 +15250,12 @@ saxes@^3.1.9:
1525215250
dependencies:
1525315251
xmlchars "^2.1.1"
1525415252

15255-
scheduler@^0.20.1:
15256-
version "0.20.1"
15257-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
15258-
integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
15253+
scheduler@^0.21.0:
15254+
version "0.21.0"
15255+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
15256+
integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
1525915257
dependencies:
1526015258
loose-envify "^1.1.0"
15261-
object-assign "^4.1.1"
1526215259

1526315260
1526415261
version "2.7.0"

0 commit comments

Comments
 (0)