PLATUI-2705: Upgrade to latest govuk-frontend v5.0.0 (#338)

--------- Co-authored-by: JoPintoPaul <joanna.pinto.paul@digital.hmrc.gov.uk> Co-authored-by: david.ellam <ellamdav@users.noreply.github.com>
hmrc · Jan 16, 2024 · c1614d3 · c1614d3
1 parent 72d6478
commit c1614d3
Show file tree

Hide file tree

Showing 119 changed files with 551 additions and 1,497 deletions.
diff --git a/app/views/layouts/includes/head.html b/app/views/layouts/includes/head.html
@@ -1,9 +1,4 @@
-<!--[if !IE 8]><!-->
 <link rel="stylesheet" href="/assets/hmrc-frontend-{{ hmrcFrontendVersion }}.min.css">
-<!--<![endif]-->
-<!--[if IE 8]>
-<link rel="stylesheet" href="/assets/hmrc-frontend-{{ hmrcFrontendVersion }}-ie8.min.css">
-<![endif]-->
 <!--[if lt IE 9]>
 <script src="/assets/vendor/html5shiv.min.js"></script>
 <![endif]-->

diff --git a/app/views/layouts/layout.njk b/app/views/layouts/layout.njk
@@ -1,4 +1,4 @@
-{% extends "govuk/template.njk" %}
+{% extends "dist/govuk/template.njk" %}
 
 {% block pageTitle %}HMRC Frontend{% endblock %}
 

diff --git a/...top_default_account-header_all-available-options_example_0_document_0_phone.png b/...top_default_account-header_all-available-options_example_0_document_0_phone.png
diff --git a/...op_default_account-header_all-available-options_example_0_document_1_tablet.png b/...op_default_account-header_all-available-options_example_0_document_1_tablet.png
diff --git a/...eference/backstop_default_account-header_default_example_0_document_0_phone.png b/...eference/backstop_default_account-header_default_example_0_document_0_phone.png
diff --git a/...ference/backstop_default_account-header_default_example_0_document_1_tablet.png b/...ference/backstop_default_account-header_default_example_0_document_1_tablet.png
diff --git a/...kstop_default_account-header_global-service-name_example_0_document_0_phone.png b/...kstop_default_account-header_global-service-name_example_0_document_0_phone.png
diff --git a/...stop_default_account-header_global-service-name_example_0_document_1_tablet.png b/...stop_default_account-header_global-service-name_example_0_document_1_tablet.png
diff --git a/...p_default_account-header_link-states-on-desktop_example_0_document_0_tablet.png b/...p_default_account-header_link-states-on-desktop_example_0_document_0_tablet.png
diff --git a/...es-on-desktop_example_account-menu-account-home-focused_0_document_0_tablet.png b/...es-on-desktop_example_account-menu-account-home-focused_0_document_0_tablet.png
diff --git a/...es-on-desktop_example_account-menu-account-home-hovered_0_document_0_tablet.png b/...es-on-desktop_example_account-menu-account-home-hovered_0_document_0_tablet.png
diff --git a/...states-on-desktop_example_account-menu-messages-focused_0_document_0_tablet.png b/...states-on-desktop_example_account-menu-messages-focused_0_document_0_tablet.png
diff --git a/...states-on-desktop_example_account-menu-messages-hovered_0_document_0_tablet.png b/...states-on-desktop_example_account-menu-messages-hovered_0_document_0_tablet.png
diff --git a/...-select-alternate-lang-focused-and-current-lang-hovered_0_document_0_tablet.png b/...-select-alternate-lang-focused-and-current-lang-hovered_0_document_0_tablet.png
diff --git a/..._link-states-on-mobile-with-dropdown-link-active_example_0_document_0_phone.png b/..._link-states-on-mobile-with-dropdown-link-active_example_0_document_0_phone.png
diff --git a/...e_example_account-menu-dropdown-open-active-link-focused_0_document_0_phone.png b/...e_example_account-menu-dropdown-open-active-link-focused_0_document_0_phone.png
diff --git a/...e_example_account-menu-dropdown-open-active-link-hovered_0_document_0_phone.png b/...e_example_account-menu-dropdown-open-active-link-hovered_0_document_0_phone.png
diff --git a/...-dropdown-link-active_example_account-menu-dropdown-open_0_document_0_phone.png b/...-dropdown-link-active_example_account-menu-dropdown-open_0_document_0_phone.png
diff --git a/...ink-active_example_account-menu-with-larger-browser-font_0_document_0_phone.png b/...ink-active_example_account-menu-with-larger-browser-font_0_document_0_phone.png
diff --git a/...top_default_account-header_link-states-on-mobile_example_0_document_0_phone.png b/...top_default_account-header_link-states-on-mobile_example_0_document_0_phone.png
diff --git a/...ates-on-mobile_example_account-menu-account-home-focused_0_document_0_phone.png b/...ates-on-mobile_example_account-menu-account-home-focused_0_document_0_phone.png
diff --git a/...ates-on-mobile_example_account-menu-account-home-hovered_0_document_0_phone.png b/...ates-on-mobile_example_account-menu-account-home-hovered_0_document_0_phone.png
diff --git a/...k-states-on-mobile_example_account-menu-dropdown-focused_0_document_0_phone.png b/...k-states-on-mobile_example_account-menu-dropdown-focused_0_document_0_phone.png
diff --git a/...k-states-on-mobile_example_account-menu-dropdown-hovered_0_document_0_phone.png b/...k-states-on-mobile_example_account-menu-dropdown-hovered_0_document_0_phone.png
diff --git a/...bile_example_account-menu-dropdown-open-messages-focused_0_document_0_phone.png b/...bile_example_account-menu-dropdown-open-messages-focused_0_document_0_phone.png
diff --git a/...bile_example_account-menu-dropdown-open-messages-hovered_0_document_0_phone.png b/...bile_example_account-menu-dropdown-open-messages-hovered_0_document_0_phone.png
diff --git a/...link-states-on-mobile_example_account-menu-dropdown-open_0_document_0_phone.png b/...link-states-on-mobile_example_account-menu-dropdown-open_0_document_0_phone.png
diff --git a/...lt_account-header_overridden-global-service-name_example_0_document_0_phone.png b/...lt_account-header_overridden-global-service-name_example_0_document_0_phone.png
diff --git a/...t_account-header_overridden-global-service-name_example_0_document_1_tablet.png b/...t_account-header_overridden-global-service-name_example_0_document_1_tablet.png
diff --git a/...p_default_account-header_welsh-with-service-name_example_0_document_0_phone.png b/...p_default_account-header_welsh-with-service-name_example_0_document_0_phone.png
diff --git a/..._default_account-header_welsh-with-service-name_example_0_document_1_tablet.png b/..._default_account-header_welsh-with-service-name_example_0_document_1_tablet.png
diff --git a/...ackstop_default_account-header_with-service-name_example_0_document_0_phone.png b/...ackstop_default_account-header_with-service-name_example_0_document_0_phone.png
diff --git a/...ckstop_default_account-header_with-service-name_example_0_document_1_tablet.png b/...ckstop_default_account-header_with-service-name_example_0_document_1_tablet.png
diff --git a/...itmaps_reference/backstop_default_header_default_example_0_document_0_phone.png b/...itmaps_reference/backstop_default_header_default_example_0_document_0_phone.png
diff --git a/...tmaps_reference/backstop_default_header_default_example_0_document_1_tablet.png b/...tmaps_reference/backstop_default_header_default_example_0_document_1_tablet.png
diff --git a/...aps_reference/backstop_default_header_full_width_example_0_document_0_phone.png b/...aps_reference/backstop_default_header_full_width_example_0_document_0_phone.png
diff --git a/...ps_reference/backstop_default_header_full_width_example_0_document_1_tablet.png b/...ps_reference/backstop_default_header_full_width_example_0_document_1_tablet.png
diff --git a/...ll_width_with_navigation_and_menu_open_on_mobile_example_0_document_0_phone.png b/...ll_width_with_navigation_and_menu_open_on_mobile_example_0_document_0_phone.png
diff --git a/...ckstop_default_header_full_width_with_navigation_example_0_document_0_phone.png b/...ckstop_default_header_full_width_with_navigation_example_0_document_0_phone.png
diff --git a/...kstop_default_header_full_width_with_navigation_example_0_document_1_tablet.png b/...kstop_default_header_full_width_with_navigation_example_0_document_1_tablet.png
diff --git a/...ackstop_default_header_navigation_item_with_html_example_0_document_0_phone.png b/...ackstop_default_header_navigation_item_with_html_example_0_document_0_phone.png
diff --git a/...ckstop_default_header_navigation_item_with_html_example_0_document_1_tablet.png b/...ckstop_default_header_navigation_item_with_html_example_0_document_1_tablet.png
diff --git a/...lt_header_navigation_item_with_html_without_link_example_0_document_0_phone.png b/...lt_header_navigation_item_with_html_without_link_example_0_document_0_phone.png
diff --git a/...t_header_navigation_item_with_html_without_link_example_0_document_1_tablet.png b/...t_header_navigation_item_with_html_without_link_example_0_document_1_tablet.png
diff --git a/...lt_header_navigation_item_with_text_without_link_example_0_document_0_phone.png b/...lt_header_navigation_item_with_text_without_link_example_0_document_0_phone.png
diff --git a/...t_header_navigation_item_with_text_without_link_example_0_document_1_tablet.png b/...t_header_navigation_item_with_text_without_link_example_0_document_1_tablet.png
diff --git a/..._reference/backstop_default_header_sign_out_link_example_0_document_0_phone.png b/..._reference/backstop_default_header_sign_out_link_example_0_document_0_phone.png
diff --git a/...reference/backstop_default_header_sign_out_link_example_0_document_1_tablet.png b/...reference/backstop_default_header_sign_out_link_example_0_document_1_tablet.png
diff --git a/...e/backstop_default_header_sign_out_link_in_welsh_example_0_document_0_phone.png b/...e/backstop_default_header_sign_out_link_in_welsh_example_0_document_0_phone.png
diff --git a/.../backstop_default_header_sign_out_link_in_welsh_example_0_document_1_tablet.png b/.../backstop_default_header_sign_out_link_in_welsh_example_0_document_1_tablet.png
diff --git a/...e/backstop_default_header_with_additional_banner_example_0_document_0_phone.png b/...e/backstop_default_header_with_additional_banner_example_0_document_0_phone.png
diff --git a/.../backstop_default_header_with_additional_banner_example_0_document_1_tablet.png b/.../backstop_default_header_with_additional_banner_example_0_document_1_tablet.png
diff --git a/...backstop_default_header_with_hmrc_banner_english_example_0_document_0_phone.png b/...backstop_default_header_with_hmrc_banner_english_example_0_document_0_phone.png
diff --git a/...ackstop_default_header_with_hmrc_banner_english_example_0_document_1_tablet.png b/...ackstop_default_header_with_hmrc_banner_english_example_0_document_1_tablet.png
diff --git a/...e/backstop_default_header_with_hmrc_banner_welsh_example_0_document_0_phone.png b/...e/backstop_default_header_with_hmrc_banner_welsh_example_0_document_0_phone.png
diff --git a/.../backstop_default_header_with_hmrc_banner_welsh_example_0_document_1_tablet.png b/.../backstop_default_header_with_hmrc_banner_welsh_example_0_document_1_tablet.png
diff --git a/...stop_default_header_with_language_toggle_english_example_0_document_0_phone.png b/...stop_default_header_with_language_toggle_english_example_0_document_0_phone.png
diff --git a/...top_default_header_with_language_toggle_english_example_0_document_1_tablet.png b/...top_default_header_with_language_toggle_english_example_0_document_1_tablet.png
diff --git a/...ckstop_default_header_with_language_toggle_welsh_example_0_document_0_phone.png b/...ckstop_default_header_with_language_toggle_welsh_example_0_document_0_phone.png
diff --git a/...kstop_default_header_with_language_toggle_welsh_example_0_document_1_tablet.png b/...kstop_default_header_with_language_toggle_welsh_example_0_document_1_tablet.png
diff --git a/...ce/backstop_default_header_with_large_navigation_example_0_document_0_phone.png b/...ce/backstop_default_header_with_large_navigation_example_0_document_0_phone.png
diff --git a/...e/backstop_default_header_with_large_navigation_example_0_document_1_tablet.png b/...e/backstop_default_header_with_large_navigation_example_0_document_1_tablet.png
diff --git a/...kstop_default_header_with_large_navigation_welsh_example_0_document_0_phone.png b/...kstop_default_header_with_large_navigation_welsh_example_0_document_0_phone.png
diff --git a/...stop_default_header_with_large_navigation_welsh_example_0_document_1_tablet.png b/...stop_default_header_with_large_navigation_welsh_example_0_document_1_tablet.png
diff --git a/...eference/backstop_default_header_with_navigation_example_0_document_0_phone.png b/...eference/backstop_default_header_with_navigation_example_0_document_0_phone.png
diff --git a/...ference/backstop_default_header_with_navigation_example_0_document_1_tablet.png b/...ference/backstop_default_header_with_navigation_example_0_document_1_tablet.png
diff --git a/...ce/backstop_default_header_with_navigation_welsh_example_0_document_0_phone.png b/...ce/backstop_default_header_with_navigation_welsh_example_0_document_0_phone.png
diff --git a/...e/backstop_default_header_with_navigation_welsh_example_0_document_1_tablet.png b/...e/backstop_default_header_with_navigation_welsh_example_0_document_1_tablet.png
diff --git a/...erence/backstop_default_header_with_product_name_example_0_document_0_phone.png b/...erence/backstop_default_header_with_product_name_example_0_document_0_phone.png
diff --git a/...rence/backstop_default_header_with_product_name_example_0_document_1_tablet.png b/...rence/backstop_default_header_with_product_name_example_0_document_1_tablet.png
diff --git a/..._default_header_with_service_name_and_navigation_example_0_document_0_phone.png b/..._default_header_with_service_name_and_navigation_example_0_document_0_phone.png
diff --git a/...default_header_with_service_name_and_navigation_example_0_document_1_tablet.png b/...default_header_with_service_name_and_navigation_example_0_document_1_tablet.png
diff --git a/...ult_header_with_service_name_but_no_service_link_example_0_document_0_phone.png b/...ult_header_with_service_name_but_no_service_link_example_0_document_0_phone.png
diff --git a/...lt_header_with_service_name_but_no_service_link_example_0_document_1_tablet.png b/...lt_header_with_service_name_but_no_service_link_example_0_document_1_tablet.png
diff --git a/...erence/backstop_default_header_with_service_name_example_0_document_0_phone.png b/...erence/backstop_default_header_with_service_name_example_0_document_0_phone.png
diff --git a/...rence/backstop_default_header_with_service_name_example_0_document_1_tablet.png b/...rence/backstop_default_header_with_service_name_example_0_document_1_tablet.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hmrc-frontend",
-  "version": "5.62.0",
+  "version": "6.0.0",
   "description": "Design patterns for HMRC frontends",
   "scripts": {
     "start": "gulp dev",
@@ -42,7 +42,7 @@
   },
   "homepage": "https://github.com/hmrc/hmrc-frontend#readme",
   "dependencies": {
-    "govuk-frontend": "^4.7.0",
+    "govuk-frontend": "^5.0.0",
     "accessible-autocomplete": "^2.0.4"
   },
   "devDependencies": {
@@ -82,14 +82,12 @@
     "jest-environment-node": "^26.6.2",
     "jest-serializer-html": "^5.0.0",
     "js-yaml": "^3.14.1",
-    "merge-stream": "^2.0.0",
     "mkdirp": "^3.0.1",
     "mockdate": "^3.0.2",
     "node-fetch": "^3.3.1",
     "node-sass": "^7.0.1",
     "nodemon": "^2.0.22",
     "nunjucks": "^3.2.4",
-    "oldie": "^1.3.0",
     "postcss": "^8.0.0",
     "postcss-pseudo-classes": "^0.2.0",
     "postcss-scss": "^2.0.0",

diff --git a/src/accessible-autocomplete.js b/src/accessible-autocomplete.js
@@ -1,12 +1,11 @@
 import HMRCAccessibleAutocomplete from 'accessible-autocomplete';
-import { nodeListForEach } from './common';
 import AccessibleAutoComplete from './components/accessible-autocomplete/accessible-autocomplete';
 
 window.HMRCAccessibleAutocomplete = HMRCAccessibleAutocomplete;
 
 const $AccessibleAutocomplete = document.querySelectorAll('select[data-module="hmrc-accessible-autocomplete"]');
 if ($AccessibleAutocomplete) {
-  nodeListForEach($AccessibleAutocomplete, (selectElement) => {
+  $AccessibleAutocomplete.forEach((selectElement) => {
     new AccessibleAutoComplete(selectElement, window, document).init();
   });
 }
diff --git a/src/accessible-autocomplete.scss b/src/accessible-autocomplete.scss
@@ -1,8 +1,8 @@
 $govuk-include-default-font-face: false;
 
-@import "../../govuk-frontend/govuk/settings/all";
-@import "../../govuk-frontend/govuk/tools/all";
-@import "../../govuk-frontend/govuk/helpers/all";
+@import "../../govuk-frontend/dist/govuk/settings/all";
+@import "../../govuk-frontend/dist/govuk/tools/all";
+@import "../../govuk-frontend/dist/govuk/helpers/all";
 @import "../../accessible-autocomplete/dist/accessible-autocomplete.min";
 
 .autocomplete__wrapper,

diff --git a/src/all-govuk-and-hmrc-ie8.scss b/src/all-govuk-and-hmrc-ie8.scss
diff --git a/src/all-govuk-and-hmrc.js b/src/all-govuk-and-hmrc.js
@@ -1,8 +1,5 @@
-import GOVUKFrontend from 'govuk-frontend/govuk/all';
+import { initAll } from 'govuk-frontend/dist/govuk/govuk-frontend.min';
 import HMRCFrontend from './all';
 
-window.GOVUKFrontend = GOVUKFrontend;
-window.HMRCFrontend = HMRCFrontend;
-
-GOVUKFrontend.initAll();
+initAll();
 HMRCFrontend.initAll();
diff --git a/src/all-govuk-and-hmrc.scss b/src/all-govuk-and-hmrc.scss
@@ -3,6 +3,6 @@ $hmrc-assets-path: "";
 $govuk-assets-path: "govuk/";
 $govuk-new-link-styles: true;
 
-@import "../../govuk-frontend/govuk/all";
+@import "../../govuk-frontend/dist/govuk/all";
 @import "components/all";
 @import "hmrc-frontend-print-overrides";
diff --git a/src/all-ie8.scss b/src/all-ie8.scss
diff --git a/src/all.js b/src/all.js
@@ -2,7 +2,6 @@ import AccountMenu from './components/account-menu/account-menu';
 import BackLinkHelper from './components/back-link-helper/back-link-helper';
 import TimeoutDialog from './components/timeout-dialog/timeout-dialog';
 import UserResearchBanner from './components/user-research-banner/user-research-banner';
-import { nodeListForEach } from './common';
 import SessionActivityService from './components/timeout-dialog/session-activity-service';
 import HmrcPrintLink from './components/hmrc-print-link/hmrc-print-link';
 
@@ -13,7 +12,7 @@ function initAll() {
   }
 
   const $HmrcPrintLinks = document.querySelectorAll('a[data-module="hmrc-print-link"]');
-  nodeListForEach($HmrcPrintLinks, ($HmrcPrintLink) => {
+  $HmrcPrintLinks.forEach(($HmrcPrintLink) => {
     new HmrcPrintLink($HmrcPrintLink, window).init();
   });
 
@@ -31,7 +30,7 @@ function initAll() {
   }
 
   const $BackLinks = document.querySelectorAll('[data-module="hmrc-back-link"]');
-  nodeListForEach($BackLinks, ($BackLink) => {
+  $BackLinks.forEach(($BackLink) => {
     new BackLinkHelper($BackLink, window, document).init();
   });
 }

diff --git a/src/all.scss b/src/all.scss
@@ -11,7 +11,6 @@ $govuk-global-styles: true;
 
 $hmrc-assets-path: "./" !default;
 $govuk-assets-path: $hmrc-assets-path !default;
-$govuk-is-ie8: false !default;
 $govuk-new-link-styles: true !default;
 
 @import "components/all";
diff --git a/src/common.js b/src/common.js
diff --git a/src/components/accessible-autocomplete/template.njk b/src/components/accessible-autocomplete/template.njk
@@ -1,6 +1,6 @@
-{% from "govuk/components/error-message/macro.njk" import govukErrorMessage -%}
-{% from "govuk/components/hint/macro.njk" import govukHint %}
-{% from "govuk/components/label/macro.njk" import govukLabel %}
+{% from "dist/govuk/components/error-message/macro.njk" import govukErrorMessage -%}
+{% from "dist/govuk/components/hint/macro.njk" import govukHint %}
+{% from "dist/govuk/components/label/macro.njk" import govukLabel %}
 
 {% set describedBy = params.describedBy if params.describedBy else "" %}
 <div class="govuk-form-group {%- if params.errorMessage %} govuk-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">

diff --git a/src/components/account-header/example.njk b/src/components/account-header/example.njk
@@ -1,7 +1,7 @@
 {% extends '../../layouts/account-header.html' %}
 
 {% block beforeContent %}
-  {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
+  {% from "dist/govuk/components/back-link/macro.njk" import govukBackLink %}
 
   {{ govukBackLink({
     text: "Back",

diff --git a/src/components/account-menu/_account-menu.scss b/src/components/account-menu/_account-menu.scss
@@ -1,7 +1,7 @@
-@import "../../../../govuk-frontend/govuk/settings/all";
-@import "../../../../govuk-frontend/govuk/tools/all";
-@import "../../../../govuk-frontend/govuk/helpers/all";
-@import "../../../../govuk-frontend/govuk/vendor/sass-mq";
+@import "../../../../govuk-frontend/dist/govuk/settings/all";
+@import "../../../../govuk-frontend/dist/govuk/tools/all";
+@import "../../../../govuk-frontend/dist/govuk/helpers/all";
+@import "../../../../govuk-frontend/dist/govuk/vendor/sass-mq";
 
 // previously provided by govuk-template, no equivalent in govuk-frontend
 .hidden {
@@ -33,10 +33,6 @@ $hmrc-transition-type: "all";
   background-image: url("data:image/svg+xml;base64,PHN2ZyBkYXRhLW5hbWU9IkxheWVyIDEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDI0IDI0IiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaW5ZTWlkIj48dGl0bGU+aWNvbi1ob21lPC90aXRsZT48cGF0aCBkPSJNMTIgMkwxIDEyLjVoMy4xOXY5LjM4aDUuNDR2LTcuMTNoNC41djcuMTNoNS40NFYxMi41SDIzTDEyIDJ6Ii8+PC9zdmc+");
   background-position: left -1px;
   background-size: 19px;
-
-  @include govuk-if-ie8 {
-    background-image: url("#{$hmrc-assets-path}components/account-menu/images/icon-home.png");
-  }
 }
 
 .hmrc-account-menu {
@@ -218,10 +214,6 @@ body:not(.js-enabled) {
     background-position: 10px;
     background-size: 12px;
 
-    @include govuk-if-ie8 {
-      background-image: url("#{$hmrc-assets-path}components/account-menu/images/icon-chevron-left.png");
-    }
-
     .hmrc-account-menu__link {
       padding: 12px 8px 8px;
 
@@ -238,10 +230,6 @@ body:not(.js-enabled) {
   background-repeat: no-repeat;
   background-position: right 4px center;
   background-size: 12px;
-
-  @include govuk-if-ie8 {
-    background-image: url("#{$hmrc-assets-path}components/account-menu/images/icon-chevron-right.png");
-  }
 }
 
 .js-enabled .hmrc-account-home--account--is-open,
@@ -250,10 +238,6 @@ body:not(.js-enabled) {
   background-image: url("#{$hmrc-assets-path}components/account-menu/images/icon-chevron-down.svg");
   background-position: right 4px center;
   background-size: 12px;
-
-  @include govuk-if-ie8 {
-    background-image: url("#{$hmrc-assets-path}components/account-menu/images/icon-chevron-down.png");
-  }
 }
 
 .js-enabled .hmrc-account-menu__link--more {
@@ -263,10 +247,6 @@ body:not(.js-enabled) {
   background-position: right 14px center;
   background-size: 12px;
 
-  @include govuk-if-ie8 {
-    background-image: url("#{$hmrc-assets-path}components/account-menu/images/icon-chevron-down.png");
-  }
-
   &::before,
   &::after {
     content: none;

diff --git a/src/components/account-menu/account-menu.js b/src/components/account-menu/account-menu.js
@@ -1,4 +1,3 @@
-import '../../vendor/polyfills/Element/prototype/dataset';
 import { debounce } from '../../utils/debounce';
 import { getCurrentBreakpoint } from '../../utils/breakpoints';
 

diff --git a/src/components/add-to-a-list/_add-to-a-list.scss b/src/components/add-to-a-list/_add-to-a-list.scss
@@ -1,7 +1,7 @@
-@import "../../../../govuk-frontend/govuk/settings/all";
-@import "../../../../govuk-frontend/govuk/tools/all";
-@import "../../../../govuk-frontend/govuk/helpers/all";
-@import "../../../../govuk-frontend/govuk/vendor/sass-mq";
+@import "../../../../govuk-frontend/dist/govuk/settings/all";
+@import "../../../../govuk-frontend/dist/govuk/tools/all";
+@import "../../../../govuk-frontend/dist/govuk/helpers/all";
+@import "../../../../govuk-frontend/dist/govuk/vendor/sass-mq";
 
 .hmrc-add-to-a-list {
   padding-left: 0;

diff --git a/src/components/add-to-a-list/template.njk b/src/components/add-to-a-list/template.njk
@@ -1,5 +1,5 @@
-{% from "govuk/components/button/macro.njk" import govukButton with context %}
-{% from "govuk/components/radios/macro.njk" import govukRadios with context %}
+{% from "dist/govuk/components/button/macro.njk" import govukButton with context %}
+{% from "dist/govuk/components/radios/macro.njk" import govukRadios with context %}
 {% from "../list-with-actions/macro.njk" import hmrcListWithActions with context %}
 
 {% if params.language == 'cy' %}

diff --git a/src/components/back-link-helper/_back-link-helper.scss b/src/components/back-link-helper/_back-link-helper.scss
@@ -3,6 +3,10 @@ body:not(.js-enabled) a[data-module="hmrc-back-link"][href="#"] {
   display: none;
 }
 
+body:not(.govuk-frontend-supported) a[data-module="hmrc-back-link"][href="#"] {
+  display: none;
+}
+
 .hmrc-hidden-backlink {
   display: none;
 }
diff --git a/src/components/back-link-helper/example.njk b/src/components/back-link-helper/example.njk
@@ -1,6 +1,6 @@
 {% extends "main.html" %}
 
-{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
+{% from "dist/govuk/components/back-link/macro.njk" import govukBackLink %}
 {% block content %}
 
 {{ govukBackLink(params) }}

diff --git a/src/components/banner/template.njk b/src/components/banner/template.njk
@@ -1,6 +1,5 @@
 <div class="hmrc-banner">
   <div class="hmrc-organisation-logo">
-  <!--[if gt IE 8]><!-->
     <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="26px" height="26px" viewBox="0 0 134.94 134.94" focusable="false" aria-hidden="true">
       <path d="M104.32,73.72,101,73.29c.94-2,1.51-3.22,1.51-3.22,0-.38,1.11-2.22,1.53-3.73a19.94,19.94,0,0,0,.61-3.89,15.05,15.05,0,0,0-3.68-10.06,12.21,12.21,0,0,0-9.18-4.18,17.46,17.46,0,0,0-3.68.44c-2.09.52-3.08.81-4.93,1.29a51.13,51.13,0,0,0-8.85,3.61,1.37,1.37,0,0,0-.73.91,2,2,0,0,0-.07.53L73.31,71.6H70.53V53.46a4.05,4.05,0,0,1,.18-1.14,3.37,3.37,0,0,1,1.43-1.71c.6-.39,1.21-.75,1.82-1.08a2.49,2.49,0,1,1,3.87-2.07c0,.12,0,.25,0,.37l.16-.06c.55-.19,1.16-.37,1.75-.55a2.49,2.49,0,1,1,3.71-2.16,2.66,2.66,0,0,1-.3,1.16l2.06-.56.36-.08a2.49,2.49,0,1,1,3.87-2.07A2.42,2.42,0,0,1,89,44.82h.06a16.43,16.43,0,0,1,2.72-.18,2.45,2.45,0,0,1-.48-1.45,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-.89,1.89A16.46,16.46,0,0,1,98.1,46a2.41,2.41,0,0,1-.12-.72,2.5,2.5,0,1,1,3,2.44,16.7,16.7,0,0,1,2.12,1.91v-.08a2.49,2.49,0,1,1,2.49,2.49,2.15,2.15,0,0,1-.68-.11,18.34,18.34,0,0,1,1.25,2.26,2.49,2.49,0,0,1,4.55,1.4,2.5,2.5,0,0,1-2.49,2.5,2.64,2.64,0,0,1-.8-.15,20.9,20.9,0,0,1,.35,2.1,2.52,2.52,0,0,1,1-.19,2.49,2.49,0,1,1,0,5,2.59,2.59,0,0,1-1.07-.25c0,.26-.08.54-.11.82s-.14.55-.21.78a2.49,2.49,0,0,1-.32,5,2.39,2.39,0,0,1-1.39-.43c-.34.8-.78,1.83-1.27,3" />
       <path d="M67.45,71.79a2.39,2.39,0,1,1,0-4.78h0a2.39,2.39,0,0,1,0,4.78Z" />
@@ -14,10 +13,6 @@
       <path d="M91.11,94.65A1.45,1.45,0,0,1,89.58,96l-7.89-.42a1.47,1.47,0,0,1-1.39-1.53L80.37,93a1.44,1.44,0,0,1,1.53-1.38l7.89.42a1.45,1.45,0,0,1,1.39,1.52Zm-20.47-1-2.81,2.81a.57.57,0,0,1-.36.16h0a.57.57,0,0,1-.36-.16l-2.82-2.81a.56.56,0,0,1,0-.81L67.09,90a.57.57,0,0,1,.36-.16h0a.57.57,0,0,1,.36.16l2.81,2.81a.55.55,0,0,1,0,.81m-17.41,2L45.34,96a1.45,1.45,0,0,1-1.53-1.37l-.07-1.13A1.46,1.46,0,0,1,45.13,92L53,91.58A1.45,1.45,0,0,1,54.55,93l.07,1.11a1.47,1.47,0,0,1-1.39,1.53m53.32-19.89a1.65,1.65,0,0,0-1.14-.66L100,74.32a.43.43,0,0,0-.43.39.45.45,0,0,0,.28.54h0a7,7,0,0,1,4,6.41c-3.92-.81-4.9-2.82-5.15-5.6,0-.12-.11-.33-.44-.36a.46.46,0,0,0-.49.25v0L96.24,88v0a.48.48,0,0,0,.91.16A7,7,0,0,1,103.5,84a8,8,0,0,1-5.59,5.74h0c-2-.22-4.09-.41-6.18-.59a5.1,5.1,0,0,1-4-4.14,3.86,3.86,0,0,1,.21-1c.51-1.36,1.49-2.25,2.58-1.85s1.26,1.72.76,3.07a3.58,3.58,0,0,1-.89,1.37A3.58,3.58,0,0,0,93.51,85c1.39-2,1.23-5-.94-6.27-1.42-.83-3.38.13-4.87,2,.45-2.93,2.23-5.52,2.43-7.78.29-3.19-.94-6.74-2.69-7.71-1.82.67-3.48,4-3.64,7.13-.1,2.27,1.43,5.26,1.51,8.25-1.23-2.13-3.1-3.4-4.63-2.76-2.32.94-2.91,3.94-1.8,6.09a3.67,3.67,0,0,0,2.85,2,3.45,3.45,0,0,1-.7-1.48c-.31-1.42,0-2.67,1.17-2.94s2,.76,2.3,2.18a3.64,3.64,0,0,1,0,1.31h0C83.65,87.2,82,87.94,80,88.44q-3.09-.14-6.23-.2h0l-.22,0c-2.94-.48-4.43-2.35-4.73-5.87a6.85,6.85,0,0,1,5.53,4.22.56.56,0,0,0,.55.35.48.48,0,0,0,.54-.44V75.35a.51.51,0,0,0-.5-.36.56.56,0,0,0-.51.33h0v0c-.52,2-1.58,4-5.61,4.3.33-3.93,2.12-5.13,4.74-5.7a.43.43,0,0,0,.3-.14.48.48,0,0,0,.13-.32v0a.52.52,0,0,0-.16-.35.5.5,0,0,0-.3-.11H61.41a.5.5,0,0,0-.3.11.57.57,0,0,0-.17.35v0a.48.48,0,0,0,.13.32.46.46,0,0,0,.31.14c2.61.57,4.41,1.77,4.74,5.7-4-.33-5.1-2.26-5.61-4.3v0h0A.56.56,0,0,0,60,75a.5.5,0,0,0-.5.36v11.1a.48.48,0,0,0,.54.44.53.53,0,0,0,.54-.35,6.87,6.87,0,0,1,5.54-4.22c-.3,3.52-1.79,5.39-4.73,5.87l-.23,0h0c-2.08,0-4.16.11-6.22.2-2-.5-3.66-1.24-4.56-3.37h0a3.43,3.43,0,0,1,.05-1.31c.31-1.42,1.16-2.42,2.3-2.18s1.47,1.52,1.17,2.94A3.69,3.69,0,0,1,53.2,86,3.67,3.67,0,0,0,56,84c1.1-2.15.52-5.15-1.8-6.09-1.54-.64-3.41.63-4.63,2.76.08-3,1.61-6,1.51-8.25-.16-3.18-1.82-6.46-3.64-7.13-1.75,1-3,4.52-2.69,7.71.2,2.26,2,4.85,2.43,7.78-1.49-1.86-3.46-2.82-4.87-2C40.18,80,40,83.07,41.41,85a3.58,3.58,0,0,0,3.08,1.63,3.58,3.58,0,0,1-.89-1.37c-.51-1.35-.39-2.64.76-3.07s2.07.49,2.58,1.85a3.86,3.86,0,0,1,.21,1,5.11,5.11,0,0,1-4,4.14c-2.07.18-4.13.37-6.17.59h0A8,8,0,0,1,31.42,84a7,7,0,0,1,6.35,4.12.45.45,0,0,0,.53.27.45.45,0,0,0,.38-.43v0L37.19,76v0a.47.47,0,0,0-.5-.25c-.32,0-.44.24-.44.36C36,78.83,35,80.84,31.1,81.65a7,7,0,0,1,4-6.41h0a.45.45,0,0,0,.28-.54.43.43,0,0,0-.43-.39l-5.46.73a1.65,1.65,0,0,0-1.14.66,1.84,1.84,0,0,0-.26,1.44c.14.81,1.79,12.39,1.94,13.45,0,.1.15,1.18.19,1.5a1.36,1.36,0,0,0,.48.67s2.42,1.64,2.84,2a.74.74,0,0,1,.18.86l-2.15,3.14a2,2,0,0,0-.26.42,1.19,1.19,0,0,0,.39,1.34H103.2a1.19,1.19,0,0,0,.39-1.34,2,2,0,0,0-.26-.42l-2.15-3.14a.75.75,0,0,1,.17-.86c.43-.33,2.85-2,2.85-2a1.36,1.36,0,0,0,.48-.67c0-.32.17-1.4.18-1.5.16-1.06,1.81-12.64,2-13.45a1.84,1.84,0,0,0-.26-1.44" />
       <path d="M67.47,7.72a59.76,59.76,0,1,0,59.75,59.75A59.75,59.75,0,0,0,67.47,7.72m67.47,59.75A67.47,67.47,0,1,1,67.47,0a67.47,67.47,0,0,1,67.47,67.47" />
     </svg>
-  <!--<![endif]-->
-  <!--[if IE 8]>
-    <img src="{{ params.assetsPath | default('/assets') }}/components/banner/images/hmrc_crest_18px.png">
-  <![endif]-->
     <p class="govuk-body-s">{% if params.language == 'cy' %}
         Cyllid a Thollau EF
       {% else %}

diff --git a/src/components/bundle.test.js b/src/components/bundle.test.js
diff --git a/src/components/character-count/template.njk b/src/components/character-count/template.njk
@@ -1,5 +1,5 @@
 {% set language = params.language | default('en') %}
-{% from "govuk/components/character-count/macro.njk" import govukCharacterCount %}
+{% from "dist/govuk/components/character-count/macro.njk" import govukCharacterCount %}
 
 {% if language === 'cy' %}
   {{ govukCharacterCount({

diff --git a/src/components/currency-input/_currency-input.scss b/src/components/currency-input/_currency-input.scss
@@ -1,7 +1,7 @@
-@import "../../../../govuk-frontend/govuk/settings/all";
-@import "../../../../govuk-frontend/govuk/tools/all";
-@import "../../../../govuk-frontend/govuk/helpers/all";
-@import "../../../../govuk-frontend/govuk/vendor/sass-mq";
+@import "../../../../govuk-frontend/dist/govuk/settings/all";
+@import "../../../../govuk-frontend/dist/govuk/tools/all";
+@import "../../../../govuk-frontend/dist/govuk/helpers/all";
+@import "../../../../govuk-frontend/dist/govuk/vendor/sass-mq";
 
 .hmrc-currency-input__wrapper {
   position: relative;

diff --git a/src/components/currency-input/template.njk b/src/components/currency-input/template.njk
@@ -1,6 +1,6 @@
-{% from "govuk/components/error-message/macro.njk" import govukErrorMessage -%}
-{% from "govuk/components/hint/macro.njk" import govukHint %}
-{% from "govuk/components/label/macro.njk" import govukLabel %}
+{% from "dist/govuk/components/error-message/macro.njk" import govukErrorMessage -%}
+{% from "dist/govuk/components/hint/macro.njk" import govukHint %}
+{% from "dist/govuk/components/label/macro.njk" import govukLabel %}
 
 {#- a record of other elements that we need to associate with the input using
 aria-describedby – for example hints or error messages -#}