Skip to content

Commit cb51d1b

Browse files
authored
chore(monorepo): Bump Redux to 5.0.1 (#18295)
Closes EXEC-1473
1 parent 09055bf commit cb51d1b

File tree

70 files changed

+296
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+296
-288
lines changed

app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
"react-select": "5.4.0",
5757
"react-simple-keyboard": "^3.7.0",
5858
"react-viewport-list": "6.3.0",
59-
"redux": "4.0.5",
59+
"redux": "5.0.1",
6060
"redux-observable": "1.1.0",
61-
"redux-thunk": "2.3.0",
61+
"redux-thunk": "3.1.0",
6262
"reselect": "4.0.0",
6363
"rxjs": "^6.5.1",
6464
"semver": "5.7.2",

app/src/App/__tests__/hooks.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { I18nextProvider } from 'react-i18next'
22
import { Provider } from 'react-redux'
33
import { renderHook } from '@testing-library/react'
4-
import { createStore } from 'redux'
4+
import { legacy_createStore } from 'redux'
55
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
66

77
import { i18n } from '/app/i18n'
@@ -18,7 +18,7 @@ describe('useSoftwareUpdatePoll', () => {
1818
let store: Store<State>
1919
beforeEach(() => {
2020
vi.useFakeTimers()
21-
store = createStore(vi.fn(), {})
21+
store = legacy_createStore(vi.fn(), {})
2222
store.dispatch = vi.fn()
2323
wrapper = ({ children }) => (
2424
<I18nextProvider i18n={i18n}>

app/src/__testing-utils__/renderWithProviders.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { I18nextProvider } from 'react-i18next'
44
import { QueryClient, QueryClientProvider } from 'react-query'
55
import { Provider } from 'react-redux'
66
import { render } from '@testing-library/react'
7-
import { createStore } from 'redux'
7+
import { legacy_createStore } from 'redux'
88
import { vi } from 'vitest'
99

1010
import type { RenderOptions, RenderResult } from '@testing-library/react'
11-
import type { PreloadedState, Store } from 'redux'
11+
import type { Store } from 'redux'
1212
import type {
1313
ComponentProps,
1414
ComponentType,
@@ -28,10 +28,7 @@ export function renderWithProviders<State>(
2828
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
2929
const { initialState = {}, i18nInstance = null } = options || {}
3030

31-
const store: Store<State> = createStore(
32-
vi.fn(),
33-
initialState as PreloadedState<State>
34-
)
31+
const store: Store<State> = legacy_createStore(vi.fn(), initialState)
3532
store.dispatch = vi.fn()
3633
store.getState = vi.fn(() => initialState) as () => State
3734

app/src/molecules/GenericWizardTile/GenericWizardTile.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Provider } from 'react-redux'
2-
import { createStore } from 'redux'
2+
import { legacy_createStore } from 'redux'
33

44
import {
55
DIRECTION_COLUMN,
@@ -26,7 +26,7 @@ const dummyConfig = {
2626
},
2727
} as any
2828

29-
const store: Store<any> = createStore(
29+
const store: Store<any> = legacy_createStore(
3030
configReducer,
3131
dummyConfig as StoreEnhancer
3232
)

app/src/molecules/InterventionModal/InterventionModal.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Provider } from 'react-redux'
2-
import { createStore } from 'redux'
2+
import { legacy_createStore } from 'redux'
33

44
import { LegacyStyledText } from '@opentrons/components'
55

@@ -15,7 +15,7 @@ const dummyConfig = {
1515
isOnDevice: false,
1616
},
1717
} as any
18-
const store: Store<any> = createStore(
18+
const store: Store<any> = legacy_createStore(
1919
configReducer,
2020
dummyConfig as StoreEnhancer
2121
)

app/src/molecules/SimpleWizardBody/SimpleWizardBody.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Provider } from 'react-redux'
2-
import { createStore } from 'redux'
2+
import { legacy_createStore } from 'redux'
33

44
import { COLORS, ModalShell, PrimaryButton } from '@opentrons/components'
55

@@ -23,7 +23,7 @@ const dummyConfig = {
2323
},
2424
} as any
2525

26-
const store: Store<any> = createStore(
26+
const store: Store<any> = legacy_createStore(
2727
configReducer,
2828
dummyConfig as StoreEnhancer
2929
)

app/src/molecules/ToggleGroup/__tests__/useToggleGroup.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Provider } from 'react-redux'
2-
import { createStore } from 'redux'
2+
import { legacy_createStore } from 'redux'
33

44
import '@testing-library/jest-dom/vitest'
55

@@ -19,7 +19,7 @@ vi.mock('/app/redux/analytics')
1919
let mockTrackEvent: any
2020

2121
describe('useToggleGroup', () => {
22-
const store: Store<State> = createStore(vi.fn(), {})
22+
const store: Store<State> = legacy_createStore(vi.fn(), {})
2323
beforeEach(() => {
2424
mockTrackEvent = vi.fn()
2525
vi.mocked(useTrackEvent).mockReturnValue(mockTrackEvent)

app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/modals/HeaterShakerIsRunningModal/__tests__/hooks.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Provider } from 'react-redux'
22
import { renderHook } from '@testing-library/react'
3-
import { createStore } from 'redux'
3+
import { legacy_createStore } from 'redux'
44
import { beforeEach, describe, expect, it, vi } from 'vitest'
55

66
import { HEATERSHAKER_MODULE_V1 } from '@opentrons/shared-data'
@@ -17,7 +17,7 @@ import type { State } from '/app/redux/types'
1717
vi.mock('/app/resources/runs')
1818

1919
describe('useHeaterShakerModuleIdsFromRun', () => {
20-
const store: Store<State> = createStore(vi.fn(), {})
20+
const store: Store<State> = legacy_createStore(vi.fn(), {})
2121

2222
beforeEach(() => {
2323
store.dispatch = vi.fn()

app/src/organisms/Desktop/Devices/RobotSettings/UpdateBuildroot/__tests__/UpdateRobotModal.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { fireEvent, screen } from '@testing-library/react'
2-
import { createStore } from 'redux'
2+
import { legacy_createStore } from 'redux'
33
import { beforeEach, describe, expect, it, vi } from 'vitest'
44

55
import '@testing-library/jest-dom/vitest'
@@ -33,7 +33,7 @@ describe('UpdateRobotModal', () => {
3333
let props: ComponentProps<typeof UpdateRobotModal>
3434
let store: Store<State>
3535
beforeEach(() => {
36-
store = createStore(vi.fn(), {})
36+
store = legacy_createStore(vi.fn(), {})
3737
store.dispatch = vi.fn()
3838
props = {
3939
robotName: 'test robot',

app/src/organisms/Desktop/Devices/RobotSettings/UpdateBuildroot/__tests__/useRobotUpdateInfo.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { I18nextProvider } from 'react-i18next'
22
import { Provider } from 'react-redux'
33
import { renderHook } from '@testing-library/react'
4-
import { createStore } from 'redux'
4+
import { legacy_createStore } from 'redux'
55
import { beforeEach, describe, expect, it, vi } from 'vitest'
66

77
import '@testing-library/jest-dom/vitest'
@@ -40,7 +40,7 @@ describe('useRobotUpdateInfo', () => {
4040

4141
beforeEach(() => {
4242
vi.useFakeTimers()
43-
store = createStore(vi.fn(), {})
43+
store = legacy_createStore(vi.fn(), {})
4444
store.dispatch = vi.fn()
4545
wrapper = ({ children }) => (
4646
<I18nextProvider i18n={i18n}>

0 commit comments

Comments
 (0)