From d7d27067c7a40eeae0bca6cf53ac7cf5bde8ec66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Mar 2021 04:05:30 +0000 Subject: [PATCH 1/2] chore(deps): bump typescript from 4.1.3 to 4.2.3 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.1.3 to 4.2.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.1.3...v4.2.3) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e3121a727f..8cb367f1ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25819,9 +25819,9 @@ typescript-json-schema@^0.49.0: yargs "^16.2.0" typescript@^4.0.3, typescript@^4.1.3: - version "4.1.3" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" - integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== + version "4.2.3" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3" + integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== ua-parser-js@^0.7.18: version "0.7.21" From dd880a60652dc572006f9e95ed57a5ddafda36a9 Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 30 Mar 2021 11:04:20 +0200 Subject: [PATCH 2/2] chore: fixing typescript compile errors with new `DateTimeFormatOptions` Signed-off-by: blam --- packages/core/src/layout/HomepageTimer/HomepageTimer.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/core/src/layout/HomepageTimer/HomepageTimer.tsx b/packages/core/src/layout/HomepageTimer/HomepageTimer.tsx index 2adbf8fbd5..ad54388cce 100644 --- a/packages/core/src/layout/HomepageTimer/HomepageTimer.tsx +++ b/packages/core/src/layout/HomepageTimer/HomepageTimer.tsx @@ -18,7 +18,10 @@ import React from 'react'; import { HeaderLabel } from '../HeaderLabel'; import { ConfigApi, useApi, configApiRef } from '@backstage/core-api'; -const timeFormat = { hour: '2-digit', minute: '2-digit' }; +const timeFormat: Intl.DateTimeFormatOptions = { + hour: '2-digit', + minute: '2-digit', +}; type TimeObj = { time: string; @@ -41,7 +44,7 @@ function getTimes(configApi: ConfigApi) { if (clock.has('label') && clock.has('timezone')) { let label = clock.getString('label'); - const options = { + const options: Intl.DateTimeFormatOptions = { timeZone: clock.getString('timezone'), ...timeFormat, };