Merge pull request #4994 from webkom/wrong-rtk-type-imports

Fix imports of redux-toolkit types
webkom · Sep 25, 2024 · 932b29f · 932b29f
2 parents 8ae9420 + 67a86b8
commit 932b29f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 16 deletions.
diff --git a/app/reducers/comments.ts b/app/reducers/comments.ts
@@ -5,9 +5,11 @@ import { EntityType } from 'app/store/models/entities';
 import { parseContentTarget } from 'app/store/utils/contentTarget';
 import createLegoAdapter from 'app/utils/legoAdapter/createLegoAdapter';
 import { addReactionCases } from './reactions';
-import type { EntityId } from '@reduxjs/toolkit';
-import type { EntityState } from '@reduxjs/toolkit/src/entities/models';
-import type { ActionReducerMapBuilder } from '@reduxjs/toolkit/src/mapBuilders';
+import type {
+  EntityId,
+  EntityState,
+  ActionReducerMapBuilder,
+} from '@reduxjs/toolkit';
 import type { RootState } from 'app/store/createRootReducer';
 import type { AnyAction } from 'redux';
 

diff --git a/app/reducers/reactions.ts b/app/reducers/reactions.ts
@@ -1,8 +1,11 @@
 import { Reaction } from 'app/actions/ActionTypes';
 import { parseContentTarget } from 'app/store/utils/contentTarget';
-import type { AnyAction, EntityId } from '@reduxjs/toolkit';
-import type { EntityState } from '@reduxjs/toolkit/src/entities/models';
-import type { ActionReducerMapBuilder } from '@reduxjs/toolkit/src/mapBuilders';
+import type {
+  AnyAction,
+  EntityId,
+  EntityState,
+  ActionReducerMapBuilder,
+} from '@reduxjs/toolkit';
 import type { ReactionsGrouped } from 'app/store/models/Reaction';
 import type { EntityType } from 'app/store/models/entities';
 

diff --git a/app/utils/legoAdapter/buildActionGrantReducer.ts b/app/utils/legoAdapter/buildActionGrantReducer.ts
@@ -1,5 +1,5 @@
 import { isAsyncApiActionSuccess } from 'app/utils/legoAdapter/asyncApiActions';
-import type { ActionReducerMapBuilder } from '@reduxjs/toolkit/src/mapBuilders';
+import type { ActionReducerMapBuilder } from '@reduxjs/toolkit';
 import type { EntityType } from 'app/store/models/entities';
 
 interface StateWithActionGrant {

diff --git a/app/utils/legoAdapter/buildDeleteEntityReducer.ts b/app/utils/legoAdapter/buildDeleteEntityReducer.ts
@@ -1,7 +1,9 @@
 import { isAsyncApiActionSuccess } from 'app/utils/legoAdapter/asyncApiActions';
-import type { EntityId } from '@reduxjs/toolkit';
-import type { EntityState } from '@reduxjs/toolkit/src/entities/models';
-import type { ActionReducerMapBuilder } from '@reduxjs/toolkit/src/mapBuilders';
+import type {
+  EntityId,
+  EntityState,
+  ActionReducerMapBuilder,
+} from '@reduxjs/toolkit';
 import type { AsyncActionType } from 'app/types';
 import type { DeleteMeta } from 'app/utils/legoAdapter/asyncApiActions';
 

diff --git a/app/utils/legoAdapter/buildEntitiesReducer.ts b/app/utils/legoAdapter/buildEntitiesReducer.ts
@@ -1,7 +1,10 @@
 import { isAsyncApiActionSuccess } from 'app/utils/legoAdapter/asyncApiActions';
-import type { EntityAdapter, EntityId } from '@reduxjs/toolkit';
-import type { EntityState } from '@reduxjs/toolkit/src/entities/models';
-import type { ActionReducerMapBuilder } from '@reduxjs/toolkit/src/mapBuilders';
+import type {
+  EntityAdapter,
+  EntityId,
+  EntityState,
+  ActionReducerMapBuilder,
+} from '@reduxjs/toolkit';
 import type Entities from 'app/store/models/entities';
 import type { EntityType } from 'app/store/models/entities';
 

diff --git a/app/utils/legoAdapter/buildFetchingReducer.ts b/app/utils/legoAdapter/buildFetchingReducer.ts
@@ -3,7 +3,7 @@ import {
   isAsyncApiActionFailure,
   isAsyncApiActionSuccess,
 } from 'app/utils/legoAdapter/asyncApiActions';
-import type { ActionReducerMapBuilder } from '@reduxjs/toolkit/src/mapBuilders';
+import type { ActionReducerMapBuilder } from '@reduxjs/toolkit';
 import type { AsyncActionType } from 'app/types';
 
 type StateWithFetching = {

diff --git a/app/utils/legoAdapter/buildPaginationReducer.ts b/app/utils/legoAdapter/buildPaginationReducer.ts
@@ -4,8 +4,7 @@ import {
   isAsyncApiActionFailure,
   isAsyncApiActionSuccess,
 } from 'app/utils/legoAdapter/asyncApiActions';
-import type { EntityId } from '@reduxjs/toolkit';
-import type { ActionReducerMapBuilder } from '@reduxjs/toolkit/src/mapBuilders';
+import type { EntityId, ActionReducerMapBuilder } from '@reduxjs/toolkit';
 import type { AsyncActionType } from 'app/types';
 import type {
   FetchMeta,