Merge pull request #668 from kodadot/main

yangwao · web-flow · commit b539a059aec1 · 2021-08-31T14:40:23.000+02:00
New TS(i) 4.4
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "sass": "^1.35.1",
     "sass-loader": "^10.2",
     "tslint": "^6.1.0",
-    "typescript": "^3.8.3",
+    "typescript": "^4.4.2",
     "vue-cli-plugin-i18n": "^1.0.1",
     "vue-debounce-decorator": "^1.0.1",
     "vue-template-compiler": "^2.6.12"
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
@@ -122,7 +122,7 @@
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator';
-import i18n from '@/i18n.ts';
+import i18n from '@/i18n';
 import { TranslateResult } from 'vue-i18n/types'
 
 interface Menu {
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
@@ -83,7 +83,7 @@ import { Component, Vue } from 'vue-property-decorator';
 import LocaleChanger from '@/components/shared/SwitchLocale.vue';
 import NavbarProfileDropdown from '@/components/rmrk/Profile/NavbarProfileDropdown.vue'
 import { getCurrentColor } from '@/colors'
-import i18n from '@/i18n.ts';
+import i18n from '@/i18n';
 
 @Component({
   components: {
diff --git a/src/components/rmrk/Create/CreateCollection.vue b/src/components/rmrk/Create/CreateCollection.vue
@@ -254,7 +254,7 @@ export default class CreateCollection extends Mixins(
           res => this.resolveStatus(res.status)
         )
       );
-    } catch (e) {
+    } catch (e: any) {
       showNotification(`[ERR] ${e}`, notificationTypes.danger);
       console.error(e);
       this.isLoading = false;
diff --git a/src/components/rmrk/Create/CreateToken.vue b/src/components/rmrk/Create/CreateToken.vue
@@ -316,7 +316,7 @@ export default class CreateToken extends Mixins(
           res => this.resolveStatus(res.status, true)
         )
       );
-    } catch (e) {
+    } catch (e: any) {
       showNotification(e.toString(), notificationTypes.danger);
       this.isLoading = false;
     }
@@ -360,7 +360,7 @@ export default class CreateToken extends Mixins(
       // TODO: upload meta to IPFS
       const metaHash = await pinJson(meta);
       return unSanitizeIpfsUrl(metaHash);
-    } catch (e) {
+    } catch (e: any) {
       throw new ReferenceError(e.message);
     }
   }
@@ -430,7 +430,7 @@ export default class CreateToken extends Mixins(
           res => this.resolveStatus(res.status)
         )
       );
-    } catch (e) {
+    } catch (e: any) {
       showNotification(e.message, notificationTypes.danger);
     }
   }
diff --git a/src/components/rmrk/Create/SimpleMint.vue b/src/components/rmrk/Create/SimpleMint.vue
@@ -398,7 +398,7 @@ export default class SimpleMint extends Mixins(
           res => this.resolveStatus(res.status)
         )
       );
-    } catch (e) {
+    } catch (e: any) {
       showNotification(e.toString(), notificationTypes.danger);
       this.isLoading = false;
     }
@@ -498,7 +498,7 @@ export default class SimpleMint extends Mixins(
           }
         )
       );
-    } catch (e) {
+    } catch (e: any) {
       showNotification(e.message, notificationTypes.danger);
     }
   }
@@ -560,7 +560,7 @@ export default class SimpleMint extends Mixins(
       // TODO: upload meta to IPFS
       const metaHash = await pinJson(this.meta);
       return unSanitizeIpfsUrl(metaHash);
-    } catch (e) {
+    } catch (e: any) {
       throw new ReferenceError(e.message);
     }
   }
diff --git a/src/components/rmrk/Gallery/Gallery.vue b/src/components/rmrk/Gallery/Gallery.vue
@@ -277,7 +277,7 @@ export default class Gallery extends Vue {
           }
         }
       });
-    } catch (e) {
+    } catch (e: any) {
       console.warn('[PREFETCH] Unable fo fetch', offset, e.message)
     } finally {
       if (offset <= prefetchLimit) {
diff --git a/src/components/shared/TxButton.vue b/src/components/shared/TxButton.vue
@@ -35,7 +35,7 @@ export default class TxButton extends Vue {
       const tx = await exec(account, password, callback, params);
       showNotification(execResultValue(tx), notificationTypes.success);
       this.handleProcessed(tx);
-    } catch (e) {
+    } catch (e: any) {
       showNotification(e, notificationTypes.danger);
       this.handleProcessed(e);
     }
diff --git a/src/components/subsocial/Comment.vue b/src/components/subsocial/Comment.vue
@@ -207,7 +207,7 @@ export default class Comment extends Mixins(TransactionMixin) {
         ));
 
 
-    } catch (e) {
+    } catch (e: any) {
       console.error(`[SUBSOCIAL] Unable to react ${this.postId} with reaction ${reaction},\nREASON: ${e}`)
       showNotification(e.message, notificationTypes.danger);
       this.isLoading = false;
diff --git a/src/components/subsocial/CreatePost.vue b/src/components/subsocial/CreatePost.vue
@@ -104,7 +104,7 @@ export default class CreatePost extends Mixins(TransactionMixin, AuthMixin) {
           }
           )
       );
