Skip to content

Commit 952e7ed

Browse files
authored
Deduplicate imports (#5128)
* Deduplicate core imports * Deduplicate RTKQ imports
1 parent df24e25 commit 952e7ed

26 files changed

+64
-38
lines changed

packages/toolkit/src/configureStore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
compose,
1414
combineReducers,
1515
isPlainObject,
16-
} from 'redux'
16+
} from './reduxImports'
1717
import type { DevToolsEnhancerOptions as DevToolsOptions } from './devtoolsExtension'
1818
import { composeWithDevTools } from './devtoolsExtension'
1919

packages/toolkit/src/createAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { isAction } from 'redux'
1+
import { isAction } from './reduxImports'
22
import type {
33
IsUnknownOrNonInferrable,
44
IfMaybeUndefined,

packages/toolkit/src/createDraftSafeSelector.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { current, isDraft } from 'immer'
2-
import { createSelectorCreator, weakMapMemoize } from 'reselect'
1+
import { current, isDraft } from './immerImports'
2+
import { createSelectorCreator, weakMapMemoize } from './reselectImports'
33

44
export const createDraftSafeSelectorCreator: typeof createSelectorCreator = (
55
...args: unknown[]

packages/toolkit/src/createReducer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { Draft } from 'immer'
22
import {
3-
produce as createNextState,
3+
createNextState,
44
isDraft,
55
isDraftable,
66
setUseStrictIteration,
7-
} from 'immer'
7+
} from './immerImports'
88
import type { Action, Reducer, UnknownAction } from 'redux'
99
import type { ActionReducerMapBuilder } from './mapBuilders'
1010
import { executeReducerBuilderCallback } from './mapBuilders'

packages/toolkit/src/devtoolsExtension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Action, ActionCreator, StoreEnhancer } from 'redux'
2-
import { compose } from 'redux'
2+
import { compose } from './reduxImports'
33

44
/**
55
* @public

packages/toolkit/src/dynamicMiddleware/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Dispatch, Middleware, UnknownAction } from 'redux'
2-
import { compose } from 'redux'
2+
import { compose } from '../reduxImports'
33
import { createAction } from '../createAction'
44
import { isAllOf } from '../matchers'
55
import { nanoid } from '../nanoid'

packages/toolkit/src/entities/state_adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { produce as createNextState, isDraft } from 'immer'
1+
import { createNextState, isDraft } from '../immerImports'
22
import type { Draft } from 'immer'
33
import type { EntityId, DraftableEntityState, PreventAny } from './models'
44
import type { PayloadAction } from '../createAction'

packages/toolkit/src/entities/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Draft } from 'immer'
2-
import { current, isDraft } from 'immer'
2+
import { current, isDraft } from '../immerImports'
33
import type {
44
DraftableEntityState,
55
EntityId,
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export {
2+
current,
3+
isDraft,
4+
produce as createNextState,
5+
isDraftable,
6+
setUseStrictIteration,
7+
} from 'immer'

packages/toolkit/src/index.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,11 @@
33
import { formatProdErrorMessage } from './formatProdErrorMessage'
44

55
export * from 'redux'
6-
export {
7-
produce as createNextState,
8-
current,
9-
freeze,
10-
original,
11-
isDraft,
12-
} from 'immer'
6+
export { freeze, original } from 'immer'
7+
export { createNextState, current, isDraft } from './immerImports'
138
export type { Draft, WritableDraft } from 'immer'
14-
export {
15-
createSelector,
16-
createSelectorCreator,
17-
lruMemoize,
18-
weakMapMemoize,
19-
} from 'reselect'
9+
export { createSelector, lruMemoize } from 'reselect'
10+
export { createSelectorCreator, weakMapMemoize } from './reselectImports'
2011
export type { Selector, OutputSelector } from 'reselect'
2112
export {
2213
createDraftSafeSelector,

0 commit comments

Comments
 (0)