APIS-6938 Upgrade play frontend to 9.0.0 (#499)

petekirby-ee · web-flow · commit ee9cd1585134 · 2024-03-25T14:03:40.000Z
* APIS-6938 Upgrade play frontend to 9.0.0

* APIS-6938 Fix govuk-frontend script to call initAll
diff --git a/app/assets/css/main.scss b/app/assets/css/main.scss
@@ -1,4 +1,4 @@
-$govuk-assets-path: "/api-documentation/assets/lib/govuk-frontend/govuk/assets/";
+$govuk-assets-path: "/api-documentation/assets/lib/govuk-frontend/dist/govuk/assets/";
 $hmrc-assets-path: "/api-test-user/assets/lib/hmrc-frontend/hmrc/";
 
 // Components
@@ -20,5 +20,5 @@ $hmrc-assets-path: "/api-test-user/assets/lib/hmrc-frontend/hmrc/";
 // Ad-hoc fixes
 @import "ad-hoc";
 
-@import "lib/govuk-frontend/govuk/all";
+@import "lib/govuk-frontend/dist/govuk/all";
 @import "lib/hmrc-frontend/hmrc/all";
diff --git a/app/uk/gov/hmrc/apidocumentation/views/include/main.scala.html b/app/uk/gov/hmrc/apidocumentation/views/include/main.scala.html
@@ -54,8 +54,10 @@
 }
 
 @scripts = {
-    <script @CSPNonce.attr src='@routes.Assets.versioned("lib/govuk-frontend/govuk/all.js")'></script>
-    <script @CSPNonce.attr>window.GOVUKFrontend.initAll();</script>
+    <script @CSPNonce.attr type="module">
+        import { initAll } from '@routes.Assets.versioned("lib/govuk-frontend/dist/govuk/govuk-frontend.min.js")'
+        initAll()
+    </script>    
 }
 
 
diff --git a/app/uk/gov/hmrc/apidocumentation/views/templates/GovUkWrapper.scala.html b/app/uk/gov/hmrc/apidocumentation/views/templates/GovUkWrapper.scala.html
@@ -50,9 +50,11 @@
 }
 
 @scripts = {
-    <script @CSPNonce.attr src='@controllers.routes.Assets.versioned("lib/govuk-frontend/govuk/all.js")'></script>
+    <script @CSPNonce.attr type="module">
+        import { initAll } from '@controllers.routes.Assets.versioned("lib/govuk-frontend/dist/govuk/govuk-frontend.min.js")'
+        initAll()
+    </script>    
     <script @CSPNonce.attr src='@routes.Assets.versioned("javascripts/feedback.js")' type="text/javascript"></script>
-    <script @CSPNonce.attr>window.GOVUKFrontend.initAll();</script>
 }
 
 
