fixed merge conflicts

jonathanwelch1-nhs · jonathanwelch1-nhs · commit fa292cff4083 · 2025-12-19T14:02:36.000Z
diff --git a/packages/CIS2SignOutLambda/jest.config.ts b/packages/CIS2SignOutLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config.ts"
+import defaultConfig from "../../jest.default.config"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
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.ts"
+import defaultConfig from "../../jest.default.config"
 
 const jestConfig: JestConfigWithTsJest = {
   ...defaultConfig,
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.ts"
+import defaultConfig from "../../jest.default.config"
 
 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.ts"
+import defaultConfig from "../../jest.default.config"
 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.ts"
+import defaultConfig from "../../../jest.default.config"
 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.ts"
+import defaultConfig from "../../../jest.default.config"
 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.ts"
+import defaultConfig from "../../../jest.default.config"
 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.ts"
+import defaultConfig from "../../../jest.default.config"
 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.ts"
+import defaultConfig from "../../../jest.default.config"
 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.ts"
+import defaultConfig from "../../../jest.default.config"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/patientSearchLambda/jest.config.ts b/packages/patientSearchLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config.ts"
+import defaultConfig from "../../jest.default.config"
 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.ts"
+import defaultConfig from "../../jest.default.config"
 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.ts"
+import defaultConfig from "../../jest.default.config"
 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.ts"
+import defaultConfig from "../../jest.default.config"
 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.ts"
+import defaultConfig from "../../jest.default.config"
 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.ts"
+import defaultConfig from "../../../jest.default.config"
 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.ts"
+import defaultConfig from "../../jest.default.config"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import defaultConfig from "../../jest.default.config.ts"`
	`1`	`+import defaultConfig from "../../jest.default.config"`
`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.ts"`
	`1`	`+import defaultConfig from "../../../jest.default.config"`
`2`	`2`	`import type {JestConfigWithTsJest} from "ts-jest"`
`3`	`3`
`4`	`4`	`const jestConfig: JestConfigWithTsJest = {`