From 96c2c70e285ee862dd1c314b7733e3e33545f4e3 Mon Sep 17 00:00:00 2001 From: Yasuaki Uechi Date: Sun, 19 Jul 2020 13:39:15 +0900 Subject: [PATCH] prettier --- .prettierrc | 5 +---- .vercelignore | 1 - api/services/twitter/[query].ts | 8 +++---- package.json | 1 - src/index.tsx | 38 +++++++++++++++++---------------- src/store.tsx | 4 ++-- tests/existense.test.ts | 13 ++++++----- util/http.ts | 8 +++---- 8 files changed, 37 insertions(+), 41 deletions(-) diff --git a/.prettierrc b/.prettierrc index f841e50..6d058ca 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,8 +1,5 @@ { - "jsxBracketSameLine": true, - "semi": true, "singleQuote": true, "trailingComma": "all", - "arrowParens": "always", - "bracketSpacing": true + "arrowParens": "always" } diff --git a/.vercelignore b/.vercelignore index 5260145..d0fe991 100644 --- a/.vercelignore +++ b/.vercelignore @@ -1,6 +1,5 @@ /build /tests -/.dependabot /.envrc /.env /.github diff --git a/api/services/twitter/[query].ts b/api/services/twitter/[query].ts index b85df18..381bb7a 100644 --- a/api/services/twitter/[query].ts +++ b/api/services/twitter/[query].ts @@ -1,11 +1,11 @@ -import {send, sendError, fetch} from '../../../util/http'; -import {NowRequest, NowResponse} from '@vercel/node'; +import { NowRequest, NowResponse } from '@vercel/node'; +import { fetch, send, sendError } from '../../../util/http'; export default async function handler( req: NowRequest, res: NowResponse, ): Promise { - const {query} = req.query; + const { query } = req.query; if (!query || typeof query !== 'string') { return sendError(res, new Error('No query given')); @@ -21,7 +21,7 @@ export default async function handler( 'GET', ).then((res) => res.json()); const availability = response.valid; - send(res, {availability}); + send(res, { availability }); } catch (err) { sendError(res, err); } diff --git a/package.json b/package.json index f86c93e..362818b 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "mutationobserver-shim": "^0.3.5", "nock": "^12.0.3", "prettier": "^2.0.5", - "prettier-plugin-organize-imports": "^1.1.1", "pretty-quick": "^2.0.1", "ts-jest": "26.1.0", "typescript": "^3.9.5" diff --git a/src/index.tsx b/src/index.tsx index db29bfe..8b50aa4 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -4,7 +4,7 @@ import 'rc-tooltip/assets/bootstrap.css'; import React from 'react'; import ReactDOM from 'react-dom'; import { Router } from 'react-router-dom'; -import { toast, ToastContainer } from 'react-toastify'; +import { ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.css'; import App from './App'; import * as serviceWorker from './serviceWorker'; @@ -36,21 +36,23 @@ ReactDOM.render( document.getElementById('root'), ); -serviceWorker.register({ - onUpdate: (registration) => { - console.log('Update available'); +serviceWorker.unregister(); +// TODO: gracefully update service worker +// serviceWorker.register({ +// onUpdate: (registration) => { +// console.log('Update available'); - toast.dark('New version available! Click here to update.', { - onClose: () => { - window.location.reload(); - }, - position: 'top-right', - autoClose: false, - closeButton: false, - closeOnClick: true, - }); - if (registration && registration.waiting) { - registration.waiting.postMessage({ type: 'SKIP_WAITING' }); - } - }, -}); +// toast.dark('New version available! Click here to update.', { +// onClose: () => { +// window.location.reload(); +// }, +// position: 'top-right', +// autoClose: false, +// closeButton: false, +// closeOnClick: true, +// }); +// if (registration && registration.waiting) { +// registration.waiting.postMessage({ type: 'SKIP_WAITING' }); +// } +// }, +// }); diff --git a/src/store.tsx b/src/store.tsx index 8515a0f..ba6e44d 100644 --- a/src/store.tsx +++ b/src/store.tsx @@ -1,5 +1,5 @@ -import {History} from 'history'; -import {action, createTypedHooks, Action, createStore} from 'easy-peasy'; +import { action, Action, createStore, createTypedHooks } from 'easy-peasy'; +import { History } from 'history'; interface StatsModel { availableCount: number; diff --git a/tests/existense.test.ts b/tests/existense.test.ts index c91d1f0..9c8517f 100644 --- a/tests/existense.test.ts +++ b/tests/existense.test.ts @@ -1,22 +1,21 @@ import nock from 'nock'; -import {mockProvider} from '../util/testHelpers'; - import provider from '../api/services/existence/[query]'; +import { mockProvider } from '../util/testHelpers'; test('return false if name is taken', async () => { - const result = await mockProvider(provider, {query: 'github.com/uetchy'}); - expect(result).toStrictEqual({availability: false}); + const result = await mockProvider(provider, { query: 'github.com/uetchy' }); + expect(result).toStrictEqual({ availability: false }); }); test('return true if name is not taken', async () => { const result = await mockProvider(provider, { query: 'github.com/uetchyasdf', }); - expect(result).toStrictEqual({availability: true}); + expect(result).toStrictEqual({ availability: true }); }); beforeEach(() => { - nock('https://github.com:443', {encodedQueryParams: true}) + nock('https://github.com:443', { encodedQueryParams: true }) .head('/uetchyasdf') .reply(404, [], { Date: 'Wed, 14 Aug 2019 10:52:54 GMT', @@ -46,7 +45,7 @@ beforeEach(() => { 'Content-Encoding': 'gzip', 'X-GitHub-Request-Id': 'BA06:51D6:125A0F:1A9B4A:5D53E806', }); - nock('https://github.com:443', {encodedQueryParams: true}) + nock('https://github.com:443', { encodedQueryParams: true }) .head('/uetchy') .reply(200, [], { Date: 'Wed, 14 Aug 2019 10:43:09 GMT', diff --git a/util/http.ts b/util/http.ts index 3ba019f..bf901f3 100644 --- a/util/http.ts +++ b/util/http.ts @@ -1,5 +1,5 @@ -import nodeFetch, {Response} from 'node-fetch'; -import {NowResponse} from '@vercel/node'; +import { NowResponse } from '@vercel/node'; +import nodeFetch, { Response } from 'node-fetch'; export type HttpMethod = | 'GET' @@ -15,7 +15,7 @@ export function fetch( url: string, method: HttpMethod = 'HEAD', ): Promise { - return nodeFetch(url, {method: method}); + return nodeFetch(url, { method: method }); } export function send(res: NowResponse, data: object): void { @@ -24,5 +24,5 @@ export function send(res: NowResponse, data: object): void { } export function sendError(res: NowResponse, error: Error): void { - res.status(400).json({error: error.message}); + res.status(400).json({ error: error.message }); }