Bump dev deps (#5647)

* Bump dev deps * Adjust * Actual bump, fix tsconfig for typegen
polkadot-js · May 18, 2023 · 8394c71 · 8394c71
1 parent dd0bd21
commit 8394c71
Show file tree

Hide file tree

Showing 34 changed files with 220 additions and 238 deletions.
diff --git a/.github/workflows/pr-any.yml b/.github/workflows/pr-any.yml
@@ -21,5 +21,5 @@ jobs:
     - name: ${{ matrix.step }}
       if: always()
       run: |
-        yarn install --immutable | grep -v 'YN0013'
+        yarn install --immutable
         yarn ${{ matrix.step }}
diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -27,5 +27,5 @@ jobs:
         node-version: 'lts/*'
     - name: ${{ matrix.step }}
       run: |
-        yarn install --immutable | grep -v 'YN0013'
+        yarn install --immutable
         yarn ${{ matrix.step }}
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -2,6 +2,11 @@ enableImmutableInstalls: false
 
 enableProgressBars: false
 
+logFilters:
+  # Discard any "cannot be found in cache" messages
+  - code: YN0013
+    level: discard
+
 nodeLinker: node-modules
 
 plugins:

diff --git a/package.json b/package.json
@@ -40,9 +40,9 @@
     "test:one": "polkadot-dev-run-test --env node"
   },
   "devDependencies": {
-    "@polkadot/dev": "^0.73.17",
+    "@polkadot/dev": "^0.73.24",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/node": "^20.1.3"
+    "@types/node": "^20.2.0"
   },
   "resolutions": {
     "typescript": "^5.0.4"

diff --git a/packages/api-augment/package.json b/packages/api-augment/package.json
@@ -27,6 +27,6 @@
     "@polkadot/types-augment": "10.7.1",
     "@polkadot/types-codec": "10.7.1",
     "@polkadot/util": "^12.2.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   }
 }
diff --git a/packages/api-augment/tsconfig.kusama.spec.json b/packages/api-augment/tsconfig.kusama.spec.json
diff --git a/packages/api-base/package.json b/packages/api-base/package.json
@@ -25,6 +25,6 @@
     "@polkadot/types": "10.7.1",
     "@polkadot/util": "^12.2.1",
     "rxjs": "^7.8.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   }
 }
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
@@ -28,7 +28,7 @@
     "@polkadot/util": "^12.2.1",
     "@polkadot/util-crypto": "^12.2.1",
     "rxjs": "^7.8.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@polkadot/api-augment": "10.7.1",

diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
@@ -30,7 +30,7 @@
     "@polkadot/util": "^12.2.1",
     "@polkadot/util-crypto": "^12.2.1",
     "rxjs": "^7.8.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@polkadot/api": "10.7.1",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -37,7 +37,7 @@
     "@polkadot/util-crypto": "^12.2.1",
     "eventemitter3": "^5.0.1",
     "rxjs": "^7.8.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@polkadot/api-augment": "10.7.1",

diff --git a/packages/rpc-augment/package.json b/packages/rpc-augment/package.json
@@ -25,6 +25,6 @@
     "@polkadot/types": "10.7.1",
     "@polkadot/types-codec": "10.7.1",
     "@polkadot/util": "^12.2.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   }
 }
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
@@ -26,7 +26,7 @@
     "@polkadot/types": "10.7.1",
     "@polkadot/util": "^12.2.1",
     "rxjs": "^7.8.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@polkadot/keyring": "^12.2.1",

diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
@@ -32,7 +32,7 @@
     "eventemitter3": "^5.0.1",
     "mock-socket": "^9.2.1",
     "nock": "^13.3.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@substrate/connect": "0.7.26"

diff --git a/packages/rpc-provider/tsconfig.spec.json b/packages/rpc-provider/tsconfig.spec.json
@@ -4,8 +4,8 @@
     "baseUrl": "..",
     "outDir": "./build",
     "rootDir": "./src",
-    "resolveJsonModule": true,
     "emitDeclarationOnly": false,