diff --git a/app/uk/gov/hmrc/apidocumentation/views/templates/LayoutHomePage.scala.html b/app/uk/gov/hmrc/apidocumentation/views/templates/LayoutHomePage.scala.html
@@ -43,8 +43,10 @@
 }
 
 @scripts = {
-    <script @CSPNonce.attr src='@controllers.routes.Assets.versioned("lib/govuk-frontend/govuk/all.js")'></script>
-    <script @CSPNonce.attr>window.GOVUKFrontend.initAll();</script>
+    <script @CSPNonce.attr type="module">
+        import { initAll } from '@controllers.routes.Assets.versioned("lib/govuk-frontend/dist/govuk/govuk-frontend.min.js")'
+        initAll()
+    </script>    
 }
 
 @bodyEndDefault = {
diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala
@@ -4,7 +4,7 @@ import sbt._
 object AppDependencies {
   def apply(): Seq[ModuleID] = compile ++ test
 
-  lazy val bootstrapVersion       = "8.4.0"
+  lazy val bootstrapVersion       = "8.5.0"
   lazy val seleniumVersion        = "4.2.0"
   lazy val jacksonDatabindVersion = "2.10.5.1"
   lazy val jacksonVersion         = "2.10.5"
@@ -17,7 +17,7 @@ object AppDependencies {
     "uk.gov.hmrc"                         %% "bootstrap-frontend-play-30" % bootstrapVersion,
     "uk.gov.hmrc"                         %% "play-partials-play-30"      % "9.1.0",
     "uk.gov.hmrc"                         %% "http-metrics"               % "2.8.0",
-    "uk.gov.hmrc"                         %% "play-frontend-hmrc-play-30" % "8.5.0",
+    "uk.gov.hmrc"                         %% "play-frontend-hmrc-play-30" % "9.0.0",
     "uk.gov.hmrc"                         %% "api-platform-api-domain"    % apiDomainVersion,
     "org.typelevel"                       %% "cats-core"                  % "2.10.0",
     "org.commonjava.googlecode.markdown4j" % "markdown4j"                 % "2.2-cj-1.1",
@@ -41,7 +41,7 @@ object AppDependencies {
     "io.cucumber"            %% "cucumber-scala"                  % "5.7.0",
     "org.mockito"            %% "mockito-scala-scalatest"         % "1.17.30",
     "org.jsoup"               % "jsoup"                           % "1.12.1",
-    "uk.gov.hmrc"            %% "ui-test-runner"                  % "0.19.0",
+    "uk.gov.hmrc"            %% "ui-test-runner"                  % "0.22.0",
     "uk.gov.hmrc"            %% "api-platform-test-common-domain" % commonDomainVersion
   ).map(_ % Test)
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ resolvers += Resolver.typesafeRepo("releases")
 
 addSbtPlugin("uk.gov.hmrc"         % "sbt-auto-build"        % "3.20.0")
 addSbtPlugin("uk.gov.hmrc"         % "sbt-distributables"    % "2.5.0")
-addSbtPlugin("org.playframework"   % "sbt-plugin"            % "3.0.1")
+addSbtPlugin("org.playframework"   % "sbt-plugin"            % "3.0.2")
 addSbtPlugin("io.github.irundaia"  % "sbt-sassify"           % "1.5.2")
 addSbtPlugin("net.ground5hark.sbt" % "sbt-concat"            % "0.2.0")
 addSbtPlugin("com.typesafe.sbt"    % "sbt-uglify"            % "2.0.0")
diff --git a/run_local_with_dependencies.sh b/run_local_with_dependencies.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-sm2 --start API_DEFINITION THIRD_PARTY_APPLICATION API_EXAMPLE_MICROSERVICE API_PLATFORM_MICROSERVICE THIRD_PARTY_DEVELOPER_FRONTEND CONTACT_FRONTEND API_PLATFORM_XML_SERVICES
+sm2 --start API_DEFINITION THIRD_PARTY_APPLICATION THIRD_PARTY_DEVELOPER API_EXAMPLE_MICROSERVICE API_PLATFORM_MICROSERVICE THIRD_PARTY_DEVELOPER_FRONTEND CONTACT_FRONTEND API_PLATFORM_XML_SERVICES
 
 
 ./run_local.sh

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,10 @@`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@scripts = {`
`57`		`- <script @CSPNonce.attr src='@routes.Assets.versioned("lib/govuk-frontend/govuk/all.js")'></script>`
`58`		`- <script @CSPNonce.attr>window.GOVUKFrontend.initAll();</script>`
	`57`	`+ <script @CSPNonce.attr type="module">`
	`58`	`+ import { initAll } from '@routes.Assets.versioned("lib/govuk-frontend/dist/govuk/govuk-frontend.min.js")'`
	`59`	`+ initAll()`
	`60`	`+ </script>`
`59`	`61`	`}`
`60`	`62`
`61`	`63`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,11 @@`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@scripts = {`
`53`		`- <script @CSPNonce.attr src='@controllers.routes.Assets.versioned("lib/govuk-frontend/govuk/all.js")'></script>`
	`53`	`+ <script @CSPNonce.attr type="module">`
	`54`	`+ import { initAll } from '@controllers.routes.Assets.versioned("lib/govuk-frontend/dist/govuk/govuk-frontend.min.js")'`
	`55`	`+ initAll()`
	`56`	`+ </script>`
`54`	`57`	`<script @CSPNonce.attr src='@routes.Assets.versioned("javascripts/feedback.js")' type="text/javascript"></script>`
`55`		`- <script @CSPNonce.attr>window.GOVUKFrontend.initAll();</script>`
`56`	`58`	`}`
`57`	`59`
`58`	`60`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,10 @@`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@scripts = {`
`46`		`- <script @CSPNonce.attr src='@controllers.routes.Assets.versioned("lib/govuk-frontend/govuk/all.js")'></script>`
`47`		`- <script @CSPNonce.attr>window.GOVUKFrontend.initAll();</script>`
	`46`	`+ <script @CSPNonce.attr type="module">`
	`47`	`+ import { initAll } from '@controllers.routes.Assets.versioned("lib/govuk-frontend/dist/govuk/govuk-frontend.min.js")'`
	`48`	`+ initAll()`
	`49`	`+ </script>`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`@bodyEndDefault = {`