-    } catch (e) {
+    } catch (e: any) {
       showNotification(`[POST] ${e.message}`, notificationTypes.warn);
     }
   }
diff --git a/src/components/subsocial/Reply.vue b/src/components/subsocial/Reply.vue
@@ -113,7 +113,7 @@ export default class Reply extends Mixins(TransactionMixin) {
           }
         )
       );
-    } catch (e) {
+    } catch (e: any) {
       console.error(
         `[SUBSOCIAL] Unable to reply ${this.postId} with reaction ${this.message},\nREASON: ${e}`
       );
diff --git a/src/components/transfer/SignSubmit.vue b/src/components/transfer/SignSubmit.vue
@@ -129,7 +129,7 @@ export default class Transfer extends Vue {
         this.showNotification(hash.toHex(), this.snackbarTypes.success);
         console.log('tx', hash.toHex());
         this.tx = hash.toHex();
-      } catch (e) {
+      } catch (e: any) {
         this.showNotification(e, this.snackbarTypes.danger);
       }
     }
diff --git a/src/components/transfer/Transfer.vue b/src/components/transfer/Transfer.vue
@@ -109,7 +109,7 @@ export default class Transfer extends Vue {
         console.log([this.accountTo.address, this.balance])
         const tx = await exec(this.accountFrom.address, this.password, api.tx.balances.transfer, [this.accountTo.address, this.balance?.toString()]);
         showNotification(execResultValue(tx), this.snackbarTypes.success);
-      } catch (e) {
+      } catch (e: any) {
         console.error('[ERR: TRANSFER SUBMIT]', e)
         showNotification(e.message, this.snackbarTypes.danger);
       }
diff --git a/src/fetch.ts b/src/fetch.ts
@@ -21,7 +21,7 @@ const api = Axios.create({
     try {
       const { headers } = await api.head(assetUrl);
       return headers['content-type'];
-    } catch (e) {
+    } catch (e: any) {
       console.warn(`[MIME TYPE] Unable to access type of ${assetUrl}\n\nReason ${e.message}`)
       return undefined
     }
diff --git a/src/utils/formatBalance.ts b/src/utils/formatBalance.ts
@@ -4,7 +4,7 @@ import { formatBalance } from '@polkadot/util';
 function format(balance: number | string | BN | bigint, decimals: number = 12, withUnit?: boolean | string, withSi?: boolean ) {
   try {
     return formatBalance(balance, { decimals , withUnit , forceUnit: '-', withSi })
-  } catch (e) {
+  } catch (e: any) {
     console.error('[FORMAT BALANCE]', e.message, String(balance), typeof balance, decimals, withUnit)
     return ''
   }
diff --git a/src/utils/ipfs.ts b/src/utils/ipfs.ts
@@ -33,7 +33,7 @@ export const ipfsToArweave = async (ipfsLink: string): Promise<string> => {
     }
 
     return ''
-  } catch (e) {
+  } catch (e: any) {
     console.error(`[IPFS2AR] Unable to Arweave ${e.message}`)
     return ''
   }
diff --git a/src/utils/mixins/queryMixin.ts b/src/utils/mixins/queryMixin.ts
@@ -52,7 +52,7 @@ export default class QueryMixin extends Vue {
     this.random = [...this.random, key];
     this.keys[key.name] = this.defaultValues.length - 1;
     this.subscribe(method, key.name, args, this.magic(key.name, this.keys[key.name], unwrap), isConst);
-    } catch (e) {
+    } catch (e: any) {
       console.warn(e.message)
     }
   }
diff --git a/src/views/ChainState.vue b/src/views/ChainState.vue
@@ -90,7 +90,7 @@ export default class ChainState extends Vue {
     this.random = [...this.random, key];
     this.keys[key.name] = this.defaultValues.length - 1;
     this.subscribe(method, key.name, args, this.magic(key.name, this.keys[key.name], unwrap), isConst);
-    } catch (e) {
+    } catch (e: any) {
       console.warn(e.message)
     }
   }
diff --git a/src/views/Extrinsics.vue b/src/views/Extrinsics.vue
@@ -182,7 +182,7 @@ export default class Extrinsics extends Vue {
         this.showNotification(hash.toHex(), this.snackbarTypes.success);
         console.log('tx', hash.toHex());
         this.tx = hash.toHex();
-      } catch (e) {
+      } catch (e: any) {
         this.showNotification(e, this.snackbarTypes.danger);
       }
 
