Merge branch 'main' into feature/CCM-8628-favicons

Author: harrim91

.eslintrc.json

@@ -5,14 +5,11 @@
     }
   },
   "extends": [
-    "airbnb",
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:jest/recommended",
     "plugin:jsx-a11y/recommended",
     "plugin:prettier/recommended",
-    "plugin:react-hooks/recommended",
-    "plugin:react/recommended",
     "plugin:security/recommended-legacy",
     "plugin:sonarjs/recommended-legacy",
     "plugin:unicorn/recommended"
@@ -24,14 +21,11 @@
     "jest",
     "jsx-a11y",
     "prettier",
-    "react",
-    "react-hooks",
     "security",
     "sonarjs",
     "unicorn"
   ],
   "rules": {
-    "react/display-name": "off",
     "no-restricted-syntax": "off",
     "consistent-return": "off",
     "prettier/prettier": "error",
@@ -45,16 +39,6 @@
         ]
       }
     ],
-    "react/react-in-jsx-scope": "off",
-    "react/jsx-filename-extension": "off",
-    "react/jsx-props-no-spreading": "off",
-    "react/function-component-definition": "off",
-    "react/jsx-no-useless-fragment": [
-      "error",
-      {
-        "allowExpressions": true
-      }
-    ],
     "import/prefer-default-export": "off",
     "import/extensions": "off",
     "no-shadow": "off",
@@ -69,13 +53,10 @@
     ],
     "security/detect-object-injection": "off",
     "sonarjs/no-duplicate-string": "off",
-    "react/no-danger": "off",
     "no-param-reassign": "off",
-    "react/require-default-props": "off",
     "no-useless-constructor": "off",
     "sonarjs/no-small-switch": "off",
     "sonarjs/no-unused-vars": "off",
-    "react/jsx-no-bind": "off",
     "unicorn/no-null": "off",
     "prefer-regex-literals": "off",
     "class-methods-use-this": "off",

frontend/.eslintrc.json

@@ -1,7 +1,23 @@
 {
   "extends": [
+    "../.eslintrc",
     "next",
-    "next/core-web-vitals",
-    "../.eslintrc"
-  ]
+    "next/core-web-vitals"
+  ],
+  "rules": {
+    "react/display-name": "off",
+    "react/react-in-jsx-scope": "off",
+    "react/jsx-filename-extension": "off",
+    "react/jsx-props-no-spreading": "off",
+    "react/function-component-definition": "off",
+    "react/jsx-no-useless-fragment": [
+      "error",
+      {
+        "allowExpressions": true
+      }
+    ],
+    "react/no-danger": "off",
+    "react/require-default-props": "off",
+    "react/jsx-no-bind": "off"
+  }
 }

frontend/next.config.js

@@ -18,6 +18,10 @@ const nextConfig = (phase) => {
       API_BASE_URL: amplifyConfig?.meta?.api_base_url,
     },
 
+    sassOptions: {
+      quietDeps: true,
+    },
+
     experimental: {
       serverActions: {
         allowedOrigins: [domain, domain.replace('templates', 'web-gateway')],

frontend/package.json

@@ -18,57 +18,50 @@
     "mock-amplify-outputs": "if [ ! -f ./amplify_outputs.json ]; then echo \"{}\" > ./amplify_outputs.json ; fi"
   },
   "dependencies": {
-    "@aws-amplify/adapter-nextjs": "^1.2.23",
-    "@aws-amplify/backend": "^1.2.0",
-    "@aws-amplify/ui-react": "^6.3.1",
+    "@aws-amplify/adapter-nextjs": "^1.4.3",
+    "@aws-amplify/ui-react": "^6.9.1",
     "@aws-sdk/client-ses": "^3.637.0",
-    "aws-amplify": "^6.6.0",
+    "aws-amplify": "^6.12.3",
     "date-fns": "^4.1.0",
+    "jsonwebtoken": "^9.0.2",
     "jwt-decode": "^4.0.0",
     "markdown-it": "^13.0.1",
     "mimetext": "^3.0.24",
-    "next": "14.2.13",
-    "next-client-cookies": "^1.1.1",
+    "next": "^15.1.7",
+    "next-client-cookies": "^2.0.1",
     "nhs-notify-backend-client": "*",
-    "nhs-notify-web-template-management-amplify": "*",
     "nhs-notify-web-template-management-utils": "*",
     "nhsuk-frontend": "^9.1.0",
     "nhsuk-react-components": "^5.0.0",
     "path": "^0.12.7",
-    "react": "^18",
-    "react-dom": "^18",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@aws-amplify/backend-cli": "^1.2.5",
-    "@testing-library/jest-dom": "^6.5.0",
-    "@testing-library/react": "^16.0.1",
-    "@testing-library/user-event": "^14.5.2",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.2.0",
+    "@testing-library/user-event": "^14.6.1",
     "@types/jest": "^29.5.14",
     "@types/jsonwebtoken": "^9.0.8",
     "@types/markdown-it": "^13.0.1",
     "@types/node": "^22.8.1",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
+    "@types/react": "^19.0.8",
+    "@types/react-dom": "^19.0.3",
     "constructs": "^10.3.0",
+    "eslint-config-next": "^15.1.7",
     "jest-mock-extended": "^3.0.7",
     "mochawesome": "^7.1.3",
-    "pa11y": "^8.0.0",
     "pa11y-ci": "^3.1.0",
     "pa11y-ci-reporter-html": "^7.0.0",
     "pm2": "^5.4.2",
     "prettier": "^3.3.3",
-    "sass": "^1.80.5",
+    "sass": "^1.84.0",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.1",
     "typescript": "^5.5.4",
     "wait-on": "^8.0.0",
     "whatwg-fetch": "^3.6.20"
-  },
-  "overrides": {
-    "pa11y-ci": {
-      "pa11y": "^8.0.0"
-    }
   }
 }

