Merge remote-tracking branch 'origin/aea-5081-latest-header' into aea-5081-latest-header

jonathanwelch1-nhs · jonathanwelch1-nhs · commit 86fa4f78e958 · 2025-12-18T15:25:41.000Z
diff --git a/.tool-versions b/.tool-versions
@@ -1,4 +1,4 @@
-nodejs 22.12.0
+nodejs 24.11.1
 python 3.12.7
 poetry 1.8.3
 shellcheck 0.10.0
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/CIS2SignOutLambda/jest.config.ts b/packages/CIS2SignOutLambda/jest.config.ts
@@ -1,9 +1,9 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
   ...defaultConfig,
-  rootDir: __dirname,
+  "rootDir": "./",
   setupFiles: ["<rootDir>/.jest/setEnvVars.js"],
   moduleNameMapper: {"@/(.*)$": ["<rootDir>/src/$1"]}
 }
diff --git a/packages/cdk/jest.config.ts b/packages/cdk/jest.config.ts
@@ -1,5 +1,5 @@
 import type {JestConfigWithTsJest} from "ts-jest"
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 
 const jestConfig: JestConfigWithTsJest = {
   ...defaultConfig,
diff --git a/packages/cdk/package.json b/packages/cdk/package.json
@@ -7,7 +7,7 @@
     "check-licenses": "license-checker --failOn GPL --failOn LGPL --start ../.."
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.221.1",
+    "aws-cdk-lib": "^2.227.0",
     "cdk-nag": "^2.37.55",
     "constructs": "^10.4.4"
   },
diff --git a/packages/cdk/resources/LambdaFunction/helpers.ts b/packages/cdk/resources/LambdaFunction/helpers.ts
@@ -26,7 +26,7 @@ interface DefaultLambdaOptionsParams {
 function getDefaultLambdaOptions(options: DefaultLambdaOptionsParams): NodejsFunctionProps {
   const defaultOptions: NodejsFunctionProps = {
     functionName: options.functionName,
-    runtime: Runtime.NODEJS_22_X,
+    runtime: Runtime.NODEJS_24_X,
     entry: join(baseDir, options.packageBasePath, options.entryPoint),
     projectRoot: baseDir,
     memorySize: 256,
diff --git a/packages/cdk/tests/functionConstruct.test.ts b/packages/cdk/tests/functionConstruct.test.ts
@@ -108,7 +108,7 @@ describe("functionConstruct works correctly", () => {
   test("it has the correct lambda", () => {
     template.hasResourceProperties("AWS::Lambda::Function", {
       Handler: "index.handler",
-      Runtime: "nodejs22.x",
+      Runtime: "nodejs24.x",
       FunctionName: "testServiceName-testLambda",
       MemorySize: 256,
       Architectures: ["x86_64"],
@@ -159,7 +159,7 @@ describe("functionConstruct works correctly with environment variables", () => {
 
   test("environment variables are added correctly", () => {
     template.hasResourceProperties("AWS::Lambda::Function", {
-      Runtime: "nodejs22.x",
+      Runtime: "nodejs24.x",
       FunctionName: "testServiceName-testLambda",
       Environment: {Variables: {foo: "bar"}}
     })
diff --git a/packages/cloudfrontFunctions/jest.config.ts b/packages/cloudfrontFunctions/jest.config.ts
@@ -1,5 +1,5 @@
 import type {JestConfigWithTsJest} from "ts-jest"
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 
 const jestConfig: JestConfigWithTsJest = {
   ...defaultConfig,
diff --git a/packages/cognito/jest.config.ts b/packages/cognito/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/common/authFunctions/jest.config.ts b/packages/common/authFunctions/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../../jest.default.config"
+import defaultConfig from "../../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/common/doHSClient/jest.config.ts b/packages/common/doHSClient/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../../jest.default.config"
+import defaultConfig from "../../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/common/dynamoFunctions/jest.config.ts b/packages/common/dynamoFunctions/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../../jest.default.config"
+import defaultConfig from "../../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/common/lambdaUtils/jest.config.ts b/packages/common/lambdaUtils/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../../jest.default.config"
+import defaultConfig from "../../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/common/middyErrorHandler/jest.config.ts b/packages/common/middyErrorHandler/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../../jest.default.config"
+import defaultConfig from "../../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/common/pdsClient/jest.config.ts b/packages/common/pdsClient/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../../jest.default.config"
+import defaultConfig from "../../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/cpt-ui/jest.config.ts b/packages/cpt-ui/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/cpt-ui/jest.debug.config.ts b/packages/cpt-ui/jest.debug.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const debugConfig: JestConfigWithTsJest = {
diff --git a/packages/cpt-ui/tsconfig.json b/packages/cpt-ui/tsconfig.json
@@ -21,7 +21,8 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "composite": false,
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo",
+    "allowImportingTsExtensions": true
   },
   "exclude": ["node_modules"],
   "references": [
diff --git a/packages/patientSearchLambda/jest.config.ts b/packages/patientSearchLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/prescriptionDetailsLambda/jest.config.ts b/packages/prescriptionDetailsLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/prescriptionListLambda/jest.config.ts b/packages/prescriptionListLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/selectedRoleLambda/jest.config.ts b/packages/selectedRoleLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/selectedRoleLambda/jest.debug.config.ts b/packages/selectedRoleLambda/jest.debug.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/sessionManagementLambda/jest.config.ts b/packages/sessionManagementLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/testingSupport/clearActiveSessions/jest.config.ts b/packages/testingSupport/clearActiveSessions/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../../jest.default.config"
+import defaultConfig from "../../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/trackerUserInfoLambda/jest.config.ts b/packages/trackerUserInfoLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-nodejs 22.12.0`
	`1`	`+nodejs 24.11.1`
`2`	`2`	`python 3.12.7`
`3`	`3`	`poetry 1.8.3`
`4`	`4`	`shellcheck 0.10.0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import defaultConfig from "../../jest.default.config"`
	`1`	`+import defaultConfig from "../../jest.default.config.ts"`
`2`	`2`	`import type {JestConfigWithTsJest} from "ts-jest"`
`3`	`3`
`4`	`4`	`const jestConfig: JestConfigWithTsJest = {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import defaultConfig from "../../../jest.default.config"`
	`1`	`+import defaultConfig from "../../../jest.default.config.ts"`
`2`	`2`	`import type {JestConfigWithTsJest} from "ts-jest"`
`3`	`3`
`4`	`4`	`const jestConfig: JestConfigWithTsJest = {`