From e6eeccd09026deedf511c37de86fa611667e21f9 Mon Sep 17 00:00:00 2001 From: takurinton Date: Sun, 2 Oct 2022 15:16:51 +0900 Subject: [PATCH 1/3] remove `as string` written with TODO comment --- package.json | 2 +- src/styles/color.ts | 28 ++++++++++++++-------------- src/themes/palette.ts | 6 +++--- yarn.lock | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 360061454..30466f6af 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "scaffdog": "2.4.0", "styled-components": "5.3.5", "ts-jest": "28.0.4", - "typescript": "4.8.2" + "typescript": "4.9.1-beta" }, "files": [ "dist" diff --git a/src/styles/color.ts b/src/styles/color.ts index f25b3a48a..60135131e 100644 --- a/src/styles/color.ts +++ b/src/styles/color.ts @@ -1,19 +1,19 @@ export type Color = { - 40?: string; // TODO: Abolish this key or define all colors with this key - 50?: string; // TODO: Abolish this key or define all colors with this key - 100: string; - 200: string; - 300: string; - 400: string; - 500: string; - 600: string; - 700: string; - 800: string; - 900: string; - 1000?: string; // TODO: Abolish this key or define all colors with this key + 40?: `#${string}`; + 50?: `#${string}`; + 100: `#${string}`; + 200: `#${string}`; + 300: `#${string}`; + 400: `#${string}`; + 500: `#${string}`; + 600: `#${string}`; + 700: `#${string}`; + 800: `#${string}`; + 900: `#${string}`; + 1000?: `#${string}`; }; -export const colors: { [color: string]: Color } = { +export const colors = { red: { 100: "#FFE2E5", 200: "#FFBAC3", @@ -76,4 +76,4 @@ export const colors: { [color: string]: Color } = { 1000: "#001326", }, -}; +} satisfies Record; diff --git a/src/themes/palette.ts b/src/themes/palette.ts index fbdecb1b0..99fde0b06 100644 --- a/src/themes/palette.ts +++ b/src/themes/palette.ts @@ -52,7 +52,7 @@ export type Palette = { }; export const palette: Palette = { - white: colors.basic[50] as string, // TODO + white: colors.basic[50], black: colors.basic[900], primary: { deepDark: colors.blue[700], @@ -98,9 +98,9 @@ export const palette: Palette = { }, background: { default: "#FFFFFF", - dark: colors.blue[40] as string, // TODO + dark: colors.blue[40], active: colors.blue[100], - hint: colors.blue[50] as string, // TODO + hint: colors.blue[50], }, divider: colors.basic[400], icon: { diff --git a/yarn.lock b/yarn.lock index 19bdd3466..83d404349 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15009,10 +15009,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@4.8.2: - version "4.8.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" - integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== +typescript@4.9.1-beta: + version "4.9.1-beta" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.1-beta.tgz#b5fe1b26f2fe3aeb14790927b25372bebf351c67" + integrity sha512-D4c0t1+sMOS5Hy8DQsGFfEYUuKzolXhf+7e/N0Td5etBPflEYzVwWLBrbVgHpLpLC53OJQCtxk31+NWO2SBPaA== uglify-js@^3.1.4: version "3.16.0" From 7c819375b9dffb09d75b2cb22896608e874535e2 Mon Sep 17 00:00:00 2001 From: takurinton Date: Wed, 16 Nov 2022 08:12:56 +0900 Subject: [PATCH 2/3] update: typescript v4.9.3 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6a10d035f..a75fb8402 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "scaffdog": "2.4.0", "styled-components": "5.3.5", "ts-jest": "28.0.4", - "typescript": "4.9.1-beta" + "typescript": "4.9.3" }, "files": [ "dist" diff --git a/yarn.lock b/yarn.lock index 889f16dd3..bdbac958c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14883,10 +14883,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@4.9.1-beta: - version "4.9.1-beta" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.1-beta.tgz#b5fe1b26f2fe3aeb14790927b25372bebf351c67" - integrity sha512-D4c0t1+sMOS5Hy8DQsGFfEYUuKzolXhf+7e/N0Td5etBPflEYzVwWLBrbVgHpLpLC53OJQCtxk31+NWO2SBPaA== +typescript@4.9.3: + version "4.9.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db" + integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA== uglify-js@^3.1.4: version "3.16.0" From 494f1a49ddcad2d344dad5500324f0892b765028 Mon Sep 17 00:00:00 2001 From: takurinton Date: Tue, 29 Nov 2022 06:16:35 +0900 Subject: [PATCH 3/3] update prettier 2.8.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 790c6de11..d9a4e86b2 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "eslint-plugin-react-hooks": "4.6.0", "jest": "28.1.0", "jest-environment-jsdom": "29.3.1", - "prettier": "2.7.1", + "prettier": "2.8.0", "react": "18.1.0", "react-dom": "18.1.0", "rollup": "2.79.0", diff --git a/yarn.lock b/yarn.lock index 37192c60c..f2497109c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12432,10 +12432,10 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== -prettier@2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== +prettier@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9" + integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA== "prettier@>=2.2.1 <=2.3.0": version "2.3.0"