chore: Upgrade TypeScript and React types (#1420)

RocketChat · Jul 31, 2024 · 6b45d98 · 6b45d98
1 parent 215e674
commit 6b45d98
Show file tree

Hide file tree

Showing 22 changed files with 191 additions and 1,520 deletions.
diff --git a/_templates/create-package/library/files/package.json.t b/_templates/create-package/library/files/package.json.t
@@ -49,7 +49,7 @@ to: packages/<%=package%>/package.json
     "rimraf": "~3.0.2",
     "ts-jest": "~27.1.3",
     "typedoc": "~0.24.1",
-    "typescript": "~4.3.5"
+    "typescript": "~5.5.4"
   },
   "eslintConfig": {
     "extends": "@rocket.chat/eslint-config-alt/typescript",

diff --git a/packages/css-in-js/package.json b/packages/css-in-js/package.json
@@ -58,7 +58,7 @@
     "rollup-plugin-terser": "~7.0.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "dependencies": {
     "@emotion/hash": "^0.9.0",

diff --git a/packages/css-supports/package.json b/packages/css-supports/package.json
@@ -42,7 +42,7 @@
     "prettier": "~2.8.7",
     "rimraf": "~3.0.2",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "dependencies": {
     "@rocket.chat/memo": "workspace:~"

diff --git a/packages/emitter/package.json b/packages/emitter/package.json
@@ -58,6 +58,6 @@
     "rollup-plugin-terser": "~7.0.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   }
 }
diff --git a/packages/fuselage-hooks/package.json b/packages/fuselage-hooks/package.json
@@ -53,8 +53,8 @@
     "@testing-library/react-hooks": "~8.0.1",
     "@testing-library/user-event": "~14.4.3",
     "@types/jest": "~29.5.0",
-    "@types/react": "~17.0.57",
-    "@types/react-dom": "^17.0.19",
+    "@types/react": "~17.0.80",
+    "@types/react-dom": "~17.0.25",
     "@types/resize-observer-browser": "~0.1.7",
     "@types/use-sync-external-store": "~0.0.3",
     "bump": "workspace:~",
@@ -70,7 +70,7 @@
     "testing-utils": "workspace:~",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "peerDependencies": {
     "@rocket.chat/fuselage-tokens": "*",

diff --git a/packages/fuselage-toastbar/package.json b/packages/fuselage-toastbar/package.json
@@ -59,8 +59,8 @@
     "@storybook/react": "~6.5.16",
     "@storybook/theming": "~6.5.16",
     "@types/jest": "~29.5.0",
-    "@types/react": "~17.0.57",
-    "@types/react-dom": "^17.0.19",
+    "@types/react": "~17.0.80",
+    "@types/react-dom": "~17.0.25",
     "bump": "workspace:~",
     "eslint": "~8.38.0",
     "jest": "~29.5.0",
@@ -71,7 +71,7 @@
     "storybook-dark-mode": "~1.1.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "peerDependencies": {
     "@rocket.chat/fuselage": "*",

diff --git a/packages/fuselage/package.json b/packages/fuselage/package.json
@@ -136,7 +136,7 @@
     "testing-utils": "workspace:~",
     "ts-jest": "~29.1.0",
     "ts-loader": "~9.4.2",
-    "typescript": "~5.4.5",
+    "typescript": "~5.5.4",
     "webpack": "~5.78.0",
     "webpack-bundle-analyzer": "~4.8.0",
     "webpack-cli": "~5.0.1",

diff --git a/packages/fuselage/src/components/Menu/V2/MenuItem.tsx b/packages/fuselage/src/components/Menu/V2/MenuItem.tsx
@@ -1,16 +1,17 @@
-import type { ComponentProps, ReactNode } from 'react';
+import type { Node } from '@react-types/shared';
+import type { ReactNode } from 'react';
 import React, { useRef } from 'react';
 import { useMenuItem } from 'react-aria';
 import type { TreeState } from 'react-stately';
 
 import { MenuItemDescription } from '.';
+import type { MenuOptionProps } from './MenuOption';
 import MenuOption from './MenuOption';
-import type { Node } from './types';
 
 type MenuItemProps = {
   item: Node<{
     description?: ReactNode;
-    variant?: ComponentProps<typeof MenuOption>['variant'];
+    variant?: MenuOptionProps['variant'];
   }>;
   state: TreeState<unknown>;
 };
@@ -30,7 +31,7 @@ function MenuItem({ item, state }: MenuItemProps) {
       focus={isFocused}
       disabled={isDisabled}
       is='label'
-      variant={item.value && item.value.variant}
+      variant={item.value?.variant}
     >
       <div className='rcx-option__wrapper'>{item.rendered}</div>
       {item.value && item.value.description && (

diff --git a/packages/fuselage/src/components/Menu/V2/MenuOption.tsx b/packages/fuselage/src/components/Menu/V2/MenuOption.tsx
@@ -10,7 +10,7 @@ import React, { forwardRef, memo } from 'react';
 import { prevent } from '../../../helpers/prevent';
 import type Box from '../../Box/Box';
 
-type OptionProps = {
+export type MenuOptionProps = {
   is?: ComponentProps<typeof Box>['is'];
   id?: string;
   children?: ReactNode;
@@ -41,7 +41,7 @@ const MenuOption = memo(
         variant,
         onClick,
         ...props
-      }: OptionProps,
+      }: MenuOptionProps,
       ref
     ) => (
       <Tag

diff --git a/packages/fuselage/src/components/Menu/V2/MenuSection.tsx b/packages/fuselage/src/components/Menu/V2/MenuSection.tsx
@@ -1,3 +1,4 @@
+import type { Node } from '@react-types/shared';
 import React from 'react';
 import { useMenuSection, useSeparator } from 'react-aria';
 import type { TreeState } from 'react-stately';
@@ -6,14 +7,16 @@ import Box from '../../Box/Box';
 import { Divider } from '../../Divider';
 import { OptionTitle } from '../../Option';
 import MenuItem from './MenuItem';
-import type { Node } from './types';
 
-type MenuSectionProps = {
-  section: Node<unknown>;
+type MenuSectionProps<T extends object> = {
+  section: Node<T>;
   state: TreeState<unknown>;
 };
 
-function MenuSection({ section, state }: MenuSectionProps) {
+function MenuSection<T extends object>({
+  section,
+  state,
+}: MenuSectionProps<T>) {
   const { itemProps, headingProps, groupProps } = useMenuSection({
     'heading': section.rendered,
     'aria-label': section['aria-label'],

diff --git a/packages/fuselage/src/components/Menu/V2/types.ts b/packages/fuselage/src/components/Menu/V2/types.ts
diff --git a/packages/layout/package.json b/packages/layout/package.json
@@ -55,8 +55,8 @@
     "@storybook/react": "~6.5.16",
     "@storybook/theming": "~6.5.16",
     "@types/jest": "~29.5.0",
-    "@types/react": "^17",
-    "@types/react-dom": "^17",
+    "@types/react": "~17.0.80",
+    "@types/react-dom": "~17.0.25",
     "bump": "workspace:~",
     "eslint": "~8.38.0",
     "jest": "~29.5.0",
@@ -70,7 +70,7 @@
     "storybook-dark-mode": "~3.0.1",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "eslintConfig": {
     "extends": "@rocket.chat/eslint-config-alt/typescript",

diff --git a/packages/logo/package.json b/packages/logo/package.json
@@ -46,8 +46,8 @@
     "@rocket.chat/fuselage-tokens": "workspace:~",
     "@rocket.chat/prettier-config": "workspace:~",
     "@types/jest": "~29.5.0",
-    "@types/react": "~17.0.57",
-    "@types/react-dom": "^17.0.19",
+    "@types/react": "~17.0.80",
+    "@types/react-dom": "~17.0.25",
     "build-logo": "workspace:~",
     "bump": "workspace:~",
     "eslint": "~8.38.0",
@@ -60,7 +60,7 @@
     "rimraf": "^3.0.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "dependencies": {
     "@rocket.chat/fuselage-hooks": "workspace:~",

diff --git a/packages/memo/package.json b/packages/memo/package.json
@@ -51,7 +51,7 @@
     "rimraf": "~3.0.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "eslintConfig": {
     "extends": "@rocket.chat/eslint-config-alt/typescript",

diff --git a/packages/mp3-encoder/package.json b/packages/mp3-encoder/package.json
@@ -59,6 +59,6 @@
     "rollup": "~3.20.4",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   }
 }
diff --git a/packages/onboarding-ui/package.json b/packages/onboarding-ui/package.json
@@ -60,8 +60,8 @@
     "@storybook/react": "~6.5.16",
     "@storybook/theming": "~6.5.16",
     "@types/jest": "~29.5.0",
-    "@types/react": "~17.0.57",
-    "@types/react-dom": "^17.0.19",
+    "@types/react": "~17.0.80",
+    "@types/react-dom": "~17.0.25",
     "bump": "workspace:~",
     "countries-list": "^2.6.1",
     "eslint": "~8.38.0",
@@ -76,7 +76,7 @@
     "storybook-dark-mode": "^1.1.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "dependencies": {
     "i18next": "~21.6.16",

diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
@@ -55,7 +55,7 @@
     "prettier": "~2.8.7",
     "rimraf": "^3.0.2",
     "ts-jest": "~29.1.0",
-    "typescript": "~5.4.5",
+    "typescript": "~5.5.4",
     "webpack": "~5.78.0"
   }
 }
diff --git a/packages/string-helpers/package.json b/packages/string-helpers/package.json
@@ -53,7 +53,7 @@
     "rimraf": "^3.0.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "eslintConfig": {
     "extends": "@rocket.chat/eslint-config-alt/typescript",

diff --git a/packages/styled/package.json b/packages/styled/package.json
@@ -49,7 +49,7 @@
     "rimraf": "^3.0.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "dependencies": {
     "@rocket.chat/css-in-js": "workspace:~"

diff --git a/packages/stylis-logical-props-middleware/package.json b/packages/stylis-logical-props-middleware/package.json
@@ -50,7 +50,7 @@
     "stylis": "~4.3.2",
     "ts-jest": "~29.1.0",
     "typedoc": "~0.25.13",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "dependencies": {
     "@rocket.chat/css-supports": "workspace:~"

diff --git a/tools/scripts/package.json b/tools/scripts/package.json
@@ -21,7 +21,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "~2.8.7",
     "ts-node": "~10.9.1",
-    "typescript": "~5.4.5"
+    "typescript": "~5.5.4"
   },
   "version": "0.31.25"
 }