Merge pull request #250 from nekochans/feature/issue222/fix-tsconfig-…

…json

tsconfig.json の内容を create-next-app の最新版で生成される内容に変更

jest.config.js

@@ -1,18 +1,16 @@
-const { defaults: tsjPreset } = require('ts-jest/presets');
+const nextJest = require('next/jest');
 
-module.exports = {
-  preset: 'ts-jest',
+const createJestConfig = nextJest({
+  // Provide the path to your Next.js app to load next.config.js and .env files in your test environment
+  dir: './',
+});
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+const customJestConfig = {
   testEnvironment: 'node',
-  roots: ['<rootDir>/src'],
-  testPathIgnorePatterns: ['<rootDir>/.next/', '<rootDir>/node_modules/'],
-  transform: {
-    ...tsjPreset.transform,
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-  coveragePathIgnorePatterns: ['<rootDir>/.storybook/__mocks/'],
   moduleNameMapper: {
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
-      '<rootDir>/__mocks__/fileMock.js',
-    '\\.(css|less)$': '<rootDir>/__mocks__/styleMock.js',
+    '^@/*/(.*)$': '<rootDir>/src/$1',
   },
 };
+
+module.exports = createJestConfig(customJestConfig);

src/api/fetch/lgtmImage.ts

@@ -1,4 +1,4 @@
-import { httpStatusCode } from '../../constants';
+import { httpStatusCode } from '@/constants';
 import {
   FetchLgtmImagesError,
   IsAcceptableCatImageError,
@@ -20,8 +20,8 @@ import {
   type UploadCatImage,
   type LgtmImageUrl,
   type Url,
-} from '../../features';
-import { mightSetRequestIdToSentry } from '../../utils';
+} from '@/features';
+import { mightSetRequestIdToSentry } from '@/utils';
 
 type FetchImageResponseBody = {
   lgtmImages: Array<{

src/components/GoogleTagManager/GoogleTagManager.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import Script from 'next/script';
 
-import { type GoogleTagManagerId } from '../../utils';
+import { type GoogleTagManagerId } from '@/utils';
 
 type Props = {
   googleTagManagerId: GoogleTagManagerId;

src/features/metaTag.ts

@@ -1,4 +1,4 @@
-import { assertNever } from '../utils';
+import { assertNever } from '@/utils';
 
 import type { Language } from './language';
 import { appUrlList, type AppPathName, type AppUrl } from './url';

src/hooks/__tests__/useCatImageUploader.spec.ts

@@ -9,14 +9,14 @@ import {
   uploadCatImageUrl,
   type AcceptedTypesImageExtension,
   type Language,
-} from '../../features';
+} from '@/features';
+import { useCatImageUploader } from '@/hooks/useCatImageUploader';
 import {
   mockInternalServerError,
   mockUploadCatImage,
   mockUploadCatImagePayloadTooLarge,
   mockUploadCatImageUnprocessableEntity,
-} from '../../mocks';
-import { useCatImageUploader } from '../useCatImageUploader';
+} from '@/mocks';
 
 const mockHandlers = [rest.post(uploadCatImageUrl(), mockUploadCatImage)];
 

src/hooks/__tests__/useCatImageValidator.spec.ts

@@ -10,7 +10,8 @@ import {
   isAcceptableCatImageUrl,
   type AcceptedTypesImageExtension,
   type Language,
-} from '../../features';
+} from '@/features';
+import { useCatImageValidator } from '@/hooks/useCatImageValidator';
 import {
   mockInternalServerError,
   mockIsAcceptableCatImage,
@@ -20,8 +21,7 @@ import {
   mockIsAcceptableCatImageNotModerationImage,
   mockIsAcceptableCatImagePayloadTooLargeError,
   mockIsAcceptableCatImagePersonFaceInImage,
-} from '../../mocks';
-import { useCatImageValidator } from '../useCatImageValidator';
+} from '@/mocks';
 
 const mockHandlers = [
   rest.post(isAcceptableCatImageUrl(), mockIsAcceptableCatImage),

src/hooks/__tests__/useCatImagesFetcher/fetchLgtmImagesInRandom.spec.ts

@@ -4,13 +4,13 @@
 import 'whatwg-fetch';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { fetchLgtmImagesUrl, FetchLgtmImagesError } from '../../../features';
+import { fetchLgtmImagesUrl, FetchLgtmImagesError } from '@/features';
+import { useCatImagesFetcher } from '@/hooks/useCatImagesFetcher';
 import {
   mockInternalServerError,
   mockFetchLgtmImages,
   fetchLgtmImagesMockBody,
-} from '../../../mocks';
-import { useCatImagesFetcher } from '../../useCatImagesFetcher';
+} from '@/mocks';
 
 const mockHandlers = [rest.get(fetchLgtmImagesUrl(), mockFetchLgtmImages)];
 

src/hooks/__tests__/useCatImagesFetcher/newArrivalCatImagesFetcher.spec.ts

@@ -7,13 +7,13 @@ import { setupServer } from 'msw/node';
 import {
   fetchLgtmImagesInRecentlyCreatedUrl,
   FetchLgtmImagesError,
-} from '../../../features';
+} from '@/features';
+import { useCatImagesFetcher } from '@/hooks/useCatImagesFetcher';
 import {
   mockInternalServerError,
   mockFetchLgtmImages,
   fetchLgtmImagesMockBody,
-} from '../../../mocks';
-import { useCatImagesFetcher } from '../../useCatImagesFetcher';
+} from '@/mocks';
 
 const mockHandlers = [
   rest.get(fetchLgtmImagesInRecentlyCreatedUrl(), mockFetchLgtmImages),

src/hooks/createErrorMessages.ts

@@ -1,4 +1,4 @@
-import { type Language } from '../features';
+import { type Language } from '@/features';
 
 export const createCatImageSizeTooLargeErrorMessages = (
   language: Language

src/hooks/useCatImageUploader.ts

@@ -1,4 +1,4 @@
-import { uploadCatImage } from '../api';
+import { uploadCatImage } from '@/api';
 import {
   UploadCatImageSizeTooLargeError,
   UploadCatImageValidationError,
@@ -7,7 +7,7 @@ import {
   type Language,
   type AcceptedTypesImageExtension,
   type ImageUploader,
-} from '../features';
+} from '@/features';
 
 import {
   createCatImageSizeTooLargeErrorMessages,

src/hooks/useCatImageValidator.ts

@@ -1,13 +1,13 @@
-import { isAcceptableCatImage } from '../api';
+import { isAcceptableCatImage } from '@/api';
 import {
   createSuccessResult,
   isFailureResult,
   type Language,
   type AcceptedTypesImageExtension,
   type IsAcceptableCatImageNotAcceptableReason,
   type ImageValidator,
-} from '../features';
-import { assertNever } from '../utils';
+} from '@/features';
+import { assertNever } from '@/utils';
 
 import {
   createCatImageSizeTooLargeErrorMessages,

src/hooks/useCatImagesFetcher.ts

@@ -3,9 +3,9 @@ import throttle from 'lodash/throttle';
 import {
   fetchLgtmImagesInRandom,
   fetchLgtmImagesInRecentlyCreated,
-} from '../api';
+} from '@/api';
 
-import type { CatImagesFetcher, LgtmImage } from '../features';
+import type { CatImagesFetcher, LgtmImage } from '@/features';
 
 const randomCatImagesFetcher = async (): Promise<LgtmImage[]> => {
   return await fetchLgtmImagesInRandom();

src/layouts/DefaultLayout/DefaultLayout.tsx

@@ -1,7 +1,7 @@
 import type { FC, ReactNode } from 'react';
 import Head from 'next/head';
 
-import type { Language, MetaTag, Url } from '../../features';
+import type { Language, MetaTag, Url } from '@/features';
 
 type Props = {
   metaTag: MetaTag;

src/layouts/ErrorLayout/ErrorLayout.tsx

@@ -1,7 +1,7 @@
 import type { FC, ReactNode } from 'react';
 import Head from 'next/head';
 
-import type { MetaTag } from '../../features';
+import type { MetaTag } from '@/features';
 
 type Props = {
   title: string;

src/middleware.ts

@@ -4,7 +4,7 @@ import {
   NextResponse,
 } from 'next/server';
 
-import { isBanCountry, isInMaintenance } from './edge';
+import { isBanCountry, isInMaintenance } from '@/edge';
 
 export const config = {
   matcher: ['/', '/upload', '/terms', '/privacy', '/maintenance'],

src/mocks/api/error/mockInternalServerError.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockInternalServerError: ResponseResolver<
   MockedRequest,

src/mocks/api/error/mockUnauthorizedError.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockUnauthorizedError: ResponseResolver<
   MockedRequest,

src/mocks/api/external/lgtmeow/mockFetchLgtmImages.ts

@@ -4,8 +4,8 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
-import { fetchLgtmImagesMockBody } from '../../fetchLgtmImagesMockBody';
+import { httpStatusCode } from '@/constants';
+import { fetchLgtmImagesMockBody } from '@/mocks';
 
 export const mockFetchLgtmImages: ResponseResolver<
   MockedRequest,

src/mocks/api/external/lgtmeow/mockUploadCatImage.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockUploadCatImage: ResponseResolver<
   MockedRequest,

src/mocks/api/external/lgtmeow/mockUploadCatImagePayloadTooLarge.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockUploadCatImagePayloadTooLarge: ResponseResolver<
   MockedRequest,

src/mocks/api/external/lgtmeow/mockUploadCatImageUnprocessableEntity.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockUploadCatImageUnprocessableEntity: ResponseResolver<
   MockedRequest,

src/mocks/api/external/recognition/mockIsAcceptableCatImage.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockIsAcceptableCatImage: ResponseResolver<
   MockedRequest,

src/mocks/api/external/recognition/mockIsAcceptableCatImageError.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockIsAcceptableCatImageError: ResponseResolver<
   MockedRequest,

src/mocks/api/external/recognition/mockIsAcceptableCatImageNotAllowedImageExtension.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockIsAcceptableCatImageNotAllowedImageExtension: ResponseResolver<
   MockedRequest,

src/mocks/api/external/recognition/mockIsAcceptableCatImageNotCatImage.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockIsAcceptableCatImageNotCatImage: ResponseResolver<
   MockedRequest,

src/mocks/api/external/recognition/mockIsAcceptableCatImageNotModerationImage.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockIsAcceptableCatImageNotModerationImage: ResponseResolver<
   MockedRequest,

src/mocks/api/external/recognition/mockIsAcceptableCatImagePayloadTooLargeError.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockIsAcceptableCatImagePayloadTooLargeError: ResponseResolver<
   MockedRequest,

src/mocks/api/external/recognition/mockIsAcceptableCatImagePersonFaceInImage.ts

@@ -4,7 +4,7 @@ import {
   type restContext,
 } from 'msw';
 
-import { httpStatusCode } from '../../../../constants';
+import { httpStatusCode } from '@/constants';
 
 export const mockIsAcceptableCatImagePersonFaceInImage: ResponseResolver<
   MockedRequest,

src/pages/404.tsx

@@ -1,7 +1,7 @@
 import type { GetStaticProps, NextPage } from 'next';
-import { httpStatusCode } from '../constants';
-import { convertLocaleToLanguage, type Language } from '../features';
-import { ErrorTemplate } from '../templates';
+import { httpStatusCode } from '@/constants';
+import { convertLocaleToLanguage, type Language } from '@/features';
+import { ErrorTemplate } from '@/templates';
 
 type Props = {
   language: Language;

src/pages/500.tsx

@@ -1,7 +1,7 @@
 import type { GetStaticProps, NextPage } from 'next';
-import { httpStatusCode } from '../constants';
-import { convertLocaleToLanguage, type Language } from '../features';
-import { ErrorTemplate } from '../templates';
+import { httpStatusCode } from '@/constants';
+import { convertLocaleToLanguage, type Language } from '@/features';
+import { ErrorTemplate } from '@/templates';
 
 type Props = {
   language: Language;

src/pages/_app.tsx

@@ -1,6 +1,6 @@
 import type { AppProps } from 'next/app';
-import { GoogleTagManager } from '../components';
-import { googleTagManagerId } from '../utils';
+import { GoogleTagManager } from '@/components';
+import { googleTagManagerId } from '@/utils';
 
 import 'ress/ress.css';
 import '../styles/markdown.css';

src/pages/index.tsx

@@ -1,12 +1,12 @@
 import type { GetStaticProps, NextPage } from 'next';
-import { fetchLgtmImagesInRandom } from '../api';
+import { fetchLgtmImagesInRandom } from '@/api';
 import {
   convertLocaleToLanguage,
   extractRandomImages,
   type Language,
   type LgtmImage,
-} from '../features';
-import { TopTemplate } from '../templates';
+} from '@/features';
+import { TopTemplate } from '@/templates';
 
 type Props = {
   language: Language;

src/pages/maintenance.tsx

@@ -1,7 +1,7 @@
 import type { GetStaticProps, NextPage } from 'next';
-import { httpStatusCode } from '../constants';
-import { convertLocaleToLanguage, type Language } from '../features';
-import { ErrorTemplate } from '../templates';
+import { httpStatusCode } from '@/constants';
+import { convertLocaleToLanguage, type Language } from '@/features';
+import { ErrorTemplate } from '@/templates';
 
 type Props = {
   language: Language;

src/pages/privacy.tsx

@@ -1,8 +1,8 @@
 import fs from 'fs';
 
 import type { GetStaticProps, NextPage } from 'next';
-import { convertLocaleToLanguage, type Language } from '../features';
-import { TermsOrPrivacyTemplate } from '../templates';
+import { convertLocaleToLanguage, type Language } from '@/features';
+import { TermsOrPrivacyTemplate } from '@/templates';
 
 type Props = {
   language: Language;