Skip to content

Commit ac5511f

Browse files
committed
Merge branch 'main' into feature/CCM-8572_template-security-scan
2 parents 6bd89f3 + 2912239 commit ac5511f

File tree

12 files changed

+328
-4878
lines changed

12 files changed

+328
-4878
lines changed

frontend/jest.setup.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,31 @@ import { TextEncoder, TextDecoder } from 'node:util';
44
import { createMocks } from 'react-idle-timer';
55

66
/*
7-
* A polyfill for fetch API which includes the Request object
7+
* Polyfill for fetch API which includes the Request object
88
* this helps solve the issue of the test throwing an error if the `getAmplifyBackendClient` is not mocked out.
99
* https://github.com/vercel/next.js/discussions/59041#discussioncomment-10043081
1010
*/
1111
import 'whatwg-fetch';
1212

13+
/*
14+
* Polyfill for TextDecoder and TextEncoder
15+
* https://github.com/jsdom/jsdom/issues/2524
16+
*/
1317
Object.assign(global, { TextDecoder, TextEncoder });
1418

19+
/*
20+
* Polyfill for structuredClone.
21+
* amplify/nextjs-adapter uses this in createRunWithAmplifyServerContext by importing GlobalSettings.
22+
* https://github.com/jsdom/jsdom/issues/3363
23+
*/
1524
Object.assign(global, {
1625
// eslint-disable-next-line unicorn/prefer-structured-clone
1726
structuredClone: (val: unknown) => JSON.parse(JSON.stringify(val)),
1827
});
1928

29+
/*
30+
* Create mocks for react-idle-timer
31+
*/
2032
createMocks();
2133

2234
// set feature flag

frontend/package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,54 +18,54 @@
1818
"mock-amplify-outputs": "if [ ! -f ./amplify_outputs.json ]; then echo \"{}\" > ./amplify_outputs.json ; fi"
1919
},
2020
"dependencies": {
21-
"@aws-amplify/adapter-nextjs": "^1.4.3",
22-
"@aws-amplify/ui-react": "^6.9.1",
23-
"aws-amplify": "^6.12.3",
21+
"@aws-amplify/adapter-nextjs": "^1.5.6",
22+
"@aws-amplify/ui-react": "^6.9.4",
23+
"aws-amplify": "^6.13.6",
2424
"classnames": "^2.5.1",
2525
"clsx": "^2.1.1",
2626
"date-fns": "^4.1.0",
2727
"jsonwebtoken": "^9.0.2",
2828
"jwt-decode": "^4.0.0",
29-
"markdown-it": "^13.0.1",
30-
"mimetext": "^3.0.24",
31-
"next": "^15.2.1",
29+
"markdown-it": "^13.0.2",
30+
"mimetext": "^3.0.27",
31+
"next": "^15.2.3",
3232
"next-client-cookies": "^2.0.1",
33-
"nhs-notify-backend-client": "*",
34-
"nhs-notify-web-template-management-utils": "*",
35-
"nhsuk-frontend": "^9.1.0",
33+
"nhs-notify-backend-client": "^0.0.1",
34+
"nhs-notify-web-template-management-utils": "^0.0.1",
35+
"nhsuk-frontend": "^9.3.0",
3636
"nhsuk-react-components": "^5.0.0",
3737
"path": "^0.12.7",
3838
"react": "^19.0.0",
3939
"react-dom": "^19.0.0",
4040
"react-idle-timer": "^5.7.2",
41-
"zod": "^3.23.8"
41+
"zod": "^3.24.2"
4242
},
4343
"devDependencies": {
4444
"@testing-library/jest-dom": "^6.6.3",
4545
"@testing-library/react": "^16.2.0",
4646
"@testing-library/user-event": "^14.6.1",
4747
"@types/jest": "^29.5.14",
4848
"@types/js-cookie": "^3.0.6",
49-
"@types/jsonwebtoken": "^9.0.8",
50-
"@types/markdown-it": "^13.0.1",
51-
"@types/node": "^22.8.1",
52-
"@types/react": "^19.0.8",
53-
"@types/react-dom": "^19.0.3",
54-
"constructs": "^10.3.0",
55-
"eslint-config-next": "^15.1.7",
49+
"@types/jsonwebtoken": "^9.0.9",
50+
"@types/markdown-it": "^13.0.9",
51+
"@types/node": "^22.13.12",
52+
"@types/react": "^19.0.12",
53+
"@types/react-dom": "^19.0.4",
54+
"constructs": "^10.4.2",
55+
"eslint-config-next": "^15.2.3",
5656
"jest-mock-extended": "^3.0.7",
5757
"js-cookie": "^3.0.5",
5858
"mochawesome": "^7.1.3",
5959
"pa11y-ci": "^3.1.0",
6060
"pa11y-ci-reporter-html": "^7.0.0",
61-
"pm2": "^5.4.2",
62-
"prettier": "^3.3.3",
63-
"sass": "^1.84.0",
64-
"ts-jest": "^29.2.5",
61+
"pm2": "^5.4.3",
62+
"prettier": "^3.5.3",
63+
"sass": "^1.86.0",
64+
"ts-jest": "^29.3.0",
6565
"ts-node": "^10.9.2",
66-
"tsx": "^4.19.1",
67-
"typescript": "^5.5.4",
68-
"wait-on": "^8.0.0",
66+
"tsx": "^4.19.3",
67+
"typescript": "^5.8.2",
68+
"wait-on": "^8.0.3",
6969
"whatwg-fetch": "^3.6.20"
7070
}
7171
}

