hof 19.13.13 → 20.0.0-beta.1

package/.nyc_output/processinfo/65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4.json

@@ -0,0 +1 @@
+{"parent":null,"pid":50639,"argv":["/Users/sulthan/.nvm/versions/node/v16.14.0/bin/node","/Users/sulthan/development/HO/hof/node_modules/.bin/_mocha","test/**/*.spec.js","sandbox/test/**/*.spec.js"],"execArgv":[],"cwd":"/Users/sulthan/development/HO/hof","time":1649843631953,"ppid":50638,"coverageFilename":"/Users/sulthan/development/HO/hof/.nyc_output/65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4.json","externalId":"","uuid":"65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4","files":["/Users/sulthan/development/HO/hof/model/index.js","/Users/sulthan/development/HO/hof/components/index.js","/Users/sulthan/development/HO/hof/components/address-lookup/index.js","/Users/sulthan/development/HO/hof/components/address-lookup/default-model.js","/Users/sulthan/development/HO/hof/components/address-lookup/defaults.js","/Users/sulthan/development/HO/hof/components/clear-session/index.js","/Users/sulthan/development/HO/hof/components/date/index.js","/Users/sulthan/development/HO/hof/components/date/fields.js","/Users/sulthan/development/HO/hof/components/emailer/index.js","/Users/sulthan/development/HO/hof/components/emailer/email-service.js","/Users/sulthan/development/HO/hof/components/emailer/emailer.js","/Users/sulthan/development/HO/hof/components/emailer/transports/index.js","/Users/sulthan/development/HO/hof/components/emailer/transports/smtp.js","/Users/sulthan/development/HO/hof/components/emailer/transports/ses.js","/Users/sulthan/development/HO/hof/components/emailer/transports/stub.js","/Users/sulthan/development/HO/hof/components/emailer/transports/debug.js","/Users/sulthan/development/HO/hof/components/summary/index.js","/Users/sulthan/development/HO/hof/controller/base-controller.js","/Users/sulthan/development/HO/hof/controller/formatting/index.js","/Users/sulthan/development/HO/hof/controller/validation/index.js","/Users/sulthan/development/HO/hof/controller/validation/validators.js","/Users/sulthan/development/HO/hof/controller/validation/email.js","/Users/sulthan/development/HO/hof/controller/validation-error.js","/Users/sulthan/development/HO/hof/controller/formatting/formatters.js","/Users/sulthan/development/HO/hof/controller/index.js","/Users/sulthan/development/HO/hof/controller/behaviour-session.js","/Users/sulthan/development/HO/hof/controller/behaviour-hooks.js","/Users/sulthan/development/HO/hof/controller/controller.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/behaviours/country-select.js","/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/index.js","/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/template-mixins.js","/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/render.js","/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/helpers.js","/Users/sulthan/development/HO/hof/index.js","/Users/sulthan/development/HO/hof/frontend/index.js","/Users/sulthan/development/HO/hof/frontend/govuk-template/index.js","/Users/sulthan/development/HO/hof/frontend/govuk-template/build/index.js","/Users/sulthan/development/HO/hof/frontend/govuk-template/build/config.js","/Users/sulthan/development/HO/hof/frontend/template-partials/index.js","/Users/sulthan/development/HO/hof/frontend/template-partials/translations/index.js","/Users/sulthan/development/HO/hof/frontend/themes/index.js","/Users/sulthan/development/HO/hof/frontend/themes/gov-uk/index.js","/Users/sulthan/development/HO/hof/frontend/toolkit/index.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/helpers.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/form-focus.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/progressive-reveal.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/validation.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/character-count.js","/Users/sulthan/development/HO/hof/middleware/index.js","/Users/sulthan/development/HO/hof/middleware/cookies.js","/Users/sulthan/development/HO/hof/middleware/errors.js","/Users/sulthan/development/HO/hof/middleware/not-found.js","/Users/sulthan/development/HO/hof/middleware/deep-translate.js","/Users/sulthan/development/HO/hof/lib/markdown.js","/Users/sulthan/development/HO/hof/lib/router.js","/Users/sulthan/development/HO/hof/wizard/index.js","/Users/sulthan/development/HO/hof/wizard/behaviours/index.js","/Users/sulthan/development/HO/hof/wizard/behaviours/complete.js","/Users/sulthan/development/HO/hof/wizard/util/constants.js","/Users/sulthan/development/HO/hof/lib/helpers.js","/Users/sulthan/development/HO/hof/lib/health.js","/Users/sulthan/development/HO/hof/lib/serve-static.js","/Users/sulthan/development/HO/hof/lib/ga-tag.js","/Users/sulthan/development/HO/hof/lib/sessions.js","/Users/sulthan/development/HO/hof/lib/settings.js","/Users/sulthan/development/HO/hof/config/hof-defaults.js","/Users/sulthan/development/HO/hof/lib/logger.js","/Users/sulthan/development/HO/hof/build/index.js","/Users/sulthan/development/HO/hof/config/builder-defaults.js","/Users/sulthan/development/HO/hof/transpiler/index.js","/Users/sulthan/development/HO/hof/transpiler/lib/compile.js","/Users/sulthan/development/HO/hof/transpiler/lib/build.js","/Users/sulthan/development/HO/hof/transpiler/lib/expand-dirs.js","/Users/sulthan/development/HO/hof/transpiler/lib/aggregate.js","/Users/sulthan/development/HO/hof/transpiler/lib/write-files.js","/Users/sulthan/development/HO/hof/model/apis/index.js","/Users/sulthan/development/HO/hof/model/apis/html-to-pdf-converter.js","/Users/sulthan/development/HO/hof/utilities/index.js","/Users/sulthan/development/HO/hof/utilities/autofill/index.js","/Users/sulthan/development/HO/hof/utilities/autofill/inputs.js","/Users/sulthan/development/HO/hof/utilities/test-data/index.js","/Users/sulthan/development/HO/hof/utilities/countries.js","/Users/sulthan/development/HO/hof/utilities/helpers/index.js","/Users/sulthan/development/HO/hof/utilities/reqres/index.js","/Users/sulthan/development/HO/hof/wizard/model.js","/Users/sulthan/development/HO/hof/wizard/middleware/back-links.js","/Users/sulthan/development/HO/hof/wizard/util/helpers.js","/Users/sulthan/development/HO/hof/wizard/middleware/check-complete.js","/Users/sulthan/development/HO/hof/wizard/middleware/check-progress.js","/Users/sulthan/development/HO/hof/wizard/middleware/check-session.js","/Users/sulthan/development/HO/hof/wizard/middleware/csrf.js","/Users/sulthan/development/HO/hof/sandbox/test/_unit/example_app/sections/summary-data-sections.spec.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/sections/summary-data-sections.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/lib/staticAppealStages.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/fields.js","/Users/sulthan/development/HO/hof/sandbox/test/helpers/utilities.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/behaviours/international-number.js","/Users/sulthan/development/HO/hof/lib/encryption.js"]}

