Move module and moduleResolution to individual config files

wellcomecollection · Jul 2, 2024 · 2b40519 · 2b40519
1 parent 3e73415
commit 2b40519
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/cardigan/tsconfig.json b/cardigan/tsconfig.json
@@ -1,3 +1,7 @@
 {
   "extends": "../config/tsconfig-base",
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "bundler",
+  }
 }
diff --git a/common/tsconfig.json b/common/tsconfig.json
@@ -1,4 +1,7 @@
 {
   "extends": "../config/tsconfig-base",
-  "include": ["**/*.ts", "**/*.tsx"]
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "bundler",
+  }
 }
diff --git a/config/tsconfig-base.json b/config/tsconfig-base.json
@@ -8,8 +8,6 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "lib": ["esnext"], 
-    "module": "esnext",
-    "moduleResolution": "bundler",
     "noEmit": true,
     "noFallthroughCasesInSwitch": true,
     "resolveJsonModule": true,
@@ -18,5 +16,6 @@
     "strictNullChecks": true,
     "target": "es6",
   },
-  "exclude": ["**/node_modules"]
+  "exclude": ["/**/node_modules"],
+  "include": ["/**/*.ts", "/**/*.tsx"],
 }
diff --git a/content/webapp/tsconfig.json b/content/webapp/tsconfig.json
@@ -1,6 +1,9 @@
 {
   "extends": "../../config/tsconfig-base",
-  "include": ["**/*.ts", "**/*.tsx"],
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "node" // Forced by NextJs on build
+  },
   "ts-node": {
     "preferTsExts": true
   }

diff --git a/identity/webapp/tsconfig.json b/identity/webapp/tsconfig.json
@@ -1,6 +1,9 @@
 {
   "extends": "../../config/tsconfig-base",
-  "include": ["**/*.ts", "**/*.tsx"],
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "node" // Forced by NextJs on build
+  },
   "ts-node": {
     "preferTsExts": true
   }

diff --git a/toggles/webapp/tsconfig.json b/toggles/webapp/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../config/tsconfig-base",
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "bundler",
+  },
   // This is for https://github.com/wellcomecollection/ts-aws
   "ts-node": {
     "skipIgnore": true