build(common): typescript common issues

akveo · Jun 25, 2019 · fb4d6ff · fb4d6ff
1 parent 3fd790c
commit fb4d6ff
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 38 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,6 +1,6 @@
 const { defaults: tsJestConfig } = require('ts-jest/presets');
 const { pathsToModuleNameMapper } = require('ts-jest/utils');
-const tsConfig = require('./tsconfig.dev');
+const tsConfig = require('./tsconfig');
 
 module.exports = {
   ...tsJestConfig,

diff --git a/tsconfig.dev.json b/tsconfig.dev.json
@@ -1,28 +1,12 @@
 {
+  "extends": "./tsconfig",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "./dist/tsc-out",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "sourceMap": true,
-    "moduleResolution": "node",
     "jsx": "react-native",
     "target": "es2015",
     "lib": [
       "es2018"
-    ],
-    "typeRoots": [
-      "./node_modules/@types"
-    ],
-    "paths": {
-      "@kitten/ui": [
-        "./src/framework/ui"
-      ],
-      "@kitten/theme": [
-        "./src/framework/theme"
-      ]
-    }
+    ]
   },
   "include": [
     "./src"

diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/tsc-out",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "sourceMap": true,
+    "moduleResolution": "node",
+    "jsx": "react-native",
+    "typeRoots": [
+      "./node_modules/@types"
+    ],
+    "paths": {
+      "@kitten/*": [
+        "./src/framework/*"
+      ]
+    }
+  }
+}
diff --git a/tsconfig.prod.json b/tsconfig.prod.json
@@ -1,30 +1,14 @@
 {
+  "extends": "./tsconfig",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "./dist/tsc-out",
     "declaration": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
     "skipLibCheck": true,
-    "moduleResolution": "node",
-    "jsx": "react-native",
     "target": "es2015",
     "module": "esnext",
     "lib": [
       "es2018"
-    ],
-    "typeRoots": [
-      "./node_modules/@types"
-    ],
-    "paths": {
-      "@kitten/ui": [
-        "./src/framework/ui"
-      ],
-      "@kitten/theme": [
-        "./src/framework/theme"
-      ]
-    }
+    ]
   },
   "include": [
     "./src",

diff --git a/tsconfig.test.json b/tsconfig.test.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.dev.json",
+  "extends": "./tsconfig.dev",
   "compilerOptions": {
     "jsx": "react"
   }