+    "resolveJsonModule": true,
     "noEmit": true
   },
   "include": [

diff --git a/packages/typegen/package.json b/packages/typegen/package.json
@@ -41,7 +41,7 @@
     "@polkadot/util-crypto": "^12.2.1",
     "@polkadot/x-ws": "^12.2.1",
     "handlebars": "^4.7.7",
-    "tslib": "^2.5.0",
+    "tslib": "^2.5.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

diff --git a/packages/typegen/tsconfig.build.json b/packages/typegen/tsconfig.build.json
@@ -5,6 +5,12 @@
     "outDir": "./build",
     "rootDir": "./src"
   },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "scripts/**/*"
+  ],
   "references": [
     { "path": "../api/tsconfig.build.json" },
     { "path": "../api-augment/tsconfig.build.json" },

diff --git a/packages/typegen/tsconfig.scripts.json b/packages/typegen/tsconfig.scripts.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./scripts",
+    "emitDeclarationOnly": false,
+    "noEmit": true
+  },
+  "include": [
+    "scripts/**/*"
+  ],
+  "exclude": [
+    "src/**/*"
+  ],
+  "references": [
+    { "path": "../typegen/tsconfig.build.json" }
+  ]
+}
diff --git a/packages/types-augment/package.json b/packages/types-augment/package.json
@@ -24,6 +24,6 @@
     "@polkadot/types": "10.7.1",
     "@polkadot/types-codec": "10.7.1",
     "@polkadot/util": "^12.2.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   }
 }
diff --git a/packages/types-codec/package.json b/packages/types-codec/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@polkadot/util": "^12.2.1",
     "@polkadot/x-bigint": "^12.2.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@polkadot/types": "10.7.1",

diff --git a/packages/types-codec/tsconfig.build.json b/packages/types-codec/tsconfig.build.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "baseUrl": "..",
     "outDir": "./build",
