diff --git a/package.json b/package.json index ac55f1df..d72fc679 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "mini-css-extract-plugin": "^1.6.0", "postcss": "^8.3.0", "postcss-loader": "^5.3.0", - "prettier": "^2.0.5", + "prettier": "^2.3.0", "style-loader": "^2.0.0", "ts-jest": "^27.0.2", "ts-loader": "^9.2.2", diff --git a/resources/assets/src/components/EmailSuggestion.tsx b/resources/assets/src/components/EmailSuggestion.tsx index 7082c173..9ecfe080 100644 --- a/resources/assets/src/components/EmailSuggestion.tsx +++ b/resources/assets/src/components/EmailSuggestion.tsx @@ -24,12 +24,11 @@ const EmailSuggestion: React.FC = (props) => { emit('emailDomainsSuggestion', domainNames) }, []) - const handleSuggestionsFetchRequested: Autosuggest.SuggestionsFetchRequested = ({ - value, - }) => { - const segments = value.split('@') - setSuggestions([...domainNames].map((name) => `${segments[0]}@${name}`)) - } + const handleSuggestionsFetchRequested: Autosuggest.SuggestionsFetchRequested = + ({ value }) => { + const segments = value.split('@') + setSuggestions([...domainNames].map((name) => `${segments[0]}@${name}`)) + } const handleSuggestionsClearRequested = () => { setSuggestions([]) diff --git a/resources/assets/src/scripts/cli/RmCommand.ts b/resources/assets/src/scripts/cli/RmCommand.ts index bb2cf094..75176359 100644 --- a/resources/assets/src/scripts/cli/RmCommand.ts +++ b/resources/assets/src/scripts/cli/RmCommand.ts @@ -24,8 +24,9 @@ export default async function rm(stdio: Stdio, args: string[]) { ) .option('--no-preserve-root', "do not treat '/' specially") - const opts: Options = program.parse(['', ''].concat(args), { run: false }) - .options + const opts: Options = program.parse(['', ''].concat(args), { + run: false, + }).options const path = program.args[0] if (!path && !opts.help) { diff --git a/resources/assets/src/views/admin/PluginsMarket/index.tsx b/resources/assets/src/views/admin/PluginsMarket/index.tsx index 046c9d52..ad7ce04e 100644 --- a/resources/assets/src/views/admin/PluginsMarket/index.tsx +++ b/resources/assets/src/views/admin/PluginsMarket/index.tsx @@ -56,11 +56,16 @@ const PluginsMarket: React.FC = () => { installings.add(plugin.name) }) - const { code, message, data = { reason: [] } } = await fetch.post< - fetch.ResponseBody<{ reason: string[] }> - >('/admin/plugins/market/download', { - name: plugin.name, - }) + const { + code, + message, + data = { reason: [] }, + } = await fetch.post>( + '/admin/plugins/market/download', + { + name: plugin.name, + }, + ) if (code === 0) { toast.success(message) setPlugins((plugins) => { diff --git a/resources/assets/src/views/skinlib/Show/index.tsx b/resources/assets/src/views/skinlib/Show/index.tsx index 4586b72e..9d8ba6dc 100644 --- a/resources/assets/src/views/skinlib/Show/index.tsx +++ b/resources/assets/src/views/skinlib/Show/index.tsx @@ -266,9 +266,8 @@ const Show: React.FC = () => { }> { show={showModalApply} canAdd={false} {...{ - [texture.type === TextureType.Cape - ? TextureType.Cape - : 'skin']: texture.tid, + [texture.type === TextureType.Cape ? TextureType.Cape : 'skin']: + texture.tid, }} onClose={handleCloseModalApply} /> diff --git a/resources/assets/src/views/skinlib/Upload.tsx b/resources/assets/src/views/skinlib/Upload.tsx index db545810..0f9e3ed3 100644 --- a/resources/assets/src/views/skinlib/Upload.tsx +++ b/resources/assets/src/views/skinlib/Upload.tsx @@ -88,9 +88,14 @@ const Upload: React.FC = () => { formData.append('public', isPrivate ? '0' : '1') setIsUploading(true) - const { code, message, data: { tid } = { tid: 0 } } = await fetch.post< - fetch.ResponseBody<{ tid: number }> - >(urls.texture.upload(), formData) + const { + code, + message, + data: { tid } = { tid: 0 }, + } = await fetch.post>( + urls.texture.upload(), + formData, + ) setIsUploading(false) if (code === 0) { diff --git a/resources/assets/src/views/user/Players/ModalAddPlayer.tsx b/resources/assets/src/views/user/Players/ModalAddPlayer.tsx index 568a275a..56d48d4f 100644 --- a/resources/assets/src/views/user/Players/ModalAddPlayer.tsx +++ b/resources/assets/src/views/user/Players/ModalAddPlayer.tsx @@ -27,9 +27,13 @@ const ModalAddPlayer: React.FC = (props) => { } const handleConfirm = async () => { - const { code, message, data: player } = await fetch.post< - fetch.ResponseBody - >(urls.user.player.add(), { name }) + const { + code, + message, + data: player, + } = await fetch.post>(urls.user.player.add(), { + name, + }) if (code === 0) { toast.success(message) props.onAdd(player) diff --git a/resources/assets/src/views/user/profile/deleteAccount.ts b/resources/assets/src/views/user/profile/deleteAccount.ts index 0e442920..43d1f48f 100644 --- a/resources/assets/src/views/user/profile/deleteAccount.ts +++ b/resources/assets/src/views/user/profile/deleteAccount.ts @@ -7,10 +7,10 @@ export default async function handler(event: Event) { const form = event.target as HTMLFormElement const password: string = form.password.value - const { - code, - message, - }: ResponseBody = await post('/user/profile?action=delete', { password }) + const { code, message }: ResponseBody = await post( + '/user/profile?action=delete', + { password }, + ) await showModal({ mode: 'alert', text: message }) if (code === 0) { diff --git a/resources/assets/tests/views/admin/UsersManagement.test.tsx b/resources/assets/tests/views/admin/UsersManagement.test.tsx index 39644b9b..fbabbae4 100644 --- a/resources/assets/tests/views/admin/UsersManagement.test.tsx +++ b/resources/assets/tests/views/admin/UsersManagement.test.tsx @@ -600,12 +600,8 @@ describe('update password', () => { it('succeeded', async () => { fetch.put.mockResolvedValue({ code: 0, message: 'ok' }) - const { - getByText, - getByPlaceholderText, - queryByText, - queryByRole, - } = render() + const { getByText, getByPlaceholderText, queryByText, queryByRole } = + render() await waitFor(() => expect(fetch.get).toBeCalled()) fireEvent.click(getByText(t('admin.changePassword'))) @@ -626,12 +622,8 @@ describe('update password', () => { it('failed', async () => { fetch.put.mockResolvedValue({ code: 1, message: 'failed' }) - const { - getByText, - getByPlaceholderText, - queryByText, - queryByRole, - } = render() + const { getByText, getByPlaceholderText, queryByText, queryByRole } = + render() await waitFor(() => expect(fetch.get).toBeCalled()) fireEvent.click(getByText(t('admin.changePassword'))) diff --git a/resources/assets/tests/views/auth/Login.test.tsx b/resources/assets/tests/views/auth/Login.test.tsx index 61004d9a..92bcd56e 100644 --- a/resources/assets/tests/views/auth/Login.test.tsx +++ b/resources/assets/tests/views/auth/Login.test.tsx @@ -101,12 +101,8 @@ describe('submit form', () => { data: { login_fails: 4 }, }) - const { - getByPlaceholderText, - getByText, - queryByText, - queryByAltText, - } = render() + const { getByPlaceholderText, getByText, queryByText, queryByAltText } = + render() fireEvent.input(getByPlaceholderText(t('auth.identification')), { target: { value: 'a@b.c' }, }) diff --git a/resources/assets/tests/views/skinlib/Show.test.tsx b/resources/assets/tests/views/skinlib/Show.test.tsx index 5a8f3131..6bbc0d1f 100644 --- a/resources/assets/tests/views/skinlib/Show.test.tsx +++ b/resources/assets/tests/views/skinlib/Show.test.tsx @@ -288,13 +288,8 @@ describe('edit texture type', () => { it('succeeded', async () => { fetch.put.mockResolvedValue({ code: 0, message: 'ok' }) - const { - getByText, - getAllByTitle, - getByLabelText, - getByRole, - queryByText, - } = render() + const { getByText, getAllByTitle, getByLabelText, getByRole, queryByText } = + render() await waitFor(() => expect(fetch.get).toBeCalledTimes(1)) fireEvent.click(getAllByTitle(t('skinlib.show.edit'))[1]!) @@ -313,13 +308,8 @@ describe('edit texture type', () => { it('failed', async () => { fetch.put.mockResolvedValue({ code: 1, message: 'failed' }) - const { - getByText, - getAllByTitle, - getByLabelText, - getByRole, - queryByText, - } = render() + const { getByText, getAllByTitle, getByLabelText, getByRole, queryByText } = + render() await waitFor(() => expect(fetch.get).toBeCalledTimes(1)) fireEvent.click(getAllByTitle(t('skinlib.show.edit'))[1]!) diff --git a/resources/assets/tests/views/skinlib/Upload.test.tsx b/resources/assets/tests/views/skinlib/Upload.test.tsx index 172eb982..d25115da 100644 --- a/resources/assets/tests/views/skinlib/Upload.test.tsx +++ b/resources/assets/tests/views/skinlib/Upload.test.tsx @@ -82,12 +82,8 @@ describe('input file', () => { }) it('do not overwrite existing name', () => { - const { - getByTitle, - getByLabelText, - queryByDisplayValue, - queryByText, - } = render() + const { getByTitle, getByLabelText, queryByDisplayValue, queryByText } = + render() fireEvent.input(getByLabelText(t('skinlib.upload.texture-name')), { target: { value: 'my texture' }, @@ -170,13 +166,8 @@ describe('upload texture', () => { }) it('no name', () => { - const { - getByText, - getByLabelText, - getByTitle, - getByRole, - queryByText, - } = render() + const { getByText, getByLabelText, getByTitle, getByRole, queryByText } = + render() const file = new File([], 't.png') fireEvent.change(getByTitle(t('skinlib.upload.select-file')), { diff --git a/resources/assets/tests/views/user/Closet.test.tsx b/resources/assets/tests/views/user/Closet.test.tsx index 3449ae9b..73df36be 100644 --- a/resources/assets/tests/views/user/Closet.test.tsx +++ b/resources/assets/tests/views/user/Closet.test.tsx @@ -453,13 +453,8 @@ describe('apply textures to player', () => { .mockResolvedValueOnce([fixturePlayer]) fetch.put.mockResolvedValue({ code: 0, message: 'success' }) - const { - getByText, - getByAltText, - getByTitle, - getByRole, - queryByText, - } = render() + const { getByText, getByAltText, getByTitle, getByRole, queryByText } = + render() await waitFor(() => expect(fetch.get).toBeCalled()) fireEvent.click(getByAltText(fixtureSkin.pivot.item_name)) @@ -482,13 +477,8 @@ describe('apply textures to player', () => { .mockResolvedValueOnce([fixturePlayer]) fetch.put.mockResolvedValue({ code: 1, message: 'failed' }) - const { - getByText, - getByAltText, - getByTitle, - getByRole, - queryByText, - } = render() + const { getByText, getByAltText, getByTitle, getByRole, queryByText } = + render() await waitFor(() => expect(fetch.get).toBeCalled()) fireEvent.click(getByAltText(fixtureSkin.pivot.item_name)) diff --git a/resources/assets/tests/views/user/Players.test.tsx b/resources/assets/tests/views/user/Players.test.tsx index 7dc7d26f..be4c820d 100644 --- a/resources/assets/tests/views/user/Players.test.tsx +++ b/resources/assets/tests/views/user/Players.test.tsx @@ -267,13 +267,8 @@ describe('edit player name', () => { it('succeeded', async () => { fetch.put.mockResolvedValue({ code: 0, message: 'success' }) - const { - getByText, - getByTitle, - getByDisplayValue, - getByRole, - queryByText, - } = render() + const { getByText, getByTitle, getByDisplayValue, getByRole, queryByText } = + render() await waitFor(() => expect(fetch.get).toBeCalledTimes(1)) fireEvent.click(getByTitle(t('user.player.edit-pname'))) @@ -312,13 +307,8 @@ describe('edit player name', () => { it('failed', async () => { fetch.put.mockResolvedValue({ code: 1, message: 'failed' }) - const { - getByText, - getByTitle, - getByDisplayValue, - getByRole, - queryByText, - } = render() + const { getByText, getByTitle, getByDisplayValue, getByRole, queryByText } = + render() await waitFor(() => expect(fetch.get).toBeCalledTimes(1)) fireEvent.click(getByTitle(t('user.player.edit-pname'))) diff --git a/yarn.lock b/yarn.lock index b45fc2ba..c87fddf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6872,10 +6872,10 @@ prelude-ls@~1.1.2: resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prettier@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" - integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg== +prettier@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" + integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== pretty-error@^2.1.1: version "2.1.2"