DFE-Digital · mattb-hippo · Mar 1, 2024 · Mar 1, 2024 · Mar 1, 2024 · Mar 1, 2024
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -99,9 +99,7 @@ jobs:
       # transparency data even for private images, pass --force to cosign below.
       # https://github.com/sigstore/cosign
       - name: Install Cosign
-        uses: sigstore/cosign-installer@main
-        with:
-          cosign-release: 'v1.13.1'
+        uses: sigstore/[email protected]
       - name: Check install!
         run: cosign version
       - name: Sign the published Docker image
@@ -110,4 +108,4 @@ jobs:
           COSIGN_EXPERIMENTAL: "true"
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
-        run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign {}@${{ steps.build-and-push.outputs.digest }}
+        run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign --yes {}@${{ steps.build-and-push.outputs.digest }}
diff --git a/.gitignore b/.gitignore
@@ -409,4 +409,7 @@ terraform.rc
 # Built Visual Studio Code Extensions
 *.vsix
 
-.sonarqube/
+.sonarqube/
+
+# Mac Finder attributes files
+.DS_Store
diff --git a/Childrens-Social-Care-CPD/Properties/launchSettings.json b/Childrens-Social-Care-CPD/Properties/launchSettings.json
@@ -11,10 +11,10 @@
     "Childrens_Social_Care_CPD": {
       "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "https://localhost:7112;http://localhost:5112",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "https://localhost:7112;http://localhost:5112",
       "dotnetRunMessages": true
     },
     "IIS Express": {
@@ -28,6 +28,7 @@
       "commandName": "Docker",
       "launchBrowser": true,
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+      "environmentVariables": {},
       "publishAllPorts": true,
       "useSSL": true
     }

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_SiteLayout.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_SiteLayout.cshtml
@@ -13,7 +13,7 @@
     @await RenderSectionAsync("Head", required: false)
     @Html.RenderScripts(ScriptPosition.HeadEnd)
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="~/assets/images/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="~/assets/images/favicon.ico" type="image/x-icon">
 
 </head>
 <body class="govuk-template__body">
@@ -32,13 +32,14 @@
     <partial name="_Footer" />
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script>
-        document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
+        document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');
     </script>
     <!-- component HTML -->
-    <script src="/javascript/govuk-frontend-4.7.0.min.js"></script>
+    <script src="/javascript/govuk-frontend.min.js" type="module"></script>
     <script src="/javascript/dfefrontend-1.0.1.min.js"></script>
-    <script>
-        window.GOVUKFrontend.initAll()
+    <script type="module">
+        import { initAll } from '/javascript/govuk-frontend.min.js'
+        initAll()
     </script>
     @await RenderSectionAsync("Scripts", required: false)
     @Html.RenderScripts(ScriptPosition.BodyEnd)

diff --git a/Childrens-Social-Care-CPD/compile-sass.sh b/Childrens-Social-Care-CPD/compile-sass.sh
@@ -0,0 +1,2 @@
+npx sass --style=expanded --charset --source-map-urls=relative ./styles/scss/application.scss ./wwwroot/css/application.css
+npx sass --style=compressed --charset --source-map-urls=relative ./styles/scss/application.scss ./wwwroot/css/application.min.css
diff --git a/Childrens-Social-Care-CPD/package-lock.json b/Childrens-Social-Care-CPD/package-lock.json
diff --git a/Childrens-Social-Care-CPD/package.json b/Childrens-Social-Care-CPD/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@ministryofjustice/frontend": "^1.8.0",
     "dfe-frontend-alpha": "^1.0.1",
-    "govuk-frontend": "^4.7.0",
+    "govuk-frontend": "^5.2.0",
     "jquery": "^3.7.0"
   }
 }
diff --git a/Childrens-Social-Care-CPD/styles/scss/application.scss b/Childrens-Social-Care-CPD/styles/scss/application.scss
@@ -3,7 +3,7 @@ $govuk-global-styles: true;
 $govuk-new-link-styles: true;
 $moj-images-path: "/assets/images/moj/";
 
-@import "../../node_modules/govuk-frontend/govuk/all";
+@import "../../node_modules/govuk-frontend/dist/govuk/all";
 @import "../../node_modules/@ministryofjustice/frontend/moj/components/filter/filter";
 @import '../../node_modules/dfe-frontend-alpha/packages/dfefrontend';
 @import "overrides/dfe-overrides";

diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/favicon.ico b/Childrens-Social-Care-CPD/wwwroot/assets/images/favicon.ico
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/favicon.svg b/Childrens-Social-Care-CPD/wwwroot/assets/images/favicon.svg
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-apple-touch-icon-152x152.png b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-apple-touch-icon-152x152.png
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-apple-touch-icon-167x167.png b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-apple-touch-icon-167x167.png
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-apple-touch-icon-180x180.png b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-apple-touch-icon-180x180.png
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-apple-touch-icon.png b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-apple-touch-icon.png
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-icon-180.png b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-icon-180.png
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-icon-192.png b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-icon-192.png
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-icon-512.png b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-icon-512.png
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-icon-mask.svg b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-icon-mask.svg
diff --git a/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-opengraph-image.png b/Childrens-Social-Care-CPD/wwwroot/assets/images/govuk-opengraph-image.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		npx sass --style=expanded --charset --source-map-urls=relative ./styles/scss/application.scss ./wwwroot/css/application.css
		npx sass --style=compressed --charset --source-map-urls=relative ./styles/scss/application.scss ./wwwroot/css/application.min.css