package/.nyc_output/processinfo/index.json

@@ -0,0 +1 @@
+{"processes":{"65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4":{"parent":null,"children":[]}},"files":{"/Users/sulthan/development/HO/hof/model/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/address-lookup/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/address-lookup/default-model.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/address-lookup/defaults.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/clear-session/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/date/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/date/fields.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/email-service.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/emailer.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/smtp.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/ses.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/stub.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/debug.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/summary/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/base-controller.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/formatting/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/validation/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/validation/validators.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/validation/email.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/validation-error.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/formatting/formatters.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/behaviour-session.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/behaviour-hooks.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/controller.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/behaviours/country-select.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/template-mixins.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/render.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/helpers.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/govuk-template/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/govuk-template/build/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/govuk-template/build/config.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-partials/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-partials/translations/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/themes/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/themes/gov-uk/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/helpers.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/form-focus.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/progressive-reveal.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/validation.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/character-count.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/cookies.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/errors.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/not-found.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/deep-translate.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/markdown.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/router.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/behaviours/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/behaviours/complete.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/util/constants.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/helpers.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/health.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/serve-static.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/ga-tag.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/sessions.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/settings.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/config/hof-defaults.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/logger.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/build/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/config/builder-defaults.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/compile.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/build.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/expand-dirs.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/aggregate.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/write-files.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/model/apis/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/model/apis/html-to-pdf-converter.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/autofill/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/autofill/inputs.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/test-data/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/countries.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/helpers/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/reqres/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/model.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/back-links.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/util/helpers.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/check-complete.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/check-progress.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/check-session.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/csrf.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/test/_unit/example_app/sections/summary-data-sections.spec.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/sections/summary-data-sections.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/lib/staticAppealStages.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/fields.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/test/helpers/utilities.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/behaviours/international-number.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/encryption.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"]},"externalIds":{}}

package/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "search.exclude": {
+        "": true,
+        "**/node_modules": false
+    }
+}

package/components/date/index.js

