[CI Skip] release/stable 3.4.2

skip-checks: true

.eslintrc.cjs

@@ -1,19 +0,0 @@
-// Copyright 2017-2023 @polkadot/ui authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-const base = require('@polkadot/dev/config/eslint.cjs');
-
-module.exports = {
-  ...base,
-  ignorePatterns: [
-    ...base.ignorePatterns,
-    'jest/**/*',
-    '**/*.d.ts'
-  ],
-  parserOptions: {
-    ...base.parserOptions,
-    project: [
-      './tsconfig.eslint.json'
-    ]
-  }
-};

.github/workflows/pr-any.yml

@@ -17,5 +17,5 @@ jobs:
         node-version: 'lts/*'
     - name: ${{ matrix.step }}
       run: |
-        yarn install --immutable | grep -v 'YN0013'
+        yarn install --immutable
         yarn ${{ matrix.step }}

.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 }}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "eslint.enable": true,
+  "eslint.experimental.useFlatConfig": true
+}

.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:

CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## 3.4.2 Jun 5, 2023
+
+- Bump to `@polkadot/util` 12.2.2
+
+
+## 3.4.1 May 13, 2023
+
+Changes:
+
+- Add `module` to `package.json` export map (ESM-only)
+- Bump to `@polkadot/util` 12.2.1
+
+
+## 3.3.1 May 7, 2023
+
+Contributed:
+
+- Adjust `vue-identicon` to be Vue 3 compatible (Thanks to https://github.com/Gavin-Gong)
+
+Changes:
+
+- Bump to `@polkadot/util` 12.1.2
+
+
 ## 3.2.2 Apr 29, 2023
 
 Changes:

CONTRIBUTORS

@@ -1,4 +1,4 @@
-     710	Jaco                          	3.2.2 (#754)
+     719	Jaco                          	3.4.2 (#764)
        7	YJ                            	fix #224: decrease frame size to 1024, set multipart bool (#225)
        4	Antoine Estienne              	Refactor logic to better use prefix (#491)
        4	kwingram25                    	fix ff api url issue (#289)
@@ -33,4 +33,5 @@
        1	WoeOm                         	add darwinia ss58 (#379)
        1	yuhui1208                     	[Stores] make FileStroe read key safely  (#338)
        1	Yuri                          	Add webpack 5 support (#557)
+       1	Zen                           	feat: adapt Vue 3.x (#755)
        1	菩提                            	fix some bugs  (#260)

eslint.config.js

@@ -0,0 +1,8 @@
+// Copyright 2017-2023 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import baseConfig from '@polkadot/dev/config/eslint';
+
+export default [
+  ...baseConfig
+];

package.json

@@ -14,10 +14,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.2",
   "versions": {
-    "git": "3.2.2",
-    "npm": "3.2.2"
+    "git": "3.4.2",
+    "npm": "3.4.2"
   },
   "workspaces": [
     "packages/*"
@@ -33,15 +33,15 @@
     "test:one": "polkadot-dev-run-test --env browser"
   },
   "devDependencies": {
-    "@polkadot/dev": "^0.73.6",
-    "@polkadot/x-bundle": "^12.1.1",
-    "@types/node": "^18.16.3",
+    "@polkadot/dev": "^0.75.16",
+    "@polkadot/x-bundle": "^12.2.2",
+    "@types/node": "^20.2.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-is": "^18.2.0",
-    "react-native": "^0.71.7"
+    "react-native": "^0.71.8"
   },
   "resolutions": {
-    "typescript": "^5.0.4"
+    "typescript": "^5.1.3"
   }
 }

packages/react-identicon/package.json

@@ -18,23 +18,23 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/keyring": "^12.1.1",
-    "@polkadot/ui-settings": "3.2.2",
-    "@polkadot/ui-shared": "3.2.2",
-    "@polkadot/util": "^12.1.1",
-    "@polkadot/util-crypto": "^12.1.1",
+    "@polkadot/keyring": "^12.2.2",
+    "@polkadot/ui-settings": "3.4.2",
+    "@polkadot/ui-shared": "3.4.2",
+    "@polkadot/util": "^12.2.2",
+    "@polkadot/util-crypto": "^12.2.2",
     "ethereum-blockies-base64": "^1.0.2",
     "jdenticon": "3.2.0",
     "react-copy-to-clipboard": "^5.1.0",
-    "styled-components": "^5.3.10",
-    "tslib": "^2.5.0"
+    "styled-components": "^5.3.11",
+    "tslib": "^2.5.3"
   },
   "devDependencies": {
     "@types/react-copy-to-clipboard": "^5.0.4",
-    "@types/react-dom": "^18.2.1",
+    "@types/react-dom": "^18.2.4",
     "@types/styled-components": "^5.1.26",
     "xmlserializer": "^0.6.1"
   },

packages/react-identicon/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/react-identicon', path: 'auto', type: 'auto', version: '3.2.2' };
+export const packageInfo = { name: '@polkadot/react-identicon', path: 'auto', type: 'auto', version: '3.4.2' };

packages/react-qr/package.json

@@ -18,16 +18,16 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/ui-settings": "3.2.2",
-    "@polkadot/util": "^12.1.1",
-    "@polkadot/util-crypto": "^12.1.1",
+    "@polkadot/ui-settings": "3.4.2",
+    "@polkadot/util": "^12.2.2",
+    "@polkadot/util-crypto": "^12.2.2",
     "qrcode-generator": "^1.4.4",
     "react-qr-reader": "^2.2.1",
-    "styled-components": "^5.3.10",
-    "tslib": "^2.5.0"
+    "styled-components": "^5.3.11",
+    "tslib": "^2.5.3"
   },
   "devDependencies": {
     "@types/react-qr-reader": "^2.1.4",

packages/react-qr/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/react-qr', path: 'auto', type: 'auto', version: '3.2.2' };
+export const packageInfo = { name: '@polkadot/react-qr', path: 'auto', type: 'auto', version: '3.4.2' };

packages/react-qr/tsconfig.build.json

@@ -5,6 +5,9 @@
     "outDir": "./build",
     "rootDir": "./src"
   },
+  "exclude": [
+    "**/*.spec.ts"
+  ],
   "references": [
     { "path": "../ui-settings/tsconfig.build.json" }
   ]

packages/react-qr/tsconfig.spec.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src",
+    "emitDeclarationOnly": false,
+    "noEmit": true
+  },
+  "include": [
+    "**/*.spec.ts"
+  ],
+  "references": [
+    { "path": "../react-qr/tsconfig.build.json" }
+  ]
+}

packages/reactnative-identicon/package.json

@@ -18,17 +18,17 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/ui-shared": "3.2.2",
-    "@polkadot/util": "^12.1.1",
-    "@polkadot/util-crypto": "^12.1.1",
+    "@polkadot/ui-shared": "3.4.2",
+    "@polkadot/util": "^12.2.2",
+    "@polkadot/util-crypto": "^12.2.2",
     "react-native-svg": "^12.5.1",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@types/react-native": "^0.71.6"
+    "@types/react-native": "^0.72.2"
   },
   "peerDependencies": {
     "@polkadot/util": "*",

packages/reactnative-identicon/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/reactnative-identicon', path: 'auto', type: 'auto', version: '3.2.2' };
+export const packageInfo = { name: '@polkadot/reactnative-identicon', path: 'auto', type: 'auto', version: '3.4.2' };

packages/ui-keyring/package.json

@@ -17,17 +17,17 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/keyring": "^12.1.1",
-    "@polkadot/ui-settings": "3.2.2",
-    "@polkadot/util": "^12.1.1",
-    "@polkadot/util-crypto": "^12.1.1",
-    "mkdirp": "^2.1.6",
+    "@polkadot/keyring": "^12.2.2",
+    "@polkadot/ui-settings": "3.4.2",
+    "@polkadot/util": "^12.2.2",
+    "@polkadot/util-crypto": "^12.2.2",
+    "mkdirp": "^3.0.1",
     "rxjs": "^7.8.1",
     "store": "^2.0.12",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.3"
   },
   "devDependencies": {
     "@types/mkdirp": "^2.0.0",

packages/ui-keyring/src/options/index.spec.ts

@@ -1,27 +0,0 @@
-// Copyright 2017-2023 @polkadot/ui-keyring authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-/// <reference types="@polkadot/dev-test/globals.d.ts" />
-
-import type { KeyringStruct } from '../types.js';
-
-import { KeyringOption } from './index.js';
-
-describe('KeyringOption', (): void => {
-  // Warning: Test "should not allow initOptions to be called more than once" generated asynchronous activity after the test ended. This activity created the error "TypeError: Cannot read properties of undefined (reading 'subject')" and would have caused the test to fail, but instead triggered an uncaughtException event.
-  it.skip('should not allow initOptions to be called more than once', (): void => {
-    const keyringOption = new KeyringOption();
-    const state = {} as KeyringStruct;
-
-    // first call
-    keyringOption.init(state);
-
-    // second call
-    expect(
-      () => keyringOption.init(state)
-    ).toThrow('Unable to initialise options more than once');
-
-    // cleanup?
-    keyringOption.clear();
-  });
-});

packages/ui-keyring/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/ui-keyring', path: 'auto', type: 'auto', version: '3.2.2' };
+export const packageInfo = { name: '@polkadot/ui-keyring', path: 'auto', type: 'auto', version: '3.4.2' };

packages/ui-keyring/src/stores/File.ts

@@ -3,7 +3,7 @@
 
 import type { KeyringJson, KeyringStore } from '../types.js';
 
-import mkdirp from 'mkdirp';
+import { mkdirpSync } from 'mkdirp';
 import fs from 'node:fs';
 import path from 'node:path';
 
@@ -13,7 +13,7 @@ export class FileStore implements KeyringStore {
 
   constructor (path: string) {
     if (!fs.existsSync(path)) {
-      mkdirp.sync(path);
+      mkdirpSync(path);
     }
 
     this.#path = path;

packages/ui-keyring/tsconfig.build.json

@@ -5,6 +5,9 @@
     "outDir": "./build",
     "rootDir": "./src"
   },
+  "exclude": [
+    "**/*.spec.ts"
+  ],
   "references": [
     { "path": "../ui-settings/tsconfig.build.json" }
   ]

packages/ui-keyring/tsconfig.spec.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src",
+    "emitDeclarationOnly": false,
+    "noEmit": true
+  },
+  "include": [
+    "**/*.spec.ts"
+  ],
+  "references": [
+    { "path": "../ui-keyring/tsconfig.build.json" }
+  ]
+}

packages/ui-settings/package.json

@@ -18,14 +18,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/networks": "^12.1.1",
-    "@polkadot/util": "^12.1.1",
-    "eventemitter3": "^5.0.0",
+    "@polkadot/networks": "^12.2.2",
+    "@polkadot/util": "^12.2.2",
+    "eventemitter3": "^5.0.1",
     "store": "^2.0.12",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.3"
   },
   "devDependencies": {
     "@types/store": "^2.0.2"

packages/ui-settings/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/ui-settings', path: 'auto', type: 'auto', version: '3.2.2' };
+export const packageInfo = { name: '@polkadot/ui-settings', path: 'auto', type: 'auto', version: '3.4.2' };

packages/ui-shared/package.json

@@ -18,15 +18,15 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.2",
   "main": "index.js",
   "dependencies": {
     "colord": "^2.9.3",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@polkadot/util": "^12.1.1",
-    "@polkadot/util-crypto": "^12.1.1",
+    "@polkadot/util": "^12.2.2",
+    "@polkadot/util-crypto": "^12.2.2",
     "@types/xmlserializer": "^0.6.3",
     "xmlserializer": "^0.6.1"
   },

packages/ui-shared/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/ui-shared', path: 'auto', type: 'auto', version: '3.2.2' };
+export const packageInfo = { name: '@polkadot/ui-shared', path: 'auto', type: 'auto', version: '3.4.2' };

packages/ui-shared/tsconfig.build.json

@@ -5,5 +5,8 @@
     "outDir": "./build",
     "rootDir": "./src"
   },
+  "exclude": [
+    "**/*.spec.ts"
+  ],
   "references": []
 }

packages/ui-shared/tsconfig.spec.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src",
+    "emitDeclarationOnly": false,
+    "noEmit": true
+  },
+  "include": [
+    "**/*.spec.ts"
+  ],
+  "references": [
+    { "path": "../ui-shared/tsconfig.build.json" }
+  ]
+}

