Skip to content

Commit 081b9ce

Browse files
markeriksonmarkerikson
authored
Merge pull request #1834 from reduxjs/feature/react-18-alpha-updates
2 parents adade20 + 7dc8f11 commit 081b9ce

File tree

5 files changed

+80
-59
lines changed

5 files changed

+80
-59
lines changed

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"coverage": "codecov"
4141
},
4242
"peerDependencies": {
43-
"react": "^16.8.3 || ^17 || ^18"
43+
"react": "^18.0.0-alpha || ^18.0.0-beta"
4444
},
4545
"peerDependenciesMeta": {
4646
"react-dom": {
@@ -57,7 +57,7 @@
5757
"hoist-non-react-statics": "^3.3.2",
5858
"loose-envify": "^1.4.0",
5959
"react-is": "^16.13.1",
60-
"use-sync-external-store": "0.0.0-experimental-7d38e4fd8-20210930"
60+
"use-sync-external-store": "1.0.0-alpha-5cccacd13-20211101"
6161
},
6262
"devDependencies": {
6363
"@babel/cli": "^7.12.1",
@@ -77,7 +77,7 @@
7777
"@rollup/plugin-replace": "^2.3.3",
7878
"@testing-library/jest-dom": "^5.11.5",
7979
"@testing-library/jest-native": "^3.4.3",
80-
"@testing-library/react": "https://pkg.csb.dev/testing-library/react-testing-library/commit/0e2cf7da/@testing-library/react#.tgz",
80+
"@testing-library/react": "13.0.0-alpha.4",
8181
"@testing-library/react-hooks": "^3.4.2",
8282
"@testing-library/react-native": "^7.1.0",
8383
"@types/create-react-class": "^15.6.3",
@@ -103,10 +103,10 @@
103103
"glob": "^7.1.6",
104104
"jest": "^26.6.1",
105105
"prettier": "^2.1.2",
106-
"react": "0.0.0-experimental-7d38e4fd8-20210930",
107-
"react-dom": "0.0.0-experimental-7d38e4fd8-20210930",
106+
"react": "18.0.0-alpha-5cccacd13-20211101",
107+
"react-dom": "18.0.0-alpha-5cccacd13-20211101",
108108
"react-native": "^0.64.1",
109-
"react-test-renderer": "0.0.0-experimental-7d38e4fd8-20210930",
109+
"react-test-renderer": "18.0.0-alpha-5cccacd13-20211101",
110110
"redux": "^4.0.5",
111111
"rimraf": "^3.0.2",
112112
"rollup": "^2.32.1",

‎src/components/connect.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
/* eslint-disable valid-jsdoc, @typescript-eslint/no-unused-vars */
22
import hoistStatics from 'hoist-non-react-statics'
3-
import React, { useContext, useMemo, useRef, useReducer } from 'react'
3+
import React, {
4+
useContext,
5+
useMemo,
6+
useRef,
7+
useReducer,
8+
// @ts-ignore
9+
useSyncExternalStore,
10+
} from 'react'
411
import { isValidElementType, isContextConsumer } from 'react-is'
5-
import { useSyncExternalStore } from 'use-sync-external-store'
612

713
import type { Store, Dispatch, Action, AnyAction } from 'redux'
814

‎src/hooks/useSelector.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { useContext, useDebugValue } from 'react'
22

3-
import { useSyncExternalStoreExtra } from 'use-sync-external-store/extra'
3+
// @ts-ignore
4+
import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/with-selector'
45

56
import { useReduxContext as useDefaultReduxContext } from './useReduxContext'
67
import { ReactReduxContext } from '../components/Context'
@@ -45,7 +46,7 @@ export function createSelectorHook(
4546

4647
const { store } = useReduxContext()!
4748

48-
const selectedState = useSyncExternalStoreExtra(
49+
const selectedState = useSyncExternalStoreWithSelector(
4950
store.subscribe,
5051
store.getState,
5152
// TODO Need a server-side snapshot here

‎tsconfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"outDir": "./es",
1414
"forceConsistentCasingInFileNames": true,
1515
"experimentalDecorators": true,
16-
"rootDirs": ["./src", "./test", "./types"],
16+
"rootDirs": ["./src", "./types"],
1717
"rootDir": "./src",
1818
"typeRoots": [
1919
"./node_modules/@types",
2020
"./types"
2121
]
2222
},
23-
"include": ["src/**/*", "est/**/*", "types"],
24-
"exclude": ["node_modules", "dist"]
23+
"include": ["src/**/*", "types"],
24+
"exclude": ["node_modules", "dist", "test/**/*"]
2525
}

‎yarn.lock

Lines changed: 60 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2260,19 +2260,19 @@ __metadata:
22602260
languageName: node
22612261
linkType: hard
22622262

2263-
"@testing-library/dom@npm:^8.0.0":
2264-
version: 8.1.0
2265-
resolution: "@testing-library/dom@npm:8.1.0"
2263+
"@testing-library/dom@npm:^8.5.0":
2264+
version: 8.10.1
2265+
resolution: "@testing-library/dom@npm:8.10.1"
22662266
dependencies:
22672267
"@babel/code-frame": ^7.10.4
22682268
"@babel/runtime": ^7.12.5
22692269
"@types/aria-query": ^4.2.0
2270-
aria-query: ^4.2.2
2270+
aria-query: ^5.0.0
22712271
chalk: ^4.1.0
2272-
dom-accessibility-api: ^0.5.6
2272+
dom-accessibility-api: ^0.5.9
22732273
lz-string: ^1.4.4
22742274
pretty-format: ^27.0.2
2275-
checksum: 5b8c04123a50f2d3e01d2b1c8c929a009e83caca5b1813785330657d387914dedd87f0d158e94c6039b08d00c19a17a61a66fd9fca39cb67115718314dcced5a
2275+
checksum: d37eef1a3db509f3be3fcb77721f04694aadba7de195c0338d7f203668e132452a694504733ecee6fc71838abca8c02d27e78545cd8d6e89abae95d4ab2c1ab0
22762276
languageName: node
22772277
linkType: hard
22782278

@@ -2337,16 +2337,16 @@ __metadata:
23372337
languageName: node
23382338
linkType: hard
23392339

2340-
"@testing-library/react@https://pkg.csb.dev/testing-library/react-testing-library/commit/0e2cf7da/@testing-library/react#.tgz":
2341-
version: 0.0.0-semantically-released
2342-
resolution: "@testing-library/react@https://pkg.csb.dev/testing-library/react-testing-library/commit/0e2cf7da/@testing-library/react#.tgz"
2340+
"@testing-library/react@npm:13.0.0-alpha.4":
2341+
version: 13.0.0-alpha.4
2342+
resolution: "@testing-library/react@npm:13.0.0-alpha.4"
23432343
dependencies:
23442344
"@babel/runtime": ^7.12.5
2345-
"@testing-library/dom": ^8.0.0
2345+
"@testing-library/dom": ^8.5.0
23462346
peerDependencies:
23472347
react: "*"
23482348
react-dom: "*"
2349-
checksum: d4d01e1ca0f07a43f0267fbdb5c61e3c7cbaebdfe139fd6efc4b7c5df9e8a76c54ca524ef2adbc091b1873e550dfeb26e20f7167c83dc48a7ea8493b064304b6
2349+
checksum: ac40cf67d3305dec64a2692bbc9b2193be13a6d49469869ba21054bfd3b1c11a8a47ea586d4bf58ed2f84982f2ed68e17fa0a808cd197747f378a594b1e7397d
23502350
languageName: node
23512351
linkType: hard
23522352

@@ -3099,6 +3099,13 @@ __metadata:
30993099
languageName: node
31003100
linkType: hard
31013101

3102+
"aria-query@npm:^5.0.0":
3103+
version: 5.0.0
3104+
resolution: "aria-query@npm:5.0.0"
3105+
checksum: d25020459620570d05d39327e1269da4f213ff1632c0b8be1bfac984c76601dfcfe7acacd94da4c007ea204144fee8728d6d0d4b7d0f527e84cd748bf980bddc
3106+
languageName: node
3107+
linkType: hard
3108+
31023109
"arr-diff@npm:^4.0.0":
31033110
version: 4.0.0
31043111
resolution: "arr-diff@npm:4.0.0"
@@ -4502,6 +4509,13 @@ __metadata:
45024509
languageName: node
45034510
linkType: hard
45044511

4512+
"dom-accessibility-api@npm:^0.5.9":
4513+
version: 0.5.10
4514+
resolution: "dom-accessibility-api@npm:0.5.10"
4515+
checksum: f6135bf1fe84b2eee884db115ad165e773811ed035dffb519750c137bf954d3f6c69d2f9e27510265303dc3c6050c775d2fc261e802ad7196154f4148312f653
4516+
languageName: node
4517+
linkType: hard
4518+
45054519
"domexception@npm:^2.0.1":
45064520
version: 2.0.1
45074521
resolution: "domexception@npm:2.0.1"
@@ -8922,23 +8936,23 @@ __metadata:
89228936
languageName: node
89238937
linkType: hard
89248938

8925-
"react-dom@npm:0.0.0-experimental-7d38e4fd8-20210930":
8926-
version: 0.0.0-experimental-7d38e4fd8-20210930
8927-
resolution: "react-dom@npm:0.0.0-experimental-7d38e4fd8-20210930"
8939+
"react-dom@npm:18.0.0-alpha-5cccacd13-20211101":
8940+
version: 18.0.0-alpha-5cccacd13-20211101
8941+
resolution: "react-dom@npm:18.0.0-alpha-5cccacd13-20211101"
89288942
dependencies:
89298943
loose-envify: ^1.1.0
89308944
object-assign: ^4.1.1
8931-
scheduler: 0.0.0-experimental-7d38e4fd8-20210930
8945+
scheduler: 0.21.0-alpha-5cccacd13-20211101
89328946
peerDependencies:
8933-
react: 0.0.0-experimental-7d38e4fd8-20210930
8934-
checksum: cd0108ef6759e25c09b060ae6b8a3a7bf401875c615d42e1d19008dd29f89987c8c07437a2636e50788682417638bf4e5f8b4c46051c3cc1e2b3440371363b67
8947+
react: 18.0.0-alpha-5cccacd13-20211101
8948+
checksum: a1c2a2b0da1ad2acfcc7071b8a7b5ca58984eb882449258f7a1a4a64b42d9a7604e6232744ea7295b8418cdfe120b117aa910b92b24ad523aab097aa8935fe01
89358949
languageName: node
89368950
linkType: hard
89378951

8938-
"react-is@npm:0.0.0-experimental-7d38e4fd8-20210930":
8939-
version: 0.0.0-experimental-7d38e4fd8-20210930
8940-
resolution: "react-is@npm:0.0.0-experimental-7d38e4fd8-20210930"
8941-
checksum: b6dec7caa381a523dc8d22763b7da72f02403ac135c884407bb7b4cc4b88c1d96f9bc45b78f663a41c60d481cdc68b2f746cc10d5d7927c826f2271df6690d6b
8952+
"react-is@npm:18.0.0-alpha-5cccacd13-20211101":
8953+
version: 18.0.0-alpha-5cccacd13-20211101
8954+
resolution: "react-is@npm:18.0.0-alpha-5cccacd13-20211101"
8955+
checksum: 1db5b5a764529764f49581ad160e6b9741b2b79cdd01560c974783da06ace334b1db98815d3253641b3a36dffc296635625f6c306dee3e12a1c0b588e00ef747
89428956
languageName: node
89438957
linkType: hard
89448958

@@ -9033,7 +9047,7 @@ __metadata:
90339047
"@rollup/plugin-replace": ^2.3.3
90349048
"@testing-library/jest-dom": ^5.11.5
90359049
"@testing-library/jest-native": ^3.4.3
9036-
"@testing-library/react": "https://pkg.csb.dev/testing-library/react-testing-library/commit/0e2cf7da/@testing-library/react#.tgz"
9050+
"@testing-library/react": 13.0.0-alpha.4
90379051
"@testing-library/react-hooks": ^3.4.2
90389052
"@testing-library/react-native": ^7.1.0
90399053
"@types/create-react-class": ^15.6.3
@@ -9063,18 +9077,18 @@ __metadata:
90639077
jest: ^26.6.1
90649078
loose-envify: ^1.4.0
90659079
prettier: ^2.1.2
9066-
react: 0.0.0-experimental-7d38e4fd8-20210930
9067-
react-dom: 0.0.0-experimental-7d38e4fd8-20210930
9080+
react: 18.0.0-alpha-5cccacd13-20211101
9081+
react-dom: 18.0.0-alpha-5cccacd13-20211101
90689082
react-is: ^16.13.1
90699083
react-native: ^0.64.1
9070-
react-test-renderer: 0.0.0-experimental-7d38e4fd8-20210930
9084+
react-test-renderer: 18.0.0-alpha-5cccacd13-20211101
90719085
redux: ^4.0.5
90729086
rimraf: ^3.0.2
90739087
rollup: ^2.32.1
90749088
rollup-plugin-terser: ^7.0.2
90759089
ts-jest: 26.5.6
90769090
typescript: ^4.3.4
9077-
use-sync-external-store: 0.0.0-experimental-7d38e4fd8-20210930
9091+
use-sync-external-store: 1.0.0-alpha-5cccacd13-20211101
90789092
peerDependencies:
90799093
react: ^16.8.3 || ^17 || ^18
90809094
peerDependenciesMeta:
@@ -9104,27 +9118,27 @@ __metadata:
91049118
languageName: node
91059119
linkType: hard
91069120

9107-
"react-test-renderer@npm:0.0.0-experimental-7d38e4fd8-20210930":
9108-
version: 0.0.0-experimental-7d38e4fd8-20210930
9109-
resolution: "react-test-renderer@npm:0.0.0-experimental-7d38e4fd8-20210930"
9121+
"react-test-renderer@npm:18.0.0-alpha-5cccacd13-20211101":
9122+
version: 18.0.0-alpha-5cccacd13-20211101
9123+
resolution: "react-test-renderer@npm:18.0.0-alpha-5cccacd13-20211101"
91109124
dependencies:
91119125
object-assign: ^4.1.1
9112-
react-is: 0.0.0-experimental-7d38e4fd8-20210930
9126+
react-is: 18.0.0-alpha-5cccacd13-20211101
91139127
react-shallow-renderer: ^16.13.1
9114-
scheduler: 0.0.0-experimental-7d38e4fd8-20210930
9128+
scheduler: 0.21.0-alpha-5cccacd13-20211101
91159129
peerDependencies:
9116-
react: 0.0.0-experimental-7d38e4fd8-20210930
9117-
checksum: 91fcd41e66a75193ef59a56bf369ff8616df903b2baed9551261fdb3a9aa1bbd11a2c18780f7f31b1ed8f7dd8d4ba7ea1cc7115d0eec1a26f87ee684d858879a
9130+
react: 18.0.0-alpha-5cccacd13-20211101
9131+
checksum: 3f5ac9c3ce6f5d6112648294fd8fc6e8e6254955509401e457b53763647d150766a44ebb835ca8bc233808861587af1b4168d770431fde4a2f9f81d428f08c20
91189132
languageName: node
91199133
linkType: hard
91209134

9121-
"react@npm:0.0.0-experimental-7d38e4fd8-20210930":
9122-
version: 0.0.0-experimental-7d38e4fd8-20210930
9123-
resolution: "react@npm:0.0.0-experimental-7d38e4fd8-20210930"
9135+
"react@npm:18.0.0-alpha-5cccacd13-20211101":
9136+
version: 18.0.0-alpha-5cccacd13-20211101
9137+
resolution: "react@npm:18.0.0-alpha-5cccacd13-20211101"
91249138
dependencies:
91259139
loose-envify: ^1.1.0
91269140
object-assign: ^4.1.1
9127-
checksum: 517c9a9df49228abec04cea4afee78199281430cea768b3d795e54440ad902fb83bb4a695400846effce5ae85e69e6e34093f12ea7b52602791319f43f43fd0e
9141+
checksum: a42a6d9df8c8681744e8dd1abf0d138ba8c8eccd6c9542e63769c6f73990380a0ce2a8bd1c597ea9a48965d848c97a759bb3737ab7edc7ace0c2feca814eff2a
91289142
languageName: node
91299143
linkType: hard
91309144

@@ -9674,13 +9688,13 @@ __metadata:
96749688
languageName: node
96759689
linkType: hard
96769690

9677-
"scheduler@npm:0.0.0-experimental-7d38e4fd8-20210930":
9678-
version: 0.0.0-experimental-7d38e4fd8-20210930
9679-
resolution: "scheduler@npm:0.0.0-experimental-7d38e4fd8-20210930"
9691+
"scheduler@npm:0.21.0-alpha-5cccacd13-20211101":
9692+
version: 0.21.0-alpha-5cccacd13-20211101
9693+
resolution: "scheduler@npm:0.21.0-alpha-5cccacd13-20211101"
96809694
dependencies:
96819695
loose-envify: ^1.1.0
96829696
object-assign: ^4.1.1
9683-
checksum: f687800f2d6e4221537a24e14f663f20d1b10d9524d3f6f03b84508d12a0a71ce68da1a9a9a86929740c02b87485c459b2ab32eab6c0e228eaf4ce25a9ecf6e5
9697+
checksum: 1ab15d8e7bec520397e68283847b6f1edda6e28dcb832b1b56344188c5f2dc99cac123fe445dfc8cc5bebd890fb4cd61131a4c807cb6da2ea9c40ccb218bd319
96849698
languageName: node
96859699
linkType: hard
96869700

@@ -10957,12 +10971,12 @@ __metadata:
1095710971
languageName: node
1095810972
linkType: hard
1095910973

10960-
"use-sync-external-store@npm:0.0.0-experimental-7d38e4fd8-20210930":
10961-
version: 0.0.0-experimental-7d38e4fd8-20210930
10962-
resolution: "use-sync-external-store@npm:0.0.0-experimental-7d38e4fd8-20210930"
10974+
"use-sync-external-store@npm:1.0.0-alpha-5cccacd13-20211101":
10975+
version: 1.0.0-alpha-5cccacd13-20211101
10976+
resolution: "use-sync-external-store@npm:1.0.0-alpha-5cccacd13-20211101"
1096310977
peerDependencies:
10964-
react: 0.0.0-experimental-7d38e4fd8-20210930
10965-
checksum: 7dd969c11eb2af6ab0c017148c7c8e641538f3b21f1e8982c6f2e992dd89248848d828848efc0a8f0aa57bdfe2dbdfc5ac5351fc1f4c7dbd86a94c4fbcb61a81
10978+
react: 18.0.0-alpha-5cccacd13-20211101
10979+
checksum: aa277b4173e366f40bc01888827f125f718a6d4da1d4e3764d231450fb275b89c82dd309e4752f7c1cab027bc9f8d9fe02a62394037be85509e81e3cfa3d0257
1096610980
languageName: node
1096710981
linkType: hard
1096810982

0 commit comments

Comments
 (0)