diff --git a/karma.conf.js b/karma.conf.js index 82a17b5f..f166a9e5 100644 --- 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/typings/ethjs-util.d.ts b/src/@types/ethjs-util/index.d.ts similarity index 100% rename from typings/ethjs-util.d.ts rename to src/@types/ethjs-util/index.d.ts diff --git a/src/index.ts b/src/index.ts index a87fd2ff..37831e28 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,6 +1,3 @@ -/// -import * as ethjsUtil from 'ethjs-util' - /** * Constants */ diff --git a/tsconfig.json b/tsconfig.json index 983313f2..e80502d7 100644 --- 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 index 7b74b45d..f93323e1 100644 --- 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"] + } }