Merge pull request #192 from nationalarchives/govukfrontendv5

GOV.UK frontend upgrade from version 4 to 5

.storybook/main.js

@@ -50,10 +50,10 @@ const config = {
           loader: "sass-loader",
           options: {
             additionalData: `
-              @import "govuk-frontend/govuk/base";
-              @import "govuk-frontend/govuk/settings/all";
-              @import "govuk-frontend/govuk/tools/all";
-              @import "govuk-frontend/govuk/helpers/all";
+              @import "govuk-frontend/dist/govuk/base";
+              @import "govuk-frontend/dist/govuk/settings/all";
+              @import "govuk-frontend/dist/govuk/tools/all";
+              @import "govuk-frontend/dist/govuk/helpers/all";
             `,
             implementation: require("sass"),
           },

.storybook/preview.js

@@ -11,4 +11,13 @@ const preview = {
   },
 };
 
+// Add the required GOV.UK Frontend classes to the body
+if (typeof window !== 'undefined' && document.body) {
+  document.body.className +=
+    ' js-enabled' +
+    ('noModule' in HTMLScriptElement.prototype
+      ? ' govuk-frontend-supported'
+      : '');
+}
+
 export default preview;

package.json

@@ -61,6 +61,6 @@
     "yaml-loader": "^0.8.1"
   },
   "dependencies": {
-    "govuk-frontend": "^4.9.0"
+    "govuk-frontend": "^5.7.1"
   }
 }

src/nationalarchives/all.scss

@@ -1,3 +1,3 @@
 @import "overrides";
-@import "govuk-frontend/govuk/all";
+@import "govuk-frontend/dist/govuk/all";
 @import "components";

src/nationalarchives/components/alert/alert.scss

@@ -1,5 +1,5 @@
-@import "govuk-frontend/govuk/settings/all";
-@import "govuk-frontend/govuk/tools/all";
-@import "govuk-frontend/govuk/helpers/all";
-@import "govuk-frontend/govuk/components/inset-text";
+@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/components/inset-text";
 @import "index";

src/nationalarchives/components/alert/alert.stories.ts

@@ -1,4 +1,3 @@
-// import "govuk-frontend/govuk/components/inset-text";
 import "../icon/_index.scss";
 import "./_index.scss";
 import iconStory from "../icon/icon.stories";

src/nationalarchives/components/card/card.scss

@@ -1,4 +1,4 @@
-@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 "index";

src/nationalarchives/components/header/header.scss

@@ -1,4 +1,4 @@
-@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 "index";

src/nationalarchives/components/header/header.stories.ts

@@ -19,14 +19,17 @@ export default {
     (storyFn) => {
       // Create an element that centres element with margin.
       const wrapper = document.createElement("div");
-      wrapper.classList.add("js-enabled");
       const parser = new DOMParser();
       const doc = parser.parseFromString(storyFn() as string, "text/html");
       wrapper.append(...doc.body.children);
-
       const header = wrapper.querySelector('[data-module="govuk-header"]');
       if (header !== null) {
-        new Header(header).init();
+        // Necessary because of the order in which decorators are
+        // applied. If the timeout isn't present Header() will not
+        // find any navigation items.
+        setTimeout(() => {
+          new Header(header);
+        }, 0);
       }
 
       return wrapper;

src/nationalarchives/components/icon/icon.scss

@@ -1,4 +1,4 @@
-@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 "index";

src/nationalarchives/components/multi-select-search/multi-select-search.scss

@@ -1,4 +1,4 @@
-@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 "index";

src/nationalarchives/components/nested-navigation/nested-navigation.scss

@@ -1,4 +1,4 @@
-@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 "index";

src/nationalarchives/govuk.scss

@@ -1,2 +1,2 @@
-@import "govuk-frontend/govuk/all";
+@import "govuk-frontend/dist/govuk/all";
 @import "overrides";