Merge pull request #1052 from 0xProject/feature/remove-types

[typescript-typings] Remove types that were moved to DefinitelyTyped
0xProject · Sep 4, 2018 · a52714b · a52714b
2 parents 78d4fc5 + 40e0c82
commit a52714b
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 165 deletions.
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
@@ -47,6 +47,7 @@
         "@0xproject/monorepo-scripts": "^1.0.7",
         "@0xproject/tslint-config": "^1.0.6",
         "@types/lodash": "4.14.104",
+        "@types/web3-provider-engine": "^14.0.0",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
         "@types/sinon": "^2.2.2",

diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
@@ -49,6 +49,7 @@
         "@0xproject/subproviders": "^2.0.1",
         "@0xproject/tslint-config": "^1.0.6",
         "@types/lodash": "4.14.104",
+        "@types/web3-provider-engine": "^14.0.0",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
         "@types/sinon": "^2.2.2",

diff --git a/packages/monorepo-scripts/src/doc_gen_configs.ts b/packages/monorepo-scripts/src/doc_gen_configs.ts
@@ -16,10 +16,8 @@ export const docGenConfigs: DocGenConfigs = {
         Schema:
             'https://github.com/tdegrunt/jsonschema/blob/5c2edd4baba149964aec0f23c87ad12c25a50dfb/lib/index.d.ts#L49',
         Uint8Array: 'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array',
-        'Ganache.GanacheOpts':
-            'https://github.com/0xProject/0x-monorepo/blob/ddf85112d7e4eb1581e0d82ce6eedad429641106/packages/typescript-typings/types/ganache-core/index.d.ts#L3',
-        'lightwallet.keystore':
-            'https://github.com/0xProject/0x-monorepo/blob/ddf85112d7e4eb1581e0d82ce6eedad429641106/packages/typescript-typings/types/eth-lightwallet/index.d.ts#L32',
+        GanacheOpts: 'https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/ganache-core/index.d.ts#L8',
+        keystore: 'https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/eth-lightwallet/index.d.ts#L36',
     },
     // If a 0x package re-exports an external package, we should add a link to it's exported items here
     EXTERNAL_EXPORT_TO_LINK: {

diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
@@ -47,7 +47,6 @@
         "@0xproject/typescript-typings": "^1.0.5",
         "@0xproject/utils": "^1.0.7",
         "@0xproject/web3-wrapper": "^2.0.1",
-        "@types/solidity-parser-antlr": "^0.2.1",
         "ethereum-types": "^1.0.5",
         "ethereumjs-util": "^5.1.1",
         "glob": "^7.1.2",
@@ -67,7 +66,7 @@
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
         "@types/rimraf": "^2.0.2",
-        "@types/solidity-parser-antlr": "^0.2.1",
+        "@types/solidity-parser-antlr": "^0.2.0",
         "chai": "^4.0.1",
         "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",

diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
@@ -51,6 +51,7 @@
         "@types/mocha": "^2.2.48",
         "@types/nock": "^9.1.2",
         "@types/node": "^8.0.53",
+        "@types/newman": "^3.9.0",
         "@types/yargs": "^10.0.0",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",

diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
@@ -36,6 +36,8 @@
         "@ledgerhq/hw-app-eth": "^4.3.0",
         "@ledgerhq/hw-transport-u2f": "^4.3.0",
         "@types/hdkey": "^0.7.0",
+        "@types/ganache-core": "^2.1.0",
+        "@types/eth-lightwallet": "^3.0.0",
         "bip39": "^2.5.0",
         "bn.js": "^4.11.8",
         "eth-lightwallet": "^3.0.1",
@@ -55,6 +57,7 @@
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-tx": "^1.0.0",
         "@types/hdkey": "^0.7.0",
+        "@types/web3-provider-engine": "^14.0.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",

diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts
@@ -4,3 +4,21 @@ declare module '*.json' {
     export default json;
     /* tslint:enable */
 }
+declare module 'web3-provider-engine/util/rpc-cache-utils' {
+    class ProviderEngineRpcUtils {
+        public static blockTagForPayload(payload: any): string | null;
+    }
+    export = ProviderEngineRpcUtils;
+}
+declare module 'web3-provider-engine/subproviders/fixture' {
+    import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types';
+    class FixtureSubprovider {
+        constructor(staticResponses: any);
+        public handleRequest(
+            payload: JSONRPCRequestPayload,
+            next: () => void,
+            end: (err: Error | null, data?: JSONRPCResponsePayload) => void,
+        ): void;
+    }
+    export = FixtureSubprovider;
+}
diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "2.0.0",
+        "changes": [
+            {
+                "note": "Remove types for web3-provider-engine, newman, ganache-core, detect-node, eth-lightwallet",
+                "pr": "1052"
+            }
+        ]
+    },
     {
         "timestamp": 1535133899,
         "version": "1.0.5",

diff --git a/packages/typescript-typings/types/detect-node/index.d.ts b/packages/typescript-typings/types/detect-node/index.d.ts
diff --git a/packages/typescript-typings/types/eth-lightwallet/index.d.ts b/packages/typescript-typings/types/eth-lightwallet/index.d.ts
diff --git a/packages/typescript-typings/types/ganache-core/index.d.ts b/packages/typescript-typings/types/ganache-core/index.d.ts
diff --git a/packages/typescript-typings/types/newman/index.d.ts b/packages/typescript-typings/types/newman/index.d.ts
diff --git a/packages/typescript-typings/types/web3-provider-engine/index.d.ts b/packages/typescript-typings/types/web3-provider-engine/index.d.ts
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -28,6 +28,7 @@
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md",
     "devDependencies": {
         "@0xproject/tslint-config": "^1.0.6",
+        "@types/detect-node": "2.0.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "chai": "^4.0.1",

diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
@@ -35,6 +35,7 @@
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",
     "devDependencies": {
         "@0xproject/tslint-config": "^1.0.6",
+        "@types/ganache-core": "^2.1.0",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",

diff --git a/packages/website/package.json b/packages/website/package.json
@@ -66,6 +66,7 @@
         "@types/accounting": "^0.4.1",
         "@types/blockies": "^0.0.0",
         "@types/deep-equal": "^1.0.0",
+        "@types/web3-provider-engine": "^14.0.0",
         "@types/find-versions": "^2.0.0",
         "@types/jsonschema": "^1.1.1",
         "@types/lodash": "4.14.104",

diff --git a/packages/website/ts/globals.d.ts b/packages/website/ts/globals.d.ts
@@ -10,6 +10,7 @@ declare module '*.json' {
     export default json;
     /* tslint:enable */
 }
+declare module 'web3-provider-engine/subproviders/filters';
 
 // This will be defined by default in TS 2.4
 // Source: https://github.com/Microsoft/TypeScript/issues/12364