Fix ethjs-util types resolution

tomonari-t · cgewecke · commit 40ecfe9098ac · 2020-06-04T08:27:18.000-07:00
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,6 +1,7 @@
 module.exports = function(config) {
   config.set({
     frameworks: ['mocha', 'karma-typescript'],
+    exclude: ["src/@types/**"],  // ref: https://github.com/monounity/karma-typescript/issues/254
     files: ['src/**/*.ts', 'test/**/*.ts'],
     preprocessors: {
       '**/*.ts': ['karma-typescript'],
diff --git a/src/@types/ethjs-util/index.d.ts b/src/@types/ethjs-util/index.d.ts
diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,3 @@
-/// <reference path="../typings/ethjs-util.d.ts"/>
-import * as ethjsUtil from 'ethjs-util'
-
 /**
  * Constants
  */
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,4 +1,10 @@
 {
   "extends": "@ethereumjs/config-tsc",
-  "include": ["src/**/*.ts", "test/**/*.ts", "typings/**/*.js"]
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "*": ["src/@types/*"]
+    }
+  },
+  "include": ["src/**/*.ts", "test/**/*.ts"]
 }
diff --git a/tsconfig.prod.json b/tsconfig.prod.json
@@ -1,7 +1,6 @@
 {
-  "extends": "@ethereumjs/config-tsc",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist"
-  },
-  "include": ["src/**/*.ts", "typings/**/*.ts"]
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "@ethereumjs/config-tsc",`
`3`		`- "include": ["src/*/.ts", "test/*/.ts", "typings/*/.js"]`
	`3`	`+ "compilerOptions": {`
	`4`	`+ "baseUrl": ".",`
	`5`	`+ "paths": {`
	`6`	`+ "": ["src/@types/"]`
	`7`	`+ }`
	`8`	`+ },`
	`9`	`+ "include": ["src/*/.ts", "test/*/.ts"]`
`4`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`		`- "extends": "@ethereumjs/config-tsc",`
	`2`	`+ "extends": "./tsconfig.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"outDir": "./dist"`
`5`		`- },`
`6`		`- "include": ["src/*/.ts", "typings/*/.ts"]`
	`5`	`+ }`
`7`	`6`	`}`