From 63edd806a0d356ca3cd6b524395a4128083a6581 Mon Sep 17 00:00:00 2001
From: Serena Abbott <serena.abbott@education.gov.uk>
Date: Thu, 22 Feb 2024 15:57:11 +0000
Subject: [PATCH] feat: upgrade govuk-frontend and update crown logo

---
 app/nunjucksConfig.js                |  4 ++--
 app/templates/buying-for-schools.njk |  2 +-
 gulpfile.js                          |  6 +++---
 package-lock.json                    | 14 +++++++-------
 package.json                         |  2 +-
 sass/main.scss                       |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/nunjucksConfig.js b/app/nunjucksConfig.js
index 9709c1a..73d7519 100644
--- a/app/nunjucksConfig.js
+++ b/app/nunjucksConfig.js
@@ -7,8 +7,8 @@ const nunjucksConfig = app => {
   var env = nunjucks.configure([
     path.resolve(__dirname, './dbTree/templates'),
     path.resolve(__dirname, './templates'),
-    path.resolve(__dirname, '../node_modules/govuk-frontend/govuk'),
-    path.resolve(__dirname, '../node_modules/govuk-frontend/govuk/components/')
+    path.resolve(__dirname, '../node_modules/govuk-frontend/dist/govuk'),
+    path.resolve(__dirname, '../node_modules/govuk-frontend/dist/govuk/components/')
   ], {
     autoescape: true
   })
diff --git a/app/templates/buying-for-schools.njk b/app/templates/buying-for-schools.njk
index c0ad3ab..a76fe05 100644
--- a/app/templates/buying-for-schools.njk
+++ b/app/templates/buying-for-schools.njk
@@ -113,7 +113,7 @@
 {% block beforeContent %}
   {{ govukPhaseBanner({
     tag: {
-      text: "beta"
+      text: "Beta"
     },
     html: "This is a new service – your <a class='govuk-link' href='" + ghbsFeedbackHref() + "'>feedback</a> will help us to improve it."
   }) }}
diff --git a/gulpfile.js b/gulpfile.js
index 2fdee09..dd90325 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -50,11 +50,11 @@ function sass () {
 }
 
 function assets () {
-  // /node_modules/govuk-frontend/govuk/assets
+  // /node_modules/govuk-frontend/dist/govuk/assets
   return gulp
     .src([
-      'node_modules/govuk-frontend/govuk/assets/**/*.*', 
-      'node_modules/govuk-frontend/govuk/all.js', 
+      'node_modules/govuk-frontend/dist/govuk/assets/**/*.*', 
+      'node_modules/govuk-frontend/dist/govuk/govuk-frontend.min.js', 
       'app/assets/**/*.*'
     ])
     .pipe(gulp.dest('public/assets'))
diff --git a/package-lock.json b/package-lock.json
index 869c00f..1e5d03b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "express": "^4.17.1",
         "express-basic-auth": "^1.2.0",
         "express-device": "^0.4.2",
-        "govuk-frontend": "^3.11.0",
+        "govuk-frontend": "^5.2.0",
         "gulp": "^4.0.2",
         "gulp-cli": "^2.2.0",
         "gulp-copy": "^4.0.1",
@@ -3718,9 +3718,9 @@
       }
     },
     "node_modules/govuk-frontend": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.14.0.tgz",
-      "integrity": "sha512-y7FTuihCSA8Hty+e9h0uPhCoNanCAN+CLioNFlPmlbeHXpbi09VMyxTcH+XfnMPY4Cp++7096v0rLwwdapTXnA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.2.0.tgz",
+      "integrity": "sha512-beD3wztHpkKz6JUpPwnwop1ejb4rTFMPLCutKLCIDmUS4BPpW59ggVUfctsRqHd2Zjw9wxljdRdeIJ8AZFyyTw==",
       "engines": {
         "node": ">= 4.2.0"
       }
@@ -12431,9 +12431,9 @@
       }
     },
     "govuk-frontend": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.14.0.tgz",
-      "integrity": "sha512-y7FTuihCSA8Hty+e9h0uPhCoNanCAN+CLioNFlPmlbeHXpbi09VMyxTcH+XfnMPY4Cp++7096v0rLwwdapTXnA=="
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.2.0.tgz",
+      "integrity": "sha512-beD3wztHpkKz6JUpPwnwop1ejb4rTFMPLCutKLCIDmUS4BPpW59ggVUfctsRqHd2Zjw9wxljdRdeIJ8AZFyyTw=="
     },
     "graceful-fs": {
       "version": "4.2.10",
diff --git a/package.json b/package.json
index becea83..650fc90 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "express": "^4.17.1",
     "express-basic-auth": "^1.2.0",
     "express-device": "^0.4.2",
-    "govuk-frontend": "^3.11.0",
+    "govuk-frontend": "^5.2.0",
     "gulp": "^4.0.2",
     "gulp-cli": "^2.2.0",
     "gulp-copy": "^4.0.1",
diff --git a/sass/main.scss b/sass/main.scss
index 463f04e..a3498b8 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -1,4 +1,4 @@
-@import "node_modules/govuk-frontend/govuk/all";
+@import "node_modules/govuk-frontend/dist/govuk/all";
 
 @import "./components/flash-card";
 @import "./components/cards";