From 638298b420886321f6d45754640c8f51a0c9f2ec Mon Sep 17 00:00:00 2001 From: arrow2nd <44780846+arrow2nd@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:00:35 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=93=A6=20=E4=BE=9D=E5=AD=98=E9=96=A2?= =?UTF-8?q?=E4=BF=82=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next-env.d.ts | 2 +- package.json | 7 +-- pnpm-lock.yaml | 128 +++++++++++++++++++++++++------------------------ 3 files changed, 70 insertions(+), 67 deletions(-) diff --git a/next-env.d.ts b/next-env.d.ts index 4f11a03..1b3be08 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. +// see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/package.json b/package.json index 454d7e4..505591d 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ }, "dependencies": { "next": "15.1.1", - "react": "18.3.1", + "react": "19.0.0", "react-device-detect": "^2.2.3", - "react-dom": "18.3.1", + "react-dom": "19.0.0", "react-github-corner": "^2.5.0", "react-icons": "^5.0.1", "react-infinite-scroller": "^1.2.6", @@ -32,7 +32,8 @@ "@types/color-convert": "^2.0.3", "@types/jest": "^29.5.12", "@types/node": "^22.0.0", - "@types/react": "18.3.17", + "@types/react": "19.0.2", + "@types/react-dom": "^19.0.0", "@types/react-scroll": "^1.8.10", "autoprefixer": "^10.4.18", "axios": "^1.6.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a3864f4..a680f09 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,31 +10,31 @@ importers: dependencies: next: specifier: 15.1.1 - version: 15.1.1(@babel/core@7.26.0)(@playwright/test@1.49.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 15.1.1(@babel/core@7.26.0)(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react: - specifier: 18.3.1 - version: 18.3.1 + specifier: 19.0.0 + version: 19.0.0 react-device-detect: specifier: ^2.2.3 - version: 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.2.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react-dom: - specifier: 18.3.1 - version: 18.3.1(react@18.3.1) + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) react-github-corner: specifier: ^2.5.0 - version: 2.5.0(react@18.3.1) + version: 2.5.0(react@19.0.0) react-icons: specifier: ^5.0.1 - version: 5.4.0(react@18.3.1) + version: 5.4.0(react@19.0.0) react-infinite-scroller: specifier: ^1.2.6 - version: 1.2.6(react@18.3.1) + version: 1.2.6(react@19.0.0) react-scroll: specifier: ^1.9.0 - version: 1.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.9.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) use-media: specifier: ^1.5.0 - version: 1.5.0(react@18.3.1) + version: 1.5.0(react@19.0.0) devDependencies: '@playwright/test': specifier: ^1.42.1 @@ -47,7 +47,7 @@ importers: version: 6.6.3 '@testing-library/react': specifier: ^16.0.0 - version: 16.1.0(@testing-library/dom@10.4.0)(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 16.1.0(@testing-library/dom@10.4.0)(@types/react-dom@19.0.2(@types/react@19.0.2))(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@trivago/prettier-plugin-sort-imports': specifier: ^5.0.0 version: 5.2.0(prettier@3.4.2) @@ -61,8 +61,11 @@ importers: specifier: ^22.0.0 version: 22.10.2 '@types/react': - specifier: 18.3.17 - version: 18.3.17 + specifier: 19.0.2 + version: 19.0.2 + '@types/react-dom': + specifier: ^19.0.0 + version: 19.0.2(@types/react@19.0.2) '@types/react-scroll': specifier: ^1.8.10 version: 1.8.10 @@ -763,14 +766,16 @@ packages: '@types/node@22.10.2': resolution: {integrity: sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==} - '@types/prop-types@15.7.14': - resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==} + '@types/react-dom@19.0.2': + resolution: {integrity: sha512-c1s+7TKFaDRRxr1TxccIX2u7sfCnc3RxkVyBIUA2lCpyqCF+QoAwQ/CBg7bsMdVwP120HEH143VQezKtef5nCg==} + peerDependencies: + '@types/react': ^19.0.0 '@types/react-scroll@1.8.10': resolution: {integrity: sha512-RD4Z7grbdNGOKwKnUBKar6zNxqaW3n8m9QSrfvljW+gmkj1GArb8AFBomVr6xMOgHPD3v1uV3BrIf01py57daQ==} - '@types/react@18.3.17': - resolution: {integrity: sha512-opAQ5no6LqJNo9TqnxBKsgnkIYHozW9KSTlFVoSUJYh1Fl/sswkEoqIugRSm7tbh6pABtYjGAjW+GOS23j8qbw==} + '@types/react@19.0.2': + resolution: {integrity: sha512-USU8ZI/xyKJwFTpjSVIrSeHBVAGagkHQKPNbxeWwql/vDmnTIBgx+TJnhFnj1NXgz8XfprU0egV2dROLGpsBEg==} '@types/stack-utils@2.0.3': resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==} @@ -2483,10 +2488,10 @@ packages: react: '>= 0.14.0' react-dom: '>= 0.14.0' - react-dom@18.3.1: - resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==} + react-dom@19.0.0: + resolution: {integrity: sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==} peerDependencies: - react: ^18.3.1 + react: ^19.0.0 react-github-corner@2.5.0: resolution: {integrity: sha512-ofds9l6n61LJc6ML+jSE6W9ZSQvATcMR9evnHPXua1oDYj289HKODnVqFUB/g2a4ieBjDHw416iHP3MjqnU76Q==} @@ -2519,8 +2524,8 @@ packages: react: ^15.5.4 || ^16.0.0 || ^17.0.0 || ^18.0.0 react-dom: ^15.5.4 || ^16.0.0 || ^17.0.0 || ^18.0.0 - react@18.3.1: - resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==} + react@19.0.0: + resolution: {integrity: sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==} engines: {node: '>=0.10.0'} read-cache@1.0.0: @@ -2601,8 +2606,8 @@ packages: resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} engines: {node: '>=v12.22.7'} - scheduler@0.23.2: - resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==} + scheduler@0.25.0: + resolution: {integrity: sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==} semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} @@ -3675,14 +3680,15 @@ snapshots: lodash: 4.17.21 redent: 3.0.0 - '@testing-library/react@16.1.0(@testing-library/dom@10.4.0)(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@testing-library/react@16.1.0(@testing-library/dom@10.4.0)(@types/react-dom@19.0.2(@types/react@19.0.2))(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@babel/runtime': 7.26.0 '@testing-library/dom': 10.4.0 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) optionalDependencies: - '@types/react': 18.3.17 + '@types/react': 19.0.2 + '@types/react-dom': 19.0.2(@types/react@19.0.2) '@tootallnate/once@2.0.0': {} @@ -3770,15 +3776,16 @@ snapshots: dependencies: undici-types: 6.20.0 - '@types/prop-types@15.7.14': {} + '@types/react-dom@19.0.2(@types/react@19.0.2)': + dependencies: + '@types/react': 19.0.2 '@types/react-scroll@1.8.10': dependencies: - '@types/react': 18.3.17 + '@types/react': 19.0.2 - '@types/react@18.3.17': + '@types/react@19.0.2': dependencies: - '@types/prop-types': 15.7.14 csstype: 3.1.3 '@types/stack-utils@2.0.3': {} @@ -5619,7 +5626,7 @@ snapshots: natural-compare@1.4.0: {} - next@15.1.1(@babel/core@7.26.0)(@playwright/test@1.49.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + next@15.1.1(@babel/core@7.26.0)(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@next/env': 15.1.1 '@swc/counter': 0.1.3 @@ -5627,9 +5634,9 @@ snapshots: busboy: 1.6.0 caniuse-lite: 1.0.30001688 postcss: 8.4.31 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - styled-jsx: 5.1.6(@babel/core@7.26.0)(react@18.3.1) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + styled-jsx: 5.1.6(@babel/core@7.26.0)(react@19.0.0) optionalDependencies: '@next/swc-darwin-arm64': 15.1.1 '@next/swc-darwin-x64': 15.1.1 @@ -5871,30 +5878,29 @@ snapshots: queue-microtask@1.2.3: {} - react-device-detect@2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-device-detect@2.2.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) ua-parser-js: 1.0.39 - react-dom@18.3.1(react@18.3.1): + react-dom@19.0.0(react@19.0.0): dependencies: - loose-envify: 1.4.0 - react: 18.3.1 - scheduler: 0.23.2 + react: 19.0.0 + scheduler: 0.25.0 - react-github-corner@2.5.0(react@18.3.1): + react-github-corner@2.5.0(react@19.0.0): dependencies: - react: 18.3.1 + react: 19.0.0 - react-icons@5.4.0(react@18.3.1): + react-icons@5.4.0(react@19.0.0): dependencies: - react: 18.3.1 + react: 19.0.0 - react-infinite-scroller@1.2.6(react@18.3.1): + react-infinite-scroller@1.2.6(react@19.0.0): dependencies: prop-types: 15.8.1 - react: 18.3.1 + react: 19.0.0 react-is@16.13.1: {} @@ -5902,16 +5908,14 @@ snapshots: react-is@18.3.1: {} - react-scroll@1.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-scroll@1.9.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: lodash.throttle: 4.1.1 prop-types: 15.8.1 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) - react@18.3.1: - dependencies: - loose-envify: 1.4.0 + react@19.0.0: {} read-cache@1.0.0: dependencies: @@ -6000,9 +6004,7 @@ snapshots: dependencies: xmlchars: 2.2.0 - scheduler@0.23.2: - dependencies: - loose-envify: 1.4.0 + scheduler@0.25.0: {} semver@6.3.1: {} @@ -6203,10 +6205,10 @@ snapshots: strip-json-comments@3.1.1: {} - styled-jsx@5.1.6(@babel/core@7.26.0)(react@18.3.1): + styled-jsx@5.1.6(@babel/core@7.26.0)(react@19.0.0): dependencies: client-only: 0.0.1 - react: 18.3.1 + react: 19.0.0 optionalDependencies: '@babel/core': 7.26.0 @@ -6396,9 +6398,9 @@ snapshots: querystringify: 2.2.0 requires-port: 1.0.0 - use-media@1.5.0(react@18.3.1): + use-media@1.5.0(react@19.0.0): dependencies: - react: 18.3.1 + react: 19.0.0 util-deprecate@1.0.2: {} From d3091127385e8cc718cff189ef9fda8cfb8d16d6 Mon Sep 17 00:00:00 2001 From: arrow2nd <44780846+arrow2nd@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:04:56 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Typo=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/organisms/search-colors/color-button.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/organisms/search-colors/color-button.test.tsx b/components/organisms/search-colors/color-button.test.tsx index bc8275f..3f1ca7f 100644 --- a/components/organisms/search-colors/color-button.test.tsx +++ b/components/organisms/search-colors/color-button.test.tsx @@ -1,7 +1,7 @@ import { act, fireEvent, render } from '@testing-library/react' import ColorButton from './color-button' -describe('ColorButtton', () => { +describe('ColorButton', () => { const color = { name: '赤', hex: '#ff0000' From 4ff6f1d7d6c8f02588bb725710365d401951d6e2 Mon Sep 17 00:00:00 2001 From: arrow2nd <44780846+arrow2nd@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:08:49 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=9A=91=20import=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/organisms/search-colors/color-button.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/organisms/search-colors/color-button.tsx b/components/organisms/search-colors/color-button.tsx index 4f707fa..392b147 100644 --- a/components/organisms/search-colors/color-button.tsx +++ b/components/organisms/search-colors/color-button.tsx @@ -1,3 +1,4 @@ +import { JSX } from 'react' import ColorSampleCircle from 'components/atoms/color-sample/circle' import { SearchColor } from 'types/search-color' From c04a69de605abd83f9bb703e45ddd5448b9c9f52 Mon Sep 17 00:00:00 2001 From: arrow2nd <44780846+arrow2nd@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:09:03 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=94=A7=20FlatConfig=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc | 3 --- eslint.config.cjs | 14 ++++++++++++++ package.json | 2 ++ pnpm-lock.yaml | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) delete mode 100644 .eslintrc create mode 100644 eslint.config.cjs diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 913cdba..0000000 --- a/.eslintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["next", "next/core-web-vitals", "prettier"] -} diff --git a/eslint.config.cjs b/eslint.config.cjs new file mode 100644 index 0000000..547210a --- /dev/null +++ b/eslint.config.cjs @@ -0,0 +1,14 @@ +const { fixupConfigRules } = require('@eslint/compat') +const { FlatCompat } = require('@eslint/eslintrc') +const prettier = require('eslint-config-prettier') + +const flatCompat = new FlatCompat() + +module.exports = [ + ...fixupConfigRules( + flatCompat.extends('next/core-web-vitals'), + flatCompat.extends('next/typescript') + ), + prettier +] + diff --git a/package.json b/package.json index 505591d..7e5acb5 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,8 @@ "use-media": "^1.5.0" }, "devDependencies": { + "@eslint/compat": "^1.2.4", + "@eslint/eslintrc": "^3.2.0", "@playwright/test": "^1.42.1", "@tailwindcss/forms": "^0.5.7", "@testing-library/jest-dom": "^6.4.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a680f09..9ce606f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,6 +36,12 @@ importers: specifier: ^1.5.0 version: 1.5.0(react@19.0.0) devDependencies: + '@eslint/compat': + specifier: ^1.2.4 + version: 1.2.4(eslint@9.17.0(jiti@1.21.7)) + '@eslint/eslintrc': + specifier: ^3.2.0 + version: 3.2.0 '@playwright/test': specifier: ^1.42.1 version: 1.49.1 @@ -307,6 +313,15 @@ packages: resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + '@eslint/compat@1.2.4': + resolution: {integrity: sha512-S8ZdQj/N69YAtuqFt7653jwcvuUj131+6qGLUyDqfDg1OIoBQ66OCuXC473YQfO2AaxITTutiRQiDwoo7ZLYyg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^9.10.0 + peerDependenciesMeta: + eslint: + optional: true + '@eslint/config-array@0.19.1': resolution: {integrity: sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -3258,6 +3273,10 @@ snapshots: '@eslint-community/regexpp@4.12.1': {} + '@eslint/compat@1.2.4(eslint@9.17.0(jiti@1.21.7))': + optionalDependencies: + eslint: 9.17.0(jiti@1.21.7) + '@eslint/config-array@0.19.1': dependencies: '@eslint/object-schema': 2.1.5 From 07943acadda997bf3d2d8850f4e64074aa70aa98 Mon Sep 17 00:00:00 2001 From: arrow2nd <44780846+arrow2nd@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:11:30 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=9A=91=20import=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/organisms/search-colors/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/organisms/search-colors/index.tsx b/components/organisms/search-colors/index.tsx index 814c5e7..ebd6186 100644 --- a/components/organisms/search-colors/index.tsx +++ b/components/organisms/search-colors/index.tsx @@ -1,3 +1,4 @@ +import { JSX } from 'react' import { searchColors } from 'data/search-colors' import ColorButton from './color-button' From 0855063be8e10c37b748a5db2bfcb0895f6f2ff9 Mon Sep 17 00:00:00 2001 From: arrow2nd <44780846+arrow2nd@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:12:12 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=92=9A=20=E3=82=B9=E3=83=8A=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=82=B7=E3=83=A7=E3=83=83=E3=83=88=E3=82=92=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search-colors/__snapshots__/color-button.test.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/organisms/search-colors/__snapshots__/color-button.test.tsx.snap b/components/organisms/search-colors/__snapshots__/color-button.test.tsx.snap index c30661b..af730b8 100644 --- a/components/organisms/search-colors/__snapshots__/color-button.test.tsx.snap +++ b/components/organisms/search-colors/__snapshots__/color-button.test.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ColorButtton 色が指定されていない時の表示は正しいか 1`] = ` +exports[`ColorButton 色が指定されていない時の表示は正しいか 1`] = `