From 1d19c44a9b77089011998d48884064fffdbcea30 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Sun, 2 Jan 2022 16:35:22 +0100
Subject: [PATCH] Correct @polkadot/rpc-augment (fromChain) (#4408)

---
 package.json                      |  2 +-
 packages/typegen/src/fromChain.ts |  1 -
 tsconfig.base.json                |  5 +---
 yarn.lock                         | 40 +++++++++++++++----------------
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index a3dc5cff9e..86b28044f0 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@babel/core": "^7.16.7",
     "@babel/register": "^7.16.7",
     "@babel/runtime": "^7.16.7",
-    "@polkadot/dev": "^0.65.2",
+    "@polkadot/dev": "^0.65.4",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^27.4.0",
     "copyfiles": "^2.4.1"
diff --git a/packages/typegen/src/fromChain.ts b/packages/typegen/src/fromChain.ts
index 7cee4945c7..1f2db6f6ae 100644
--- a/packages/typegen/src/fromChain.ts
+++ b/packages/typegen/src/fromChain.ts
@@ -45,7 +45,6 @@ function generate (metaHex: HexString, pkg: string | undefined, output: string,
     [
       HEADER('chain'),
       ...[
-        '@polkadot/api/augment/rpc',
         ...['consts', 'errors', 'events', 'query', 'tx', 'rpc'].filter((key) => !!key).map((key) => `./augment-api-${key}`)
       ].map((path) => `import '${path}';\n`)
     ].join('')
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 51e5edc8be..3a653ce68c 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -32,9 +32,6 @@
       "@polkadot/types-support": ["types-support/src"],
       "@polkadot/types-support/*": ["types-support/src/*"]
     },
-    "skipLibCheck": true,
-    "typeRoots": [
-      "./node_modules/@types"
-    ]
+    "skipLibCheck": true
   }
  }
diff --git a/yarn.lock b/yarn.lock
index e2d16690ae..e004f8b5bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1956,9 +1956,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/dev@npm:^0.65.2":
-  version: 0.65.2
-  resolution: "@polkadot/dev@npm:0.65.2"
+"@polkadot/dev@npm:^0.65.4":
+  version: 0.65.4
+  resolution: "@polkadot/dev@npm:0.65.4"
   dependencies:
     "@babel/cli": ^7.16.7
     "@babel/core": ^7.16.7
@@ -1991,7 +1991,7 @@ __metadata:
     babel-plugin-styled-components: ^2.0.2
     browserslist: ^4.19.1
     coveralls: ^3.1.1
-    eslint: ^8.5.0
+    eslint: ^8.6.0
     eslint-config-standard: ^16.0.3
     eslint-import-resolver-node: ^0.3.6
     eslint-plugin-header: ^3.1.1
@@ -2043,7 +2043,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: 7ce4e87bd8d47265b2c7bbdf447693c316b7b3de6016ce785c8c7795764a71fb2da9bdd7716ef89766e8c1bc4bcbd791cdd4cbcde62e94c8e1e88cc14fc48e3b
+  checksum: bc320a62dfb3762c82db5abd165dc347b304cec268af375d69e4fd00ca5ba4dcb380f18d5b96367acd75f71a5f7befbcd403981d662b2c88d19cc2c8d15bac2f
   languageName: node
   linkType: hard
 
@@ -2909,12 +2909,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.2.4, acorn@npm:^8.6.0":
-  version: 8.6.0
-  resolution: "acorn@npm:8.6.0"
+"acorn@npm:^8.2.4, acorn@npm:^8.7.0":
+  version: 8.7.0
+  resolution: "acorn@npm:8.7.0"
   bin:
     acorn: bin/acorn
-  checksum: 9d0de73b73cb6ea8ccd8263a8144d9e2c4b6af90ea0c429997538af0ebbe83c5addecee814b2a7f91f7f615d0bd1547cc7137b3fa236ce058adc64feccee850b
+  checksum: e0f79409d68923fbf1aa6d4166f3eedc47955320d25c89a20cc822e6ba7c48c5963d5bc657bc242d68f7a4ac9faf96eef033e8f73656da6c640d4219935fdfd0
   languageName: node
   linkType: hard
 
@@ -4846,9 +4846,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.5.0":
-  version: 8.5.0
-  resolution: "eslint@npm:8.5.0"
+"eslint@npm:^8.6.0":
+  version: 8.6.0
+  resolution: "eslint@npm:8.6.0"
   dependencies:
     "@eslint/eslintrc": ^1.0.5
     "@humanwhocodes/config-array": ^0.9.2
@@ -4862,7 +4862,7 @@ __metadata:
     eslint-scope: ^7.1.0
     eslint-utils: ^3.0.0
     eslint-visitor-keys: ^3.1.0
-    espree: ^9.2.0
+    espree: ^9.3.0
     esquery: ^1.4.0
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
@@ -4890,18 +4890,18 @@ __metadata:
     v8-compile-cache: ^2.0.3
   bin:
     eslint: bin/eslint.js
-  checksum: c1a9e26070520a308cc30b62ba0d37d5b115ed23987a93219819537bdea9398e6ebe57c27d97be36ecc83b5162c72e82ecb0a9e5b44b7992980f9be90eb5c4b3
+  checksum: 19ed82fa872ebb45d0f10c2514975b85ab37e78e9b562a5aa3abdbe7802111d65f7d5a8563e394a975337b403163b40624c2cc8bfa585a061e8c7dc55def39b5
   languageName: node
   linkType: hard
 
-"espree@npm:^9.2.0":
-  version: 9.2.0
-  resolution: "espree@npm:9.2.0"
+"espree@npm:^9.2.0, espree@npm:^9.3.0":
+  version: 9.3.0
+  resolution: "espree@npm:9.3.0"
   dependencies:
-    acorn: ^8.6.0
+    acorn: ^8.7.0
     acorn-jsx: ^5.3.1
     eslint-visitor-keys: ^3.1.0
-  checksum: ae533a058036e3efeeac43a0ee39c74ab347e2a73bbe2946fba33cc0d84aca657e675bc317ed9afd95338f79d5d5a862afec2f717d2539ae13fa9f1638371761
+  checksum: c0f1885c4eab652f9be08eb9228cea0df046b559b29d4aed8d6590ea9bd60177d4cb245d204a6f737a79a096861bb4ab8e480aeb8c1dbafef5beec1157353ce4
   languageName: node
   linkType: hard
 
@@ -8955,7 +8955,7 @@ resolve@^2.0.0-next.3:
     "@babel/core": ^7.16.7
     "@babel/register": ^7.16.7
     "@babel/runtime": ^7.16.7
-    "@polkadot/dev": ^0.65.2
+    "@polkadot/dev": ^0.65.4
     "@polkadot/typegen": "workspace:packages/typegen"
     "@types/jest": ^27.4.0
     copyfiles: ^2.4.1