From 8dbdf9c7ddf90d910a3142e3a159d916b1e91b8f Mon Sep 17 00:00:00 2001
From: Mat Mannion <mathew.mannion@linklaters.com>
Date: Tue, 15 Nov 2022 11:33:20 +0000
Subject: [PATCH] Allow TS isolatedModules flag to be set for safer
 transpilation

---
 packages/toolkit/src/entities/index.ts | 2 +-
 packages/toolkit/src/index.ts          | 2 +-
 packages/toolkit/src/query/index.ts    | 3 ++-
 packages/toolkit/tsconfig.base.json    | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/toolkit/src/entities/index.ts b/packages/toolkit/src/entities/index.ts
index 2d935fdf1c..9e2292a24c 100644
--- a/packages/toolkit/src/entities/index.ts
+++ b/packages/toolkit/src/entities/index.ts
@@ -1,5 +1,5 @@
 export { createEntityAdapter } from './create_adapter'
-export {
+export type {
   Dictionary,
   EntityState,
   EntityAdapter,
diff --git a/packages/toolkit/src/index.ts b/packages/toolkit/src/index.ts
index 24501035d2..2ea3e1384c 100644
--- a/packages/toolkit/src/index.ts
+++ b/packages/toolkit/src/index.ts
@@ -189,5 +189,5 @@ export {
   SHOULD_AUTOBATCH,
   prepareAutoBatched,
   autoBatchEnhancer,
-  AutoBatchOptions,
 } from './autoBatchEnhancer'
+export type { AutoBatchOptions } from './autoBatchEnhancer'
diff --git a/packages/toolkit/src/query/index.ts b/packages/toolkit/src/query/index.ts
index bcd97a32cf..3301ef4738 100644
--- a/packages/toolkit/src/query/index.ts
+++ b/packages/toolkit/src/query/index.ts
@@ -19,7 +19,8 @@ export type {
 } from './fetchBaseQuery'
 export { retry } from './retry'
 export { setupListeners } from './core/setupListeners'
-export { skipSelector, skipToken, SkipToken } from './core/buildSelectors'
+export { skipSelector, skipToken } from './core/buildSelectors'
+export type { SkipToken } from './core/buildSelectors'
 export type { CreateApi, CreateApiOptions } from './createApi'
 export { buildCreateApi } from './createApi'
 export { fakeBaseQuery } from './fakeBaseQuery'
diff --git a/packages/toolkit/tsconfig.base.json b/packages/toolkit/tsconfig.base.json
index 09cbbdf4b8..b3da83e8fb 100644
--- a/packages/toolkit/tsconfig.base.json
+++ b/packages/toolkit/tsconfig.base.json
@@ -26,6 +26,8 @@
     "skipLibCheck": true,
     // error out if import and file system have a casing mismatch. Recommended by TS
     "forceConsistentCasingInFileNames": true,
+    // ensure that each file can be safely transpiled by babel (etc.) without relying on other imports
+    "isolatedModules": true,
     "downlevelIteration": false,
     "allowSyntheticDefaultImports": true,
     "emitDeclarationOnly": true,