diff --git a/frontend/package.json b/frontend/package.json index 54ec46a194..3a947a8e92 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -117,7 +117,7 @@ "semver": "7.7.1", "swr": "2.3.3", "tss-react": "4.9.15", - "typescript": "5.4.5", + "typescript": "5.8.3", "unleash-proxy-client": "^3.7.3", "use-query-params": "^2.2.1", "vanilla-jsoneditor": "^0.23.0", diff --git a/frontend/src/component/common/LegacyConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.tsx b/frontend/src/component/common/LegacyConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.tsx index f8fd8b7c6a..38a5becd9d 100644 --- a/frontend/src/component/common/LegacyConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.tsx +++ b/frontend/src/component/common/LegacyConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.tsx @@ -4,7 +4,7 @@ import { parseDateValue, parseValidDate } from 'component/common/util'; import { useMemo, useState } from 'react'; import { styled } from '@mui/material'; -import TimezoneCountries from 'countries-and-timezones'; +import { getAllTimezones } from 'countries-and-timezones'; interface IDateSingleValueProps { setValue: (value: string) => void; @@ -30,13 +30,13 @@ export const DateSingleValue = ({ error, setError, }: IDateSingleValueProps) => { - const timezones = Object.values( - TimezoneCountries.getAllTimezones({ deprecated: false }), - ).map((timezone) => ({ - key: timezone.name, - label: `${timezone.name}`, - utcOffset: timezone.utcOffsetStr, - })); + const timezones = Object.values(getAllTimezones({ deprecated: false })).map( + (timezone) => ({ + key: timezone.name, + label: `${timezone.name}`, + utcOffset: timezone.utcOffsetStr, + }), + ); const { timeZone: localTimezoneName } = Intl.DateTimeFormat().resolvedOptions(); const [pickedDate, setPickedDate] = useState(value || ''); diff --git a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.tsx b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.tsx index a58dcd939e..c0313f1f55 100644 --- a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.tsx +++ b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.tsx @@ -4,7 +4,7 @@ import { parseDateValue, parseValidDate } from 'component/common/util'; import { useMemo, useState } from 'react'; import { styled } from '@mui/material'; -import TimezoneCountries from 'countries-and-timezones'; +import { getAllTimezones } from 'countries-and-timezones'; interface IDateSingleValueProps { setValue: (value: string) => void; @@ -31,13 +31,13 @@ export const DateSingleValue = ({ error, setError, }: IDateSingleValueProps) => { - const timezones = Object.values( - TimezoneCountries.getAllTimezones({ deprecated: false }), - ).map((timezone) => ({ - key: timezone.name, - label: `${timezone.name}`, - utcOffset: timezone.utcOffsetStr, - })); + const timezones = Object.values(getAllTimezones({ deprecated: false })).map( + (timezone) => ({ + key: timezone.name, + label: `${timezone.name}`, + utcOffset: timezone.utcOffsetStr, + }), + ); const { timeZone: localTimezoneName } = Intl.DateTimeFormat().resolvedOptions(); const [pickedDate, setPickedDate] = useState(value || ''); diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint/ConstraintDateInput.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint/ConstraintDateInput.tsx index 3059bfe27f..2c38cbe493 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint/ConstraintDateInput.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint/ConstraintDateInput.tsx @@ -3,7 +3,7 @@ import { parseDateValue, parseValidDate } from 'component/common/util'; import { useId, useMemo, useState } from 'react'; import { styled } from '@mui/material'; -import TimezoneCountries from 'countries-and-timezones'; +import { getAllTimezones } from 'countries-and-timezones'; import { ScreenReaderOnly } from 'component/common/ScreenReaderOnly/ScreenReaderOnly'; import { HelpIcon } from 'component/common/HelpIcon/HelpIcon'; import type { ConstraintValidatorOutput } from 'component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/useConstraintInput/constraintValidators'; @@ -35,7 +35,7 @@ export const ConstraintDateInput = ({ }: IDateSingleValueProps) => { const [error, setError] = useState(''); const timezones = Object.values( - TimezoneCountries.getAllTimezones({ deprecated: false }) as { + getAllTimezones({ deprecated: false }) as { [timezone: string]: { name: string; utcOffsetStr: string }; }, ).map((timezone) => ({ diff --git a/frontend/src/themes/themeTypes.ts b/frontend/src/themes/themeTypes.ts index 7c3e053e68..3bcf15735a 100644 --- a/frontend/src/themes/themeTypes.ts +++ b/frontend/src/themes/themeTypes.ts @@ -40,16 +40,32 @@ declare module '@mui/material/styles' { }; } + interface PaletteColor { + border?: string; + } + + interface SimplePaletteColorOptions { + border?: string; + } + + interface CustomTypeBackground { + application: string; + sidebar: string; + alternative: string; + elevation1: string; + elevation2: string; + } + interface CustomPalette { /** * Generic neutral palette color */ - neutral: PaletteColorOptions; + neutral: SimplePaletteColorOptions; /** * Sales-related palette color */ - web: PaletteColorOptions; + web: SimplePaletteColorOptions; /** * Table colors @@ -170,30 +186,6 @@ declare module '@mui/material/styles' { } interface TypeAction extends CustomTypeAction {} - - /* Extend the background object from MUI */ - interface CustomTypeBackground { - application: string; - sidebar: string; - alternative: string; - elevation1: string; - elevation2: string; - } - - interface PaletteColor { - main: string; - light: string; - dark: string; - border?: string; - contrastText: string; - } - interface PaletteColorOptions { - main?: string; - light?: string; - dark?: string; - border?: string; - contrastText?: string; - } } declare module '@mui/system/createTheme/shape' { diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4a2c9ff5a9..fa44c2b99b 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -9948,23 +9948,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.4.5": - version: 5.4.5 - resolution: "typescript@npm:5.4.5" +"typescript@npm:5.8.3": + version: 5.8.3 + resolution: "typescript@npm:5.8.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e + checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48 languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.4.5#optional!builtin": - version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" +"typescript@patch:typescript@npm%3A5.8.3#optional!builtin": + version: 5.8.3 + resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin::version=5.8.3&hash=5786d5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 + checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb languageName: node linkType: hard @@ -10182,7 +10182,7 @@ __metadata: semver: "npm:7.7.1" swr: "npm:2.3.3" tss-react: "npm:4.9.15" - typescript: "npm:5.4.5" + typescript: "npm:5.8.3" unleash-proxy-client: "npm:^3.7.3" use-query-params: "npm:^2.2.1" vanilla-jsoneditor: "npm:^0.23.0" diff --git a/website/package.json b/website/package.json index dce23d20f3..ce54cb9a40 100644 --- a/website/package.json +++ b/website/package.json @@ -60,7 +60,7 @@ "@docusaurus/types": "^3.7.0", "@tsconfig/docusaurus": "2.0.3", "@types/react": "^18.3.12", - "typescript": "5.6.3" + "typescript": "5.8.3" }, "resolutions": { "http-proxy-middleware": "3.0.5", diff --git a/website/yarn.lock b/website/yarn.lock index 02def2af59..fb5e906cb8 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -16241,23 +16241,23 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom: languageName: node linkType: hard -"typescript@npm:5.6.3": - version: 5.6.3 - resolution: "typescript@npm:5.6.3" +"typescript@npm:5.8.3": + version: 5.8.3 + resolution: "typescript@npm:5.8.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/44f61d3fb15c35359bc60399cb8127c30bae554cd555b8e2b46d68fa79d680354b83320ad419ff1b81a0bdf324197b29affe6cc28988cd6a74d4ac60c94f9799 + checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48 languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.6.3#optional!builtin": - version: 5.6.3 - resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin::version=5.6.3&hash=8c6c40" +"typescript@patch:typescript@npm%3A5.8.3#optional!builtin": + version: 5.8.3 + resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin::version=5.8.3&hash=5786d5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/7c9d2e07c81226d60435939618c91ec2ff0b75fbfa106eec3430f0fcf93a584bc6c73176676f532d78c3594fe28a54b36eb40b3d75593071a7ec91301533ace7 + checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb languageName: node linkType: hard @@ -17113,7 +17113,7 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom: react: "npm:^18.3.1" react-dom: "npm:^18.3.1" sass: "npm:^1.85.1" - typescript: "npm:5.6.3" + typescript: "npm:5.8.3" languageName: unknown linkType: soft