lambdas/authorizer/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
"devDependencies": {
1212
"@swc/core": "^1.11.13",
1313
"@swc/jest": "^0.2.37",
14-
"@tsconfig/node20": "^20.1.4",
14+
"@tsconfig/node20": "^20.1.5",
1515
"@types/aws-lambda": "^8.10.148",
1616
"@types/jest": "^29.5.14",
17-
"@types/jsonwebtoken": "^9.0.7",
17+
"@types/jsonwebtoken": "^9.0.9",
1818
"esbuild": "^0.24.0",
1919
"jest": "^29.7.0",
2020
"jest-mock-extended": "^3.0.7",
21-
"typescript": "^5.5.4"
21+
"typescript": "^5.8.2"
2222
},
2323
"dependencies": {
2424
"@aws-sdk/client-cognito-identity-provider": "3.775.0",
2525
"jsonwebtoken": "^9.0.2",
26-
"jwks-rsa": "^3.1.0",
26+
"jwks-rsa": "^3.2.0",
2727
"jwt-decode": "^4.0.0",
28-
"nhs-notify-web-template-management-utils": "*",
29-
"zod": "^3.23.8"
28+
"nhs-notify-web-template-management-utils": "^0.0.1",
29+
"zod": "^3.24.2"
3030
}
3131
}

lambdas/backend-api/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@
1414
"@aws-sdk/client-s3": "3.775.0",
1515
"@aws-sdk/lib-dynamodb": "3.775.0",
1616
"handlebars": "^4.7.8",
17-
"html-entities": "^2.5.2",
17+
"html-entities": "^2.5.3",
1818
"jsonwebtoken": "^9.0.2",
19-
"mimetext": "^3.0.24",
20-
"nhs-notify-backend-client": "*",
21-
"nhs-notify-web-template-management-utils": "*",
19+
"mimetext": "^3.0.27",
20+
"nhs-notify-backend-client": "^0.0.1",
21+
"nhs-notify-web-template-management-utils": "^0.0.1",
2222
"parse-multipart-data": "^1.5.0",
23-
"tsx": "^4.19.2",
23+
"tsx": "^4.19.3",
2424
"winston": "^3.17.0",
25-
"zod": "^3.23.8"
25+
"zod": "^3.24.2"
2626
},
2727
"devDependencies": {
2828
"@swc/core": "^1.11.13",
2929
"@swc/jest": "^0.2.37",
30-
"@tsconfig/node20": "^20.1.4",
30+
"@tsconfig/node20": "^20.1.5",
3131
"@types/aws-lambda": "^8.10.148",
3232
"@types/jest": "^29.5.14",
33-
"@types/jsonwebtoken": "^9.0.7",
33+
"@types/jsonwebtoken": "^9.0.9",
3434
"aws-sdk-client-mock": "^4.1.0",
3535
"aws-sdk-client-mock-jest": "^4.1.0",
3636
"esbuild": "^0.24.0",
3737
"jest": "^29.7.0",
3838
"jest-mock-extended": "^3.0.7",
39-
"nhs-notify-web-template-management-test-helper-utils": "*",
40-
"ts-jest": "^29.2.5",
41-
"typescript": "^5.5.4"
39+
"nhs-notify-web-template-management-test-helper-utils": "^0.0.1",
40+
"ts-jest": "^29.3.0",
41+
"typescript": "^5.8.2"
4242
}
4343
}

lambdas/backend-client/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
],
1717
"types": "src/index.ts",
1818
"dependencies": {
19-
"@hey-api/openapi-ts": "^0.64.10",
20-
"axios": "^1.7.9",
19+
"@hey-api/openapi-ts": "^0.64.13",
20+
"axios": "^1.8.4",
2121
"axios-retry": "^4.5.0",
22-
"zod": "^3.24.1"
22+
"zod": "^3.24.2"
2323
},
2424
"devDependencies": {
25-
"@swc/core": "^1.11.3",
25+
"@swc/core": "^1.11.13",
2626
"@swc/jest": "^0.2.37",
27-
"@tsconfig/node20": "^20.1.4",
27+
"@tsconfig/node20": "^20.1.5",
2828
"axios-mock-adapter": "^2.1.0",
2929
"esbuild": "^0.24.0",
3030
"jest-mock-extended": "^3.0.7",
3131
"nhs-notify-web-template-management-utils": "^0.0.1",
32-
"typescript": "^5.5.4"
32+
"typescript": "^5.8.2"
3333
}
3434
}

0 commit comments

Comments
 (0)