refactor(tsconfig): Use tsconfig paths during development instead of …

…build assets for dependencies
ecadlabs · Aug 6, 2019 · 661407a · 661407a
1 parent f4c441a
commit 661407a
Show file tree

Hide file tree

Showing 16 changed files with 77 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -21,6 +21,10 @@
       "tsx",
       "js"
     ],
+    "moduleNameMapper": {
+      "^@tezos-ts/rpc$": "<rootDir>/packages/tezos-ts-rpc/src/tezos-ts-rpc.ts",
+      "^@tezos-ts/tezos-ts$": "<rootDir>/packages/tezos-ts/src/tezos-ts.ts"
+    },
     "coveragePathIgnorePatterns": [
       "/node_modules/",
       "/test/"

diff --git a/packages/tezos-ts-react-components/package.json b/packages/tezos-ts-react-components/package.json
@@ -25,7 +25,7 @@
     "lint": "tslint  --project tsconfig.json -t codeFrame 'src/**/*.ts' 'test/**/*.ts'",
     "precommit": "lint-staged",
     "prebuild": "rimraf dist",
-    "build": "tsc --module commonjs && rollup -c rollup.config.ts && typedoc --out docs --target es6 --theme minimal --mode file src",
+    "build": "tsc --project ./tsconfig.prod.json --module commonjs && rollup -c rollup.config.ts && typedoc --out docs --target es6 --theme minimal --mode file src",
     "start": "rollup -c rollup.config.ts -w",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook"
@@ -48,6 +48,10 @@
       "tsx",
       "js"
     ],
+    "moduleNameMapper": {
+      "^@tezos-ts/rpc$": "<rootDir>/../tezos-ts-rpc/src/tezos-ts-rpc.ts",
+      "^@tezos-ts/tezos-ts$": "<rootDir>/../tezos-ts/src/tezos-ts.ts"
+    },
     "coveragePathIgnorePatterns": [
       "/node_modules/",
       "/test/"

diff --git a/packages/tezos-ts-react-components/rollup.config.ts b/packages/tezos-ts-react-components/rollup.config.ts
@@ -24,7 +24,7 @@ export default {
     // Allow json resolution
     json(),
     // Compile TypeScript files
-    typescript({ useTsconfigDeclarationDir: true }),
+    typescript({ tsconfig: './tsconfig.prod.json', useTsconfigDeclarationDir: true }),
     // Allow bundling cjs modules (unlike webpack, rollup doesn't understand cjs)
     commonjs(),
     // Allow node_modules resolution, so you can use 'external' to control

diff --git a/packages/tezos-ts-react-components/tsconfig.prod.json b/packages/tezos-ts-react-components/tsconfig.prod.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.prod.json",
+  "compilerOptions": {
+    "declarationDir": "./dist/types",
+    "outDir": "./dist/lib",
+    "typeRoots": ["./node_modules/@types"]
+  },
+  "include": ["./src/**/*"]
+}
diff --git a/packages/tezos-ts-rpc/package.json b/packages/tezos-ts-rpc/package.json
@@ -25,7 +25,7 @@
     "lint": "tslint  --project tsconfig.json -t codeFrame 'src/**/*.ts' 'test/**/*.ts'",
     "precommit": "lint-staged",
     "prebuild": "rimraf dist",
-    "build": "tsc --module commonjs && rollup -c rollup.config.ts && typedoc --out docs --target es6 --theme minimal --mode file src",
+    "build": "tsc --project ./tsconfig.prod.json --module commonjs && rollup -c rollup.config.ts && typedoc --out docs --target es6 --theme minimal --mode file src",
     "start": "rollup -c rollup.config.ts -w"
   },
   "lint-staged": {

diff --git a/packages/tezos-ts-rpc/rollup.config.ts b/packages/tezos-ts-rpc/rollup.config.ts
@@ -24,7 +24,7 @@ export default {
     // Allow json resolution
     json(),
     // Compile TypeScript files
-    typescript({ useTsconfigDeclarationDir: true }),
+    typescript({ tsconfig: './tsconfig.prod.json', useTsconfigDeclarationDir: true }),
     // Allow bundling cjs modules (unlike webpack, rollup doesn't understand cjs)
     commonjs(),
     // Allow node_modules resolution, so you can use 'external' to control

diff --git a/packages/tezos-ts-rpc/src/index.ts b/packages/tezos-ts-rpc/src/index.ts
@@ -0,0 +1 @@
+export * from "./tezos-ts-rpc";
diff --git a/packages/tezos-ts-rpc/tsconfig.json b/packages/tezos-ts-rpc/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "declarationDir": "dist/types",
     "outDir": "dist/lib",
-    "typeRoots": ["node_modules/@types"]
+    "typeRoots": ["node_modules/@types"],
+    "jsx": "react"
   },
   "include": ["src"]
 }
