From 67a86b83fa5f7b47e2c4cef692476ba6e55df76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eik=20Hvattum=20R=C3=B8geberg?= <eik.rogeberg@gmail.com>
Date: Wed, 25 Sep 2024 13:12:09 +0200
Subject: [PATCH] Fix imports of rtk types

These were imported from the src folder of rtk because they weren't
exported in earlier versions of rtk. Seems like some new config makes
this cause an error, but they have been added to exports so we can just
import them normally.
---
 app/reducers/comments.ts                          | 8 +++++---
 app/reducers/reactions.ts                         | 9 ++++++---
 app/utils/legoAdapter/buildActionGrantReducer.ts  | 2 +-
 app/utils/legoAdapter/buildDeleteEntityReducer.ts | 8 +++++---
 app/utils/legoAdapter/buildEntitiesReducer.ts     | 9 ++++++---
 app/utils/legoAdapter/buildFetchingReducer.ts     | 2 +-
 app/utils/legoAdapter/buildPaginationReducer.ts   | 3 +--
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/reducers/comments.ts b/app/reducers/comments.ts
index 11b9e8d37e..2400b30a5c 100644
--- 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
index 00116051a5..712738a17c 100644
--- 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
index 2caea0cdfe..a05cac6e3b 100644
--- 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
index 726c62e169..64049657be 100644
--- 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
index b7899445c0..21d7d5f7c3 100644
--- 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
index 1e4f0525db..a130d49348 100644
--- 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
index fb7b29f106..9530ec000b 100644
--- 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,