chore: merge release 0.33.0 (#758)

Merge release 0.33.0. See release notes or PR #758 for details. Co-authored-by: Github Action <[email protected]> Co-authored-by: Albrecht <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Timo Welde <[email protected]> Co-authored-by: GustavHemmelmayr <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tom Adler <[email protected]>
KILTprotocol · Jun 8, 2023 · b166384 · b166384
1 parent 33a86b0
commit b166384
Show file tree

Hide file tree

Showing 61 changed files with 2,257 additions and 1,596 deletions.
diff --git a/.github/workflows/devpackpublish.yml b/.github/workflows/devpackpublish.yml
@@ -23,7 +23,7 @@ jobs:
           token: ${{ secrets.REPO_ACCESS_TOKEN }}
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version-file: '.nvmrc'
           cache: 'yarn'
       - name: Install dependencies
         run: yarn install --immutable

diff --git a/.github/workflows/npmpublish-rc.yml b/.github/workflows/npmpublish-rc.yml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version-file: '.nvmrc'
           cache: 'yarn'
       - run: yarn install --immutable
       - run: yarn build
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version-file: '.nvmrc'
           cache: 'yarn'
       - name: Install dependencies
         run: yarn install --immutable

diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version-file: '.nvmrc'
           cache: 'yarn'
       - run: yarn install --immutable
       - run: yarn build
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version-file: '.nvmrc'
           cache: 'yarn'
       - name: Install dependencies
         run: yarn install --immutable

diff --git a/.github/workflows/test-node-candidate.yml b/.github/workflows/test-node-candidate.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version-file: '.nvmrc'
           cache: 'yarn'
       - name: yarn install
         run: yarn install --immutable
@@ -51,17 +51,17 @@ jobs:
     needs: cache_imgs
 
     steps:
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
-      - name: Log out node version
-        run: node --version
       - uses: actions/download-artifact@v3
         with:
           name: build
       - name: unzip
         run: unzip build.zip -d .
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+      - name: Log out node version
+        run: node --version
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -97,15 +97,15 @@ jobs:
     needs: build
 
     steps:
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
       - uses: actions/download-artifact@v3
         with:
           name: build
       - name: unzip
         run: unzip build.zip -d .
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
       - name: yarn bundle
         run: yarn bundle
       - name: upload bundle artifact
@@ -120,9 +120,6 @@ jobs:
     needs: [cache_imgs, bundle_cache]
 
     steps:
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16.x'
       - uses: actions/download-artifact@v3
         with:
           name: build
@@ -132,6 +129,9 @@ jobs:
         with:
           name: checked-nonmin-bundle
           path: packages/sdk-js/dist
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
       - run: basename /packages/sdk-js/dist/
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2

diff --git a/.github/workflows/tests-polkadot-deps.yml b/.github/workflows/tests-polkadot-deps.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
       - uses: actions/checkout@v3
@@ -58,10 +58,10 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x, 18.x]
         required: ['required']
         include:
-          - node-version: 16.x
+          - node-version: 20.x
             required: 'optional'
 
     continue-on-error: ${{ matrix.required == 'optional' }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version-file: '.nvmrc'
           cache: 'yarn'
       - name: yarn install
         run: yarn install --immutable
@@ -60,15 +60,15 @@ jobs:
     needs: build
 
     steps:
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
       - uses: actions/download-artifact@v3
         with:
           name: build
       - name: unzip
         run: unzip build.zip -d .
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
       - name: lint
         run: yarn lint
       - name: check dependency duplication
@@ -80,10 +80,10 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14, 16]
+        node-version: [16, 18]
         required: ['required']
         include:
-          - node-version: 18
+          - node-version: 20
             required: 'optional'
 
     continue-on-error: ${{ matrix.required == 'optional' }}
