Skip to content

Commit 1c89568

Browse files
authored
Merge pull request #178 from dc7290/chore/eslint
chore: 🤖 eslintのルールを修正
2 parents aacbde3 + 9b26c5d commit 1c89568

3 files changed

Lines changed: 4 additions & 23 deletions

File tree

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ module.exports = {
55
node: true,
66
},
77
extends: [
8+
'eslint/recommended',
89
'plugin:@typescript-eslint/recommended',
9-
'plugin:prettier/recommended',
10+
'prettier',
1011
],
1112
parser: '@typescript-eslint/parser',
1213
parserOptions: {

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,12 @@
6262
"@types/deepmerge": "2.2.0",
6363
"@types/jest": "27.5.1",
6464
"@types/node-fetch": "2.6.1",
65-
"@types/react": "^18.0.9",
65+
"@types/react": "18.0.9",
6666
"@typescript-eslint/eslint-plugin": "5.26.0",
6767
"@typescript-eslint/parser": "5.26.0",
6868
"conventional-changelog-conventionalcommits": "4.6.3",
6969
"eslint": "8.16.0",
7070
"eslint-config-prettier": "8.5.0",
71-
"eslint-plugin-prettier": "4.0.0",
7271
"git-cz": "4.9.0",
7372
"highlight.js": "11.5.1",
7473
"husky": "8.0.1",

yarn.lock

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,7 +1520,7 @@
15201520
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
15211521
integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
15221522

1523-
"@types/react@^18.0.9":
1523+
"@types/react@18.0.9":
15241524
version "18.0.9"
15251525
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878"
15261526
integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==
@@ -2765,13 +2765,6 @@ eslint-config-prettier@8.5.0:
27652765
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
27662766
integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
27672767

2768-
eslint-plugin-prettier@4.0.0:
2769-
version "4.0.0"
2770-
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
2771-
integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
2772-
dependencies:
2773-
prettier-linter-helpers "^1.0.0"
2774-
27752768
eslint-scope@^5.1.1:
27762769
version "5.1.1"
27772770
resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
@@ -2925,11 +2918,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
29252918
resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
29262919
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
29272920

2928-
fast-diff@^1.1.2:
2929-
version "1.2.0"
2930-
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
2931-
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
2932-
29332921
fast-glob@^3.2.9:
29342922
version "3.2.11"
29352923
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
@@ -5401,13 +5389,6 @@ prelude-ls@^1.2.1:
54015389
resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
54025390
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
54035391

5404-
prettier-linter-helpers@^1.0.0:
5405-
version "1.0.0"
5406-
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
5407-
integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
5408-
dependencies:
5409-
fast-diff "^1.1.2"
5410-
54115392
prettier@2.6.2:
54125393
version "2.6.2"
54135394
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"

0 commit comments

Comments
 (0)