Merge branch 'master' into renovate/ajv-8.x

Jenkinsfile_nightly

@@ -42,6 +42,7 @@ withNightlyPipeline("nodejs", product, component) {
     loadVaultSecrets(secrets)
     enableFullFunctionalTest()
     enableCrossBrowserTest()
+    enableFortifyScan('probate-aat')
     //enableSecurityScan()
     afterAlways('build') {
         sh 'mkdir -p functional-output'

app/views/includes/head.html

@@ -1,4 +1,4 @@
 {% include "includes/scripts_ga_1.html" %}
-<link href="{{ globals.basePath }}/public/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+<link href="{{ globals.basePath }}/public/stylesheets/application.css?v=1.0" media="screen" rel="stylesheet" type="text/css" />
 </head>
 <!--[if IE 8]><link rel="stylesheet" media="screen" href="{{ globals.basePath }}/public/stylesheets/application-ie8.css"/><![endif]-->

app/views/includes/layout.html

@@ -1,5 +1,4 @@
 {% extends "govuk/template.njk" %}
-
 {% from "govuk/components/cookie-banner/macro.njk" import govukCookieBanner %}
 {% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
 {% from "govuk/components/header/macro.njk" import govukHeader %}
@@ -31,6 +30,7 @@
         homepageUrl: "#",
         containerClasses: "govuk-width-container",
         serviceName: serviceName | safe,
+        useTudorCrown: true,
         serviceUrl: (globals.basePath if globals.basePath) + "/"
     }) }}
 {% endblock %}

package.json

@@ -75,7 +75,7 @@
     "express-urlrewrite": "^1.2.0",
     "file-type": "^17.1.6",
     "get-port": "^4.2.0",
-    "govuk-frontend": "^4.6.0",
+    "govuk-frontend": "^4.8.0",
     "helmet": "^3.23.3",
     "https-proxy-agent": "^5.0.1",
     "i18next": "^17.0.11",

yarn.lock

@@ -5716,10 +5716,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"govuk-frontend@npm:^4.6.0":
-  version: 4.7.0
-  resolution: "govuk-frontend@npm:4.7.0"
-  checksum: 0e246dd2c724e51fd14dd40fc31c66627df7d07ebe89e1a19b1e7da7e7a5eb86bc6560229e18a13e40651e6c953a67422d54e77e240d82efff7b2cbefaa8b88d
+"govuk-frontend@npm:^4.8.0":
+  version: 4.8.0
+  resolution: "govuk-frontend@npm:4.8.0"
+  checksum: e255f924f399319e109347ec4993e0441fc5847a6a73ba44a465b1599c7d03e85c29212743b081ccd60e19224c6301143c77540b8e4bfe615fcb3e162b8663f4
   languageName: node
   linkType: hard
 
@@ -9439,7 +9439,7 @@ __metadata:
     file-type: ^17.1.6
     get-port: ^4.2.0
     git-rev-sync: ^1.12.0
-    govuk-frontend: ^4.6.0
+    govuk-frontend: ^4.8.0
     helmet: ^3.23.3
     https-proxy-agent: ^5.0.1
     i18next: ^17.0.11