diff --git a/.pnp.cjs b/.pnp.cjs index 11d22bb..7670deb 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -28,9 +28,9 @@ const RAW_RUNTIME_STATE = "packageLocation": "./",\ "packageDependencies": [\ ["@next/eslint-plugin-next", "npm:14.2.3"],\ - ["@nf-team/core", "npm:2.1.0"],\ + ["@nf-team/core", "npm:3.0.1"],\ ["@nf-team/eslint-config", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:3.4.0"],\ - ["@nf-team/react", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:2.7.1"],\ + ["@nf-team/react", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:2.7.2"],\ ["@nf-team/stylelint-config", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:1.1.1"],\ ["@tanem/react-nprogress", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:5.0.48"],\ ["@tanstack/react-query", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:5.59.16"],\ @@ -1608,10 +1608,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@nf-team/core", [\ - ["npm:2.1.0", {\ - "packageLocation": "./.yarn/cache/@nf-team-core-npm-2.1.0-c5b1c29f0b-d1626bd75f.zip/node_modules/@nf-team/core/",\ + ["npm:3.0.1", {\ + "packageLocation": "./.yarn/cache/@nf-team-core-npm-3.0.1-20c4cddc8a-16f0912284.zip/node_modules/@nf-team/core/",\ "packageDependencies": [\ - ["@nf-team/core", "npm:2.1.0"]\ + ["@nf-team/core", "npm:3.0.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -1672,17 +1672,17 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@nf-team/react", [\ - ["npm:2.7.1", {\ - "packageLocation": "./.yarn/cache/@nf-team-react-npm-2.7.1-4df50df0a5-bf13a0df2c.zip/node_modules/@nf-team/react/",\ + ["npm:2.7.2", {\ + "packageLocation": "./.yarn/cache/@nf-team-react-npm-2.7.2-6f8b8a3e9c-037cc7dc3f.zip/node_modules/@nf-team/react/",\ "packageDependencies": [\ - ["@nf-team/react", "npm:2.7.1"]\ + ["@nf-team/react", "npm:2.7.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:2.7.1", {\ - "packageLocation": "./.yarn/__virtual__/@nf-team-react-virtual-c762f35f82/0/cache/@nf-team-react-npm-2.7.1-4df50df0a5-bf13a0df2c.zip/node_modules/@nf-team/react/",\ + ["virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:2.7.2", {\ + "packageLocation": "./.yarn/__virtual__/@nf-team-react-virtual-697c95fbb3/0/cache/@nf-team-react-npm-2.7.2-6f8b8a3e9c-037cc7dc3f.zip/node_modules/@nf-team/react/",\ "packageDependencies": [\ - ["@nf-team/react", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:2.7.1"],\ + ["@nf-team/react", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:2.7.2"],\ ["@types/react", "npm:18.3.1"],\ ["@types/react-dom", "npm:18.3.0"],\ ["react", "npm:18.3.1"],\ @@ -3406,9 +3406,9 @@ const RAW_RUNTIME_STATE = "packageDependencies": [\ ["birth-tunes-frontend", "workspace:."],\ ["@next/eslint-plugin-next", "npm:14.2.3"],\ - ["@nf-team/core", "npm:2.1.0"],\ + ["@nf-team/core", "npm:3.0.1"],\ ["@nf-team/eslint-config", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:3.4.0"],\ - ["@nf-team/react", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:2.7.1"],\ + ["@nf-team/react", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:2.7.2"],\ ["@nf-team/stylelint-config", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:1.1.1"],\ ["@tanem/react-nprogress", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:5.0.48"],\ ["@tanstack/react-query", "virtual:e45e09d0641e8463a15803d185f02794e031faf4b29c11a027f9ba60c39d2250637c8c06b3b1e44481a91dce533952ebaf555d9883fc1491921c88f1da58906f#npm:5.59.16"],\ diff --git a/.yarn/cache/@nf-team-core-npm-2.1.0-c5b1c29f0b-d1626bd75f.zip b/.yarn/cache/@nf-team-core-npm-2.1.0-c5b1c29f0b-d1626bd75f.zip deleted file mode 100644 index aa89c27..0000000 Binary files a/.yarn/cache/@nf-team-core-npm-2.1.0-c5b1c29f0b-d1626bd75f.zip and /dev/null differ diff --git a/.yarn/cache/@nf-team-core-npm-3.0.1-20c4cddc8a-16f0912284.zip b/.yarn/cache/@nf-team-core-npm-3.0.1-20c4cddc8a-16f0912284.zip new file mode 100644 index 0000000..7bdc400 Binary files /dev/null and b/.yarn/cache/@nf-team-core-npm-3.0.1-20c4cddc8a-16f0912284.zip differ diff --git a/.yarn/cache/@nf-team-react-npm-2.7.1-4df50df0a5-bf13a0df2c.zip b/.yarn/cache/@nf-team-react-npm-2.7.2-6f8b8a3e9c-037cc7dc3f.zip similarity index 81% rename from .yarn/cache/@nf-team-react-npm-2.7.1-4df50df0a5-bf13a0df2c.zip rename to .yarn/cache/@nf-team-react-npm-2.7.2-6f8b8a3e9c-037cc7dc3f.zip index f3a0513..04fa8c5 100644 Binary files a/.yarn/cache/@nf-team-react-npm-2.7.1-4df50df0a5-bf13a0df2c.zip and b/.yarn/cache/@nf-team-react-npm-2.7.2-6f8b8a3e9c-037cc7dc3f.zip differ diff --git a/package.json b/package.json index 1ebc769..bc0a5cf 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ }, "homepage": "https://github.com/mbti-nf-team/birth-tunes-frontend#readme", "dependencies": { - "@nf-team/core": "^2.1.0", - "@nf-team/react": "^2.7.1", + "@nf-team/core": "^3.0.1", + "@nf-team/react": "^2.7.2", "@tanem/react-nprogress": "^5.0.48", "@tanstack/react-query": "^5.59.16", "axios": "^1.4.0", diff --git a/src/app/page.tsx b/src/app/page.tsx index f730b37..ff3911c 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,6 +1,6 @@ import { Metadata, ResolvingMetadata } from 'next'; -import { removeNullable } from '@nf-team/core'; +import { getStringOrDefault } from '@nf-team/core'; import dayjs from 'dayjs'; import Footer from '@/components/Footer'; @@ -45,7 +45,7 @@ export async function generateMetadata( } function Home({ searchParams }: Props) { - const defaultBirthDate = removeNullable(searchParams?.date); + const defaultBirthDate = getStringOrDefault(searchParams?.date); const isNotValidDefaultDate = defaultBirthDate && (!dayjs(defaultBirthDate).isValid() || dayjs().isBefore(dayjs(defaultBirthDate))); diff --git a/src/components/main/BirthSelectDatePicker/index.tsx b/src/components/main/BirthSelectDatePicker/index.tsx index 0656098..98ca3a7 100644 --- a/src/components/main/BirthSelectDatePicker/index.tsx +++ b/src/components/main/BirthSelectDatePicker/index.tsx @@ -2,7 +2,7 @@ import { ChangeEvent, Dispatch, SetStateAction, useCallback, useEffect, useMemo, useState, } from 'react'; -import { checkNumber, generateArrayOfNumber } from '@nf-team/core'; +import { createNumberArray, getNumberOrDefault } from '@nf-team/core'; import { useUpdateEffect } from '@nf-team/react'; import dayjs from 'dayjs'; @@ -55,7 +55,7 @@ function BirthSelectDatePicker({ defaultBirthDate, onBirthChange }: Props) { if (year && month) { const targetDays = dayjs(`${year}-${month}`).daysInMonth(); - setDaysRange(checkNumber(targetDays)); + setDaysRange(getNumberOrDefault(targetDays)); } }, [month, year]); @@ -80,7 +80,7 @@ function BirthSelectDatePicker({ defaultBirthDate, onBirthChange }: Props) { return (
- {generateArrayOfNumber(yearRange).map((number) => { + {createNumberArray(yearRange).map((number) => { const targetYear = nowYear - number; return ( @@ -89,7 +89,7 @@ function BirthSelectDatePicker({ defaultBirthDate, onBirthChange }: Props) { })} - {generateArrayOfNumber(monthRange).map((number) => { + {createNumberArray(monthRange).map((number) => { const targetMonth = number + 1; return ( @@ -98,7 +98,7 @@ function BirthSelectDatePicker({ defaultBirthDate, onBirthChange }: Props) { })} - {generateArrayOfNumber(daysRange).map((day) => { + {createNumberArray(daysRange).map((day) => { const targetDays = day + 1; return ( diff --git a/src/components/main/BirthSongResult/index.tsx b/src/components/main/BirthSongResult/index.tsx index b8d9bfe..95cba89 100644 --- a/src/components/main/BirthSongResult/index.tsx +++ b/src/components/main/BirthSongResult/index.tsx @@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef } from 'react'; -import { removeNullable } from '@nf-team/core'; +import { getStringOrDefault } from '@nf-team/core'; import { DelayRenderComponent } from '@nf-team/react'; import { useQuery } from '@tanstack/react-query'; import clsx from 'clsx'; @@ -124,7 +124,9 @@ function BirthSongResult({ birthDate }: Props) { {findBirthSong?.title}
- + diff --git a/yarn.lock b/yarn.lock index f299bdb..03f4c4a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1002,10 +1002,10 @@ __metadata: languageName: node linkType: hard -"@nf-team/core@npm:^2.1.0": - version: 2.1.0 - resolution: "@nf-team/core@npm:2.1.0" - checksum: 10/d1626bd75ff37bfa5871469117e45909597da2ae5f5c497b631fecfb9f681ae8f1243a5e99f7af2564352f298d30d1e8b0086748ecaf7fe5d6543dc16e4940d7 +"@nf-team/core@npm:^3.0.1": + version: 3.0.1 + resolution: "@nf-team/core@npm:3.0.1" + checksum: 10/16f0912284bebaf66245d0a4050f02ad97f7dfaa22be7d25b92dd79af5247caae3fe7651ed76aee4add835a4362209572a33c1a56d0a2aaa6031543fd0e71992 languageName: node linkType: hard @@ -1038,13 +1038,13 @@ __metadata: languageName: node linkType: hard -"@nf-team/react@npm:^2.7.1": - version: 2.7.1 - resolution: "@nf-team/react@npm:2.7.1" +"@nf-team/react@npm:^2.7.2": + version: 2.7.2 + resolution: "@nf-team/react@npm:2.7.2" peerDependencies: react: ^18 react-dom: ^18 - checksum: 10/bf13a0df2ca47552cface1789de681c56340ac48209d270ed2670e4887f2a0a735cc5cf15a7e421730b502ce3fb6fcd8d8d73795d2a6b44f4aed9943e2b61f3d + checksum: 10/037cc7dc3f6910b9681c7054f972f880366175a5d638ffd457cd2426b74647ade803a3aeb7d7931f0171f14e2af8036cfda1c61587130030fa44ddf14a56cf0c languageName: node linkType: hard @@ -2332,9 +2332,9 @@ __metadata: resolution: "birth-tunes-frontend@workspace:." dependencies: "@next/eslint-plugin-next": "npm:^14.2.3" - "@nf-team/core": "npm:^2.1.0" + "@nf-team/core": "npm:^3.0.1" "@nf-team/eslint-config": "npm:^3.4.0" - "@nf-team/react": "npm:^2.7.1" + "@nf-team/react": "npm:^2.7.2" "@nf-team/stylelint-config": "npm:^1.1.1" "@tanem/react-nprogress": "npm:^5.0.48" "@tanstack/react-query": "npm:^5.59.16"