diff --git a/yarn.lock b/yarn.lock
@@ -10777,10 +10777,10 @@ typeforce@^1.11.5:
   resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc"
   integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==
 
-typescript@^3.8.3:
-  version "3.9.9"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674"
-  integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==
+typescript@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86"
+  integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ export default class CreateCollection extends Mixins(`
`254`	`254`	`res => this.resolveStatus(res.status)`
`255`	`255`	`)`
`256`	`256`	`);`
`257`		`- } catch (e) {`
	`257`	`+ } catch (e: any) {`
`258`	`258`	showNotification(`[ERR] ${e}`, notificationTypes.danger);
`259`	`259`	`console.error(e);`
`260`	`260`	`this.isLoading = false;`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ export default class CreateToken extends Mixins(`
`316`	`316`	`res => this.resolveStatus(res.status, true)`
`317`	`317`	`)`
`318`	`318`	`);`
`319`		`- } catch (e) {`
	`319`	`+ } catch (e: any) {`
`320`	`320`	`showNotification(e.toString(), notificationTypes.danger);`
`321`	`321`	`this.isLoading = false;`
`322`	`322`	`}`
`@@ -360,7 +360,7 @@ export default class CreateToken extends Mixins(`
`360`	`360`	`// TODO: upload meta to IPFS`
`361`	`361`	`const metaHash = await pinJson(meta);`
`362`	`362`	`return unSanitizeIpfsUrl(metaHash);`
`363`		`- } catch (e) {`
	`363`	`+ } catch (e: any) {`
`364`	`364`	`throw new ReferenceError(e.message);`
`365`	`365`	`}`
`366`	`366`	`}`
`@@ -430,7 +430,7 @@ export default class CreateToken extends Mixins(`
`430`	`430`	`res => this.resolveStatus(res.status)`
`431`	`431`	`)`
`432`	`432`	`);`
`433`		`- } catch (e) {`
	`433`	`+ } catch (e: any) {`
`434`	`434`	`showNotification(e.message, notificationTypes.danger);`
`435`	`435`	`}`
`436`	`436`	`}`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ export default class SimpleMint extends Mixins(`
`398`	`398`	`res => this.resolveStatus(res.status)`
`399`	`399`	`)`
`400`	`400`	`);`
`401`		`- } catch (e) {`
	`401`	`+ } catch (e: any) {`
`402`	`402`	`showNotification(e.toString(), notificationTypes.danger);`
`403`	`403`	`this.isLoading = false;`
`404`	`404`	`}`
`@@ -498,7 +498,7 @@ export default class SimpleMint extends Mixins(`
`498`	`498`	`}`
`499`	`499`	`)`
`500`	`500`	`);`
`501`		`- } catch (e) {`
	`501`	`+ } catch (e: any) {`
`502`	`502`	`showNotification(e.message, notificationTypes.danger);`
`503`	`503`	`}`
`504`	`504`	`}`
`@@ -560,7 +560,7 @@ export default class SimpleMint extends Mixins(`
`560`	`560`	`// TODO: upload meta to IPFS`
`561`	`561`	`const metaHash = await pinJson(this.meta);`
`562`	`562`	`return unSanitizeIpfsUrl(metaHash);`
`563`		`- } catch (e) {`
	`563`	`+ } catch (e: any) {`
`564`	`564`	`throw new ReferenceError(e.message);`
`565`	`565`	`}`
`566`	`566`	`}`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ export default class Gallery extends Vue {`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`	`});`
`280`		`- } catch (e) {`
	`280`	`+ } catch (e: any) {`
`281`	`281`	`console.warn('[PREFETCH] Unable fo fetch', offset, e.message)`
`282`	`282`	`} finally {`
`283`	`283`	`if (offset <= prefetchLimit) {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export default class TxButton extends Vue {`
`35`	`35`	`const tx = await exec(account, password, callback, params);`
`36`	`36`	`showNotification(execResultValue(tx), notificationTypes.success);`
`37`	`37`	`this.handleProcessed(tx);`
`38`		`- } catch (e) {`
	`38`	`+ } catch (e: any) {`
`39`	`39`	`showNotification(e, notificationTypes.danger);`
`40`	`40`	`this.handleProcessed(e);`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ export default class CreatePost extends Mixins(TransactionMixin, AuthMixin) {`
`104`	`104`	`}`
`105`	`105`	`)`
`106`	`106`	`);`
`107`		`- } catch (e) {`
	`107`	`+ } catch (e: any) {`
`108`	`108`	showNotification(`[POST] ${e.message}`, notificationTypes.warn);
`109`	`109`	`}`
`110`	`110`	`}`