packages/vue-identicon/package.json

@@ -18,14 +18,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/ui-shared": "3.2.2",
-    "@polkadot/util": "^12.1.1",
-    "@polkadot/util-crypto": "^12.1.1",
+    "@polkadot/ui-shared": "3.4.2",
+    "@polkadot/util": "^12.2.2",
+    "@polkadot/util-crypto": "^12.2.2",
     "jdenticon": "3.2.0",
-    "tslib": "^2.5.0"
+    "tslib": "^2.5.3"
   },
   "devDependencies": {
     "vue": "^2.7.14"

packages/vue-identicon/src/Identicon.ts

@@ -4,12 +4,13 @@
 import type { VNode } from 'vue';
 import type { Prefix } from '@polkadot/util-crypto/address/types';
 
-import { defineComponent } from 'vue';
+import { defineComponent, h } from 'vue';
 
 import { isHex, isU8a, u8aToHex } from '@polkadot/util';
 import { decodeAddress, encodeAddress } from '@polkadot/util-crypto';
 
 import { Beachball, Empty, Jdenticon, Polkadot } from './icons/index.js';
+import { adaptVNodeAttrs } from './util.js';
 
 interface Account {
   address: string;
@@ -26,7 +27,7 @@ interface Data {
 
 const DEFAULT_SIZE = 64;
 
-function encodeAccount (value: string | Uint8Array, prefix?: Prefix): Account {
+export function encodeAccount (value: string | Uint8Array, prefix?: Prefix): Account {
   try {
     const address = isU8a(value) || isHex(value)
       ? encodeAddress(value as string, prefix)
@@ -81,23 +82,25 @@ export const Identicon = defineComponent({
     }
   },
   props: ['prefix', 'isAlternative', 'size', 'theme', 'value'],
-  render (h): VNode {
+  render (): VNode {
     const { address, iconSize, isAlternativeIcon, publicKey, type } = this.$data;
 
     if (type === 'empty') {
-      return h('Empty', {
-        attrs: {
+      return h(Empty, {
+        ...adaptVNodeAttrs({
           key: address,
           size: iconSize
-        }
+        })
       }, []);
     } else if (type === 'jdenticon') {
-      return h('Jdenticon', {
-        attrs: {
-          key: address,
-          publicKey,
-          size: iconSize
-        }
+      return h(Jdenticon, {
+        ...adaptVNodeAttrs(
+          {
+            key: address,
+            publicKey,
+            size: iconSize
+          }
+        )
       }, []);
     } else if (type === 'substrate') {
       throw new Error('substrate type is not supported');
@@ -105,14 +108,22 @@ export const Identicon = defineComponent({
 
     const cmp = type.charAt(0).toUpperCase() + type.slice(1);
 
-    return h(cmp, {
-      attrs: {
-        address,
-        isAlternative: isAlternativeIcon,
-        key: address,
-        size: iconSize
-      }
-    }, []);
+    if (['Beachball', 'Polkadot'].includes(cmp)) {
+      const component = cmp === 'Beachball'
+        ? Beachball
+        : Polkadot;
+
+      return h(component, {
+        ...adaptVNodeAttrs({
+          address,
+          isAlternative: isAlternativeIcon,
+          key: address,
+          size: iconSize
+        })
+      }, []);
+    } else {
+      return h(cmp, {}, []);
+    }
   },
   watch: {
     value: function (): void {

packages/vue-identicon/src/icons/Beachball.ts

@@ -3,7 +3,7 @@
 
 import type { VNode } from 'vue';
 
-import { defineComponent } from 'vue';
+import { defineComponent, h } from 'vue';
 
 import { beachballIcon } from '@polkadot/ui-shared';
 
@@ -19,7 +19,7 @@ type PropsType = {
  */
 export const Beachball = defineComponent({
   props: ['address', 'size', 'isAlternative'],
-  render (h): VNode {
+  render (): VNode {
     const { address, isAlternative, size } = this.$props as PropsType;
 
     return h({

packages/vue-identicon/src/icons/Jdenticon.ts

@@ -4,7 +4,7 @@
 import type { VNode } from 'vue';
 
 import * as jdenticon from 'jdenticon';
-import { defineComponent } from 'vue';
+import { defineComponent, h } from 'vue';
 
 type PropsType = {
   publicKey: string,
@@ -17,7 +17,7 @@ type PropsType = {
  */
 export const Jdenticon = defineComponent({
   props: ['publicKey', 'size'],
-  render (h): VNode {
+  render (): VNode {
     const { publicKey, size } = this.$props as PropsType;
 
     return h({

packages/vue-identicon/src/icons/Polkadot.ts

@@ -3,10 +3,12 @@
 
 import type { VNode } from 'vue';
 
-import { defineComponent } from 'vue';
+import { defineComponent, h } from 'vue';
 
 import { polkadotIcon } from '@polkadot/ui-shared';
 
+import { adaptVNodeAttrs } from '../util.js';
+
 type propsType = {
   address: string;
   isAlternative: boolean;
@@ -19,18 +21,18 @@ type propsType = {
  */
 export const Polkadot = defineComponent({
   props: ['address', 'isAlternative', 'size'],
-  render (h): VNode {
+  render (): VNode {
     const { address, isAlternative, size } = this.$props as propsType;
     const circles = polkadotIcon(address, { isAlternative }).map(({ cx, cy, fill, r }) =>
-      h('circle', { attrs: { cx, cy, fill, r } }, [])
+      h('circle', { ...adaptVNodeAttrs({ cx, cy, fill, r }) }, [])
     );
 
     return h('svg', {
-      attrs: {
+      ...adaptVNodeAttrs({
         height: size,
         viewBox: '0 0 64 64',
         width: size
-      }
+      })
     }, circles);
   }
 });

packages/vue-identicon/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/vue-identicon', path: 'auto', type: 'auto', version: '3.2.2' };
+export const packageInfo = { name: '@polkadot/vue-identicon', path: 'auto', type: 'auto', version: '3.4.2' };

packages/vue-identicon/src/util.ts

@@ -0,0 +1,17 @@
+// Copyright 2017-2023 @polkadot/vue-identicon authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { version } from 'vue';
+
+const isV3 = version.startsWith('3.');
+
+/**
+ * @internal
+ *
+ * Adjust attributes to be usable in both Vue 2 and Vue 3 components.
+ */
+export function adaptVNodeAttrs (data: Record<string, unknown>): Record<string, unknown> {
+  return isV3
+    ? data
+    : { attrs: data };
+}

tsconfig.build.json

@@ -6,10 +6,13 @@
   "references": [
     { "path": "./packages/react-identicon/tsconfig.build.json" },
     { "path": "./packages/react-qr/tsconfig.build.json" },
+    { "path": "./packages/react-qr/tsconfig.spec.json" },
     { "path": "./packages/reactnative-identicon/tsconfig.build.json" },
     { "path": "./packages/ui-keyring/tsconfig.build.json" },
+    { "path": "./packages/ui-keyring/tsconfig.spec.json" },
     { "path": "./packages/ui-settings/tsconfig.build.json" },
     { "path": "./packages/ui-shared/tsconfig.build.json" },
+    { "path": "./packages/ui-shared/tsconfig.spec.json" },
     { "path": "./packages/vue-identicon/tsconfig.build.json" }
   ]
 }

tsconfig.eslint.json

@@ -6,8 +6,9 @@
   },
   "include": [
     "packages/**/src/**/*",
-    "packages/**/*.cjs",
-    "packages/**/*.js"
+    ".prettierrc.cjs",
+    "eslint.config.js",
+    "rollup.config.js"
   ],
   "exclude": [
     "**/node_modules/**/*"