Skip to content

Commit 6f1a4c6

Browse files
authored
Merge pull request #3757 from reduxjs/feature/3745-react-redux-9
2 parents eae9bda + 7d26e27 commit 6f1a4c6

File tree

21 files changed

+197
-205
lines changed

21 files changed

+197
-205
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
fail-fast: false
106106
matrix:
107107
node: ['16.x']
108-
ts: ['4.7', '4.8', '4.9', '5.0']
108+
ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2']
109109
steps:
110110
- name: Checkout repo
111111
uses: actions/checkout@v2

examples/publish-ci/cra4/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"private": true,
55
"dependencies": {
66
"@reduxjs/toolkit": "^2.0.0-beta.2",
7-
"msw": "^0.49.2",
7+
"msw": "^1.3.2",
88
"react": "^18.2.0",
99
"react-dom": "^18.2.0",
10-
"react-redux": "^9.0.0-alpha.1",
10+
"react-redux": "^9.0.0-beta.0",
1111
"react-scripts": "^4",
1212
"web-vitals": "^2.1.4"
1313
},

examples/publish-ci/cra4/public/mockServiceWorker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* tslint:disable */
33

44
/**
5-
* Mock Service Worker (0.49.3).
5+
* Mock Service Worker (1.3.2).
66
* @see https://github.com/mswjs/msw
77
* - Please do NOT modify this file.
88
* - Please do NOT serve this file on production.

examples/publish-ci/cra4/tests/playwright/rtkq.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { test, expect } from '@playwright/test'
22

33
test('RTK / RTKQ Interactions', async ({ page }) => {
4+
page.on('console', (msg) => console.log('Console message: ', msg.text()))
45
await page.goto('http://localhost:3000')
56

67
const counterValue = page.getByTestId('counter-value')

examples/publish-ci/cra4/yarn.lock

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,19 +1959,19 @@ __metadata:
19591959
languageName: node
19601960
linkType: hard
19611961

1962-
"@mswjs/interceptors@npm:^0.17.5":
1963-
version: 0.17.9
1964-
resolution: "@mswjs/interceptors@npm:0.17.9"
1962+
"@mswjs/interceptors@npm:^0.17.10":
1963+
version: 0.17.10
1964+
resolution: "@mswjs/interceptors@npm:0.17.10"
19651965
dependencies:
19661966
"@open-draft/until": ^1.0.3
19671967
"@types/debug": ^4.1.7
19681968
"@xmldom/xmldom": ^0.8.3
19691969
debug: ^4.3.3
1970-
headers-polyfill: ^3.1.0
1970+
headers-polyfill: 3.2.5
19711971
outvariant: ^1.2.1
19721972
strict-event-emitter: ^0.2.4
19731973
web-encoding: ^1.1.5
1974-
checksum: 4df726cbee93d8baa54ead1ecb11e98124468659f51eb659ef8ead4aca7d6375198baf412ea17d4810fa5f1ee4fa53994702cb3b0b4f6f427a2f0fb890020192
1974+
checksum: 0e6d32f399144b5cefe6fd7620f2776c83adc9bbbbccf2eb4ea347332be059f585136c44168c09b544c41cd3d686f88e43432e10192227a24fbb0c98a2f52dc8
19751975
languageName: node
19761976
linkType: hard
19771977

@@ -4662,16 +4662,6 @@ __metadata:
46624662
languageName: node
46634663
linkType: hard
46644664

4665-
"chalk@npm:4.1.1":
4666-
version: 4.1.1
4667-
resolution: "chalk@npm:4.1.1"
4668-
dependencies:
4669-
ansi-styles: ^4.1.0
4670-
supports-color: ^7.1.0
4671-
checksum: 036e973e665ba1a32c975e291d5f3d549bceeb7b1b983320d4598fb75d70fe20c5db5d62971ec0fe76cdbce83985a00ee42372416abfc3a5584465005a7855ed
4672-
languageName: node
4673-
linkType: hard
4674-
46754665
"chalk@npm:5.0.1":
46764666
version: 5.0.1
46774667
resolution: "chalk@npm:5.0.1"
@@ -7877,10 +7867,10 @@ __metadata:
78777867
languageName: node
78787868
linkType: hard
78797869

7880-
"graphql@npm:^15.0.0 || ^16.0.0":
7881-
version: 16.6.0
7882-
resolution: "graphql@npm:16.6.0"
7883-
checksum: bf1d9e3c1938ce3c1a81e909bd3ead1ae4707c577f91cff1ca2eca474bfbc7873d5d7b942e1e9777ff5a8304421dba57a4b76d7a29eb19de8711cb70e3c2415e
7870+
"graphql@npm:^16.8.1":
7871+
version: 16.8.1
7872+
resolution: "graphql@npm:16.8.1"
7873+
checksum: 8d304b7b6f708c8c5cc164b06e92467dfe36aff6d4f2cf31dd19c4c2905a0e7b89edac4b7e225871131fd24e21460836b369de0c06532644d15b461d55b1ccc0
78847874
languageName: node
78857875
linkType: hard
78867876

@@ -8053,10 +8043,10 @@ __metadata:
80538043
languageName: node
80548044
linkType: hard
80558045

8056-
"headers-polyfill@npm:^3.1.0":
8057-
version: 3.1.2
8058-
resolution: "headers-polyfill@npm:3.1.2"
8059-
checksum: 510ca9637ef652404dbd432e680418f8d418ba18094ef2f64c3d8de955ebf6e68d553c7f0aeaa5fc937d130b139c1e2d7c2066cd4cf0f740a4627924eaaee9db
8046+
"headers-polyfill@npm:3.2.5":
8047+
version: 3.2.5
8048+
resolution: "headers-polyfill@npm:3.2.5"
8049+
checksum: a3c4bdd661584fd39e40c0f91412abc514616edfbd20d29a75567e591f90ef5c445c8e209b7f3c2b2375d27e95e4690f33417368a168d4832484a93861ab6a3c
80608050
languageName: node
80618051
linkType: hard
80628052

@@ -8921,10 +8911,10 @@ __metadata:
89218911
languageName: node
89228912
linkType: hard
89238913

8924-
"is-node-process@npm:^1.0.1":
8925-
version: 1.0.1
8926-
resolution: "is-node-process@npm:1.0.1"
8927-
checksum: 3ddb8a892a00f6eb9c2aea7e7e1426b8683512d9419933d95114f4f64b5455e26601c23a31c0682463890032136dd98a326988a770ab6b4eed54a43ade8bed50
8914+
"is-node-process@npm:^1.2.0":
8915+
version: 1.2.0
8916+
resolution: "is-node-process@npm:1.2.0"
8917+
checksum: 930765cdc6d81ab8f1bbecbea4a8d35c7c6d88a3ff61f3630e0fc7f22d624d7661c1df05c58547d0eb6a639dfa9304682c8e342c4113a6ed51472b704cee2928
89288918
languageName: node
89298919
linkType: hard
89308920

@@ -10879,37 +10869,37 @@ __metadata:
1087910869
languageName: node
1088010870
linkType: hard
1088110871

10882-
"msw@npm:^0.49.2":
10883-
version: 0.49.3
10884-
resolution: "msw@npm:0.49.3"
10872+
"msw@npm:^1.3.2":
10873+
version: 1.3.2
10874+
resolution: "msw@npm:1.3.2"
1088510875
dependencies:
1088610876
"@mswjs/cookies": ^0.2.2
10887-
"@mswjs/interceptors": ^0.17.5
10877+
"@mswjs/interceptors": ^0.17.10
1088810878
"@open-draft/until": ^1.0.3
1088910879
"@types/cookie": ^0.4.1
1089010880
"@types/js-levenshtein": ^1.1.1
10891-
chalk: 4.1.1
10881+
chalk: ^4.1.1
1089210882
chokidar: ^3.4.2
1089310883
cookie: ^0.4.2
10894-
graphql: ^15.0.0 || ^16.0.0
10895-
headers-polyfill: ^3.1.0
10884+
graphql: ^16.8.1
10885+
headers-polyfill: 3.2.5
1089610886
inquirer: ^8.2.0
10897-
is-node-process: ^1.0.1
10887+
is-node-process: ^1.2.0
1089810888
js-levenshtein: ^1.1.6
1089910889
node-fetch: ^2.6.7
10900-
outvariant: ^1.3.0
10890+
outvariant: ^1.4.0
1090110891
path-to-regexp: ^6.2.0
1090210892
strict-event-emitter: ^0.4.3
1090310893
type-fest: ^2.19.0
1090410894
yargs: ^17.3.1
1090510895
peerDependencies:
10906-
typescript: ">= 4.4.x <= 4.9.x"
10896+
typescript: ">= 4.4.x <= 5.2.x"
1090710897
peerDependenciesMeta:
1090810898
typescript:
1090910899
optional: true
1091010900
bin:
1091110901
msw: cli/index.js
10912-
checksum: 8322cd42cd69f289c05517d02bde22fc2f10e86fc2d0d209d9df54bd03d10b8123723c5587a2654dcd2cd0f314a016f9eccac88cffa30fafd1f9fead16db639e
10902+
checksum: c2d4f7747f5806f0fd8d8cc3ca250ee1c2a7a6cd608de43f95bd072ba1fb13cdce0b52932ce9bf8f4a21b194d2815db535501e224ec8f7052593447fe1c0cb70
1091310903
languageName: node
1091410904
linkType: hard
1091510905

@@ -11522,13 +11512,20 @@ __metadata:
1152211512
languageName: node
1152311513
linkType: hard
1152411514

11525-
"outvariant@npm:^1.2.1, outvariant@npm:^1.3.0":
11515+
"outvariant@npm:^1.2.1":
1152611516
version: 1.3.0
1152711517
resolution: "outvariant@npm:1.3.0"
1152811518
checksum: ac76ca375c1c642989e1c74f0e9ebac84c05bc9fdc8f28be949c16fae1658e9f1f2fb1133fe3cc1e98afabef78fe4298fe9360b5734baf8e6ad440c182680848
1152911519
languageName: node
1153011520
linkType: hard
1153111521

11522+
"outvariant@npm:^1.4.0":
11523+
version: 1.4.0
11524+
resolution: "outvariant@npm:1.4.0"
11525+
checksum: ec32dfc315c464bb6e4906b2f450d259ce0b86caf70b70b249054359d9af21a7fccf53a8b6aa232f8d718449e31c1cfa594e6ebffaafe7bf908b502495256d7b
11526+
languageName: node
11527+
linkType: hard
11528+
1153211529
"p-each-series@npm:^2.1.0":
1153311530
version: 2.2.0
1153411531
resolution: "p-each-series@npm:2.2.0"
@@ -13241,9 +13238,9 @@ __metadata:
1324113238
languageName: node
1324213239
linkType: hard
1324313240

13244-
"react-redux@npm:^9.0.0-alpha.1":
13245-
version: 9.0.0-alpha.1
13246-
resolution: "react-redux@npm:9.0.0-alpha.1"
13241+
"react-redux@npm:^9.0.0-beta.0":
13242+
version: 9.0.0-beta.0
13243+
resolution: "react-redux@npm:9.0.0-beta.0"
1324713244
dependencies:
1324813245
"@types/use-sync-external-store": ^0.0.3
1324913246
react-is: ^18.0.0
@@ -13266,7 +13263,7 @@ __metadata:
1326613263
optional: true
1326713264
redux:
1326813265
optional: true
13269-
checksum: ee4edbf417d0f16297e8bc6d039129f915f4d9330ec160ab4135e859a8ec7f11f943cfc26a2d336ec2395c2549c7e8e6d7a4f341febd5404ed0221fb5cbfc17a
13266+
checksum: 4fc40fc4b2c03905f5d523b854516f4323d307c0ca33f2a14701f33315b53768d9e19f59511ebcad5448ccbd7c69a362edd0b68f0932669d4f9b2f517b7257b4
1327013267
languageName: node
1327113268
linkType: hard
1327213269

@@ -13962,12 +13959,12 @@ __metadata:
1396213959
"@types/node": ^17.0.45
1396313960
"@types/react": ^18.0.26
1396413961
"@types/react-dom": ^18.0.10
13965-
msw: ^0.49.2
13962+
msw: ^1.3.2
1396613963
playwright: ^1.31.1
1396713964
prettier: ^2.8.4
1396813965
react: ^18.2.0
1396913966
react-dom: ^18.2.0
13970-
react-redux: ^9.0.0-alpha.1
13967+
react-redux: ^9.0.0-beta.0
1397113968
react-scripts: ^4
1397213969
serve: ^14.2.0
1397313970
typescript: ^4.9.4

examples/publish-ci/cra5/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"private": true,
55
"dependencies": {
66
"@reduxjs/toolkit": "^2.0.0-beta.2",
7-
"msw": "^0.49.2",
7+
"msw": "^1.3.2",
88
"react": "^18.2.0",
99
"react-dom": "^18.2.0",
10-
"react-redux": "^9.0.0-alpha.1",
10+
"react-redux": "^9.0.0-beta.0",
1111
"react-scripts": "5",
1212
"web-vitals": "^2.1.4"
1313
},

examples/publish-ci/cra5/public/mockServiceWorker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* tslint:disable */
33

44
/**
5-
* Mock Service Worker (0.49.3).
5+
* Mock Service Worker (1.3.2).
66
* @see https://github.com/mswjs/msw
77
* - Please do NOT modify this file.
88
* - Please do NOT serve this file on production.

examples/publish-ci/cra5/tests/playwright/rtkq.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { test, expect } from '@playwright/test'
22

33
test('RTK / RTKQ Interactions', async ({ page }) => {
4+
page.on('console', (msg) => console.log('Console message: ', msg.text()))
45
await page.goto('http://localhost:3000')
56

67
const counterValue = page.getByTestId('counter-value')

0 commit comments

Comments
 (0)