@@ -60,37 +60,6 @@ module.exports = (key, opts) => {
     dayOptional = true;
   }
 
-  // take the 3 date parts, padding or defaulting
-  // to '01' if applic, then create a date value in the
-  // format YYYY-MM-DD. Save to req.body for processing
-  const preProcess = (req, res, next) => {
-    const parts = getParts(req.body, fields, key);
-    if (_.some(parts, part => part !== '')) {
-      if (dayOptional && parts.day === '') {
-        parts.day = '01';
-      } else {
-        parts.day = pad(parts.day);
-      }
-      if (monthOptional && parts.month === '') {
-        parts.month = '01';
-      } else {
-        parts.month = pad(parts.month);
-      }
-      req.body[key] = `${parts.year}-${parts.month}-${parts.day}`;
-    }
-    next();
-  };
-
-  // defaultFormatters on the base controller replace '--' with '-' on the process step.
-  // This ensures having the correct number of hyphens, so values do not jump from year to month.
-  // This should only be done on a partially completed date field otherwise the validation messages break.
-  const postProcess = (req, res, next) => {
-    const value = req.form.values[key];
-    if (value) {
-      req.form.values[key] = req.body[key];
-    }
-    next();
-  };
   // if date field is included in errorValues, extend
   // errorValues with the individual components
   const preGetErrors = (req, res, next) => {
@@ -156,15 +125,35 @@ module.exports = (key, opts) => {
     });
   };
 