@@ -124,17 +124,17 @@ jobs:
     continue-on-error: ${{ matrix.required == 'optional' }}
 
     steps:
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
-      - name: Log out node version
-        run: node --version
       - uses: actions/download-artifact@v3
         with:
           name: build
       - name: unzip
         run: unzip build.zip -d .
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+      - name: Log out node version
+        run: node --version
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -170,15 +170,15 @@ jobs:
     needs: build
 
     steps:
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
       - uses: actions/download-artifact@v3
         with:
           name: build
       - name: unzip
         run: unzip build.zip -d .
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
       - name: yarn bundle
         run: yarn bundle
       - name: upload bundle artifact
@@ -201,9 +201,6 @@ jobs:
 
     continue-on-error: ${{ matrix.required == 'optional' }}
     steps:
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16.x'
       - uses: actions/download-artifact@v3
         with:
           name: build
@@ -214,6 +211,10 @@ jobs:
           name: checked-nonmin-bundle
           path: packages/sdk-js/dist
 
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-lts/*
+lts/Gallium
diff --git a/package.json b/package.json
@@ -17,10 +17,11 @@
     "publish": "yarn workspaces foreach -pt --no-private npm publish",
     "lint": "eslint packages --format=codeframe",
     "lint:fix": "yarn lint --fix",
-    "set:version": "yarn workspaces foreach -p exec npm version --no-git-tag-version",
+    "set:version": "npm version --no-git-tag-version --no-workspaces-update --workspaces --include-workspace-root",
     "style": "prettier -l packages",
     "style:fix": "yarn style --write",
     "test": "jest --coverage --group=unit",
+    "test:breaking": "jest --group=breaking",
     "test:ci": "yarn test --ci --forceExit",
     "test:integration": "jest --group=integration -w 3 --testTimeout=30000",
     "test:integration:ci": "jest --group=integration -b -w 3 --testTimeout=60000",
@@ -69,6 +70,6 @@
     "typedoc": "^0.22.15",
     "typescript": "^4.8.3"
   },
-  "version": "0.32.1",
+  "version": "0.33.0",
   "packageManager": "[email protected]"
 }
diff --git a/packages/asset-did/package.json b/packages/asset-did/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/asset-did",
-  "version": "0.32.1",
+  "version": "0.33.0",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -23,7 +23,7 @@
   },
   "repository": "github:kiltprotocol/sdk-js",
   "engines": {
-    "node": ">=14.0"
+    "node": ">=16.0"
   },
   "author": "",
   "license": "BSD-4-Clause",

diff --git a/packages/augment-api/extraDefs/package.json b/packages/augment-api/extraDefs/package.json
@@ -0,0 +1,7 @@
+{
+  "types": "../lib/interfaces/extraDefs/index.d.ts",
+  "//": [
+    "This is a fallback to support the extraDefs subpath export for module systems that do not support the package.json exports field.",
+    "Inspired by https://github.com/andrewbranch/example-subpath-exports-ts-compat/blob/1ffe3425b0a7ad8ecdf3c373f76f431ee341366b/examples/node_modules/package-json-redirects/."
+  ]
+}
diff --git a/packages/augment-api/index.cjs b/packages/augment-api/index.cjs
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2018-2023, BOTLabs GmbH.
+ *
+ * This source code is licensed under the BSD 4-Clause "Original" license
+ * found in the LICENSE file in the root directory of this source tree.
+ */
+
+// This package does not contain executable code. Index files are included only to allow api augmentation using `require('@kiltprotocol/augment-api')`.
+
+module.exports = {}
diff --git a/packages/augment-api/index.mjs b/packages/augment-api/index.mjs
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2018-2023, BOTLabs GmbH.
+ *
+ * This source code is licensed under the BSD 4-Clause "Original" license
+ * found in the LICENSE file in the root directory of this source tree.
+ */
+
+// This package does not contain executable code. Index files are included only to allow api augmentation using `import '@kiltprotocol/augment-api'`.
+
+export {}
diff --git a/packages/augment-api/package.json b/packages/augment-api/package.json
@@ -1,49 +1,51 @@
 {
   "name": "@kiltprotocol/augment-api",
-  "version": "0.32.1",
+  "version": "0.33.0",
   "description": "",
-  "main": "./lib/cjs/index.js",
-  "module": "./lib/esm/index.js",
-  "types": "./lib/cjs/index.d.ts",
+  "types": "./lib/index.d.ts",
+  "type": "module",
+  "main": "./index.cjs",
   "exports": {
     ".": {
-      "types": "./lib/cjs/index.d.ts",
-      "import": "./lib/esm/index.js",
-      "require": "./lib/cjs/index.js"
+      "types": "./lib/index.d.ts",
+      "import": "./index.mjs",
+      "require": "./index.cjs"
+    },
+    "./extraDefs": {
+      "types": "./lib/interfaces/extraDefs/index.d.ts"
     }
   },
   "files": [
-    "lib/**/*"
+    "lib/**/*",
+    "index.mjs",
+    "index.cjs",
+    "extraDefs/*"
   ],
   "scripts": {
     "clean": "rimraf ./lib",
     "build": "yarn clean && yarn build:ts",
     "build:types": "yarn generate:defs && yarn generate:meta && yarn build:fixes",
     "build:fixes": "node scripts/fixTypes.mjs",
-    "build:ts": "yarn build:cjs && yarn build:esm",
-    "build:cjs": "tsc --declaration -p tsconfig.build.json && echo '{\"type\":\"commonjs\"}' > ./lib/cjs/package.json",
-    "build:esm": "tsc --declaration -p tsconfig.esm.json && echo '{\"type\":\"module\"}' > ./lib/esm/package.json",
-    "generate:defs": "ts-node --skip-project ../../node_modules/.bin/polkadot-types-from-defs --package @kiltprotocol/augment-api --input ./src/interfaces --endpoint ./metadata/spiritnet.json",
-    "generate:meta": "ts-node --skip-project ../../node_modules/.bin/polkadot-types-from-chain --package @kiltprotocol/augment-api --endpoint ./metadata/spiritnet.json --output ./src/interfaces  --strict",
-    "update-metadata": "node ./scripts/fetchMetadata.js -o './metadata/spiritnet.json' -e 'wss://spiritnet.kilt.io/'"
+    "build:ts": "tsc -p tsconfig.build.json",
+    "generate:defs": "ts-node --esm -P tsconfig.build.json ../../node_modules/.bin/polkadot-types-from-defs --package @kiltprotocol/augment-api --input ./src/interfaces --endpoint ./metadata/spiritnet.json",
+    "generate:meta": "ts-node --esm -P tsconfig.build.json ../../node_modules/.bin/polkadot-types-from-chain --package @kiltprotocol/augment-api --endpoint ./metadata/spiritnet.json --output ./src/interfaces  --strict",
+    "update-metadata": "node ./scripts/fetchMetadata.cjs -o './metadata/spiritnet.json' -e 'wss://spiritnet.kilt.io/'"
   },
   "repository": "github:kiltprotocol/sdk-js",
   "engines": {
-    "node": ">=14.0"
+    "node": ">=16.0"
   },
   "author": "",
   "license": "BSD-4-Clause",
   "bugs": "https://github.com/KILTprotocol/sdk-js/issues",
   "homepage": "https://github.com/KILTprotocol/sdk-js#readme",
   "devDependencies": {
-    "@polkadot/api": "^9.10.2",
-    "@polkadot/typegen": "^9.10.2",
-    "@types/websocket": "^1.0.5",
+    "@polkadot/api": "^10.4.0",
+    "@polkadot/typegen": "^10.4.0",
     "glob": "^7.1.1",
     "rimraf": "^3.0.2",
     "ts-node": "^10.4.0",
     "typescript": "^4.8.3",
-    "websocket": "^1.0.34",
     "yargs": "^16.2.0"
   },
   "dependencies": {

diff --git a/...ages/augment-api/scripts/fetchMetadata.js → ...ges/augment-api/scripts/fetchMetadata.cjs b/...ages/augment-api/scripts/fetchMetadata.js → ...ges/augment-api/scripts/fetchMetadata.cjs