From 6de4293f9f9a1f5752687c2a1599d155d0fe0350 Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 24 Dec 2021 15:42:12 +0100 Subject: [PATCH] Remove @polkadot/ts dependency (#4391) * Remove @polkadot/ts dependency * Remove VoidCallback * Bump dev --- package.json | 3 +- packages/rpc-core/src/bundle.ts | 4 +-- tsconfig.base.json | 1 - tsconfig.eslint.json | 4 ++- yarn.lock | 53 ++++----------------------------- 5 files changed, 11 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index c498364fd0..2e3f48f8f7 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,7 @@ "@babel/core": "^7.16.5", "@babel/register": "^7.16.5", "@babel/runtime": "^7.16.5", - "@polkadot/dev": "^0.64.19", - "@polkadot/ts": "^0.4.22", + "@polkadot/dev": "^0.64.20", "@polkadot/typegen": "workspace:packages/typegen", "@types/jest": "^27.0.3", "copyfiles": "^2.4.1" diff --git a/packages/rpc-core/src/bundle.ts b/packages/rpc-core/src/bundle.ts index 6816a0e496..74f320d581 100644 --- a/packages/rpc-core/src/bundle.ts +++ b/packages/rpc-core/src/bundle.ts @@ -212,7 +212,7 @@ export class RpcCore { const creator = (isScale: boolean) => (...values: unknown[]): Observable => { const isDelayed = isScale && hashIndex !== -1 && !!values[hashIndex]; - return new Observable((observer: Observer): VoidCallback => { + return new Observable((observer: Observer): () => void => { callWithRegistry(isScale, values) .then((value): void => { observer.next(value); @@ -263,7 +263,7 @@ export class RpcCore { let memoized: null | Memoized = null; const creator = (isScale: boolean) => (...values: unknown[]): Observable => { - return new Observable((observer: Observer): VoidCallback => { + return new Observable((observer: Observer): () => void => { // Have at least an empty promise, as used in the unsubscribe let subscriptionPromise: Promise = Promise.resolve(null); const registry = this.#registryDefault; diff --git a/tsconfig.base.json b/tsconfig.base.json index bbee80f89c..51e5edc8be 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -34,7 +34,6 @@ }, "skipLibCheck": true, "typeRoots": [ - "./node_modules/@polkadot/ts", "./node_modules/@types" ] } diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index 43f49c8809..b29bdd4c9a 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -8,5 +8,7 @@ "packages/**/scripts/**/*", "packages/**/test/**/*" ], - "exclue": ["**/node_modules/**/*"] + "exclude": [ + "**/node_modules/**/*" + ] } diff --git a/yarn.lock b/yarn.lock index 56d1be7245..b04c58d08b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1955,9 +1955,9 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.64.19": - version: 0.64.19 - resolution: "@polkadot/dev@npm:0.64.19" +"@polkadot/dev@npm:^0.64.20": + version: 0.64.20 + resolution: "@polkadot/dev@npm:0.64.20" dependencies: "@babel/cli": ^7.16.0 "@babel/core": ^7.16.5 @@ -2042,7 +2042,7 @@ __metadata: polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: 4a1fa23d0f54f5901761ec0819f337d180b81ac481a20e57ec20086bc6f12810c60cda06ab5b2802f36c2ad952b51a36fe20a4f293cfda2427fb668cc9aa91da + checksum: 5b067d12ebe04ea3abb673acbaf3244b868c9410787b66593b2dd9a916fd509dcd2ab72871132e7605ae967b1a2b8a87fd16b648a6d7601d392e02dcb75316eb languageName: node linkType: hard @@ -2114,15 +2114,6 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/ts@npm:^0.4.22": - version: 0.4.22 - resolution: "@polkadot/ts@npm:0.4.22" - dependencies: - "@types/chrome": ^0.0.171 - checksum: 4f900a16949b13bf46c420d110dcd9287ebe4b112c30e3250e3374b6f4203f28b08d85039cb2daf645012807b6817d09079d84cda53eb4b9a826bfa74bb1fe55 - languageName: node - linkType: hard - "@polkadot/typegen@workspace:packages/typegen": version: 0.0.0-use.local resolution: "@polkadot/typegen@workspace:packages/typegen" @@ -2549,16 +2540,6 @@ __metadata: languageName: node linkType: hard -"@types/chrome@npm:^0.0.171": - version: 0.0.171 - resolution: "@types/chrome@npm:0.0.171" - dependencies: - "@types/filesystem": "*" - "@types/har-format": "*" - checksum: 657bd2a82b2550bc70a24f43e15121eaf2ee56e52e7a7a904375cded6ffd2e7a1dc27f2456719f5272454a88c483727b99deec1b7244c0cab815f8946c8a3a73 - languageName: node - linkType: hard - "@types/estree@npm:*": version: 0.0.49 resolution: "@types/estree@npm:0.0.49" @@ -2573,22 +2554,6 @@ __metadata: languageName: node linkType: hard -"@types/filesystem@npm:*": - version: 0.0.29 - resolution: "@types/filesystem@npm:0.0.29" - dependencies: - "@types/filewriter": "*" - checksum: d57682687c3df2593d56cf78981e3d7f14c1e8bfb4e595995c5acd1a3c81e38079b572feb7de91f2838e8005ee018bc536b93e473d7a4bbdb8116fde3e93c2f8 - languageName: node - linkType: hard - -"@types/filewriter@npm:*": - version: 0.0.28 - resolution: "@types/filewriter@npm:0.0.28" - checksum: e558fd6aed0444e5512037f51ae21d43628012c20a2149b9d9aa4cef029a4a36c7d46cbce430ecac3beedf9a55ac0f9751acd83cec67236c22bbe988d7c46d04 - languageName: node - linkType: hard - "@types/graceful-fs@npm:^4.1.2": version: 4.1.4 resolution: "@types/graceful-fs@npm:4.1.4" @@ -2598,13 +2563,6 @@ __metadata: languageName: node linkType: hard -"@types/har-format@npm:*": - version: 1.2.5 - resolution: "@types/har-format@npm:1.2.5" - checksum: f2507601100364fd261bf7589feb1f9b9b0cd18c6273db29b45d694133a7063baa473004238d8a03954f0e9622cff9f42b0050d86743b4272f6b4d68007db651 - languageName: node - linkType: hard - "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1": version: 2.0.3 resolution: "@types/istanbul-lib-coverage@npm:2.0.3" @@ -8994,8 +8952,7 @@ resolve@^2.0.0-next.3: "@babel/core": ^7.16.5 "@babel/register": ^7.16.5 "@babel/runtime": ^7.16.5 - "@polkadot/dev": ^0.64.19 - "@polkadot/ts": ^0.4.22 + "@polkadot/dev": ^0.64.20 "@polkadot/typegen": "workspace:packages/typegen" "@types/jest": ^27.0.3 copyfiles: ^2.4.1