-    "rootDir": "./src",
-    "resolveJsonModule": true
+    "rootDir": "./src"
   },
   "exclude": [
     "**/*.data.ts",

diff --git a/packages/types-codec/tsconfig.spec.json b/packages/types-codec/tsconfig.spec.json
@@ -5,7 +5,6 @@
     "outDir": "./build",
     "rootDir": "./src",
     "emitDeclarationOnly": false,
-    "resolveJsonModule": true,
     "noEmit": true
   },
   "include": [

diff --git a/packages/types-create/package.json b/packages/types-create/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@polkadot/types-codec": "10.7.1",
     "@polkadot/util": "^12.2.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@polkadot/types": "10.7.1"

diff --git a/packages/types-create/tsconfig.build.json b/packages/types-create/tsconfig.build.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "baseUrl": "..",
     "outDir": "./build",
-    "rootDir": "./src",
-    "resolveJsonModule": true
+    "rootDir": "./src"
   },
   "exclude": [
     "**/*.spec.ts"

diff --git a/packages/types-create/tsconfig.spec.json b/packages/types-create/tsconfig.spec.json
@@ -5,7 +5,6 @@
     "outDir": "./build",
     "rootDir": "./src",
     "emitDeclarationOnly": false,
-    "resolveJsonModule": true,
     "noEmit": true
   },
   "include": [

diff --git a/packages/types-known/package.json b/packages/types-known/package.json
@@ -26,7 +26,7 @@
     "@polkadot/types-codec": "10.7.1",
     "@polkadot/types-create": "10.7.1",
     "@polkadot/util": "^12.2.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@polkadot/api": "10.7.1"

diff --git a/packages/types-known/tsconfig.spec.json b/packages/types-known/tsconfig.spec.json
@@ -5,7 +5,6 @@
     "outDir": "./build",
     "rootDir": "./src",
     "emitDeclarationOnly": false,
-    "resolveJsonModule": true,
     "noEmit": true
   },
   "include": [

diff --git a/packages/types-support/package.json b/packages/types-support/package.json
@@ -22,6 +22,6 @@
   "main": "index.js",
   "dependencies": {
     "@polkadot/util": "^12.2.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   }
 }
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -28,7 +28,7 @@
     "@polkadot/util": "^12.2.1",
     "@polkadot/util-crypto": "^12.2.1",
     "rxjs": "^7.8.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.1"
   },
   "devDependencies": {
     "@polkadot/keyring": "^12.2.1",

diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "baseUrl": "..",
     "outDir": "./build",
-    "rootDir": "./src",
-    "resolveJsonModule": true
+    "rootDir": "./src"
   },
   "exclude": [
     "**/checkTypes.manual.ts",

diff --git a/scripts/metadata-get.mjs b/scripts/metadata-get.mjs
@@ -5,7 +5,6 @@ import fs from 'node:fs';
 
 import { fetch } from '@polkadot/x-fetch';
 
-const META = 14;
 const PREAMBLE = `// Copyright 2017-2023 @polkadot/types-support authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\n/* eslint-disable */\n\n`;
 const CMD = {
   kusama: `${PREAMBLE}// cargo run --release -- purge-chain -y --chain kusama-dev  && cargo run --release -- --chain kusama-dev --alice --force-authoring\n\nexport default`,
@@ -15,6 +14,11 @@ const CMD = {
 
 let requestId = 0;
 
+/**
+ *
+ * @param {'rpc_methods' | 'state_getMetadata' | 'state_getRuntimeVersion'} method
+ * @returns {Promise<any>}
+ */
 async function get (method) {
   const res = await fetch('http://127.0.0.1:9944', {
     body: JSON.stringify({
@@ -34,6 +38,7 @@ async function get (method) {
   return body.result;
 }
 
+/** @type {[string[], string, { specName: 'polkadot' | 'kusama' | 'node'; specVersion: string; }]} */
 const [methods, metadata, version] = await Promise.all([
   get('rpc_methods'),
   get('state_getMetadata'),
@@ -42,10 +47,11 @@ const [methods, metadata, version] = await Promise.all([
 const chain = version.specName === 'node'
   ? 'substrate'
   : version.specName;
-const path = `packages/types-support/src/metadata/v${META}/${chain}`;
+const metaVer = parseInt(metadata.substring(10, 12), 16);
+const path = `packages/types-support/src/metadata/v${metaVer}/${chain}`;
 
 fs.writeFileSync(`${path}-hex.ts`, `${CMD[chain]} '${metadata}';\n`);
 fs.writeFileSync(`${path}-rpc.ts`, `${CMD[chain]} ${JSON.stringify(methods, null, 2)};\n`);
 fs.writeFileSync(`${path}-ver.ts`, `${CMD[chain]} ${JSON.stringify(version, null, 2)};\n`);
 
-console.log(`Done. ${chain}/${version.specVersion}`);
+console.log(`Retrieved ${chain}/${version.specVersion}, metadata v${metaVer}`);
diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -8,7 +8,6 @@
     { "path": "./packages/api/tsconfig.spec.json" },
     { "path": "./packages/api-augment/tsconfig.build.json" },
     { "path": "./packages/api-augment/tsconfig.kusama.json" },
-    { "path": "./packages/api-augment/tsconfig.kusama.spec.json" },
     { "path": "./packages/api-augment/tsconfig.polkadot.json" },
     { "path": "./packages/api-base/tsconfig.build.json" },
     { "path": "./packages/api-contract/tsconfig.build.json" },
@@ -21,6 +20,7 @@
     { "path": "./packages/rpc-provider/tsconfig.build.json" },
     { "path": "./packages/rpc-provider/tsconfig.spec.json" },
     { "path": "./packages/typegen/tsconfig.build.json" },
+    { "path": "./packages/typegen/tsconfig.scripts.json" },
     { "path": "./packages/types/tsconfig.build.json" },
     { "path": "./packages/types/tsconfig.spec.json" },
     { "path": "./packages/types-augment/tsconfig.build.json" },

diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
@@ -7,7 +7,7 @@
   "include": [
     "packages/**/src/**/*",
     "packages/**/scripts/**/*",
-    "packages/**/test/**/*"
+    "scripts/*"
   ],
   "exclude": [
     "**/node_modules/**/*"

diff --git a/tsconfig.json b/tsconfig.json
@@ -2,12 +2,19 @@
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": "./packages",
-    "composite": false
+    "composite": false,
+    "resolveJsonModule": true
   },
   "include": [
-    "packages/**/src/**/*"
+    "packages/**/src/**/*",
+    "packages/**/scripts/**/*",
+    "scripts/*"
   ],
   "exclude": [
-    "**/node_modules/**/*"
+    "**/node_modules/**/*",
+    // these include the different-chain augmentations, which then overrides
+    // the substrate base. TS only allow single augmentations, so exclude here
+    "packages/api-augment/src/kusama/*.ts",
+    "packages/api-augment/src/polkadot/*.ts"
   ]
 }