Typescript-eslint 2 (#132)

* Setup

* Linting fixes
This commit is contained in:
Jaco Greeff
2019-08-31 09:20:00 +02:00
committed by GitHub
parent af4d38013e
commit 92f749c8ab
19 changed files with 156 additions and 133 deletions
@@ -48,9 +48,10 @@ function injectSingleSource (win: SingleWindow): void {
// decorate the compat interface
win.injectedWeb3.SingleSource = {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/require-await
enable: async (origin: string): Promise<Injected> => ({
accounts: {
// eslint-disable-next-line @typescript-eslint/require-await
get: async (): Promise<InjectedAccount[]> =>
accounts,
subscribe: (cb: (accounts: InjectedAccount[]) => void): () => void => {
+1 -1
View File
@@ -58,7 +58,7 @@ export function web3Enable (originName: string): Promise<InjectedExtension[]> {
if (ext && !ext.accounts.subscribe) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
ext.accounts.subscribe = (cb: (accounts: InjectedAccount[]) => any): Unsubcall => {
ext.accounts.get().then(cb).catch(console.error);
ext.accounts.get().then(cb).catch((error: Error) => console.error(error));
return (): void => {
// no ubsubscribe needed, this is a single-shot
@@ -27,7 +27,7 @@ function Account ({ address, className, onAction }: Props): React.ReactElement<P
if (editedName && editedName !== name) {
editAccount(address, editedName)
.then((): void => onAction())
.catch(console.error);
.catch((error: Error) => console.error(error));
}
toggleEdit();
@@ -24,11 +24,11 @@ function Request ({ authId, className, isFirst, onAction, request: { origin }, u
const onApprove = (): Promise<void> =>
approveAuthRequest(authId)
.then((): void => onAction())
.catch(console.error);
.catch((error: Error) => console.error(error));
const onReject = (): Promise<void> =>
rejectAuthRequest(authId)
.then((): void => onAction())
.catch(console.error);
.catch((error: Error) => console.error(error));
return (
<IconBox
+2 -2
View File
@@ -22,7 +22,7 @@ function Create ({ onAction }: Props): React.ReactElement<Props> {
useEffect((): void => {
createSeed()
.then(setAccount)
.catch(console.error);
.catch((error: Error) => console.error(error));
}, []);
// FIXME Duplicated between here and Import.tsx
@@ -31,7 +31,7 @@ function Create ({ onAction }: Props): React.ReactElement<Props> {
if (name && password && account) {
createAccount(name, password, account.seed)
.then((): void => onAction('/'))
.catch(console.error);
.catch((error: Error) => console.error(error));
}
};
+1 -1
View File
@@ -19,7 +19,7 @@ function Forget ({ match: { params: { address } }, onAction }: Props): React.Rea
const onClick = (): Promise<void> =>
forgetAccount(address)
.then((): void => onAction('/'))
.catch(console.error);
.catch((error: Error) => console.error(error));
return (
<div>
+1 -1
View File
@@ -30,7 +30,7 @@ function Import ({ onAction }: Props): React.ReactElement<Props> {
if (name && password && account) {
createAccount(name, password, account.suri)
.then((): void => onAction('/'))
.catch(console.error);
.catch((error: Error) => console.error(error));
}
};
@@ -25,7 +25,7 @@ function Request ({ isFirst, onAction, request, signId, url }: Props): React.Rea
const onCancel = (): Promise<void> =>
cancelSignRequest(signId)
.then((): void => onAction())
.catch(console.error);
.catch((error: Error) => console.error(error));
const onSign = (password: string): Promise<void> =>
approveSignRequest(signId, password)
.then((): void => onAction());
+1 -1
View File
@@ -49,7 +49,7 @@ export default function Popup (): React.ReactElement<{}> {
subscribeAccounts(setAccounts),
subscribeAuthorize(setAuthRequests),
subscribeSigning(setSignRequests)
]).catch(console.error);
]).catch((error: Error) => console.error(error));
onAction();
}, []);
@@ -29,9 +29,9 @@ export function withAccounts<P extends { accounts: AccountsFromCtx }> (Component
return (
<AccountContext.Consumer>
{(accounts): React.ReactNode => (
// @ts-ignore Something here with the props are going wonky
<Component
{...props}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
{...props as any}
accounts={accounts}
/>
)}
@@ -46,9 +46,9 @@ export function withOnAction<P extends { onAction: OnActionFromCtx }> (Component
return (
<ActionContext.Consumer>
{(onAction): React.ReactNode => (
// @ts-ignore Something here with the props are going wonky
<Component
{...props}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
{...props as any}
onAction={onAction}
/>
)}
@@ -63,9 +63,9 @@ export function withAuthRequests<P extends { requests: AuthRequestsFromCtx }> (C
return (
<AuthorizeContext.Consumer>
{(requests): React.ReactNode => (
// @ts-ignore Something here with the props are going wonky
<Component
{...props}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
{...props as any}
requests={requests}
/>
)}
@@ -80,9 +80,9 @@ export function withSignRequests<P extends { requests: SignRequestsFromCtx }> (C
return (
<SigningContext.Consumer>
{(requests): React.ReactNode => (
// @ts-ignore Something here with the props are going wonky
<Component
{...props}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
{...props as any}
requests={requests}
/>
)}
+1 -1
View File
@@ -8,7 +8,7 @@ import { HashRouter } from 'react-router-dom';
import { View } from './components';
export default function createView (Entry: React.ComponentType, rootId: string = 'root'): void {
export default function createView (Entry: React.ComponentType, rootId = 'root'): void {
const rootElement = document.getElementById(rootId);
if (!rootElement) {
+2 -2
View File
@@ -5,13 +5,13 @@
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
"@polkadot/api": "^0.91.0-beta.9",
"@polkadot/api": "^0.91.0-beta.10",
"@polkadot/extension-ui": "^0.9.1",
"@polkadot/ui-keyring": "^0.43.0-beta.4"
},
"devDependencies": {
"@babel/runtime": "^7.5.5",
"@polkadot/keyring": "^1.1.1",
"@polkadot/keyring": "^1.2.0-beta.3",
"@types/chrome": "^0.0.88",
"@types/firefox-webext-browser": "^67.0.1",
"extensionizer": "^1.0.1",
@@ -194,7 +194,7 @@ export default class Extension {
return true;
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/require-await
public async handle (id: string, type: MessageTypes, request: any, port: chrome.runtime.Port): Promise<any> {
switch (type) {
case 'authorize.approve':
@@ -134,7 +134,7 @@ export default class State {
}
private stripUrl (url: string): string {
assert(url && (url.indexOf('http:') === 0 || url.indexOf('https:') === 0), `Invalid url ${url}, expected to start with http: or https:`);
assert(url && (url.startsWith('http:') || url.startsWith('https:')), `Invalid url ${url}, expected to start with http: or https:`);
const parts = url.split('/');
+1 -1
View File
@@ -19,7 +19,7 @@ export default class Accounts implements InjectedAccounts {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
public subscribe (cb: (accounts: InjectedAccount[]) => any): Unsubcall {
sendRequest('accounts.subscribe', null, cb)
.catch(console.error);
.catch((error: Error) => console.error(error));
return (): void => {
// FIXME we need the ability to unsubscribe