diff --git a/packages/tezos-ts-rpc/tsconfig.prod.json b/packages/tezos-ts-rpc/tsconfig.prod.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.prod.json",
+  "compilerOptions": {
+    "declarationDir": "./dist/types",
+    "outDir": "./dist/lib",
+    "typeRoots": ["./node_modules/@types"],
+    "jsx": "react"
+  },
+  "include": ["./src/**/*"]
+}
diff --git a/packages/tezos-ts/package.json b/packages/tezos-ts/package.json
@@ -25,7 +25,7 @@
     "lint": "tslint  --project tsconfig.json -t codeFrame 'src/**/*.ts' 'test/**/*.ts'",
     "precommit": "lint-staged",
     "prebuild": "rimraf dist",
-    "build": "tsc --module commonjs && rollup -c rollup.config.ts && typedoc --out docs --target es6 --theme minimal --mode file src",
+    "build": "tsc --project ./tsconfig.prod.json --module commonjs && rollup -c rollup.config.ts && typedoc --out docs --target es6 --theme minimal --mode file src",
     "start": "rollup -c rollup.config.ts -w"
   },
   "lint-staged": {
@@ -46,6 +46,9 @@
       "tsx",
       "js"
     ],
+    "moduleNameMapper": {
+      "^@tezos-ts/rpc$": "<rootDir>/../tezos-ts-rpc/src/tezos-ts-rpc.ts"
+    },
     "coveragePathIgnorePatterns": [
       "/node_modules/",
       "/test/"

diff --git a/packages/tezos-ts/rollup.config.ts b/packages/tezos-ts/rollup.config.ts
@@ -24,7 +24,7 @@ export default {
     // Allow json resolution
     json(),
     // Compile TypeScript files
-    typescript({ useTsconfigDeclarationDir: true }),
+    typescript({ tsconfig: './tsconfig.prod.json', useTsconfigDeclarationDir: true }),
     // Allow bundling cjs modules (unlike webpack, rollup doesn't understand cjs)
     commonjs(),
     // Allow node_modules resolution, so you can use 'external' to control

diff --git a/packages/tezos-ts/tsconfig.json b/packages/tezos-ts/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "declarationDir": "dist/types",
-    "outDir": "dist/lib",
-    "typeRoots": ["node_modules/@types"]
+    "declarationDir": "./dist/types",
+    "outDir": "./dist/lib",
+    "typeRoots": ["./node_modules/@types"]
   },
-  "include": ["src"]
+  "include": ["./src/**/*"]
 }
diff --git a/packages/tezos-ts/tsconfig.prod.json b/packages/tezos-ts/tsconfig.prod.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.prod.json",
+  "compilerOptions": {
+    "declarationDir": "./dist/types",
+    "outDir": "./dist/lib",
+    "typeRoots": ["./node_modules/@types"]
+  },
+  "include": ["./src/**/*"]
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -10,13 +10,11 @@
     "allowSyntheticDefaultImports": true,
     "noUnusedParameters": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
-  },
-  "paths": {
-    "@tezos-ts": ["packages/tezos-ts/src/tezos-ts.ts"],
-    "@tezos-ts/rpc": ["packages/tezos-ts-rpc/src/tezos-ts-rpc.ts"],
-    "@tezos-ts/react-components": [
-      "packages/tezos-ts-react-components/src/tezos-ts-react-components.ts"
-    ]
+    "emitDecoratorMetadata": true,
+    "baseUrl": "packages",
+    "paths": {
+      "@tezos-ts/rpc": ["tezos-ts-rpc/src/tezos-ts-rpc.ts"],
+      "@tezos-ts/tezos-ts": ["tezos-ts/src/tezos-ts.ts"]
+    }
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./tsconfig.base.json"
+}
diff --git a/tsconfig.prod.json b/tsconfig.prod.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "target": "es5",
+    "module": "es2015",
+    "lib": ["es2015", "es2016", "es2017", "dom"],
+    "strict": true,
+    "sourceMap": true,
+    "declaration": true,
+    "allowSyntheticDefaultImports": true,
+    "noUnusedParameters": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "jsx": "react"
+  }
+}