hof 21.0.0-instrumentation-beta.0 → 21.0.2-axios-beta

package/build/tasks/sass/index.js

@@ -26,7 +26,9 @@ module.exports = config => {
       sass.render({
         file: config.sass.src,
         importer: importer({ aliases }),
-        aliases
+        aliases,
+        outputStyle: config.sass.outputStyle,
+        quietDeps: config.sass.quietDeps
       }, (err, result) => err ? reject(err) : resolve(result.css));
     }))
     .then(css => new Promise((resolve, reject) => {

package/build/tasks/watch/index.js

@@ -116,7 +116,7 @@ module.exports = config => {
 
       if (process.env.HOF_SANDBOX === 'true') {
         const rootDir = require('path').resolve(__dirname, '../../../');
-        ignored.push(`${rootDir}/frontend/govuk-template/govuk_template.html`);
+        ignored.push(`${rootDir}/frontend/govuk-template/govuk_template_generated.html`);
         watchLocation = [rootDir, '.'];
       }
 

package/components/combine-and-loop-fields/Readme.md

@@ -0,0 +1,42 @@
+# Combine & Loop Fields Behaviour
+
+## What this does
+This allows you to specify fields to loop over and add as objects to a parent array. You can use this for adding multiple addresses, criminal offences, names etc. You can see here in this example, we ask for a set of details prefixed with the word `storage-` for getting address details for multiple storage addresses (see the Home Office's firearms repository). We then can aggregate these addresses as objects into an array called `all-storage-addresses` and get redirected back to `/add-address` whenever we selected `yes` to adding another address,
+```
+'/add-address': {
+  fields: [
+    'storage-building',
+    'storage-street',
+    'storage-townOrCity',
+    'storage-postcodeOrZIPCode'
+  ],
+  next: '/add-another-address-with-list',
+  continueOnEdit: true
+},
+'/add-another-address-with-list': {
+  template: 'add-another-address-loop.html',
+  behaviours: CombineAndLoopFields({
+    groupName: 'all-storage-addresses',
+    fieldsToGroup: [
+      'storage-building',
+      'storage-street',
+      'storage-townOrCity',
+      'storage-postcodeOrZIPCode'
+    ],
+    removePrefix: 'storage-',
+    combineValuesToSingleField: 'address',
+    groupOptional: true,
+    returnTo: '/add-address'
+  }),
+  next: '/confirm'
+```
+Here are the fields you call this behaviour first to set config for it:
+```
+`groupName`: (Required) a parent array for storing details for each object you are collecting information for,
+`fieldsToGroup`: (Required) the fields being specified for an object, e.g. house number, street, postcode, that are grouped together,
+`removePrefix`: (Optional) a string which is used to remove consistent prefixes from a collection of fields that are grouped together,
+`combineValuesToSingleField`: (Optional) a new field that is created with its value being the concatenation of values of the fields specified in `fieldsToGroup`,
+`groupOptional`: (Optional) set this to true if you want to land on the radio button question if all records in the group are deleted after creation,
+`returnTo`: (Required) the next step if you want to add another object to this group
+```
+N.B. in the above example we use `continueOnEdit: true` on the individual record step (i.e. `/add-address`) to ensure we revisit the grouped fields page otherwise it will not be added to the group and the user will be returned to the 'Check Your Answers' page upon a field edit.

package/components/combine-and-loop-fields/index.js

@@ -0,0 +1,156 @@
+
+const _ = require('lodash');
+const uuid = require('uuid').v1;
+const path = require('path');
+const express = require('express');
+
+module.exports = config => {
+  const { returnTo, groupName, fieldsToGroup, combineValuesToSingleField, removePrefix, groupOptional } = config;
+
+  if (removePrefix && typeof removePrefix !== 'string') {
+    throw new Error('removePrefix is a string and is optional for loops');
+  }
+
+  if (combineValuesToSingleField && typeof combineValuesToSingleField !== 'string') {
+    throw new Error('combineValuesToSingleField is a string and is optional for loops');
+  }
+
+  if (!returnTo || typeof returnTo !== 'string') {
+    throw new Error('returnTo is a string and is required for loops');
+  }
+
+  if (!groupName || typeof groupName !== 'string') {
+    throw new Error('groupName is a string and is required for loops');
+  }
+
+  if (!fieldsToGroup ||
+    !fieldsToGroup.length ||
+    !Array.isArray(fieldsToGroup) ||
+    _.some(fieldsToGroup, field => typeof field !== 'string')) {
+    throw new Error('fieldsToGroup is an array of strings and is required for loops');
+  }
+
+  return superclass => class extends superclass {
+    get(req, res, next) {
+      if (req.query.delete) {
+        const router = express.Router({ mergeParams: true });
+        router.use([
+          // eslint-disable-next-line no-underscore-dangle
+          this._configure.bind(this),
+          this.removeItem.bind(this),
+          this.reload.bind(this)
+        ]);
+        return router.handle(req, res, next);
+      }
+      return super.get(req, res, next);
+    }
+
+    getLoopFields(req) {
+      let loopedFields = _.pick(req.sessionModel.toJSON(), fieldsToGroup);
+
+      if (removePrefix) {
+        loopedFields = _.mapKeys(loopedFields, (value, key) => key.replace(removePrefix, ''));
+      }
+      return loopedFields;
+    }
+
+    removeItem(req, res, next) {
+      const id = req.query.delete;
+      const items = req.sessionModel.get(groupName).filter(item => item.id !== id);
+      req.sessionModel.set(groupName, items);
+      next();
+    }
+
+    // eslint-disable-next-line no-unused-vars
+    reload(req, res, next) {
+      const items = req.sessionModel.get(groupName);
+      if (!items.length) {
+        req.sessionModel.set(`${groupName}-saved`, false);
+        fieldsToGroup.forEach(field => {
+          req.sessionModel.unset(field);
+        });
+      }
+
+      const target = (items.length || groupOptional) ? req.form.options.route : returnTo;
+      const action = req.params.action || '';
+      res.redirect(path.join(req.baseUrl, target, action));
+    }
+
+    configure(req, res, next) {
+      const field = `${groupName}-add-another`;
+      // add yes/no field
+      req.form.options.fields[field] = Object.assign({
+        mixin: 'radio-group',
+        validate: ['required'],
+        options: [
+          'yes', 'no'
+        ],
+        legend: {
+          className: 'visuallyhidden'
+        }
+      }, req.form.options.fieldSettings);
+
+      // add conditonal fork
+      req.form.options.forks = req.form.options.forks || [];
+      req.form.options.forks.push({
+        target: returnTo,
+        continueOnEdit: true,
+        condition: {
+          field: field,
+          value: 'yes'
+        }
+      });
+      next();
+    }
+
+    getValues(req, res, next) {
+      const fieldsGroup = req.sessionModel.get(groupName) || [];
+      const added = req.sessionModel.get(`${groupName}-saved`);
+      return super.getValues(req, res, (err, values) => {
+        if (err) {
+          return next(err);
+        }
+        if (!added) {
+          const fields = this.getLoopFields(req);
+          if (!_.isEmpty(fields)) {
+            const newField = Object.assign({id: uuid()}, fields);
+
+            if (combineValuesToSingleField) {
+              const combinedValues = _.filter(fieldsToGroup.map(field => req.sessionModel.get(field))).join(', ');
+              newField[combineValuesToSingleField] = combinedValues;
+            }
+
+            fieldsGroup.push(newField);
+            values[groupName] = fieldsGroup;
+            fieldsToGroup.forEach(field => req.sessionModel.unset(field));
+
+            req.sessionModel.set(groupName, fieldsGroup);
+            req.sessionModel.set(`${groupName}-saved`, true);
+          }
+        }
+        return next(null, values);
+      });
+    }
+
+    locals(req, res) {
+      const items = req.form.values[groupName] || [];
+      return Object.assign({}, super.locals(req, res), {
+        items,
+        hasItems: items.length > 0,
+        field: groupName
+      });
+    }
+
+    saveValues(req, res, next) {
+      // remove "yes" value from session so it is no pre-populated next time around
+      super.saveValues(req, res, err => {
+        const field = `${groupName}-add-another`;
+        if (req.form.values[field] === 'yes') {
+          req.sessionModel.unset(field);
+          req.sessionModel.set(`${groupName}-saved`, false);
+        }
+        next(err);
+      });
+    }
+  };
+};

package/components/date/index.js

@@ -40,6 +40,7 @@ const conditionalTranslate = (key, translate) => {
 };
 
 const getLegendClassName = field => field && field.legend && field.legend.className || '';
+const getIsPageHeading = field => field && field.isPageHeading || '';
 
 module.exports = (key, opts) => {
   if (!key) {
@@ -144,8 +145,9 @@ module.exports = (key, opts) => {
     const legend = conditionalTranslate(`fields.${key}.legend`, req.translate);
     const hint = conditionalTranslate(`fields.${key}.hint`, req.translate);
     const legendClassName = getLegendClassName(options);
+    const isPageHeading = getIsPageHeading(options);
     const error = req.form.errors && req.form.errors[key];
-    res.render(template, { key, legend, legendClassName, hint, error }, (err, html) => {
+    res.render(template, { key, legend, legendClassName, isPageHeading, hint, error }, (err, html) => {
       if (err) {
         next(err);
       } else {

package/components/date/templates/date.html

@@ -1,17 +1,20 @@
-<fieldset id="{{key}}-group" class="{{#className}}{{className}}{{/className}} {{#error}}validation-error{{/error}}">
-  <legend>
-    {{#error}}
-      <span id="{{key}}-error" class="error-message">{{error.message}}</span>
-    {{/error}}
-    <span{{#legendClassName}} class="{{legendClassName}}"{{/legendClassName}}>{{legend}}</span>
+<div class="govuk-form-group {{#error}}govuk-form-group--error{{/error}}">
+<fieldset id="{{key}}-group" class="govuk-fieldset{{#className}} {{className}}{{/className}}" role="group">
+  <legend class="govuk-fieldset__legend {{#isPageHeading}}govuk-fieldset__legend--l{{/isPageHeading}}{{#legendClassName}} {{legendClassName}}{{/legendClassName}}">
+    {{#isPageHeading}}<h1 class="govuk-fieldset__heading">{{/isPageHeading}}
+      {{legend}}
+    {{#isPageHeading}}</h1>{{/isPageHeading}}
+  </legend>
     {{#hint}}
-      <span id="{{key}}-hint" class="form-hint">{{hint}}</span>
+      <span id="{{key}}-hint" class="govuk-hint">{{hint}}</span>
     {{/hint}}
-  </legend>
-
-  <input type="hidden" name="{{key}}" />
-
-  <div class="form-group form-date">
+    {{#error}}
+      <p id="{{key}}-error" class="govuk-error-message">
+        <span class="govuk-visually-hidden">Error:</span> {{error.message}}
+      </p>
+    {{/error}}
+  <div id="{{key}}" class="govuk-date-input">
     {{#input-date}}{{key}}{{/input-date}}
   </div>
 </fieldset>
+</div>

package/components/homeoffice-countries/index.js

@@ -0,0 +1,22 @@
+
+const _ = require('lodash');
+const componentDefaults = require('../../config/component-defaults');
+
+module.exports = superclass => class extends superclass {
+  configure(req, res, next) {
+    const homeOfficeCountries = [''].concat(require('homeoffice-countries').allCountries);
+
+    const nationalityFields = componentDefaults.homeOfficeCountries;
+
+    nationalityFields.forEach(field => {
+      if (_.get(req, `form.options.fields[${field}].options`)) {
+        req.form.options.fields[field].options = homeOfficeCountries.map(country => {
+          const labelString = country !== '' ? country : 'Please select a country';
+          return { label: labelString, value: country };
+        });
+      }
+    });
+
+    next();
+  }
+};

package/components/index.js

@@ -3,8 +3,10 @@
 module.exports = {
   addressLookup: require('./address-lookup'),
   clearSession: require('./clear-session'),
+  combineAndLoopFields: require('./combine-and-loop-fields'),
   date: require('./date'),
   emailer: require('./emailer'),
+  homeOfficeCountries: require('./homeoffice-countries'),
   notify: require('./notify'),
   summary: require('./summary')
 };

package/components/notify/notify.js

@@ -1,6 +1,6 @@
 'use strict';
 const NotifyClient = require('notifications-node-client').NotifyClient;
-const uuid = require('uuid');
+const { v4: uuidv4 } = require('uuid');
 
 module.exports = class Notify {
   constructor(opts) {
@@ -11,7 +11,7 @@ module.exports = class Notify {
   }
 
   send(email) {
-    const reference = uuid.v1();
+    const reference = uuidv4();
 
     return this.notifyClient.sendEmail(this.notifyTemplate, email.recipient, {
       personalisation: {

package/components/summary/index.js

@@ -59,7 +59,7 @@ module.exports = SuperClass => class extends SuperClass {
           fieldData.value = fieldSpec.derivation ?
             this.runCombinerForDerivedField(fieldSpec, req) : fieldData.value;
           fieldData.value = (typeof fieldSpec.parse === 'function') ?
-            fieldSpec.parse(fieldData.value) : fieldData.value;
+            fieldSpec.parse(fieldData.value, req) : fieldData.value;
         }
 
         return fieldData;
@@ -121,7 +121,8 @@ module.exports = SuperClass => class extends SuperClass {
   }
 
   getStepForField(key, steps) {
-    return Object.keys(steps).filter(step => steps[step].fields && steps[step].fields.indexOf(key) > -1)[0];
+    const keyName = Array.isArray(key) ? key[0] : key;
+    return Object.keys(steps).filter(step => steps[step].fields && steps[step].fields.indexOf(keyName) > -1)[0];
   }
 
 

package/config/builder-defaults.js

@@ -12,7 +12,9 @@ module.exports = {
     src: 'assets/scss/app.scss',
     out: 'public/css/app.css',
     match: 'assets/scss/**/*.scss',
-    restart: false
+    restart: false,
+    quietDeps: false,
+    outputStyle: 'expanded'
   },
   translate: {
     src: 'apps/**/translations/src',

package/config/component-defaults.js

@@ -0,0 +1,13 @@
+
+module.exports = {
+  homeOfficeCountries: [
+    'nationality',
+    'former-nationality',
+    'dual-nationality',
+    'nominated-nationality',
+    'nationality-error',
+    'country',
+    'country-of-birth',
+    'someone-else-nationality'
+  ]
+};

package/controller/controller.js

@@ -103,15 +103,23 @@ module.exports = class Controller extends BaseController {
     const locals = super.locals(req, res);
     const stepLocals = req.form.options.locals || {};
 
-    const fields = _.map(req.form.options.fields, (field, key) =>
+    let fields = _.map(req.form.options.fields, (field, key) =>
       Object.assign({}, field, { key })
     );
+    // only include fields that aren't dependents to mitigate duplicate fields on the page
+    fields = fields.filter(field => !req.form.options.fields[field.key].dependent);
 
     return _.extend({}, locals, {
       fields,
       route,
       baseUrl: req.baseUrl,
+      skipToMain: this.getFirstFormItem(req.form.options.fields),
       title: this.getTitle(route, lookup, req.form.options.fields, res.locals),
+      journeyHeaderURL: this.getJourneyHeaderURL(req.baseUrl),
+      header: this.getHeader(route, lookup, res.locals),
+      captionHeading: this.getCaptionHeading(route, lookup, res.locals),
+      warning: this.getWarning(route, lookup, res.locals),
+      subHeading: this.getSubHeading(route, lookup, res.locals),
       intro: this.getIntro(route, lookup, res.locals),
       backLink: this.getBackLink(req, res),
       nextPage: this.getNextStep(req, res),
@@ -119,6 +127,34 @@ module.exports = class Controller extends BaseController {
     }, stepLocals);
   }
 
+  getJourneyHeaderURL(url) {
+    return url === '' ? '/' : url;
+  }
+
+  getFirstFormItem(fields) {
+    let firstFieldKey;
+    if (_.size(fields)) {
+      firstFieldKey = Object.keys(fields)[0];
+    }
+    return firstFieldKey | 'main-content';
+  }
+
+  getHeader(route, lookup, locals) {
+    return lookup(`pages.${route}.header`, locals);
+  }
+
+  getCaptionHeading(route, lookup, locals) {
+    return lookup(`pages.${route}.captionHeading`, locals);
+  }
+
+  getSubHeading(route, lookup, locals) {
+    return lookup(`pages.${route}.subHeading`, locals);
+  }
+
+  getWarning(route, lookup, locals) {
+    return lookup(`pages.${route}.warning`, locals);
+  }
+
   getTitle(route, lookup, fields, locals) {
     let fieldName = '';
     if (_.size(fields)) {
@@ -140,6 +176,26 @@ module.exports = class Controller extends BaseController {
   _getErrors(req, res, callback) {
     super._getErrors(req, res, () => {
       Object.keys(req.form.errors).forEach(key => {
+        if (req.form && req.form.options && req.form.options.fields) {
+          const field = req.form.options.fields[key];
+          // get first option for radios and checkbox
+          if (field.mixin === 'radio-group' || field.mixin === 'checkbox-group') {
+            // get first option for radios and checkbox where there is a toggle
+            if(typeof field.options[0] === 'object') {
+              req.form.errors[key].errorLinkId = key + '-' + field.options[0].value;
+            } else {
+              req.form.errors[key].errorLinkId = key + '-' + field.options[0];
+            }
+          // eslint-disable-next-line brace-style
+          }
+          // get first field for date input control
+          else if (field && field.mixin === 'input-date') {
+            req.form.errors[key].errorLinkId = key + '-day';
+          } else {
+            req.form.errors[key].errorLinkId = key;
+          }
+        }
+
         req.form.errors[key].message = this.getErrorMessage(req.form.errors[key], req, res);
       });
       callback();

package/controller/formatting/formatters.js

@@ -53,6 +53,18 @@ module.exports = {
 
   base64decode(value) {
     return Buffer.from(value, 'base64').toString();
+  },
+
+  ukPostcode(value) {
+    if (typeof value !== 'string' || value === '') {
+      return value;
+    }
+
+    const postcode = this.uppercase(this.removespaces(value));
+    const firstPart = postcode.slice(0, -3);
+    const secondPart = postcode.slice(-3);
+
+    return `${firstPart} ${secondPart}`;
   }
 
 };

package/controller/validation/index.js

@@ -63,7 +63,8 @@ function validate(fields) {
     debug(`Validating field: "${key}" with value: "${value}"`);
 
     function shouldValidate() {
-      let dependent = fields[key].dependent;
+      // validationLink used to validates multiple dependent fields in checkbox-group
+      let dependent = fields[key].dependent || fields[key].validationLink;
 
       if (typeof dependent === 'string') {
         dependent = {

package/controller/validation/validators.js

@@ -62,6 +62,10 @@ module.exports = Validators = {
     return Validators.string(value) && (value === '' || value.length <= length);
   },
 
+  maxword(value, length) {
+    return Validators.string(value) && (value === '' || value.split(/\s+/).length <= length);
+  },
+
   exactlength(value, length) {
     return Validators.string(value) && (value === '' || value.length === length);
   },

package/frontend/govuk-template/build/config.js

@@ -5,6 +5,7 @@ module.exports = {
   assetPath: '{{govukAssetPath}}',
   afterHeader: '{{$afterHeader}}{{/afterHeader}}',
   bodyClasses: '{{$bodyClasses}}{{/bodyClasses}}',
+  bodyStart: '{{$bodyStart}}{{/bodyStart}}',
   bodyEnd: '{{$bodyEnd}}{{/bodyEnd}}',
   content: '{{$main}}{{/main}}',
   cookieMessage: '{{$cookieMessage}}{{/cookieMessage}}',
@@ -17,8 +18,7 @@ module.exports = {
   insideHeader: '{{$insideHeader}}{{/insideHeader}}',
   pageTitle: '{{$pageTitle}}{{/pageTitle}}',
   propositionHeader: '{{$propositionHeader}}{{/propositionHeader}}',
-  skipLinkMessage: '{{$skipLinkMessage}}Skip to main content{{/skipLinkMessage}}',
   globalHeaderText: '{{$globalHeaderText}}GOV.UK{{/globalHeaderText}}',
-  licenceMessage: '{{$licenceMessage}}<p>All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated</p>{{/licenceMessage}}',
+  licenceMessage: '{{$licenceMessage}}All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" id="open-government-licence" class="govuk-footer__link" target="_blank" rel="license">Open Government Licence v3.0</a>, except where otherwise stated{{/licenceMessage}}',
   crownCopyrightMessage: '{{$crownCopyrightMessage}}© Crown copyright{{/crownCopyrightMessage}}'
 };

package/frontend/govuk-template/build/govuk_template.html

@@ -0,0 +1,104 @@
+
+<!DOCTYPE html>
+<!--[if lt IE 9]><html class="lte-ie8" lang="{{ htmlLang }}"><![endif]-->
+<!--[if gt IE 8]><!--><html lang="{{ htmlLang }}" class="govuk-template"><!--<![endif]-->
+  <head>
+    <meta charset="utf-8" />
+    <title>{{ pageTitle }}</title>
+
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{assetPath}}images/favicon.ico" type="image/x-icon">
+      <link rel="mask-icon" href="{{assetPath}}images/govuk-mask-icon.svg" color="#0b0c0c"> 
+      <link rel="apple-touch-icon" sizes="180x180" href="{{assetPath}}images/govuk-apple-touch-icon-180x180.png">
+      <link rel="apple-touch-icon" sizes="167x167" href="{{assetPath}}images/govuk-apple-touch-icon-167x167.png">
+      <link rel="apple-touch-icon" sizes="152x152" href="{{assetPath}}images/govuk-apple-touch-icon-152x152.png">
+      <link rel="apple-touch-icon" href="{{assetPath}}images/govuk-apple-touch-icon.png">
+    
+    
+    <meta name="theme-color" content="#0b0c0c" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{{ head }}}
+    
+    
+    <meta property="og:image" content="{{assetPath}}images/opengraph-image.png">
+  </head>
+
+  <body class="{{ bodyClasses }} govuk-template__body  js-enabled" >
+    <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
+
+    
+
+    <div id="global-cookie-message" class="gem-c-cookie-banner govuk-clearfix" data-module="cookie-banner" role="region" aria-label="cookie banner" data-nosnippet="">
+       {{{ cookieMessage }}}
+    </div>
+	
+	{{{ bodyStart }}}  
+	
+    <header role="banner" id="govuk-header" class="{{{ headerClass }}}">
+      <div class="govuk-header__container govuk-width-container">
+        
+          <div class="govuk-header__logo">
+            <a href="{{{ homepageUrl }}}" title="{{ logoLinkTitle }}" id="logo" class="govuk-header__link govuk-header__link--homepage" target="_blank" data-module="track-click" data-track-category="homeLinkClicked" data-track-action="homeHeader">
+			<span class="govuk-header__logotype">
+				<!--[if gt IE 8]><!-->
+          <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 132 97" height="30" width="36">
+            <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
+          </svg>
+          <!--<![endif]-->
+         <!--<![endif]-->
+          <!--[if IE 8]>
+          <img src="{{ assetPath }}images/govuk-logotype-crown.png" class="govuk-header__logotype-crown-fallback-image" width="36" height="32">
+          <![endif]-->
+			</span>
+				<span class="govuk-header__logotype-text">
+				  {{{ globalHeaderText }}}
+				</span>
+            </a>
+          </div>
+          {{{ insideHeader }}}
+        
+        {{{ propositionHeader }}}
+      </div>
+    </header>
+    
+
+    {{{ afterHeader }}}
+
+
+    {{{ content }}}
+
+    <footer class="govuk-footer" id="footer" role="contentinfo">
+
+      <div class="govuk-width-container">
+        {{{ footerTop }}}
+
+        <div class="govuk-footer__meta">
+          <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+		        <h2 class="govuk-visually-hidden">Support links</h2>
+            {{{ footerSupportLinks }}}
+
+			      <svg aria-hidden="true" focusable="false" class="govuk-footer__licence-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 483.2 195.7" height="17" width="41">
+                <path fill="currentColor" d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"></path>
+            </svg>
+            
+			      <span class="govuk-footer__licence-description">{{{ licenceMessage }}}</span>
+          </div>
+
+          <div class="govuk-footer__meta-item">
+            <a class="govuk-footer__link govuk-footer__copyright-logo" id="copyright-logo" target="_blank" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">{{{ crownCopyrightMessage }}}</a>
+          </div>
+        </div>
+      </div>
+    </footer>
+
+    <div id="global-app-error" class="app-error hidden"></div>
+	
+
+    {{{ bodyEnd }}}
+	
+	
+    <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>if (typeof window.GOVUK === 'undefined') document.body.className = document.body.className.replace('js-enabled', '');</script>
+	
+  </body>
+</html>

package/frontend/govuk-template/build/index.js

@@ -12,12 +12,12 @@ function addNonceValueAttributeToInlineScripts(compiledTemplateString) {
 }
 
 module.exports = () => {
-  const template = require.resolve('govuk_template_mustache/views/layouts/govuk_template.html');
+  const template = require.resolve('./govuk_template.html');
 
   const govukTemplate = fs.readFileSync(template, { encoding: 'utf-8' });
   const compiledTemplate = Hogan.compile(govukTemplate).render(govukConfig);
   const parsedTemplate = addNonceValueAttributeToInlineScripts(compiledTemplate);
-  const output = path.resolve(__dirname, '../govuk_template.html');
+  const output = path.resolve(__dirname, '../govuk_template_generated.html');
 
   fs.writeFileSync(output, parsedTemplate, { encoding: 'utf-8' });
 };