Merge pull request #1792 from CruGlobal/typescript-6

canac · web-flow · commit bdb41fd3a1b0 · 2026-05-21T15:29:43.000-05:00
[no-Jira] Migrate to TypeScript 6
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/data-uri-to-buffer-npm-4.0.1-5c66a78beb-0d0790b67f.zip b/.yarn/cache/data-uri-to-buffer-npm-4.0.1-5c66a78beb-0d0790b67f.zip
diff --git a/.yarn/cache/fetch-blob-npm-3.2.0-28e01becfc-5264ecceb5.zip b/.yarn/cache/fetch-blob-npm-3.2.0-28e01becfc-5264ecceb5.zip
diff --git a/.yarn/cache/formdata-polyfill-npm-4.0.10-e03013c013-9b5001d2ed.zip b/.yarn/cache/formdata-polyfill-npm-4.0.10-e03013c013-9b5001d2ed.zip
diff --git a/.yarn/cache/node-domexception-npm-1.0.0-e1e813b76f-e332522f24.zip b/.yarn/cache/node-domexception-npm-1.0.0-e1e813b76f-e332522f24.zip
diff --git a/.yarn/cache/node-fetch-npm-3.3.2-5267e015f2-24207ca8c8.zip b/.yarn/cache/node-fetch-npm-3.3.2-5267e015f2-24207ca8c8.zip
diff --git a/.yarn/cache/typescript-npm-6.0.3-585eecd158-0ef2357a4c.zip b/.yarn/cache/typescript-npm-6.0.3-585eecd158-0ef2357a4c.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76d54e74337fa7e24041b747019116c410ace3b707cb2c53dd03759904cdadff
+size 4598427
diff --git a/.yarn/cache/typescript-patch-bfb0cdd3b9-22b67a18da.zip b/.yarn/cache/typescript-patch-bfb0cdd3b9-22b67a18da.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1af8cbfc5b84fcf3f8360f346b53f09190ad18a673737cda61641bea10e54723
+size 4602371
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "5.6.3-sdk",
+  "version": "6.0.3-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs",
   "bin": {
diff --git a/app.d.ts b/app.d.ts
@@ -5,4 +5,5 @@ declare module '*.graphql' {
   export = value;
 }
 
+declare module '*.css';
 declare module '*.svg';
diff --git a/i18next.d.ts b/i18next.d.ts
@@ -0,0 +1,13 @@
+// Narrow react-i18next's `t()` return type to `string`. Without this,
+// TFunction's TDefaultResult widens to `TFunctionResult | ReactNode`,
+// which doesn't satisfy MUI props like `aria-label: string | undefined`.
+//
+// Remove this file once i18next is upgraded to v22+ and react-i18next to v12+,
+// where `t()` returns `string` by default and this workaround is unnecessary.
+import 'react-i18next';
+
+declare module 'react-i18next' {
+  interface Resources {
+    translation: Record<string, string>;
+  }
+}
diff --git a/package.json b/package.json
@@ -68,7 +68,6 @@
     "next-auth": "^4.24.11",
     "next-optimized-images": "^2.6.2",
     "next-pwa": "^5.6.0",
-    "node-fetch": "^3.3.2",
     "notistack": "^2.0.5",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
@@ -141,7 +140,7 @@
     "prettier": "^3.6.2",
     "puppeteer": "24.4.0",
     "ts-essentials": "^9.3.0",
-    "typescript": "~5.6.3",
+    "typescript": "~6.0.0",
     "url-loader": "^4.1.1",
     "webpack": "^5.96.1"
   },
diff --git a/pages/acceptInvite.test.tsx b/pages/acceptInvite.test.tsx
@@ -3,9 +3,7 @@ import { render, waitFor } from '@testing-library/react';
 import { SnackbarProvider } from 'notistack';
 import TestRouter from '__tests__/util/TestRouter';
 import AcceptInvitePage from './acceptInvite.page';
-import 'node-fetch';
 
-jest.mock('node-fetch', () => jest.fn());
 jest.mock('src/hooks/useAccountListId');
 const mockPush = jest.fn();
 const dashboardLink = '/accountLists/_/';
diff --git a/pages/api/auth/[...nextauth].page.ts b/pages/api/auth/[...nextauth].page.ts
@@ -1,6 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 import NextAuth, { NextAuthOptions } from 'next-auth';
-import { Provider } from 'next-auth/providers';
 import OktaProvider from 'next-auth/providers/okta';
 import rollbar, { isRollBarEnabled } from 'pages/api/utils/rollBar';
 import {
@@ -95,7 +94,7 @@ if (
   );
 }
 