+  // take the 3 date parts, padding or defaulting
+  // to '01' if applic, then create a date value in the
+  // format YYYY-MM-DD. Save to req.body for processing
+  const preProcess = (req, res, next) => {
+    const parts = getParts(req.body, fields, key);
+    if (_.some(parts, part => part !== '')) {
+      if (dayOptional && parts.day === '') {
+        parts.day = '01';
+      } else {
+        parts.day = pad(parts.day);
+      }
+      if (monthOptional && parts.month === '') {
+        parts.month = '01';
+      } else {
+        parts.month = pad(parts.month);
+      }
+      req.body[key] = `${parts.year}-${parts.month}-${parts.day}`;
+    }
+    next();
+  };
+
   // return config extended with hooks
   return Object.assign({}, options, {
     hooks: {
-      'pre-process': preProcess,
-      'post-process': postProcess,
       'pre-getErrors': preGetErrors,
       'post-getErrors': postGetErrors,
       'post-getValues': postGetValues,
-      'pre-render': preRender
+      'pre-render': preRender,
+      'pre-process': preProcess
     }
   });
 };

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 govuk-fieldset__legend--l{{#legendClassName}} {{legendClassName}}{{/legendClassName}}">
+    <h1 class="govuk-fieldset__heading">
+      {{legend}}
+    </h1>
+  </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 class="govuk-date-input">
     {{#input-date}}{{key}}{{/input-date}}
   </div>
 </fieldset>
+</div>

package/controller/controller.js

@@ -115,7 +115,11 @@ module.exports = class Controller extends BaseController {
       fields,
       route,
       baseUrl: req.baseUrl,
+      skipToMain: this.getFirstFormItem(req.form.options.fields),
       title: this.getTitle(route, lookup, req.form.options.fields, res.locals),
+      header: this.getHeader(route, lookup, res.locals),
+      captionHeading: this.getCaptionHeading(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),
@@ -123,6 +127,26 @@ module.exports = class Controller extends BaseController {
     }, stepLocals);
   }
 
+  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);
+  }
+
   getTitle(route, lookup, fields, locals) {
     let fieldName = '';
     if (_.size(fields)) {
@@ -144,6 +168,21 @@ 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
+          if(field.mixin === 'radio-group') {
+            req.form.errors[key].errorLinkId = key + "-" + field.options[0];
+          }
+          // get first field for date input control
+          else if (field && field.controlType === 'date-input') {
+            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/frontend/govuk-template/build/config.js

@@ -4,7 +4,8 @@ module.exports = {
   htmlLang: '{{htmlLang}}',
   assetPath: '{{govukAssetPath}}',
   afterHeader: '{{$afterHeader}}{{/afterHeader}}',
-  bodyClasses: '{{$bodyClasses}}{{/bodyClasses}}',
+  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' });
 };

package/frontend/govuk-template/govuk_template_generated.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}}{{/pageTitle}}</title>
+
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{govukAssetPath}}images/favicon.ico" type="image/x-icon">
+      <link rel="mask-icon" href="{{govukAssetPath}}images/govuk-mask-icon.svg" color="#0b0c0c"> 
+      <link rel="apple-touch-icon" sizes="180x180" href="{{govukAssetPath}}images/govuk-apple-touch-icon-180x180.png">
+      <link rel="apple-touch-icon" sizes="167x167" href="{{govukAssetPath}}images/govuk-apple-touch-icon-167x167.png">
+      <link rel="apple-touch-icon" sizes="152x152" href="{{govukAssetPath}}images/govuk-apple-touch-icon-152x152.png">
+      <link rel="apple-touch-icon" href="{{govukAssetPath}}images/govuk-apple-touch-icon.png">
+    
+    
+    <meta name="theme-color" content="#0b0c0c" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{$head}}{{/head}}
+    
+    
+    <meta property="og:image" content="{{govukAssetPath}}images/opengraph-image.png">
+  </head>
+
+  <body class="{{$bodyClasses}}{{/bodyClasses}} govuk-template__body  js-enabled" >
+    <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>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}}{{/cookieMessage}}
+    </div>
+	
+	{{$bodyStart}}{{/bodyStart}}  
+	
+    <header role="banner" id="govuk-header" class="{{$headerClass}}{{/headerClass}}">
+      <div class="govuk-header__container govuk-width-container">
+        
+          <div class="govuk-header__logo">
+            <a href="{{$homepageUrl}}https://www.gov.uk{{/homepageUrl}}" title="{{$logoLinkTitle}}Go to the GOV.UK homepage{{/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="{{govukAssetPath}}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}}GOV.UK{{/globalHeaderText}}
+				</span>
+            </a>
+          </div>
+          {{$insideHeader}}{{/insideHeader}}
+        
+        {{$propositionHeader}}{{/propositionHeader}}
+      </div>
+    </header>
+    
+
+    {{$afterHeader}}{{/afterHeader}}
+
+
+    {{$main}}{{/main}}
+
+    <footer class="govuk-footer" id="footer" role="contentinfo">
+
+      <div class="govuk-width-container">
+        {{$footerTop}}{{/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}}{{/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}}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}}</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}}© Crown copyright{{/crownCopyrightMessage}}</a>
+          </div>
+        </div>
+      </div>
+    </footer>
+
+    <div id="global-app-error" class="app-error hidden"></div>
+	
+
+    {{$bodyEnd}}{{/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/index.js

@@ -5,18 +5,18 @@ const servestatic = require('serve-static');
 const Router = require('express').Router;
 const buildTemplateLayout = require('./build');
 
-const basedir = path.dirname(require.resolve('govuk_template_mustache/package.json'));
+const basedir = path.dirname(require.resolve('govuk-frontend/package.json'));
 
 const setup = (opts, router) => {
   buildTemplateLayout();
   const options = opts || {};
-  options.path = options.path || '/govuk-assets';
+  options.path = options.path || '/assets';
 
-  router.use(options.path, servestatic(path.join(basedir, './assets'), options));
+  router.use(options.path, servestatic(path.join(basedir, './govuk/assets'), options));
   router.use((req, res, next) => {
     res.locals.govukAssetPath = req.baseUrl + options.path + '/';
     res.locals.partials = res.locals.partials || {};
-    res.locals.partials['govuk-template'] = path.resolve(__dirname, './govuk_template');
+    res.locals.partials['govuk-template'] = path.resolve(__dirname, './govuk_template_generated');
     next();
   });
 

package/frontend/template-mixins/mixins/template-mixins.js

@@ -12,11 +12,13 @@ const renderer = require('./render');
 const PANELMIXIN = 'partials/mixins/panel';
 const PARTIALS = [
   'partials/forms/input-text-group',
+  'partials/forms/input-text-date',
   'partials/forms/input-submit',
   'partials/forms/select',
   'partials/forms/checkbox',
   'partials/forms/textarea-group',
-  'partials/forms/option-group'
+  'partials/forms/option-group',
+  'partials/forms/checkbox-group'
 ];
 
 // This returns a middleware that places mixins against the `res.locals` object.
@@ -191,6 +193,7 @@ module.exports = function (options) {
       const lKey = getTranslationKey(field, key, 'label');
       const hint = conditionalTranslate(hKey);
       const required = isRequired(field);
+      const labelClassName = classNames(field, 'labelClassName');
       const autocomplete = field.autocomplete || extension.autocomplete;
 
       return Object.assign({}, extension, {
@@ -199,8 +202,8 @@ module.exports = function (options) {
         type: extension.type || type(field),
         value: this.values && this.values[key],
         label: t(lKey),
-        labelClassName: classNames(field, 'labelClassName') || 'form-label',
-        formGroupClassName: classNames(field, 'formGroupClassName') || extension.formGroupClassName || 'form-group',
+        labelClassName: labelClassName ? `govuk-label ${labelClassName}` : 'govuk-label',
+        formGroupClassName: classNames(field, 'formGroupClassName') || extension.formGroupClassName || 'govuk-form-group',
         hint: hint,
         hintId: extension.hintId || (hint ? key + '-hint' : null),
         error: this.errors && this.errors[key],
@@ -210,6 +213,7 @@ module.exports = function (options) {
         date: extension.date,
         autocomplete: autocomplete,
         child: field.child,
+        noHeading: field.noHeading,
         attributes: field.attributes,
         renderChild: renderChild.bind(this)
       });
@@ -219,7 +223,7 @@ module.exports = function (options) {
       opts = opts || {};
       const field = Object.assign({}, this.options.fields[key] || options.fields[key]);
       const legend = field.legend;
-
+      const detail = field.detail;
       let legendClassName;
       let legendValue = 'fields.' + key + '.legend';
       if (legend) {
@@ -237,6 +241,8 @@ module.exports = function (options) {
         legendClassName: legendClassName,
         role: opts.type === 'radio' ? 'radiogroup' : 'group',
         ariaRequired: opts.type === 'radio',
+        noHeading: field.noHeading,
+        detail: detail ? detail : '',
         hint: conditionalTranslate(getTranslationKey(field, key, 'hint')),
         options: _.map(field.options, function (obj) {
           let selected = false;
@@ -355,7 +361,7 @@ module.exports = function (options) {
         }
       },
       'checkbox-group': {
-        path: 'partials/forms/option-group',
+        path: 'partials/forms/checkbox-group',
         renderWith: optionGroup,
         options: {
           type: 'checkbox'
@@ -425,16 +431,21 @@ module.exports = function (options) {
                 year: autocomplete + '-year'
               };
             }
+            const isRequired = field.validate ? field.validate.indexOf('required') > -1 : false;
+            const formGroupClassName = (field.formGroup && field.formGroup.className) ? field.formGroup.className : ''
+            const classNameDay = (field.controlsClass && field.controlsClass.day) ? field.controlsClass.day : 'govuk-date-input__input govuk-input--width-2';
+            const classNameMonth = (field.controlsClass && field.controlsClass.month) ? field.controlsClass.month : 'govuk-date-input__input govuk-input--width-2';
+            const classNameYear = (field.controlsClass && field.controlsClass.year) ? field.controlsClass.year : 'govuk-date-input__input govuk-input--width-4';
 
             const parts = [];
 
             if (isExact) {
-              const dayPart = compiled['partials/forms/input-text-group'].render(inputText.call(this, key + '-day', { pattern: '[0-9]*', min: 1, max: 31, maxlength: 2, hintId: key + '-hint', date: true, autocomplete: autocomplete.day }));
+              const dayPart = compiled['partials/forms/input-text-date'].render(inputText.call(this, key + '-day', { pattern: '[0-9]*', min: 1, max: 31, maxlength: 2, hintId: key + '-hint', date: true, autocomplete: autocomplete.day, formGroupClassName, className: classNameDay, isRequired }));
               parts.push(dayPart);
             }
 
-            const monthPart = compiled['partials/forms/input-text-group'].render(inputText.call(this, key + '-month', { pattern: '[0-9]*', min: 1, max: 12, maxlength: 2, hintId: key + '-hint', date: true, autocomplete: autocomplete.month }));
-            const yearPart = compiled['partials/forms/input-text-group'].render(inputText.call(this, key + '-year', { pattern: '[0-9]*', maxlength: 4, hintId: key + '-hint', date: true, formGroupClassName: 'form-group-year', autocomplete: autocomplete.year }));
+            const monthPart = compiled['partials/forms/input-text-date'].render(inputText.call(this, key + '-month', { pattern: '[0-9]*', min: 1, max: 12, maxlength: 2, hintId: key + '-hint', date: true, autocomplete: autocomplete.month, formGroupClassName, className: classNameMonth, isRequired }));
+            const yearPart = compiled['partials/forms/input-text-date'].render(inputText.call(this, key + '-year', { pattern: '[0-9]*', maxlength: 4, hintId: key + '-hint', date: true, autocomplete: autocomplete.year, formGroupClassName, className: classNameYear, isRequired }));
 
             return parts.concat(monthPart, yearPart).join('\n');
           };