👕 #335 アップグレードでFormatterの仕様が変わったので修正

nekochans · Aug 16, 2024 · f26b706 · f26b706
1 parent 7396d99
commit f26b706
Show file tree

Hide file tree

Showing 23 changed files with 14 additions and 45 deletions.
diff --git a/public/mockServiceWorker.js b/public/mockServiceWorker.js
@@ -8,7 +8,7 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.2.14'
+const PACKAGE_VERSION = '2.3.5'
 const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

diff --git a/src/api/cognito/openIdConnect.ts b/src/api/cognito/openIdConnect.ts
@@ -6,7 +6,7 @@ import { IssueClientCredentialsAccessTokenError } from './IssueClientCredentials
 
 type CognitoTokenResponseBody = {
   access_token: string;
-  // eslint-disable-next-line no-magic-numbers
+
   expires_in: 3600;
   token_type: 'Bearer';
 };
@@ -95,7 +95,6 @@ export const issueClientCredentialsAccessToken: IssueClientCredentialsAccessToke
       );
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const responseBody = (await response.json()) as unknown;
 
     if (isCognitoTokenResponseBody(responseBody)) {

diff --git a/src/api/lgtmeow/lgtmImage.ts b/src/api/lgtmeow/lgtmImage.ts
@@ -21,7 +21,6 @@ import {
 } from '@/features';
 import { mightSetRequestIdToSentry } from '@/utils';
 
-// eslint-disable-next-line require-await
 export const fetchLgtmImagesInRandom: FetchLgtmImages = async (
   appBaseUrl,
   revalidate,
@@ -41,7 +40,6 @@ export const fetchLgtmImagesInRandom: FetchLgtmImages = async (
   return (await response.json()) as LgtmImage[];
 };
 
-// eslint-disable-next-line require-await
 export const fetchLgtmImagesInRecentlyCreated: FetchLgtmImages = async (
   appBaseUrl,
   revalidate,

diff --git a/src/app/api/lgtm-images/recently-created/route.ts b/src/app/api/lgtm-images/recently-created/route.ts
@@ -52,7 +52,6 @@ export const GET = async (request: NextRequest): Promise<Response> => {
     options,
   );
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   const responseBody = (await response.json()) as unknown;
   if (isFetchLgtmImagesResponseBody(responseBody)) {
     const lgtmImages = responseBody.lgtmImages.map((value) => {

diff --git a/src/app/api/lgtm-images/route.ts b/src/app/api/lgtm-images/route.ts
@@ -53,7 +53,6 @@ export const GET = async (request: NextRequest): Promise<Response> => {
 
   const response = await fetch(`${lgtmeowApiUrl()}/lgtm-images`, options);
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   const responseBody = (await response.json()) as unknown;
   if (isFetchLgtmImagesResponseBody(responseBody)) {
     const lgtmImages = responseBody.lgtmImages.map((value) => {

diff --git a/src/app/en/layout.tsx b/src/app/en/layout.tsx
@@ -50,7 +50,7 @@ export const metadata: Metadata = {
 
 const InternationalizationLayout = ({ children }: Props): JSX.Element => {
   return (
-    <html lang={language} prefix="og: https://ogp.me/ns#">
+    <html lang={language}>
       <head>
         <link
           href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP&family=Roboto&family=Zen+Kaku+Gothic+New&display=swap"

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -50,7 +50,7 @@ export const metadata: Metadata = {
 
 const RootLayout = ({ children }: Props): JSX.Element => {
   return (
-    <html lang={language} prefix="og: https://ogp.me/ns#">
+    <html lang={language}>
       <head>
         <link
           href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP&family=Roboto&family=Zen+Kaku+Gothic+New&display=swap"

diff --git a/src/components/LgtmImages/LgtmImages.stories.tsx b/src/components/LgtmImages/LgtmImages.stories.tsx
@@ -74,7 +74,7 @@ export const WithAppUrl: Story = {
 export const WithCallbackFunc: Story = {
   args: {
     images,
-    // eslint-disable-next-line no-alert
+
     callback: () => {
       alert('run callback func!');
     },

diff --git a/src/components/Upload/UploadForm/UploadForm.tsx b/src/components/Upload/UploadForm/UploadForm.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 'use client';
 
 import type { AppUrl } from '@/constants';
@@ -83,7 +82,6 @@ export type Props = {
   appUrl?: AppUrl;
 };
 
-// eslint-disable-next-line max-lines-per-function, max-statements
 export const UploadForm: FC<Props> = ({
   language,
   imageValidator,
@@ -143,7 +141,6 @@ export const UploadForm: FC<Props> = ({
     setBase64Image(window.btoa(binaryString));
   };
 
-  // eslint-disable-next-line max-statements
   const mightConvertImageToBase64 = (file: File) => {
     setUploaded(false);
     const fileType = file.type;
@@ -175,10 +172,9 @@ export const UploadForm: FC<Props> = ({
     openModal();
   };
 
-  // eslint-disable-next-line max-statements
   const handleFileUpload = (event: ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
-    // eslint-disable-next-line no-magic-numbers
+
     if (event.target.files && event.target.files.length > 0) {
       const targetIndex = 0;
       const file = event.target.files[targetIndex];
@@ -187,7 +183,6 @@ export const UploadForm: FC<Props> = ({
   };
 
   const shouldDisableButton = (): boolean => {
-    // eslint-disable-next-line no-magic-numbers
     if (displayErrorMessages.length !== 0) {
       return true;
     }
@@ -201,7 +196,6 @@ export const UploadForm: FC<Props> = ({
     openModal();
   };
 
-  // eslint-disable-next-line max-statements, max-lines-per-function
   const executeUpload = async () => {
     setIsLoading(true);
 
@@ -213,7 +207,6 @@ export const UploadForm: FC<Props> = ({
 
       if (
         !imageValidationResult.value.isAcceptableCatImage ||
-        // eslint-disable-next-line no-magic-numbers
         imageValidationResult.value.notAcceptableReason.length !== 0
       ) {
         setDisplayErrorMessages(
@@ -242,7 +235,6 @@ export const UploadForm: FC<Props> = ({
         }
       }
 
-      // eslint-disable-next-line no-magic-numbers
       if (imageUploadResult.value.displayErrorMessages.length !== 0) {
         setDisplayErrorMessages(imageUploadResult.value.displayErrorMessages);
         stateInitAtError();
@@ -264,7 +256,6 @@ export const UploadForm: FC<Props> = ({
   };
 
   const onDrop = useCallback((acceptedFiles: File[]) => {
-    // eslint-disable-next-line no-magic-numbers
     if (acceptedFiles.length > 0) {
       const targetIndex = 0;
       const file = acceptedFiles[targetIndex];
@@ -278,15 +269,15 @@ export const UploadForm: FC<Props> = ({
 
   return (
     <div className={styles.wrapper}>
-      {/* eslint-disable no-magic-numbers */}
+      {}
       {displayErrorMessages.length === 0 ? (
         ''
       ) : (
         <UploadErrorMessageArea messages={displayErrorMessages} />
       )}
       <UploadTitleArea language={language} />
       <form className={styles.form}>
-        {/* eslint-disable-next-line react/jsx-props-no-spreading */}
+        {}
         <div {...getRootProps()} className={styles['input-file-area']}>
           <FaCloudUploadAlt className={styles['fa-cloud-upload-alt']} />
           <div className={styles.text}>{imageDropAreaText(language)}</div>

diff --git a/src/components/Upload/UploadModal/UploadModal.tsx b/src/components/Upload/UploadModal/UploadModal.tsx
@@ -65,7 +65,6 @@ const modalStyle = {
   },
 };
 
-// eslint-disable-next-line max-lines-per-function
 export const UploadModal: FC<Props> = ({
   isOpen,
   language,

diff --git a/src/features/imageData.ts b/src/features/imageData.ts
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import type { LgtmImage } from './lgtmImage';
 
 export const imageData: LgtmImage[] = [

diff --git a/src/features/lgtmImage.ts b/src/features/lgtmImage.ts
@@ -99,12 +99,10 @@ export const isLgtmImageUrl = (value: unknown): value is LgtmImageUrl => {
 
 export const isLgtmImages = (value: unknown): value is LgtmImage[] => {
   if (Array.isArray(value)) {
-    // eslint-disable-next-line no-magic-numbers
     if (Object.prototype.toString.call(value[0]) !== '[object Object]') {
       return false;
     }
 
-    // eslint-disable-next-line no-magic-numbers
     const lgtmImage = value[0] as LgtmImage;
 
     return (
@@ -120,11 +118,9 @@ export const extractRandomImages = (numberToExtract: number): LgtmImage[] => {
   const copiedLgtmImages = [...imageData];
   const result = [];
 
-  // eslint-disable-next-line id-length, no-magic-numbers
   for (let i = numberToExtract; i > 0; i -= 1) {
-    // eslint-disable-next-line no-magic-numbers
     const rand = Math.floor(Math.random() * (copiedLgtmImages.length + 1)) - 1;
-    // eslint-disable-next-line no-magic-numbers
+
     result.push(...copiedLgtmImages.splice(rand, 1));
   }
 
@@ -150,10 +146,9 @@ export const extractImageExtFromValidFileType = (
 
 const calculateFileSize = (file: File): number => {
   const kb = 1024;
-  // eslint-disable-next-line no-magic-numbers
+
   const mb = kb ** 2;
 
-  // eslint-disable-next-line no-magic-numbers
   return Math.round((file.size / mb) * 100.0) / 100.0;
 };
 

diff --git a/src/features/result.ts b/src/features/result.ts
@@ -7,13 +7,13 @@ export type Result<T, E> = SuccessResult<T> | FailureResult<E>;
 
 export const createSuccessResult = <T>(value: T): SuccessResult<T> => ({
   value,
-  // eslint-disable-next-line id-length
+
   _: SuccessMarker,
 });
 
 export const createFailureResult = <E>(value: E): FailureResult<E> => ({
   value,
-  // eslint-disable-next-line id-length
+
   _: FailureMarker,
 });
 

diff --git a/src/features/url.ts b/src/features/url.ts
@@ -8,9 +8,7 @@ export const isUrl = (value: unknown): value is Url => {
   }
 
   return (
-    // eslint-disable-next-line no-magic-numbers
     value.substring(0, 8) === 'https://' ||
-    // eslint-disable-next-line no-magic-numbers
     value.substring(0, 16) === 'http://localhost'
   );
 };

diff --git a/src/features/validator.ts b/src/features/validator.ts
@@ -12,10 +12,8 @@ export type ValidationResult = {
   invalidParams?: InvalidParams;
 };
 
-// eslint-disable-next-line max-statements
 const isInvalidParams = (value: unknown): value is InvalidParams => {
   if (Array.isArray(value)) {
-    // eslint-disable-next-line no-magic-numbers
     if (value.length === 0) {
       return false;
     }
@@ -72,7 +70,6 @@ export const validation = (
   } catch (error) {
     if (isZodError(error)) {
       const invalidParams = error.errors.map((value) => ({
-        // eslint-disable-next-line no-magic-numbers
         name: value.path[0],
         reason: value.message,
       }));

diff --git a/src/hooks/__tests__/useCatImageUploader.spec.ts b/src/hooks/__tests__/useCatImageUploader.spec.ts
@@ -19,7 +19,6 @@ const mockHandlers = [http.post(uploadCatImageUrl(), mockUploadCatImage)];
 
 const server = setupServer(...mockHandlers);
 
-// eslint-disable-next-line max-lines-per-function, max-statements
 describe('useCatImageUploader TestCases', () => {
   beforeAll(() => {
     server.listen();

diff --git a/src/hooks/__tests__/useCatImageValidator.spec.ts b/src/hooks/__tests__/useCatImageValidator.spec.ts
@@ -27,7 +27,6 @@ const mockHandlers = [
 
 const server = setupServer(...mockHandlers);
 
-// eslint-disable-next-line max-lines-per-function, max-statements
 describe('useCatImageValidator TestCases', () => {
   beforeAll(() => {
     server.listen();

diff --git a/src/hooks/__tests__/useCatImagesFetcher/fetchLgtmImagesInRandom.spec.ts b/src/hooks/__tests__/useCatImagesFetcher/fetchLgtmImagesInRandom.spec.ts
@@ -17,7 +17,6 @@ const mockHandlers = [http.get(fetchLgtmImagesUrl(), mockFetchLgtmImages)];
 
 const server = setupServer(...mockHandlers);
 
-// eslint-disable-next-line max-lines-per-function
 describe('useCatImagesFetcher.ts randomCatImagesFetcher TestCases', () => {
   beforeAll(() => {
     server.listen();

diff --git a/src/hooks/__tests__/useCatImagesFetcher/newArrivalCatImagesFetcher.spec.ts b/src/hooks/__tests__/useCatImagesFetcher/newArrivalCatImagesFetcher.spec.ts
@@ -22,7 +22,6 @@ const mockHandlers = [
 
 const server = setupServer(...mockHandlers);
 
-// eslint-disable-next-line max-lines-per-function
 describe('useCatImagesFetcher.ts newArrivalCatImagesFetcher TestCases', () => {
   beforeAll(() => {
     server.listen();

diff --git a/src/instrumentation.ts b/src/instrumentation.ts
@@ -1,9 +1,11 @@
 export async function register(): Promise<void> {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
+    // eslint-disable-next-line import/extensions
     await import('../sentry.server.config');
   }
 
   if (process.env.NEXT_RUNTIME === 'edge') {
+    // eslint-disable-next-line import/extensions
     await import('../sentry.edge.config');
   }
 }
diff --git a/src/layouts/DefaultLayout/DefaultLayout.tsx b/src/layouts/DefaultLayout/DefaultLayout.tsx
@@ -12,7 +12,6 @@ type Props = {
   }>;
 };
 
-// eslint-disable-next-line max-lines-per-function
 export const DefaultLayout: FC<Props> = ({
   metaTag,
   children,

diff --git a/src/templates/ExternalTransmissionTemplate/ExternalTransmissionTemplate.tsx b/src/templates/ExternalTransmissionTemplate/ExternalTransmissionTemplate.tsx
@@ -11,7 +11,6 @@ type Props = {
   children: ReactNode;
 };
 
-// eslint-disable-next-line max-lines-per-function
 export const ExternalTransmissionTemplate: FC<Props> = ({
   language,
   currentUrlPath,

diff --git a/src/templates/TermsOrPrivacyTemplate/TermsOrPrivacyTemplate.tsx b/src/templates/TermsOrPrivacyTemplate/TermsOrPrivacyTemplate.tsx
@@ -11,7 +11,6 @@ type Props = {
   children: ReactNode;
 };
 
-// eslint-disable-next-line max-lines-per-function
 export const TermsOrPrivacyTemplate: FC<Props> = ({
   language,
   currentUrlPath,