frontend/src/__tests__/app/choose-a-template-type/page.test.tsx

@@ -13,12 +13,12 @@ jest.mock('next/navigation', () => ({
   },
 }));
 
-jest.mock('react-dom', () => {
-  const originalModule = jest.requireActual('react-dom');
+jest.mock('react', () => {
+  const originalModule = jest.requireActual('react');
 
   return {
     ...originalModule,
-    useFormState: (
+    useActionState: (
       _: (
         formState: TemplateFormState,
         formData: FormData

frontend/src/__tests__/app/copy-template/page.test.tsx

@@ -36,19 +36,19 @@ describe('CopyTemplatePage', () => {
     getTemplateMock.mockResolvedValueOnce(template);
 
     const page = await CopyTemplatePage({
-      params: {
+      params: Promise.resolve({
         templateId: 'template-id',
-      },
+      }),
     });
 
     expect(page).toEqual(<CopyTemplate template={template} />);
   });
 
   it('should redirect to invalid-template when no templateId is found', async () => {
     await CopyTemplatePage({
-      params: {
+      params: Promise.resolve({
         templateId: 'template-id',
-      },
+      }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');

frontend/src/__tests__/app/create-and-submit-templates/__snapshots__/page.test.tsx.snap

@@ -63,7 +63,6 @@ exports[`matches the snapshot 1`] = `
         <a
           aria-disabled="false"
           class="nhsuk-button"
-          data-testid="link-button"
           draggable="false"
           href="/templates/manage-templates"
           role="button"

frontend/src/__tests__/app/delete-template/page.test.tsx

@@ -44,19 +44,19 @@ describe('PreviewEmailTemplatePage', () => {
     getTemplateMock.mockResolvedValueOnce(templateDTO);
 
     const page = await DeleteTemplatePage({
-      params: {
+      params: Promise.resolve({
         templateId: 'template-id',
-      },
+      }),
     });
 
     expect(page).toEqual(<DeleteTemplate template={emailTemplate} />);
   });
 
   it('should redirect to invalid-template when no templateId is found', async () => {
     await DeleteTemplatePage({
-      params: {
+      params: Promise.resolve({
         templateId: 'template-id',
-      },
+      }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -74,9 +74,9 @@ describe('PreviewEmailTemplatePage', () => {
     });
 
     await DeleteTemplatePage({
-      params: {
+      params: Promise.resolve({
         templateId: 'template-id',
-      },
+      }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -94,9 +94,9 @@ describe('PreviewEmailTemplatePage', () => {
     });
 
     await DeleteTemplatePage({
-      params: {
+      params: Promise.resolve({
         templateId: 'template-id',
-      },
+      }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/manage-templates', 'push');

frontend/src/__tests__/app/edit-email-template/page.test.tsx

@@ -36,7 +36,11 @@ describe('EditEmailTemplatePage', () => {
   it('should redirect to invalid-template when no template is found', async () => {
     getTemplateMock.mockResolvedValueOnce(undefined);
 
-    await EditEmailTemplatePage({ params: { templateId: 'template-id' } });
+    await EditEmailTemplatePage({
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
+    });
 
     expect(getTemplateMock).toHaveBeenCalledWith('template-id');
 
@@ -49,7 +53,11 @@ describe('EditEmailTemplatePage', () => {
       templateType: TemplateType.NHS_APP,
     });
 
-    await EditEmailTemplatePage({ params: { templateId: 'template-id' } });
+    await EditEmailTemplatePage({
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
+    });
 
     expect(getTemplateMock).toHaveBeenCalledWith('template-id');
 
@@ -67,7 +75,9 @@ describe('EditEmailTemplatePage', () => {
     };
 
     const page = await EditEmailTemplatePage({
-      params: { templateId: 'template-id' },
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
     });
 
     expect(getTemplateMock).toHaveBeenCalledWith('template-id');

frontend/src/__tests__/app/edit-nhs-app-template/page.test.tsx

@@ -42,7 +42,9 @@ describe('EditNhsAppTemplatePage', () => {
     getTemplateMock.mockResolvedValueOnce(templateDTO);
 
     const page = await EditNhsAppTemplatePage({
-      params: { templateId: 'template-id' },
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
     });
 
     expect(page).toEqual(<NhsAppTemplateForm initialState={nhsAppTemplate} />);
@@ -52,9 +54,9 @@ describe('EditNhsAppTemplatePage', () => {
     getTemplateMock.mockResolvedValueOnce(undefined);
 
     await EditNhsAppTemplatePage({
-      params: {
+      params: Promise.resolve({
         templateId: 'template-id',
-      },
+      }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -79,9 +81,9 @@ describe('EditNhsAppTemplatePage', () => {
       });
 
       await EditNhsAppTemplatePage({
-        params: {
+        params: Promise.resolve({
           templateId: 'template-id',
-        },
+        }),
       });
 
       expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');