Revert "Upgrade to TypeScript 4.8.4. (#6082)" (#6087)

This reverts commit abb4dfc.

It breaks the sync to the internal repo.

Author: bmd3k

package.json

@@ -61,7 +61,7 @@
     "prettier-plugin-organize-imports": "2.3.4",
     "requirejs": "^2.3.6",
     "tslib": "^2.3.0",
-    "typescript": "4.8.4",
+    "typescript": "4.7.4",
     "yarn-deduplicate": "^5.0.0"
   },
   "dependencies": {

tensorboard/components/tf_paginated_view/tf-category-paginated-view.ts

@@ -28,9 +28,9 @@ import {
 import {TfDomRepeat} from './tf-dom-repeat';
 
 @customElement('tf-category-paginated-view')
-class TfCategoryPaginatedView<
-  CategoryItem extends {}
-> extends TfDomRepeat<CategoryItem> {
+// @ts-ignore(go/ts48upgrade) Fix code and remove this comment. Error:
+// TS2344: Type 'CategoryItem' does not satisfy the constraint '{}'.
+class TfCategoryPaginatedView<CategoryItem> extends TfDomRepeat<CategoryItem> {
   static readonly template = html`
     <template is="dom-if" if="[[_paneRendered]]" id="ifRendered">
       <button class="heading" on-tap="_togglePane" open-button$="[[opened]]">

tensorboard/plugins/graph/tf_graph_controls/tf-graph-controls.ts

@@ -1271,10 +1271,12 @@ class TfGraphControls extends LegacyElementMixin(
   _deviceCheckboxClicked(event: Event) {
     // Update the device map.
     const input = event.target as HTMLInputElement;
+    // @ts-ignore(go/ts48upgrade) Fix code and remove this comment. Error:
+    // TS2322: Type 'object' is not assignable to type 'DeviceForStats'.
     const devicesForStats: DeviceForStats = Object.assign(
       {},
       this.devicesForStats
-    ) as DeviceForStats;
+    );
     const device = input.value;
     if (input.checked) {
       devicesForStats[device] = true;

tensorboard/webapp/persistent_settings/_data_source/types.ts

@@ -37,7 +37,7 @@ export declare interface BackendSettings {
   notificationLastReadTimeInMs?: number;
   sideBarWidthInPercent?: number;
   timeSeriesSettingsPaneOpened?: boolean;
-  timeSeriesCardMinWidth?: number | null;
+  timeSeriesCardMinWidth?: number;
   stepSelectorEnabled?: boolean;
   rangeSelectionEnabled?: boolean;
   linkedTimeEnabled?: boolean;
@@ -59,7 +59,7 @@ export interface PersistableSettings {
   notificationLastReadTimeInMs?: number;
   sideBarWidthInPercent?: number;
   timeSeriesSettingsPaneOpened?: boolean;
-  timeSeriesCardMinWidth?: number | null;
+  timeSeriesCardMinWidth?: number;
   stepSelectorEnabled?: boolean;
   rangeSelectionEnabled?: boolean;
   linkedTimeEnabled?: boolean;

tensorboard/webapp/persistent_settings/persistent_settings_config_module.ts

@@ -17,20 +17,22 @@ import {
   GLOBAL_PERSISTENT_SETTINGS_TOKEN,
   SettingSelector,
 } from './persistent_settings_config_types';
-import {PersistableSettings} from './_data_source/types';
 
 @NgModule()
-export class PersistentSettingsConfigModule<
-  State,
-  Settings extends PersistableSettings
-> {
+export class PersistentSettingsConfigModule<State, Settings> {
+  // @ts-ignore(go/ts48upgrade) Fix code and remove this comment. Error:
+  // TS2344: Type 'Settings' does not satisfy the constraint
+  // 'PersistableSettings'.
   private readonly globalSettingSelectors: SettingSelector<State, Settings>[] =
     [];
 
   constructor(
     @Optional()
     @Inject(GLOBAL_PERSISTENT_SETTINGS_TOKEN)
     globalSettingSelectorFactories: Array<
+      // @ts-ignore(go/ts48upgrade) Fix code and remove this
+      // comment. Error: TS2344: Type 'Settings' does not satisfy
+      // the constraint 'PersistableSettings'.
       () => SettingSelector<State, Settings>
     > | null
   ) {
@@ -45,6 +47,9 @@ export class PersistentSettingsConfigModule<
   /**
    * Returns Ngrx selectors for getting global setting values.
    */
+  // @ts-ignore(go/ts48upgrade) Fix code and remove this comment. Error:
+  // TS2344: Type 'Settings' does not satisfy the constraint
+  // 'PersistableSettings'.
   getGlobalSettingSelectors(): SettingSelector<State, Settings>[] {
     return this.globalSettingSelectors ?? [];
   }
@@ -72,7 +77,10 @@ export class PersistentSettingsConfigModule<
    * })
    * export class MyModule {}
    */
-  static defineGlobalSetting<State, Settings extends PersistableSettings>(
+  static defineGlobalSetting<State, Settings>(
+    // @ts-ignore(go/ts48upgrade) Fix code and remove this comment. Error:
+    // TS2344: Type 'Settings' does not satisfy the constraint
+    // 'PersistableSettings'.
     selectorFactory: () => SettingSelector<State, Settings>
   ): ModuleWithProviders<PersistentSettingsConfigModule<any, {}>> {
     return {

tensorboard/webapp/testing/lang.ts

@@ -16,7 +16,9 @@ limitations under the License.
  * Recursively freezes an object and all of its fields. The given object is
  * assumed not to have reference loops.
  */
-export function deepFreeze<T extends {}>(obj: T): T {
+export function deepFreeze<T>(obj: T): T {
+  // @ts-ignore(go/ts48upgrade) Fix code and remove this comment. Error:
+  // TS2769: No overload matches this call.
   for (const val of Object.values(obj)) {
     if (val && typeof val === 'object') {
       deepFreeze(val);

yarn.lock

@@ -9843,16 +9843,16 @@ typed-assert@^1.0.8:
   resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.9.tgz#8af9d4f93432c4970ec717e3006f33f135b06213"
   integrity sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==
 
-[email protected], typescript@^4.6.2, typescript@~4.8.0:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
-  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
-
-typescript@~4.7.4:
+[email protected], typescript@~4.7.4:
   version "4.7.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
   integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
 
+typescript@^4.6.2, typescript@~4.8.0:
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
+  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
+
 [email protected]:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/typesettable/-/typesettable-4.1.0.tgz#9dc4f539fabad7db4de2c3b08e286ff72a60f038"