diff --git a/.gitignore b/.gitignore
index 19df2314..378fb780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ lerna-debug.log*
 master-build.zip
 master-src.zip
 npm-debug.log*
+tsconfig.*buildinfo
 yarn-debug.log*
 yarn-error.log*
 package-lock.json
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 00000000..0ca27650
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,22 @@
+{
+  "extends": "@polkadot/dev/config/tsconfig.json",
+	"compilerOptions": {
+		"composite": true,
+		"paths": {
+      "@polkadot/extension": ["extension/src"],
+      "@polkadot/extension/*": ["extension/src/*"],
+      "@polkadot/extension-base": ["extension-base/src"],
+      "@polkadot/extension-base/*": ["extension-base/src/*"],
+      "@polkadot/extension-chains": ["extension-chains/src"],
+      "@polkadot/extension-chains/*": ["extension-chains/src/*"],
+      "@polkadot/extension-compat-metamask": ["extension-compat-metamask/src"],
+      "@polkadot/extension-dapp": ["extension-dapp/src"],
+      "@polkadot/extension-dapp/*": ["extension-dapp/src/*"],
+      "@polkadot/extension-inject": ["extension-inject/src"],
+      "@polkadot/extension-inject/*": ["extension-inject/src/*"],
+      "@polkadot/extension-ui": ["extension-ui/src"],
+      "@polkadot/extension-ui/*": ["extension-ui/src/*"]
+    },
+    "skipLibCheck": true
+	}
+ }
diff --git a/tsconfig.json b/tsconfig.json
index 7a203b48..3929e9b3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,27 +1,11 @@
 {
-  "extends": "@polkadot/dev/config/tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "exclude": [
     "build/**/*",
     "**/build/*",
     "**/build/**/*"
   ],
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@polkadot/extension": ["packages/extension/src"],
-      "@polkadot/extension/*": ["packages/extension/src/*"],
-      "@polkadot/extension-base": ["packages/extension-base/src"],
-      "@polkadot/extension-base/*": ["packages/extension-base/src/*"],
-      "@polkadot/extension-chains": ["packages/extension-chains/src"],
-      "@polkadot/extension-chains/*": ["packages/extension-chains/src/*"],
-      "@polkadot/extension-compat-metamask": ["packages/extension-compat-metamask/src"],
-      "@polkadot/extension-dapp": ["packages/extension-dapp/src"],
-      "@polkadot/extension-dapp/*": ["packages/extension-dapp/src/*"],
-      "@polkadot/extension-inject": ["packages/extension-inject/src"],
-      "@polkadot/extension-inject/*": ["packages/extension-inject/src/*"],
-      "@polkadot/extension-ui": ["packages/extension-ui/src"],
-      "@polkadot/extension-ui/*": ["packages/extension-ui/src/*"]
-    },
-    "skipLibCheck": true
+    "baseUrl": "./packages"
   }
 }