Skip to content

Commit b1be340

Browse files
nabeliwonabeliwo
committed
chore: update linter packages
1 parent 5c22860 commit b1be340

File tree

13 files changed

+653
-339
lines changed

13 files changed

+653
-339
lines changed

‎.eslintrc.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module.exports = {
2-
extends: 'smarthr',
3-
settings: {
4-
react: {
5-
version: 'latest',
6-
},
2+
extends: ['smarthr'],
3+
plugins: ['import'],
4+
rules: {
5+
'smarthr/require-barrel-import': 'off',
6+
'smarthr/best-practice-for-date': 'off',
77
},
88
}

‎.prettierrc

-6
This file was deleted.

‎.prettierrc.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
...require("prettier-config-smarthr"),
3+
};

‎package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
"license": "MIT",
2525
"devDependencies": {
2626
"@types/jest": "^29.2.5",
27-
"eslint": "^8.22.0",
28-
"eslint-config-smarthr": "^6.0.12",
27+
"eslint": "^8.32.0",
28+
"eslint-config-smarthr": "^6.6.3",
2929
"jest": "^29.3.1",
3030
"lerna": "^5.6.2",
31-
"prettier": "^2.7.1",
31+
"prettier": "^2.8.3",
32+
"prettier-config-smarthr": "^1.0.0",
3233
"rimraf": "^4.0.7",
3334
"ts-jest": "^29.0.5",
3435
"typescript": "^4.9.4"

‎packages/create-lint-set/src/createLintSet.ts

+9-23
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
import { program } from 'commander'
21
import chalk from 'chalk'
2+
import { program } from 'commander'
33
import spawn from 'cross-spawn'
4-
const path = require('path')
5-
const fs = require('fs-extra')
64

75
import { Item, items } from './items'
86

7+
const path = require('path')
8+
9+
const fs = require('fs-extra')
10+
911
// CLI 実行時のオプションを取得
1012
const getOptions = () => {
1113
const packageJson = require('../package.json')
@@ -31,10 +33,7 @@ const filterInstallPackages = (targetDir: string, itemList: Item[]) => {
3133
process.exit(1)
3234
}
3335
const packageJson = require(packageJsonPath)
34-
const installedPackages = [
35-
...Object.keys(packageJson.dependencies ?? {}),
36-
...Object.keys(packageJson.devDependencies ?? {}),
37-
]
36+
const installedPackages = [...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]
3837

3938
return itemList.map((item) => ({
4039
...item,
@@ -43,11 +42,7 @@ const filterInstallPackages = (targetDir: string, itemList: Item[]) => {
4342
}
4443

4544
// インストール
46-
const installPackages = async (
47-
targetDir: string,
48-
itemList: Item[],
49-
useYarn: boolean,
50-
): Promise<void> => {
45+
const installPackages = async (targetDir: string, itemList: Item[], useYarn: boolean): Promise<void> => {
5146
const targetPackages = itemList.map((item) => item.packages).flat()
5247
let command: string
5348
let args: string[]
@@ -80,12 +75,7 @@ const shouldCreateConfigFile = (regex: RegExp, fileNames: string[]) => {
8075
}
8176

8277
// 設定ファイルの作成
83-
const createConfigFiles = (
84-
scriptDir: string,
85-
targetDir: string,
86-
targetDirFiles: string[],
87-
itemList: Item[],
88-
) => {
78+
const createConfigFiles = (scriptDir: string, targetDir: string, targetDirFiles: string[], itemList: Item[]) => {
8979
itemList.forEach((item) => {
9080
if (shouldCreateConfigFile(item.configFilePattern, targetDirFiles)) {
9181
const templateDir = scriptDir + '/templates/' + item.templateDirName
@@ -106,11 +96,7 @@ const printMessage = (itemList: Item[]) => {
10696
isFirst = false
10797
}
10898
})
109-
console.info(
110-
chalk.green(
111-
'Packages were successfully installed!🍺\nAdd something like below to your package.json.\n',
112-
),
113-
)
99+
console.info(chalk.green('Packages were successfully installed!🍺\nAdd something like below to your package.json.\n'))
114100
// 下記のような文字列の出力
115101
// "scripts": {
116102
// "eslint": "eslint './**/*.ts{,x}'"

‎packages/next-auth/src/RedisAdapter.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,13 @@ export function RedisAdapter(redis: Redis): Adapter {
124124
},
125125
async createVerificationToken(verificationToken) {
126126
await setObjectAsJson(
127-
prefixes.verificationTokenKey +
128-
verificationToken.identifier +
129-
':' +
130-
verificationToken.token,
127+
prefixes.verificationTokenKey + verificationToken.identifier + ':' + verificationToken.token,
131128
verificationToken,
132129
)
133130
return verificationToken
134131
},
135132
async useVerificationToken(verificationToken) {
136-
const tokenKey =
137-
prefixes.verificationTokenKey + verificationToken.identifier + ':' + verificationToken.token
133+
const tokenKey = prefixes.verificationTokenKey + verificationToken.identifier + ':' + verificationToken.token
138134

139135
const token = await redis.get(tokenKey)
140136
if (!token) return null

‎packages/next-auth/src/SmarthrProvider.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ type Arguments = {
88
clientSecret: string
99
}
1010

11-
export const SmarthrProvider = ({
12-
smarthrUrl,
13-
redirectUri,
14-
clientId,
15-
clientSecret,
16-
}: Arguments): Provider => ({
11+
export const SmarthrProvider = ({ smarthrUrl, redirectUri, clientId, clientSecret }: Arguments): Provider => ({
1712
id: 'smarthr',
1813
name: 'SmartHR',
1914
type: 'oauth',
@@ -44,8 +39,8 @@ export const SmarthrProvider = ({
4439
}
4540
},
4641
},
47-
clientId: clientId,
48-
clientSecret: clientSecret,
42+
clientId,
43+
clientSecret,
4944
userinfo: `${smarthrUrl}/api/v1/users/me`,
5045
issuer: 'https://authlete.com',
5146
httpOptions: {

‎packages/use-bulk-check/src/__tests__/index.test.ts

+7-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { act, renderHook } from '@testing-library/react-hooks'
22

3-
import { useBulkCheck } from '../'
3+
import { useBulkCheck } from '..'
44

55
describe('useBulkCheck', () => {
66
const list = [{ id: 'item-1' }, { id: 'item-2' }, { id: 'item-3' }]
@@ -24,9 +24,7 @@ describe('useBulkCheck', () => {
2424

2525
describe('defaultCheckedIds がある場合', () => {
2626
it('チェックした item の ID が反映される', () => {
27-
const { result } = renderHook(() =>
28-
useBulkCheck({ pageItems: list, defaultCheckedIds: ['item-1', 'item-3'] }),
29-
)
27+
const { result } = renderHook(() => useBulkCheck({ pageItems: list, defaultCheckedIds: ['item-1', 'item-3'] }))
3028

3129
expect(result.current.pageItems).toEqual([
3230
{ item: { id: 'item-1' }, checked: true },
@@ -42,9 +40,7 @@ describe('useBulkCheck', () => {
4240

4341
describe('defaultIsAllChecked がある場合', () => {
4442
it('全件チェックが反映される', () => {
45-
const { result } = renderHook(() =>
46-
useBulkCheck({ pageItems: list, defaultIsAllChecked: true }),
47-
)
43+
const { result } = renderHook(() => useBulkCheck({ pageItems: list, defaultIsAllChecked: true }))
4844

4945
expect(result.current.pageItems).toEqual([
5046
{ item: { id: 'item-1' }, checked: true },
@@ -162,9 +158,7 @@ describe('useBulkCheck', () => {
162158

163159
describe('checkedItemsInCurrentPage の length が1以上の場合', () => {
164160
it('checkedSet 内にある ID のうち pageItems 内にあるものが削除される', () => {
165-
const { result } = renderHook(() =>
166-
useBulkCheck({ pageItems: list, defaultCheckedIds: ['item-1', 'item-5'] }),
167-
)
161+
const { result } = renderHook(() => useBulkCheck({ pageItems: list, defaultCheckedIds: ['item-1', 'item-5'] }))
168162

169163
act(() => {
170164
result.current.togglePageChecked()
@@ -184,9 +178,7 @@ describe('useBulkCheck', () => {
184178

185179
describe('isPageChecked が false かつ checkedItemsInCurrentPage の length が0の場合', () => {
186180
it('checkedSet に pageItems 内にある ID が全て追加される', () => {
187-
const { result } = renderHook(() =>
188-
useBulkCheck({ pageItems: list, defaultCheckedIds: ['item-5'] }),
189-
)
181+
const { result } = renderHook(() => useBulkCheck({ pageItems: list, defaultCheckedIds: ['item-5'] }))
190182

191183
act(() => {
192184
result.current.togglePageChecked()
@@ -209,9 +201,7 @@ describe('useBulkCheck', () => {
209201
describe('toggleAllChecked', () => {
210202
describe('isAllChecked が true の場合', () => {
211203
it('isAllChecked が false になる', () => {
212-
const { result } = renderHook(() =>
213-
useBulkCheck({ pageItems: list, defaultIsAllChecked: true }),
214-
)
204+
const { result } = renderHook(() => useBulkCheck({ pageItems: list, defaultIsAllChecked: true }))
215205

216206
act(() => {
217207
result.current.toggleAllChecked()
@@ -235,9 +225,7 @@ describe('useBulkCheck', () => {
235225

236226
describe('選択状態の item がすでにある場合', () => {
237227
it('checkedIds には影響しない', () => {
238-
const { result } = renderHook(() =>
239-
useBulkCheck({ pageItems: list, defaultCheckedIds: ['item-1', 'item-3'] }),
240-
)
228+
const { result } = renderHook(() => useBulkCheck({ pageItems: list, defaultCheckedIds: ['item-1', 'item-3'] }))
241229

242230
act(() => {
243231
result.current.toggleAllChecked()

‎packages/use-bulk-check/src/index.ts

+4-11
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,11 @@ export const useBulkCheck = <T>({
7676
}
7777
}
7878

79-
const getPageItemsWithChecked = <T>(
80-
pageItems: Array<ListItem<T>>,
81-
checkedSet: Set<string>,
82-
isAllChecked: boolean,
83-
) =>
79+
const getPageItemsWithChecked = <T>(pageItems: Array<ListItem<T>>, checkedSet: Set<string>, isAllChecked: boolean) =>
8480
pageItems.map((item) => ({
8581
item,
8682
checked: checkedSet.has(item.id) || isAllChecked,
8783
}))
88-
const getHasCheckedItemInPage = <T>(pageItems: Array<CheckedListItem<T>>) =>
89-
pageItems.some(({ checked }) => checked)
90-
const getIsPageChecked = <T>(pageItems: Array<CheckedListItem<T>>) =>
91-
pageItems.every(({ checked }) => checked)
92-
const getCheckedItems = <T>(pageItems: Array<CheckedListItem<T>>) =>
93-
pageItems.filter(({ checked }) => checked)
84+
const getHasCheckedItemInPage = <T>(pageItems: Array<CheckedListItem<T>>) => pageItems.some(({ checked }) => checked)
85+
const getIsPageChecked = <T>(pageItems: Array<CheckedListItem<T>>) => pageItems.every(({ checked }) => checked)
86+
const getCheckedItems = <T>(pageItems: Array<CheckedListItem<T>>) => pageItems.filter(({ checked }) => checked)

‎packages/use-virtual-scroll/src/stories/useVirtualScroll.stories.tsx

+10-9
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ const ScrollOnWindow = () => {
1919
const originalItems = [...Array(1000)].map((_, i) => i)
2020
const itemHeight = 20
2121

22-
const { items, listRef, createListStyle, createItemStyle } = useVirtualScroll<
23-
typeof originalItems[number],
24-
HTMLUListElement
25-
>(originalItems, itemHeight)
22+
const { items, listRef, createListStyle, createItemStyle } = useVirtualScroll<(typeof originalItems)[number], HTMLUListElement>(
23+
originalItems,
24+
itemHeight,
25+
)
2626

2727
return (
2828
<ul ref={listRef} style={createListStyle()}>
@@ -40,18 +40,19 @@ const ScrollOnContainer = () => {
4040
const itemHeight = 20
4141
const [containerHeight, setContainerHeight] = useState(300)
4242

43-
const { items, listRef, scrollableContainerRef, createListStyle, createItemStyle } =
44-
useVirtualScroll<typeof originalItems[number], HTMLUListElement, HTMLDivElement>(
45-
originalItems,
46-
itemHeight,
47-
)
43+
const { items, listRef, scrollableContainerRef, createListStyle, createItemStyle } = useVirtualScroll<
44+
(typeof originalItems)[number],
45+
HTMLUListElement,
46+
HTMLDivElement
47+
>(originalItems, itemHeight)
4848

4949
return (
5050
<>
5151
<div>
5252
<label htmlFor="scroll-container-height">Scroll Container Height</label>
5353
</div>
5454
<input
55+
name="height"
5556
id="scroll-container-height"
5657
type="number"
5758
value={containerHeight}

‎packages/use-virtual-scroll/src/useVirtualScroll.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ type Options = {
44
marginItemCount?: number
55
}
66

7-
export const useVirtualScroll = <
8-
Item,
9-
List extends HTMLElement,
10-
ScrollContainer extends HTMLElement | Window = Window,
11-
>(
7+
export const useVirtualScroll = <Item, List extends HTMLElement, ScrollContainer extends HTMLElement | Window = Window>(
128
items: Item[],
139
itemHeight: number,
1410
options?: Options,
@@ -98,8 +94,7 @@ export const useVirtualScroll = <
9894
scrollableContainer.removeEventListener('resize', onResize)
9995
}
10096
} else {
101-
const onResizeHTMLElement = () =>
102-
setScrollableContainerHeight(scrollableContainer.clientHeight)
97+
const onResizeHTMLElement = () => setScrollableContainerHeight(scrollableContainer.clientHeight)
10398
const observer = new ResizeObserver(onResizeHTMLElement)
10499
observer.observe(scrollableContainer)
105100
return () => {

‎packages/wareki/src/index.ts

+3-11
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,9 @@ const { WAREKI_START_YEARS, reg, selectGengo } = (() => {
4040
return {
4141
WAREKI_START_YEARS: YEARS,
4242
reg: {
43-
dateString: new RegExp(
44-
`^([0-9]{4})(${SEPARATOR})?([0-9]{1,2})(${SEPARATOR})?([0-9]{1,2})([\\s．]([0-9]{2}):([0-9]{2})$)?`,
45-
),
43+
dateString: new RegExp(`^([0-9]{4})(${SEPARATOR})?([0-9]{1,2})(${SEPARATOR})?([0-9]{1,2})([\\s．]([0-9]{2}):([0-9]{2})$)?`),
4644
wareki: new RegExp(
47-
`^(${Object.keys(YEARS).join(
48-
'|',
49-
)})([0-9]{1,2})(${SEPARATOR})([0-9]{1,2})(${SEPARATOR})([0-9]{1,2})(${SEPARATOR}?)$`,
45+
`^(${Object.keys(YEARS).join('|')})([0-9]{1,2})(${SEPARATOR})([0-9]{1,2})(${SEPARATOR})([0-9]{1,2})(${SEPARATOR}?)$`,
5046
),
5147
},
5248
selectGengo: (year: number, month: number, date: number): Geongo => {
@@ -115,11 +111,7 @@ export function warekiToDate(wareki: string): Result<Date> {
115111
return {
116112
isValid: true,
117113
// 和暦は1年から始まるので - 1 が必要
118-
result: new Date(
119-
baseYear + Number(matchedWareki[2]) - 1,
120-
Number(matchedWareki[4]) - 1,
121-
Number(matchedWareki[6]),
122-
),
114+
result: new Date(baseYear + Number(matchedWareki[2]) - 1, Number(matchedWareki[4]) - 1, Number(matchedWareki[6])),
123115
formatted,
124116
}
125117
}

0 commit comments

Comments
 (0)