@companieshouse/ch-node-utils 2.1.12 → 3.0.0

package/README.md

@@ -141,7 +141,7 @@ The navbar uses translations from `@companieshouse/ch-node-utils` (this) package
 
 The navbar also requires the use of styles provided in the [ch.gov.uk.css](https://github.com/companieshouse/cdn.ch.gov.uk/blob/master/app/assets/stylesheets/ch.gov.uk.css) stylesheet (you can either add the provided link to the head section or include specific styles in your own stylesheet)
 
-`<link href="{{ cdnHost }}/stylesheets/ch.gov.uk.css" rel="stylesheet" crossorigin="anonymous"/>`
+`<link href="{{ cdnHost }}/stylesheets/ch.gov.uk.css" rel="stylesheet"/>`
 
 It also requires the [navbar.js](https://github.com/companieshouse/cdn.ch.gov.uk/blob/master/app/assets/javascripts/lib/navbar.js) script to be added to the footer to make the navbar work in mobile mode (make sure it's the latest version).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companieshouse/ch-node-utils",
-  "version": "2.1.12",
+  "version": "3.0.0",
   "author": "companieshouse",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -41,8 +41,7 @@
     "@types/ioredis": "4.28.10",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.11.28",
-    "govuk-frontend-4-10-0": "npm:govuk-frontend@^4.10.0",
-    "govuk-frontend-5-10-2": "npm:govuk-frontend@^5.10.2",
+    "govuk-frontend-6-0-0": "npm:govuk-frontend@6.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "nunjucks": "^3.2.4",
@@ -50,7 +49,7 @@
     "typescript": "^5.4.2"
   },
   "peerDependencies": {
-    "govuk-frontend": "^4.10.0 || ^5.10.0"
+    "govuk-frontend": "^6.0.0"
   },
   "bugs": {
     "url": "https://github.com/companieshouse/ch-node-utils/issues"

package/templates/layouts/template.njk

@@ -2,14 +2,7 @@
 {% extends "govuk/template.njk" %}
 
 {% set _cdnImageRootPath = cdnHost + "/images/govuk-frontend/v" + govukFrontendVersion %}
-{% if govukRebrand %}
-  {% set _cdnImageRootPath = _cdnImageRootPath + "/rebrand" %}
-{% endif %}
-
 {% set _cdnManifestRootPath = cdnHost + "/static/govuk-frontend/v" + govukFrontendVersion %}
-{% if govukRebrand %}
-  {% set _cdnManifestRootPath = _cdnManifestRootPath + "/rebrand" %}
-{% endif %}
 
 {# GOV.UK Frontend Page Template option for Open Graph https://design-system.service.gov.uk/styles/page-template/#options #}
 {% set opengraphImageUrl = _cdnImageRootPath + "/govuk-opengraph-image.png" %}
@@ -24,19 +17,13 @@
 {% endblock %}
 
 {% block head %}
-  <link rel="stylesheet" href="{{ cdnHost }}/stylesheets/govuk-frontend/v{{ govukFrontendVersion }}/govuk-frontend-{{ govukFrontendVersion }}.min.css" crossorigin="anonymous">
+  <link rel="stylesheet" href="{{ cdnHost }}/stylesheets/govuk-frontend/v{{ govukFrontendVersion }}/govuk-frontend-{{ govukFrontendVersion }}.min.css">
 {% endblock %}
 
 {% block bodyEnd %}
   {# Run JavaScript at end of the <body>, to avoid blocking the initial render. #}
-  {# Starting in GOV.UK Frontend version 5, JavaScript is only loaded in modern browsers using ES6 Module imports. #}
-  {% if govukFrontendVersion | first >= "5"  %}
-    <script type="module"{% if nonce %} nonce="{{ nonce }}"{% endif %}>
-      import { initAll } from '{{ cdnHost }}/javascripts/govuk-frontend/v{{ govukFrontendVersion }}/govuk-frontend-{{ govukFrontendVersion }}.min.js'
-      initAll()
-    </script>
-  {% else %}
-    <script src="{{ cdnHost }}/javascripts/govuk-frontend/v{{ govukFrontendVersion }}/govuk-frontend-{{ govukFrontendVersion }}.min.js"></script>
-    <script{% if nonce %} nonce="{{ nonce }}"{% endif %}>window.GOVUKFrontend.initAll()</script>
-  {% endif %}
+  <script type="module"{% if cspNonce %} nonce="{{ cspNonce }}"{% endif %}>
+    import { initAll } from '{{ cdnHost }}/javascripts/govuk-frontend/v{{ govukFrontendVersion }}/govuk-frontend-{{ govukFrontendVersion }}.min.js'
+    initAll()
+  </script>
 {% endblock %}

package/templates/navbar.njk

@@ -9,7 +9,7 @@ It also requires the use of styles provided in the following stylesheet
 (you can either add the provided link to the head section or include specific
 styles in your own stylesheet)
 
-    <link href="{{ cdnHost }}/stylesheets/ch.gov.uk.css" rel="stylesheet" crossorigin="anonymous"/>
+    <link href="{{ cdnHost }}/stylesheets/ch.gov.uk.css" rel="stylesheet"/>
 
 It also requires the following script to be added to the footer