diff --git a/.eslintrc.yml b/.eslintrc.yml index 75a8a0a3..c3068411 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -22,3 +22,4 @@ rules: '@typescript-eslint/no-misused-promises': - off - checksVoidReturn: false + '@typescript-eslint/unbound-method': off diff --git a/package.json b/package.json index 03066352..0e398afc 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "ts-jest": "^26.0.0", "ts-loader": "^7.0.4", "ts-node": "^8.10.2", - "typescript": "^3.9.2", + "typescript": "^4.0.2", "url-loader": "^4.1.0", "webpack": "^4.43.0", "webpack-cli": "^3.3.11", diff --git a/resources/assets/src/components/Captcha.tsx b/resources/assets/src/components/Captcha.tsx index 9dbb7259..f6629052 100644 --- a/resources/assets/src/components/Captcha.tsx +++ b/resources/assets/src/components/Captcha.tsx @@ -15,11 +15,11 @@ type State = { invisible: boolean } -class Captcha extends React.Component<{}, State> { +class Captcha extends React.Component { state: State ref: React.MutableRefObject - constructor(props: {}) { + constructor(props: null) { super(props) this.state = { value: '', diff --git a/resources/assets/src/views/skinlib/Show/index.tsx b/resources/assets/src/views/skinlib/Show/index.tsx index ac20be38..4586b72e 100644 --- a/resources/assets/src/views/skinlib/Show/index.tsx +++ b/resources/assets/src/views/skinlib/Show/index.tsx @@ -260,7 +260,7 @@ const Show: React.FC = () => { const textureUrl = `${blessing.base_url}/textures/${texture.hash}` return ( - + <> {container && createPortal( }> @@ -356,7 +356,7 @@ const Show: React.FC = () => { ) : ( - + <>
{texture.name}
@@ -368,7 +368,7 @@ const Show: React.FC = () => { /> )} -
+ )}
@@ -378,7 +378,7 @@ const Show: React.FC = () => {
) : ( - + <>
{texture.type === TextureType.Cape ? t('general.cape') @@ -392,7 +392,7 @@ const Show: React.FC = () => { />
)} -
+ )}
@@ -416,7 +416,7 @@ const Show: React.FC = () => { {isLoading ? ( ) : isUploaderExists ? ( - + <> - + ) : ( nickname )} @@ -482,7 +482,7 @@ const Show: React.FC = () => { }} onClose={handleCloseModalApply} /> - + ) } diff --git a/resources/assets/src/views/user/Players/index.tsx b/resources/assets/src/views/user/Players/index.tsx index 39d06438..c47c8b20 100644 --- a/resources/assets/src/views/user/Players/index.tsx +++ b/resources/assets/src/views/user/Players/index.tsx @@ -102,7 +102,7 @@ const Players: React.FC = () => { search.append('cape', 'true') } const { code, message } = await fetch.del( - `${urls.user.player.clear(selected)}?${search}`, + `${urls.user.player.clear(selected)}?${search.toString()}`, ) if (code === 0) { toast.success(message) @@ -159,7 +159,7 @@ const Players: React.FC = () => { const closeModalReset = () => setShowModalReset(false) return ( - + <>
{ onSubmit={resetTexture} onClose={closeModalReset} /> - + ) } diff --git a/yarn.lock b/yarn.lock index 08153e52..ef5af5b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9052,10 +9052,10 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.9.2: - version "3.9.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.2.tgz#64e9c8e9be6ea583c54607677dd4680a1cf35db9" - integrity sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw== +typescript@^4.0.2: + version "4.0.2" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" + integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== union-value@^1.0.0: version "1.0.1"