Migrate to TypeScript 6

canac · canac · commit b40c9dbaa3da · 2026-05-21T12:43:03.000-05:00
diff --git a/.pnp.cjs b/.pnp.cjs
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
@@ -141,7 +141,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/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/uploads/csv-upload.page.ts b/pages/api/uploads/csv-upload.page.ts
@@ -54,7 +54,7 @@ const uploadFile = async (
     }
 
     const csvFile = new File(
-      [await readFile(file.filepath)],
+      [new Uint8Array(await readFile(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
@@ -59,7 +59,7 @@ const uploadPersonAvatar = async (
 
     const pictureId = crypto.randomUUID();
     const file = new File(
-      [await readFile(avatar.filepath)],
+      [new Uint8Array(await readFile(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
@@ -14818,7 +14818,7 @@ __metadata:
     ts-essentials: "npm:^9.3.0"
     tslib: "npm:^2.4.0"
     tss-react: "npm:^4.1.3"
-    typescript: "npm:~5.6.3"
+    typescript: "npm:~6.0.0"
     url-loader: "npm:^4.1.1"
     webpack: "npm:^5.96.1"
     yup: "npm:^1.4.0"
@@ -19150,7 +19150,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.0.4, typescript@npm:~5.6.3":
+"typescript@npm:^5.0.4":
   version: 5.6.3
   resolution: "typescript@npm:5.6.3"
   bin:
@@ -19160,7 +19160,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.6.3#optional!builtin<compat/typescript>":
+"typescript@npm:~6.0.0":
+  version: 6.0.3
+  resolution: "typescript@npm:6.0.3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/0ef2357a4cffd916b52b683a021cdab0f81eea4e9aa35f2d254581c9a5106da02224e3392e1b0ed42b7a48f80c966e5f52b8e1a27941fa0523c1705a9c2e0330
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
   version: 5.6.3
   resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=8c6c40"
   bin:
@@ -19170,6 +19180,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@npm%3A~6.0.0#optional!builtin<compat/typescript>":
+  version: 6.0.3
+  resolution: "typescript@patch:typescript@npm%3A6.0.3#optional!builtin<compat/typescript>::version=6.0.3&hash=5786d5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/22b67a18dafedf9b1468b64ca20d9aa02ea61d449b65413d8aa6552aeb63f52ef369e86beb25b6b4c91a803d9726ee5c196f391a9b64201263263410a4223ee6
+  languageName: node
+  linkType: hard
+
 "ua-parser-js@npm:^0.7.30":
   version: 0.7.33
   resolution: "ua-parser-js@npm:0.7.33"

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';`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ const uploadFile = async (`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`const csvFile = new File(`
`57`		`- [await readFile(file.filepath)],`
	`57`	`+ [new Uint8Array(await readFile(file.filepath))],`
`58`	`58`	`file.originalFilename ?? 'csvFile',`
`59`	`59`	`);`
`60`	`60`