Merge pull request #329 from guardian/use-esnext

upgrade to latest Typescript and use `esnext` to utilise latest language features
guardian · Dec 10, 2024 · 0a22003 · 0a22003
2 parents bfff1b9 + 0cf64d1
commit 0a22003
Show file tree

Hide file tree

Showing 5 changed files with 1,024 additions and 90 deletions.
diff --git a/client/src/fronts/frontsIntegration.tsx b/client/src/fronts/frontsIntegration.tsx
@@ -21,21 +21,11 @@ export const FrontsIntegration = ({
 }: {
   frontsPinboardElements: HTMLElement[];
 }) => {
-  const pathToElementsMap: { [path: string]: HTMLElement[] } = useMemo(
+  const pathToElementsMap: Partial<{ [path: string]: HTMLElement[] }> = useMemo(
     () =>
-      frontsPinboardElements.reduce(
-        // TODO could be replaced with groupBy if we upgrade to Node21 plus set lib to esnext in tsconfig
-        (acc, htmlElement) =>
-          htmlElement.dataset.urlPath
-            ? {
-                ...acc,
-                [htmlElement.dataset.urlPath]: [
-                  ...(acc[htmlElement.dataset.urlPath] || []),
-                  htmlElement,
-                ],
-              }
-            : acc,
-        {} as Record<string, HTMLElement[]>
+      Object.groupBy(
+        frontsPinboardElements,
+        (htmlElement) => htmlElement.dataset.urlPath ?? "undefined"
       ),
     [frontsPinboardElements]
   );
@@ -108,7 +98,7 @@ export const FrontsIntegration = ({
     <>
       {Object.entries(pathToElementsMap).map(
         ([path, htmlElementsToMountInto]) =>
-          htmlElementsToMountInto.map((htmlElementToMountInto) =>
+          htmlElementsToMountInto!.map((htmlElementToMountInto) =>
             ReactDOM.createPortal(
               <FrontsPinboardArticleButton
                 maybePinboardData={pathToPinboardDataMap[path]}

diff --git a/email-lambda/tsconfig.json b/email-lambda/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "lib": ["es2020.promise"],
     "jsx": "react-jsx",
     "jsxImportSource": "preact"
   }

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "@guardian/node-riffraff-artifact": "0.3.2",
     "@types/aws-lambda": "^8.10.114",
     "@types/jest": "^26.0.22",
-    "@types/node": "^18.15.11",
+    "@types/node": "^22.10.1",
     "@types/node-fetch": "^2.6.3",
     "@types/prompts": "^2.0.14",
     "@typescript-eslint/eslint-plugin": "^4.11.1",
@@ -56,7 +56,7 @@
     "prompts": "^2.4.2",
     "ts-jest": "^26.5.4",
     "tsafe": "^1.0.1",
-    "typescript": "^5.0.2",
+    "typescript": "^5.7.2",
     "wsrun": "^5.2.4",
     "yarn-run-all": "^3.1.1"
   },

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,7 @@
     // "incremental": true,                   /* Enable incremental compilation */
     "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    "lib": ["es2020"],                        /* Specify library files to be included in the compilation. */
+    "lib": ["esnext"],                        /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */