Merge pull request #226 from hmrc/PODS-9868

PODS-9868 - Update libraries
hmrc · Oct 18, 2024 · 14b529c · 14b529c
2 parents af424c9 + 749b75c
commit 14b529c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 50 deletions.
diff --git a/app/assets/stylesheets/_timeout-dialog.scss b/app/assets/stylesheets/_timeout-dialog.scss
@@ -1,7 +1,7 @@
-@import "lib/govuk-frontend/govuk/settings/all";
-@import "lib/govuk-frontend/govuk/tools/all";
-@import "lib/govuk-frontend/govuk/helpers/all";
-@import "lib/govuk-frontend/govuk/vendor/sass-mq";
+@import "lib/govuk-frontend/dist/govuk/settings/index";
+@import "lib/govuk-frontend/dist/govuk/tools/index";
+@import "lib/govuk-frontend/dist/govuk/helpers/index";
+@import "lib/govuk-frontend/dist/govuk/vendor/sass-mq";
 
 .hmrc-timeout-overlay {
   position: fixed;
@@ -39,11 +39,6 @@ html {
 
   @include govuk-media-query($from: tablet) {
     width: 435px;
-
-    @include govuk-if-ie8 {
-      margin-top: -128px;
-      margin-left: -227px;
-    }
   }
 }
 

diff --git a/app/assets/stylesheets/application-ie8.scss b/app/assets/stylesheets/application-ie8.scss
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -1,7 +1,7 @@
-$govuk-assets-path: "/pension-scheme-practitioner/assets/lib/govuk-frontend/govuk/assets/";
+$govuk-assets-path: "/pension-scheme-practitioner/assets/lib/govuk-frontend/dist/govuk/assets/";
 $hmrc-assets-path: "/pension-scheme-practitioner/assets/lib/hmrc-frontend/hmrc/assets";
 
-@import "lib/govuk-frontend/govuk/all";
+@import "lib/govuk-frontend/dist/govuk/all";
 @import "lib/hmrc-frontend/hmrc/components/header/header";
 @import "language-toggles.scss";
 @import "_timeout-dialog.scss";

diff --git a/app/handlers/FrontendErrorHandler.scala b/app/handlers/FrontendErrorHandler.scala
@@ -19,8 +19,7 @@ package handlers
 import config.FrontendAppConfig
 import play.api.http.HeaderNames.CACHE_CONTROL
 import play.api.http.Status._
-import play.api.i18n.{I18nSupport, MessagesApi}
-import play.api.libs.json.Json
+import play.api.i18n.{I18nSupport, Messages, MessagesApi}
 import play.api.mvc.Results._
 import play.api.mvc.{Request, RequestHeader, Result}
 import play.api.{Logger, PlayException}
@@ -40,10 +39,14 @@ class FrontendErrorHandler @Inject()(
                                       internalServerErrorView: InternalServerErrorView,
                                       errorTemplate: ErrorTemplate,
                                       notFoundView: NotFoundView
-                                    )(implicit ec: ExecutionContext) extends uk.gov.hmrc.play.bootstrap.frontend.http.FrontendErrorHandler with I18nSupport {
+                                    )(implicit override val ec: ExecutionContext) extends uk.gov.hmrc.play.bootstrap.frontend.http.FrontendErrorHandler with I18nSupport {
 
-  override def standardErrorTemplate(pageTitle: String, heading: String, message: String)(implicit request: Request[_]): Html = {
-    errorTemplate(pageTitle, heading, Some(message))
+  override def standardErrorTemplate(pageTitle: String, heading: String, message: String)
+                                    (implicit request: RequestHeader): Future[Html] = {
+    def requestImplicit: Request[_] = Request(request, "")
+
+    def messages: Messages = messagesApi.preferred(request)
+    Future.successful(errorTemplate(pageTitle, heading, Some(message))(requestImplicit, messages))
   }
 
   override def onClientError(request: RequestHeader, statusCode: Int, message: String = ""): Future[Result] = {

diff --git a/app/views/templates/Layout.scala.html b/app/views/templates/Layout.scala.html
@@ -69,13 +69,9 @@
     @if(includeAutoLocation) {
         <script @CSPNonce.attr src='@controllers.routes.Assets.versioned("javascripts/autocomplete/location-autocomplete.min.js")'></script>
     }
-    <script @CSPNonce.attr src='@controllers.routes.Assets.versioned("lib/govuk-frontend/govuk/all.js")'></script>
+    <script @CSPNonce.attr src='@controllers.routes.Assets.versioned("lib/govuk-frontend/dist/govuk/all.bundle.js")'></script>
     <script @CSPNonce.attr src='@controllers.routes.Assets.versioned("lib/hmrc-frontend/hmrc/all.js")'></script>
     <script @CSPNonce.attr src='@routes.Assets.versioned("javascripts/psp.js")'></script> @*Combined in build.sbt*@
-    <script @CSPNonce.attr>
-            window.GOVUKFrontend.initAll();
-            window.HMRCFrontend.initAll()
-    </script>
 }
 
 @mainContentWithGetHelp = {

diff --git a/conf/application-json-logger.xml b/conf/application-json-logger.xml
diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala
@@ -1,29 +1,28 @@
 import sbt._
 
 object AppDependencies {
-  private val bootstrapVersion = "8.5.0"
-  //TODO: Update play-frontend-hmrc-play-30, bootstrap-frontend-play-30, govuk-frontend after migration to twirl. -Pavel Vjalicin
+  private val bootstrapVersion = "9.5.0"
   val compile = Seq(
     play.sbt.PlayImport.ws,
-    "uk.gov.hmrc"                   %% "play-conditional-form-mapping-play-30"  % "2.0.0",
+    "uk.gov.hmrc"                   %% "play-conditional-form-mapping-play-30"  % "3.2.0",
     "uk.gov.hmrc"                   %% "bootstrap-frontend-play-30"             % bootstrapVersion,
-    "uk.gov.hmrc"                   %% "play-frontend-hmrc-play-30"             % "8.5.0",
-    "org.webjars.npm"               %  "govuk-frontend"                         % "4.8.0",
+    "uk.gov.hmrc"                   %% "play-frontend-hmrc-play-30"             % "10.13.0",
+    "org.webjars.npm"               %  "govuk-frontend"                         % "5.4.1",
     "com.google.inject.extensions"  %  "guice-multibindings"                    % "4.2.3",
-    "uk.gov.hmrc"                   %% "domain-play-30"                         % "9.0.0",
-    "com.fasterxml.jackson.module"  %% "jackson-module-scala"                   % "2.17.0"
+    "uk.gov.hmrc"                   %% "domain-play-30"                         % "10.0.0",
+    "com.fasterxml.jackson.module"  %% "jackson-module-scala"                   % "2.17.2"
   )
 
   val test = Seq(
     "uk.gov.hmrc"                 %% "bootstrap-test-play-30"  % bootstrapVersion,
-    "org.scalatest"               %% "scalatest"               % "3.2.18",
+    "org.scalatest"               %% "scalatest"               % "3.2.19",
     "org.scalatestplus.play"      %% "scalatestplus-play"      % "7.0.1",
     "org.scalatestplus"           %% "mockito-4-6"             % "3.2.15.0",
     "org.scalatestplus"           %% "scalacheck-1-17"         % "3.2.18.0",
     "org.pegdown"                 %  "pegdown"                 % "1.6.0",
     "org.scalacheck"              %% "scalacheck"              % "1.18.0",
-    "org.jsoup"                   %  "jsoup"                   % "1.17.2",
-    "org.mockito"                 %% "mockito-scala"           % "1.17.31",
+    "org.jsoup"                   %  "jsoup"                   % "1.18.1",
+    "org.mockito"                 %% "mockito-scala"           % "1.17.37",
     "io.github.wolfendale"        %% "scalacheck-gen-regexp"   % "1.1.0",
     "com.vladsch.flexmark"        %  "flexmark-all"            % "0.64.8"
   ).map(_ % Test)

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -11,7 +11,7 @@ addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.22.0")
 
 addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "2.5.0")
 
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5")
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0" exclude("org.scala-lang.modules", "scala-xml_2.12"))