diff --git a/.gitignore b/.gitignore
index a17f9942..be0f9a82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,5 +26,6 @@ lerna-debug.log*
 npm-debug.log*
 package-lock.json
 report.*.json
+tsconfig.*buildinfo
 yarn-debug.log*
 yarn-error.log*
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 00000000..ddc977cc
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,18 @@
+{
+  "extends": "@polkadot/dev/config/tsconfig.json",
+	"compilerOptions": {
+		"composite": true,
+		"paths": {
+      "@polkadot/wasm-crypto-asmjs/packageInfo": [ "wasm-crypto-asmjs/src/packageInfo" ],
+      "@polkadot/wasm-crypto-asmjs": [ "wasm-crypto-asmjs/src/data" ],
+      "@polkadot/wasm-crypto-wasm/packageInfo": [ "wasm-crypto-wasm/src/packageInfo" ],
+      "@polkadot/wasm-crypto-wasm": [ "wasm-crypto-wasm/src/data" ],
+      "@polkadot/wasm-crypto": [ "wasm-crypto/src" ]
+    },
+    "skipLibCheck": true,
+    "typeRoots": [
+      "./node_modules/@polkadot/ts",
+      "./node_modules/@types"
+    ]
+	}
+ }
diff --git a/tsconfig.json b/tsconfig.json
index 019579d4..f8dbc9ff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,22 +1,10 @@
 {
-  "extends": "@polkadot/dev/config/tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "exclude": [
     "build/**/*",
     "**/build/**/*"
   ],
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@polkadot/wasm-crypto-asmjs/packageInfo": [ "packages/wasm-crypto-asmjs/src/packageInfo" ],
-      "@polkadot/wasm-crypto-asmjs": [ "packages/wasm-crypto-asmjs/src/data" ],
-      "@polkadot/wasm-crypto-wasm/packageInfo": [ "packages/wasm-crypto-wasm/src/packageInfo" ],
-      "@polkadot/wasm-crypto-wasm": [ "packages/wasm-crypto-wasm/src/data" ],
-      "@polkadot/wasm-crypto": [ "packages/wasm-crypto/src" ]
-    },
-    "skipLibCheck": true,
-    "typeRoots": [
-      "./node_modules/@polkadot/ts",
-      "./node_modules/@types"
-    ]
+    "baseUrl": "./packages"
   }
 }