-const providersArray: Provider[] = [];
+const providersArray: NextAuthOptions['providers'] = [];
 
 if (AUTH_PROVIDER === 'OKTA') {
   providersArray.push(
diff --git a/pages/api/auth/impersonate/impersonateHelper.ts b/pages/api/auth/impersonate/impersonateHelper.ts
@@ -1,6 +1,5 @@
 import { NextApiRequest } from 'next';
 import { getToken } from 'next-auth/jwt';
-import fetch from 'node-fetch';
 import { getErrorMessage } from 'src/lib/getErrorFromCatch';
 import { cookieDefaultInfo } from '../../utils/cookies';
 import { signValue } from '../helpers';
diff --git a/pages/api/csv-update.page.ts b/pages/api/csv-update.page.ts
@@ -1,7 +1,6 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 import formidable, { IncomingForm } from 'formidable';
 import { getToken } from 'next-auth/jwt';
-import fetch from 'node-fetch';
 import createPatch from 'src/lib/createPatch';
 import { camelToSnakeObject } from 'src/lib/snakeToCamel';
 
diff --git a/pages/api/uploads/csv-upload.page.ts b/pages/api/uploads/csv-upload.page.ts
@@ -1,8 +1,7 @@
-import { readFile } from 'fs/promises';
+import { openAsBlob } from 'node:fs';
 import { NextApiRequest, NextApiResponse } from 'next';
 import formidable, { IncomingForm } from 'formidable';
 import { getToken } from 'next-auth/jwt';
-import fetch, { File, FormData } from 'node-fetch';
 
 export const config = {
   api: {
@@ -54,7 +53,7 @@ const uploadFile = async (
     }
 
     const csvFile = new File(
-      [await readFile(file.filepath)],
+      [await openAsBlob(file.filepath)],
       file.originalFilename ?? 'csvFile',
     );
 
diff --git a/pages/api/uploads/upload-person-avatar.page.ts b/pages/api/uploads/upload-person-avatar.page.ts
@@ -1,8 +1,7 @@
-import { readFile } from 'fs/promises';
+import { openAsBlob } from 'node:fs';
 import { NextApiRequest, NextApiResponse } from 'next';
 import formidable, { IncomingForm } from 'formidable';
 import { getToken } from 'next-auth/jwt';
-import fetch, { File, FormData } from 'node-fetch';
 
 export const config = {
   api: {
@@ -59,7 +58,7 @@ const uploadPersonAvatar = async (
 
     const pictureId = crypto.randomUUID();
     const file = new File(
-      [await readFile(avatar.filepath)],
+      [await openAsBlob(avatar.filepath)],
       avatar.originalFilename ?? 'avatar',
     );
 
diff --git a/src/components/Shared/MassActions/MassActionsDropdown.tsx b/src/components/Shared/MassActions/MassActionsDropdown.tsx
@@ -17,7 +17,7 @@ const ActionsButton = styled(Button)(({ theme }) => ({
 
 interface MassActionsDropdownProps {
   handleClick: (event: React.MouseEvent<HTMLElement>) => void;
-  children: React.ReactElement;
+  children: React.ReactNode;
   disabled?: boolean;
   open: boolean;
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
     "target": "esnext",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": ["dom", "esnext"],
     "allowJs": true,
     "checkJs": true,
     "skipLibCheck": true,
@@ -12,14 +11,21 @@
     "incremental": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "noImplicitAny": false,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "types": ["node", "jest", "@testing-library/jest-dom"],
+    "paths": {
+      "src/*": ["./src/*"],
+      "pages/*": ["./pages/*"],
+      "__tests__/*": ["./__tests__/*"]
+    }
   },
   "include": [
     "app.d.ts",
+    "i18next.d.ts",
     "next-env.d.ts",
     "__tests__/jest.d.ts",
     "**/*.ts",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:76d54e74337fa7e24041b747019116c410ace3b707cb2c53dd03759904cdadff`
	`3`	`+size 4598427`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:1af8cbfc5b84fcf3f8360f346b53f09190ad18a673737cda61641bea10e54723`
	`3`	`+size 4602371`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "typescript",`
`3`		`- "version": "5.6.3-sdk",`
	`3`	`+ "version": "6.0.3-sdk",`
`4`	`4`	`"main": "./lib/typescript.js",`
`5`	`5`	`"type": "commonjs",`
`6`	`6`	`"bin": {`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ declare module '*.graphql' {`
`5`	`5`	`export = value;`
`6`	`6`	`}`
`7`	`7`
	`8`	`+declare module '*.css';`
`8`	`9`	`declare module '*.svg';`