hof 22.11.0-frontend-v4-beta.2 → 23.0.0-frontend-v4-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. package/CHANGELOG.md +5 -0
  2. package/components/emailer/emailer.js +3 -3
  3. package/config/builder-defaults.js +6 -6
  4. package/frontend/govuk-template/build/govuk_template.html +39 -44
  5. package/frontend/govuk-template/govuk_template_generated.html +39 -44
  6. package/frontend/govuk-template/index.js +2 -2
  7. package/frontend/themes/gov-uk/client-js/cookieSettings.js +20 -20
  8. package/frontend/toolkit/index.js +6 -6
  9. package/index.js +4 -2
  10. package/package.json +47 -47
  11. package/sandbox/assets/{js → rebrand/js}/index.js +1 -1
  12. package/sandbox/assets/{scss → rebrand/scss}/app.scss +1 -1
  13. package/sandbox/package.json +2 -2
  14. package/sandbox/public/css/app.css +1365 -853
  15. package/sandbox/public/images/gov-uk-logo-opt.svg +1 -0
  16. package/sandbox/public/images/govuk-logo.svg +25 -0
  17. package/sandbox/public/images/image.svg +1 -0
  18. package/sandbox/public/js/bundle.js +29 -29
  19. package/sandbox/yarn.lock +56 -163
  20. /package/frontend/toolkit/assets/{images → rebrand/images}/passports/new-window-link-blue.png +0 -0
  21. /package/frontend/toolkit/assets/{images → rebrand/images}/passports/new-window-link.png +0 -0
  22. /package/frontend/toolkit/assets/{images → rebrand/images}/spinner.gif +0 -0
  23. /package/frontend/toolkit/assets/{javascript → rebrand/javascript}/character-count.js +0 -0
  24. /package/frontend/toolkit/assets/{javascript → rebrand/javascript}/form-focus.js +0 -0
  25. /package/frontend/toolkit/assets/{javascript → rebrand/javascript}/helpers.js +0 -0
  26. /package/frontend/toolkit/assets/{javascript → rebrand/javascript}/progressive-reveal.js +0 -0
  27. /package/frontend/toolkit/assets/{javascript → rebrand/javascript}/validation.js +0 -0
  28. /package/frontend/toolkit/assets/{javascript → rebrand/javascript}/vendor/details.polyfill.js +0 -0
  29. /package/frontend/toolkit/assets/{javascript → rebrand/javascript}/vendor/indexof.polyfill.js +0 -0
  30. /package/frontend/toolkit/assets/{javascript → rebrand/javascript}/vendor/safari-cachebuster.js +0 -0
  31. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/_base.scss +0 -0
  32. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/_helpers.scss +0 -0
  33. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/_layout.scss +0 -0
  34. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/_typography.scss +0 -0
  35. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/_variables.scss +0 -0
  36. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/app.scss +0 -0
  37. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_buttons.scss +0 -0
  38. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_details.scss +0 -0
  39. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_elements-typography.scss +0 -0
  40. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_forms.scss +0 -0
  41. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_helpers.scss +0 -0
  42. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_layout.scss +0 -0
  43. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_lists.scss +0 -0
  44. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_panels.scss +0 -0
  45. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_reset.scss +0 -0
  46. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/_tables.scss +0 -0
  47. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/forms/_form-block-labels.scss +0 -0
  48. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/forms/_form-date.scss +0 -0
  49. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/govuk-elements/forms/_form-validation.scss +0 -0
  50. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/mixins.scss +0 -0
  51. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/modules/_alerts.scss +0 -0
  52. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/modules/_buttons.scss +0 -0
  53. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/modules/_confirm-page.scss +0 -0
  54. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/modules/_lists.scss +0 -0
  55. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/modules/_progressive-reveal.scss +0 -0
  56. /package/frontend/toolkit/assets/{stylesheets → rebrand/stylesheets}/modules/_validation.scss +0 -0
  57. /package/sandbox/assets/{images → rebrand/images}/icons/icon-caret-left.png +0 -0
  58. /package/sandbox/assets/{images → rebrand/images}/icons/icon-complete.png +0 -0
  59. /package/sandbox/assets/{images → rebrand/images}/icons/icon-cross-remove-sign.png +0 -0
package/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ ## 2025-10-10, Version 22.10.4 (Stable), @dk4g
2
+ ### Security
3
+ - Upgraded axios version to address a security vulnerability
4
+ - Updated version declarations to match installed packages
5
+
1
6
  ## 2025-10-08, Version 22.10.3 (Stable), @Rhodine-orleans-lindsay
2
7
 
3
8
  ### Changed
package/components/emailer/emailer.js CHANGED
@@ -34,17 +34,17 @@ module.exports = class Emailer {
34
34
  html: body,
35
35
  attachments: [{
36
36
  filename: 'govuk_logotype_email.png',
37
- path: path.resolve(__dirname, './assets/images/govuk_logotype_email.png'),
37
+ path: path.resolve(__dirname, './assets/rebrand/images/govuk_logotype_email.png'),
38
38
  cid: 'govuk_logotype_email'
39
39
  },
40
40
  {
41
41
  filename: 'ho_crest_27px.png',
42
- path: path.resolve(__dirname, './assets/images/ho_crest_27px.png'),
42
+ path: path.resolve(__dirname, './assets/rebrand/images/ho_crest_27px.png'),
43
43
  cid: 'ho_crest_27px'
44
44
  },
45
45
  {
46
46
  filename: 'spacer.gif',
47
- path: path.resolve(__dirname, './assets/images/spacer.gif'),
47
+ path: path.resolve(__dirname, './assets/rebrand/images/spacer.gif'),
48
48
  cid: 'spacer_image'
49
49
  }]
50
50
  }, (err, result) => err ? reject(err) : resolve(result));
package/config/builder-defaults.js CHANGED
@@ -2,17 +2,17 @@
2
2
 
3
3
  module.exports = {
4
4
  browserify: {
5
- src: 'assets/js/index.js',
5
+ src: 'assets/rebrand/js/index.js',
6
6
  out: 'public/js/bundle.js',
7
- match: 'assets/js/**/*.js',
7
+ match: 'assets/rebrand/js/**/*.js',
8
8
  restart: false,
9
9
  compress: false,
10
10
  debug: false
11
11
  },
12
12
  sass: {
13
- src: 'assets/scss/app.scss',
13
+ src: 'assets/rebrand/scss/app.scss',
14
14
  out: 'public/css/app.css',
15
- match: 'assets/scss/**/*.scss',
15
+ match: 'assets/rebrand/scss/**/*.scss',
16
16
  restart: false,
17
17
  quietDeps: false,
18
18
  outputStyle: 'expanded',
@@ -24,9 +24,9 @@ module.exports = {
24
24
  shared: 'apps/common/translations/src'
25
25
  },
26
26
  images: {
27
- src: 'assets/images',
27
+ src: 'assets/rebrand/images',
28
28
  out: 'public',
29
- match: 'assets/images/**/*',
29
+ match: 'assets/rebrand/images/**/*',
30
30
  restart: false
31
31
  },
32
32
  server: {
package/frontend/govuk-template/build/govuk_template.html CHANGED
@@ -7,23 +7,17 @@
7
7
  <title>{{ pageTitle }}</title>
8
8
  {{{ head }}}
9
9
 
10
- <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{assetPath}}images/favicon.ico" type="image/x-icon">
11
- <link rel="mask-icon" href="{{assetPath}}images/govuk-mask-icon.svg" color="#0b0c0c">
12
- <link rel="apple-touch-icon" sizes="180x180" href="{{assetPath}}images/govuk-apple-touch-icon-180x180.png">
13
- <link rel="apple-touch-icon" sizes="167x167" href="{{assetPath}}images/govuk-apple-touch-icon-167x167.png">
14
- <link rel="apple-touch-icon" sizes="152x152" href="{{assetPath}}images/govuk-apple-touch-icon-152x152.png">
15
- <link rel="apple-touch-icon" href="{{assetPath}}images/govuk-apple-touch-icon.png">
16
-
17
-
18
- <meta name="theme-color" content="#0b0c0c" />
19
-
20
- <meta name="viewport" content="width=device-width, initial-scale=1">
21
-
22
-
23
- <meta property="og:image" content="{{assetPath}}images/opengraph-image.png">
10
+ <meta name="theme-color" content="#1d70b8">
11
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
12
+ <link rel="icon" sizes="48x48" href="{{assetPath}}images/favicon.ico">
13
+ <link rel="icon" sizes="any" href="{{assetPath}}images/favicon.svg" type="image/svg+xml">
14
+ <link rel="mask-icon" href="{{assetPath}}images/govuk-icon-mask.svg" color="#1d70b8">
15
+ <link rel="apple-touch-icon" href="{{assetPath}}images/govuk-icon-180.png">
16
+ <link rel="manifest" href="{{assetPath}}manifest.json">
17
+ <meta property="og:image" content="{{assetPath}}images/govuk-opengraph-image.png">
24
18
  </head>
25
19
 
26
- <body class="{{ bodyClasses }} govuk-template__body js-enabled" >
20
+ <body class="{{ bodyClasses }} govuk-template__body js-enabled" >
27
21
  <script>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
28
22
 
29
23
 
@@ -38,17 +32,36 @@
38
32
 
39
33
  <div class="govuk-header__logo">
40
34
  <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">
41
- <span class="govuk-header__logotype">
42
- <!-- Due to large SVG used for the logo, Safari sometimes delays rendering so a SVG `<use>` Reference has been implementd for the header and the svg has been moved to end of the body as a workaround -->
43
- <!--[if gt IE 8]><!-->
44
- <svg height="30" width="162" class="govuk-header__logotype" aria-label="GOV.UK" focusable="false" role="img">
45
- <use xlink:href="#govuk-logo"></use>
46
- </svg>
47
- <!--<![endif]-->
48
- <!--[if IE 8]>
49
- <img src="{{ assetPath }}images/govuk-logotype-tudor-crown.png" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
50
- <![endif]-->
51
- </span>
35
+ <!--[if gt IE 8]><!-->
36
+ <svg
37
+ focusable="false"
38
+ role="img"
39
+ xmlns="http://www.w3.org/2000/svg"
40
+ viewBox="0 0 324 60"
41
+ height="30"
42
+ width="162"
43
+ fill="currentcolor"
44
+ class="govuk-header__logotype"
45
+ aria-label="GOV.UK">
46
+ <title>GOV.UK</title>
47
+ <g>
48
+ <circle cx="20" cy="17.6" r="3.7"></circle>
49
+ <circle cx="10.2" cy="23.5" r="3.7"></circle>
50
+ <circle cx="3.7" cy="33.2" r="3.7"></circle>
51
+ <circle cx="31.7" cy="30.6" r="3.7"></circle>
52
+ <circle cx="43.3" cy="17.6" r="3.7"></circle>
53
+ <circle cx="53.2" cy="23.5" r="3.7"></circle>
54
+ <circle cx="59.7" cy="33.2" r="3.7"></circle>
55
+ <circle cx="31.7" cy="30.6" r="3.7"></circle>
56
+ <path d="M33.1,9.8c.2-.1.3-.3.5-.5l4.6,2.4v-6.8l-4.6,1.5c-.1-.2-.3-.3-.5-.5l1.9-5.9h-6.7l1.9,5.9c-.2.1-.3.3-.5.5l-4.6-1.5v6.8l4.6-2.4c.1.2.3.3.5.5l-2.6,8c-.9,2.8,1.2,5.7,4.1,5.7h0c3,0,5.1-2.9,4.1-5.7l-2.6-8ZM37,37.9s-3.4,3.8-4.1,6.1c2.2,0,4.2-.5,6.4-2.8l-.7,8.5c-2-2.8-4.4-4.1-5.7-3.8.1,3.1.5,6.7,5.8,7.2,3.7.3,6.7-1.5,7-3.8.4-2.6-2-4.3-3.7-1.6-1.4-4.5,2.4-6.1,4.9-3.2-1.9-4.5-1.8-7.7,2.4-10.9,3,4,2.6,7.3-1.2,11.1,2.4-1.3,6.2,0,4,4.6-1.2-2.8-3.7-2.2-4.2.2-.3,1.7.7,3.7,3,4.2,1.9.3,4.7-.9,7-5.9-1.3,0-2.4.7-3.9,1.7l2.4-8c.6,2.3,1.4,3.7,2.2,4.5.6-1.6.5-2.8,0-5.3l5,1.8c-2.6,3.6-5.2,8.7-7.3,17.5-7.4-1.1-15.7-1.7-24.5-1.7h0c-8.8,0-17.1.6-24.5,1.7-2.1-8.9-4.7-13.9-7.3-17.5l5-1.8c-.5,2.5-.6,3.7,0,5.3.8-.8,1.6-2.3,2.2-4.5l2.4,8c-1.5-1-2.6-1.7-3.9-1.7,2.3,5,5.2,6.2,7,5.9,2.3-.4,3.3-2.4,3-4.2-.5-2.4-3-3.1-4.2-.2-2.2-4.6,1.6-6,4-4.6-3.7-3.7-4.2-7.1-1.2-11.1,4.2,3.2,4.3,6.4,2.4,10.9,2.5-2.8,6.3-1.3,4.9,3.2-1.8-2.7-4.1-1-3.7,1.6.3,2.3,3.3,4.1,7,3.8,5.4-.5,5.7-4.2,5.8-7.2-1.3-.2-3.7,1-5.7,3.8l-.7-8.5c2.2,2.3,4.2,2.7,6.4,2.8-.7-2.3-4.1-6.1-4.1-6.1h10.6,0Z"></path>
57
+ </g>
58
+ <circle class="govuk-logo-dot" cx="226" cy="36" r="7.3"></circle>
59
+ <path d="M93.94 41.25c.4 1.81 1.2 3.21 2.21 4.62 1 1.4 2.21 2.41 3.61 3.21s3.21 1.2 5.22 1.2 3.61-.4 4.82-1c1.4-.6 2.41-1.4 3.21-2.41.8-1 1.4-2.01 1.61-3.01s.4-2.01.4-3.01v.14h-10.86v-7.02h20.07v24.08h-8.03v-5.56c-.6.8-1.38 1.61-2.19 2.41-.8.8-1.81 1.2-2.81 1.81-1 .4-2.21.8-3.41 1.2s-2.41.4-3.81.4a18.56 18.56 0 0 1-14.65-6.63c-1.6-2.01-3.01-4.41-3.81-7.02s-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83a20.45 20.45 0 0 1 19.46-13.65c3.21 0 4.01.2 5.82.8 1.81.4 3.61 1.2 5.02 2.01 1.61.8 2.81 2.01 4.01 3.21s2.21 2.61 2.81 4.21l-7.63 4.41c-.4-1-1-1.81-1.61-2.61-.6-.8-1.4-1.4-2.21-2.01-.8-.6-1.81-1-2.81-1.4-1-.4-2.21-.4-3.61-.4-2.01 0-3.81.4-5.22 1.2-1.4.8-2.61 1.81-3.61 3.21s-1.61 2.81-2.21 4.62c-.4 1.81-.6 3.71-.6 5.42s.8 5.22.8 5.22Zm57.8-27.9c3.21 0 6.22.6 8.63 1.81 2.41 1.2 4.82 2.81 6.62 4.82S170.2 24.39 171 27s1.4 5.62 1.4 8.83-.4 6.02-1.4 8.83-2.41 5.02-4.01 7.02-4.01 3.61-6.62 4.82-5.42 1.81-8.63 1.81-6.22-.6-8.63-1.81-4.82-2.81-6.42-4.82-3.21-4.41-4.01-7.02-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83 2.41-5.02 4.01-7.02 4.01-3.61 6.42-4.82 5.42-1.81 8.63-1.81Zm0 36.73c1.81 0 3.61-.4 5.02-1s2.61-1.81 3.61-3.01 1.81-2.81 2.21-4.41c.4-1.81.8-3.61.8-5.62 0-2.21-.2-4.21-.8-6.02s-1.2-3.21-2.21-4.62c-1-1.2-2.21-2.21-3.61-3.01s-3.21-1-5.02-1-3.61.4-5.02 1c-1.4.8-2.61 1.81-3.61 3.01s-1.81 2.81-2.21 4.62c-.4 1.81-.8 3.61-.8 5.62 0 2.41.2 4.21.8 6.02.4 1.81 1.2 3.21 2.21 4.41s2.21 2.21 3.61 3.01c1.4.8 3.21 1 5.02 1Zm36.32 7.96-12.24-44.15h9.83l8.43 32.77h.4l8.23-32.77h9.83L200.3 58.04h-12.24Zm74.14-7.96c2.18 0 3.51-.6 3.51-.6 1.2-.6 2.01-1 2.81-1.81s1.4-1.81 1.81-2.81a13 13 0 0 0 .8-4.01V13.9h8.63v28.15c0 2.41-.4 4.62-1.4 6.62-.8 2.01-2.21 3.61-3.61 5.02s-3.41 2.41-5.62 3.21-4.62 1.2-7.02 1.2-5.02-.4-7.02-1.2c-2.21-.8-4.01-1.81-5.62-3.21s-2.81-3.01-3.61-5.02-1.4-4.21-1.4-6.62V13.9h8.63v26.95c0 1.61.2 3.01.8 4.01.4 1.2 1.2 2.21 2.01 2.81.8.8 1.81 1.4 2.81 1.81 0 0 1.34.6 3.51.6Zm34.22-36.18v18.92l15.65-18.92h10.82l-15.03 17.32 16.03 26.83h-10.21l-11.44-20.21-5.62 6.22v13.99h-8.83V13.9"></path>
60
+ </svg>
61
+ <!--<![endif]-->
62
+ <!--[if IE 8]>
63
+ <img src="{{ assetPath }}images/govuk-logotype-tudor-crown.png" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
64
+ <![endif]-->
52
65
  </a>
53
66
  </div>
54
67
  {{{ insideHeader }}}
@@ -124,23 +137,5 @@
124
137
 
125
138
  <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>if (typeof window.GOVUK === 'undefined') document.body.className = document.body.className.replace('js-enabled', '');</script>
126
139
 
127
- <svg width="0" height="0" style="position:absolute">
128
- <symbol id="govuk-logo" viewBox="0 0 324 60">
129
- <title>GOV.UK</title>
130
- <g>
131
- <circle cx="20" cy="17.6" r="3.7"></circle>
132
- <circle cx="10.2" cy="23.5" r="3.7"></circle>
133
- <circle cx="3.7" cy="33.2" r="3.7"></circle>
134
- <circle cx="31.7" cy="30.6" r="3.7"></circle>
135
- <circle cx="43.3" cy="17.6" r="3.7"></circle>
136
- <circle cx="53.2" cy="23.5" r="3.7"></circle>
137
- <circle cx="59.7" cy="33.2" r="3.7"></circle>
138
- <circle cx="31.7" cy="30.6" r="3.7"></circle>
139
- <path d="M33.1,9.8c.2-.1.3-.3.5-.5l4.6,2.4v-6.8l-4.6,1.5c-.1-.2-.3-.3-.5-.5l1.9-5.9h-6.7l1.9,5.9c-.2.1-.3.3-.5.5l-4.6-1.5v6.8l4.6-2.4c.1.2.3.3.5.5l-2.6,8c-.9,2.8,1.2,5.7,4.1,5.7h0c3,0,5.1-2.9,4.1-5.7l-2.6-8ZM37,37.9s-3.4,3.8-4.1,6.1c2.2,0,4.2-.5,6.4-2.8l-.7,8.5c-2-2.8-4.4-4.1-5.7-3.8.1,3.1.5,6.7,5.8,7.2,3.7.3,6.7-1.5,7-3.8.4-2.6-2-4.3-3.7-1.6-1.4-4.5,2.4-6.1,4.9-3.2-1.9-4.5-1.8-7.7,2.4-10.9,3,4,2.6,7.3-1.2,11.1,2.4-1.3,6.2,0,4,4.6-1.2-2.8-3.7-2.2-4.2.2-.3,1.7.7,3.7,3,4.2,1.9.3,4.7-.9,7-5.9-1.3,0-2.4.7-3.9,1.7l2.4-8c.6,2.3,1.4,3.7,2.2,4.5.6-1.6.5-2.8,0-5.3l5,1.8c-2.6,3.6-5.2,8.7-7.3,17.5-7.4-1.1-15.7-1.7-24.5-1.7h0c-8.8,0-17.1.6-24.5,1.7-2.1-8.9-4.7-13.9-7.3-17.5l5-1.8c-.5,2.5-.6,3.7,0,5.3.8-.8,1.6-2.3,2.2-4.5l2.4,8c-1.5-1-2.6-1.7-3.9-1.7,2.3,5,5.2,6.2,7,5.9,2.3-.4,3.3-2.4,3-4.2-.5-2.4-3-3.1-4.2-.2-2.2-4.6,1.6-6,4-4.6-3.7-3.7-4.2-7.1-1.2-11.1,4.2,3.2,4.3,6.4,2.4,10.9,2.5-2.8,6.3-1.3,4.9,3.2-1.8-2.7-4.1-1-3.7,1.6.3,2.3,3.3,4.1,7,3.8,5.4-.5,5.7-4.2,5.8-7.2-1.3-.2-3.7,1-5.7,3.8l-.7-8.5c2.2,2.3,4.2,2.7,6.4,2.8-.7-2.3-4.1-6.1-4.1-6.1h10.6,0Z"></path>
140
- </g>
141
- <circle class="govuk-logo-dot" cx="226" cy="36" r="7.3"></circle>
142
- <path d="M93.94 41.25c.4 1.81 1.2 3.21 2.21 4.62 1 1.4 2.21 2.41 3.61 3.21s3.21 1.2 5.22 1.2 3.61-.4 4.82-1c1.4-.6 2.41-1.4 3.21-2.41.8-1 1.4-2.01 1.61-3.01s.4-2.01.4-3.01v.14h-10.86v-7.02h20.07v24.08h-8.03v-5.56c-.6.8-1.38 1.61-2.19 2.41-.8.8-1.81 1.2-2.81 1.81-1 .4-2.21.8-3.41 1.2s-2.41.4-3.81.4a18.56 18.56 0 0 1-14.65-6.63c-1.6-2.01-3.01-4.41-3.81-7.02s-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83a20.45 20.45 0 0 1 19.46-13.65c3.21 0 4.01.2 5.82.8 1.81.4 3.61 1.2 5.02 2.01 1.61.8 2.81 2.01 4.01 3.21s2.21 2.61 2.81 4.21l-7.63 4.41c-.4-1-1-1.81-1.61-2.61-.6-.8-1.4-1.4-2.21-2.01-.8-.6-1.81-1-2.81-1.4-1-.4-2.21-.4-3.61-.4-2.01 0-3.81.4-5.22 1.2-1.4.8-2.61 1.81-3.61 3.21s-1.61 2.81-2.21 4.62c-.4 1.81-.6 3.71-.6 5.42s.8 5.22.8 5.22Zm57.8-27.9c3.21 0 6.22.6 8.63 1.81 2.41 1.2 4.82 2.81 6.62 4.82S170.2 24.39 171 27s1.4 5.62 1.4 8.83-.4 6.02-1.4 8.83-2.41 5.02-4.01 7.02-4.01 3.61-6.62 4.82-5.42 1.81-8.63 1.81-6.22-.6-8.63-1.81-4.82-2.81-6.42-4.82-3.21-4.41-4.01-7.02-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83 2.41-5.02 4.01-7.02 4.01-3.61 6.42-4.82 5.42-1.81 8.63-1.81Zm0 36.73c1.81 0 3.61-.4 5.02-1s2.61-1.81 3.61-3.01 1.81-2.81 2.21-4.41c.4-1.81.8-3.61.8-5.62 0-2.21-.2-4.21-.8-6.02s-1.2-3.21-2.21-4.62c-1-1.2-2.21-2.21-3.61-3.01s-3.21-1-5.02-1-3.61.4-5.02 1c-1.4.8-2.61 1.81-3.61 3.01s-1.81 2.81-2.21 4.62c-.4 1.81-.8 3.61-.8 5.62 0 2.41.2 4.21.8 6.02.4 1.81 1.2 3.21 2.21 4.41s2.21 2.21 3.61 3.01c1.4.8 3.21 1 5.02 1Zm36.32 7.96-12.24-44.15h9.83l8.43 32.77h.4l8.23-32.77h9.83L200.3 58.04h-12.24Zm74.14-7.96c2.18 0 3.51-.6 3.51-.6 1.2-.6 2.01-1 2.81-1.81s1.4-1.81 1.81-2.81a13 13 0 0 0 .8-4.01V13.9h8.63v28.15c0 2.41-.4 4.62-1.4 6.62-.8 2.01-2.21 3.61-3.61 5.02s-3.41 2.41-5.62 3.21-4.62 1.2-7.02 1.2-5.02-.4-7.02-1.2c-2.21-.8-4.01-1.81-5.62-3.21s-2.81-3.01-3.61-5.02-1.4-4.21-1.4-6.62V13.9h8.63v26.95c0 1.61.2 3.01.8 4.01.4 1.2 1.2 2.21 2.01 2.81.8.8 1.81 1.4 2.81 1.81 0 0 1.34.6 3.51.6Zm34.22-36.18v18.92l15.65-18.92h10.82l-15.03 17.32 16.03 26.83h-10.21l-11.44-20.21-5.62 6.22v13.99h-8.83V13.9"></path>
143
- </symbol>
144
- </svg>
145
140
  </body>
146
141
  </html>
package/frontend/govuk-template/govuk_template_generated.html CHANGED
@@ -7,23 +7,17 @@
7
7
  <title>{{$pageTitle}}{{/pageTitle}}</title>
8
8
  {{$head}}{{/head}}
9
9
 
10
- <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{govukAssetPath}}images/favicon.ico" type="image/x-icon">
11
- <link rel="mask-icon" href="{{govukAssetPath}}images/govuk-mask-icon.svg" color="#0b0c0c">
12
- <link rel="apple-touch-icon" sizes="180x180" href="{{govukAssetPath}}images/govuk-apple-touch-icon-180x180.png">
13
- <link rel="apple-touch-icon" sizes="167x167" href="{{govukAssetPath}}images/govuk-apple-touch-icon-167x167.png">
14
- <link rel="apple-touch-icon" sizes="152x152" href="{{govukAssetPath}}images/govuk-apple-touch-icon-152x152.png">
15
- <link rel="apple-touch-icon" href="{{govukAssetPath}}images/govuk-apple-touch-icon.png">
16
-
17
-
18
- <meta name="theme-color" content="#0b0c0c" />
19
-
20
- <meta name="viewport" content="width=device-width, initial-scale=1">
21
-
22
-
23
- <meta property="og:image" content="{{govukAssetPath}}images/opengraph-image.png">
10
+ <meta name="theme-color" content="#1d70b8">
11
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
12
+ <link rel="icon" sizes="48x48" href="{{govukAssetPath}}images/favicon.ico">
13
+ <link rel="icon" sizes="any" href="{{govukAssetPath}}images/favicon.svg" type="image/svg+xml">
14
+ <link rel="mask-icon" href="{{govukAssetPath}}images/govuk-icon-mask.svg" color="#1d70b8">
15
+ <link rel="apple-touch-icon" href="{{govukAssetPath}}images/govuk-icon-180.png">
16
+ <link rel="manifest" href="{{govukAssetPath}}manifest.json">
17
+ <meta property="og:image" content="{{govukAssetPath}}images/govuk-opengraph-image.png">
24
18
  </head>
25
19
 
26
- <body class="{{$bodyClasses}}{{/bodyClasses}} govuk-template__body js-enabled" >
20
+ <body class="{{$bodyClasses}}{{/bodyClasses}} govuk-template__body js-enabled" >
27
21
  <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
28
22
 
29
23
 
@@ -38,17 +32,36 @@
38
32
 
39
33
  <div class="govuk-header__logo">
40
34
  <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">
41
- <span class="govuk-header__logotype">
42
- <!-- Due to large SVG used for the logo, Safari sometimes delays rendering so a SVG `<use>` Reference has been implementd for the header and the svg has been moved to end of the body as a workaround -->
43
- <!--[if gt IE 8]><!-->
44
- <svg height="30" width="162" class="govuk-header__logotype" aria-label="GOV.UK" focusable="false" role="img">
45
- <use xlink:href="#govuk-logo"></use>
46
- </svg>
47
- <!--<![endif]-->
48
- <!--[if IE 8]>
49
- <img src="{{govukAssetPath}}images/govuk-logotype-tudor-crown.png" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
50
- <![endif]-->
51
- </span>
35
+ <!--[if gt IE 8]><!-->
36
+ <svg
37
+ focusable="false"
38
+ role="img"
39
+ xmlns="http://www.w3.org/2000/svg"
40
+ viewBox="0 0 324 60"
41
+ height="30"
42
+ width="162"
43
+ fill="currentcolor"
44
+ class="govuk-header__logotype"
45
+ aria-label="GOV.UK">
46
+ <title>GOV.UK</title>
47
+ <g>
48
+ <circle cx="20" cy="17.6" r="3.7"></circle>
49
+ <circle cx="10.2" cy="23.5" r="3.7"></circle>
50
+ <circle cx="3.7" cy="33.2" r="3.7"></circle>
51
+ <circle cx="31.7" cy="30.6" r="3.7"></circle>
52
+ <circle cx="43.3" cy="17.6" r="3.7"></circle>
53
+ <circle cx="53.2" cy="23.5" r="3.7"></circle>
54
+ <circle cx="59.7" cy="33.2" r="3.7"></circle>
55
+ <circle cx="31.7" cy="30.6" r="3.7"></circle>
56
+ <path d="M33.1,9.8c.2-.1.3-.3.5-.5l4.6,2.4v-6.8l-4.6,1.5c-.1-.2-.3-.3-.5-.5l1.9-5.9h-6.7l1.9,5.9c-.2.1-.3.3-.5.5l-4.6-1.5v6.8l4.6-2.4c.1.2.3.3.5.5l-2.6,8c-.9,2.8,1.2,5.7,4.1,5.7h0c3,0,5.1-2.9,4.1-5.7l-2.6-8ZM37,37.9s-3.4,3.8-4.1,6.1c2.2,0,4.2-.5,6.4-2.8l-.7,8.5c-2-2.8-4.4-4.1-5.7-3.8.1,3.1.5,6.7,5.8,7.2,3.7.3,6.7-1.5,7-3.8.4-2.6-2-4.3-3.7-1.6-1.4-4.5,2.4-6.1,4.9-3.2-1.9-4.5-1.8-7.7,2.4-10.9,3,4,2.6,7.3-1.2,11.1,2.4-1.3,6.2,0,4,4.6-1.2-2.8-3.7-2.2-4.2.2-.3,1.7.7,3.7,3,4.2,1.9.3,4.7-.9,7-5.9-1.3,0-2.4.7-3.9,1.7l2.4-8c.6,2.3,1.4,3.7,2.2,4.5.6-1.6.5-2.8,0-5.3l5,1.8c-2.6,3.6-5.2,8.7-7.3,17.5-7.4-1.1-15.7-1.7-24.5-1.7h0c-8.8,0-17.1.6-24.5,1.7-2.1-8.9-4.7-13.9-7.3-17.5l5-1.8c-.5,2.5-.6,3.7,0,5.3.8-.8,1.6-2.3,2.2-4.5l2.4,8c-1.5-1-2.6-1.7-3.9-1.7,2.3,5,5.2,6.2,7,5.9,2.3-.4,3.3-2.4,3-4.2-.5-2.4-3-3.1-4.2-.2-2.2-4.6,1.6-6,4-4.6-3.7-3.7-4.2-7.1-1.2-11.1,4.2,3.2,4.3,6.4,2.4,10.9,2.5-2.8,6.3-1.3,4.9,3.2-1.8-2.7-4.1-1-3.7,1.6.3,2.3,3.3,4.1,7,3.8,5.4-.5,5.7-4.2,5.8-7.2-1.3-.2-3.7,1-5.7,3.8l-.7-8.5c2.2,2.3,4.2,2.7,6.4,2.8-.7-2.3-4.1-6.1-4.1-6.1h10.6,0Z"></path>
57
+ </g>
58
+ <circle class="govuk-logo-dot" cx="226" cy="36" r="7.3"></circle>
59
+ <path d="M93.94 41.25c.4 1.81 1.2 3.21 2.21 4.62 1 1.4 2.21 2.41 3.61 3.21s3.21 1.2 5.22 1.2 3.61-.4 4.82-1c1.4-.6 2.41-1.4 3.21-2.41.8-1 1.4-2.01 1.61-3.01s.4-2.01.4-3.01v.14h-10.86v-7.02h20.07v24.08h-8.03v-5.56c-.6.8-1.38 1.61-2.19 2.41-.8.8-1.81 1.2-2.81 1.81-1 .4-2.21.8-3.41 1.2s-2.41.4-3.81.4a18.56 18.56 0 0 1-14.65-6.63c-1.6-2.01-3.01-4.41-3.81-7.02s-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83a20.45 20.45 0 0 1 19.46-13.65c3.21 0 4.01.2 5.82.8 1.81.4 3.61 1.2 5.02 2.01 1.61.8 2.81 2.01 4.01 3.21s2.21 2.61 2.81 4.21l-7.63 4.41c-.4-1-1-1.81-1.61-2.61-.6-.8-1.4-1.4-2.21-2.01-.8-.6-1.81-1-2.81-1.4-1-.4-2.21-.4-3.61-.4-2.01 0-3.81.4-5.22 1.2-1.4.8-2.61 1.81-3.61 3.21s-1.61 2.81-2.21 4.62c-.4 1.81-.6 3.71-.6 5.42s.8 5.22.8 5.22Zm57.8-27.9c3.21 0 6.22.6 8.63 1.81 2.41 1.2 4.82 2.81 6.62 4.82S170.2 24.39 171 27s1.4 5.62 1.4 8.83-.4 6.02-1.4 8.83-2.41 5.02-4.01 7.02-4.01 3.61-6.62 4.82-5.42 1.81-8.63 1.81-6.22-.6-8.63-1.81-4.82-2.81-6.42-4.82-3.21-4.41-4.01-7.02-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83 2.41-5.02 4.01-7.02 4.01-3.61 6.42-4.82 5.42-1.81 8.63-1.81Zm0 36.73c1.81 0 3.61-.4 5.02-1s2.61-1.81 3.61-3.01 1.81-2.81 2.21-4.41c.4-1.81.8-3.61.8-5.62 0-2.21-.2-4.21-.8-6.02s-1.2-3.21-2.21-4.62c-1-1.2-2.21-2.21-3.61-3.01s-3.21-1-5.02-1-3.61.4-5.02 1c-1.4.8-2.61 1.81-3.61 3.01s-1.81 2.81-2.21 4.62c-.4 1.81-.8 3.61-.8 5.62 0 2.41.2 4.21.8 6.02.4 1.81 1.2 3.21 2.21 4.41s2.21 2.21 3.61 3.01c1.4.8 3.21 1 5.02 1Zm36.32 7.96-12.24-44.15h9.83l8.43 32.77h.4l8.23-32.77h9.83L200.3 58.04h-12.24Zm74.14-7.96c2.18 0 3.51-.6 3.51-.6 1.2-.6 2.01-1 2.81-1.81s1.4-1.81 1.81-2.81a13 13 0 0 0 .8-4.01V13.9h8.63v28.15c0 2.41-.4 4.62-1.4 6.62-.8 2.01-2.21 3.61-3.61 5.02s-3.41 2.41-5.62 3.21-4.62 1.2-7.02 1.2-5.02-.4-7.02-1.2c-2.21-.8-4.01-1.81-5.62-3.21s-2.81-3.01-3.61-5.02-1.4-4.21-1.4-6.62V13.9h8.63v26.95c0 1.61.2 3.01.8 4.01.4 1.2 1.2 2.21 2.01 2.81.8.8 1.81 1.4 2.81 1.81 0 0 1.34.6 3.51.6Zm34.22-36.18v18.92l15.65-18.92h10.82l-15.03 17.32 16.03 26.83h-10.21l-11.44-20.21-5.62 6.22v13.99h-8.83V13.9"></path>
60
+ </svg>
61
+ <!--<![endif]-->
62
+ <!--[if IE 8]>
63
+ <img src="{{govukAssetPath}}images/govuk-logotype-tudor-crown.png" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
64
+ <![endif]-->
52
65
  </a>
53
66
  </div>
54
67
  {{$insideHeader}}{{/insideHeader}}
@@ -124,23 +137,5 @@
124
137
 
125
138
  <script {{#nonce}}nonce="{{nonce}}"{{/nonce}}>if (typeof window.GOVUK === 'undefined') document.body.className = document.body.className.replace('js-enabled', '');</script>
126
139
 
127
- <svg width="0" height="0" style="position:absolute">
128
- <symbol id="govuk-logo" viewBox="0 0 324 60">
129
- <title>GOV.UK</title>
130
- <g>
131
- <circle cx="20" cy="17.6" r="3.7"></circle>
132
- <circle cx="10.2" cy="23.5" r="3.7"></circle>
133
- <circle cx="3.7" cy="33.2" r="3.7"></circle>
134
- <circle cx="31.7" cy="30.6" r="3.7"></circle>
135
- <circle cx="43.3" cy="17.6" r="3.7"></circle>
136
- <circle cx="53.2" cy="23.5" r="3.7"></circle>
137
- <circle cx="59.7" cy="33.2" r="3.7"></circle>
138
- <circle cx="31.7" cy="30.6" r="3.7"></circle>
139
- <path d="M33.1,9.8c.2-.1.3-.3.5-.5l4.6,2.4v-6.8l-4.6,1.5c-.1-.2-.3-.3-.5-.5l1.9-5.9h-6.7l1.9,5.9c-.2.1-.3.3-.5.5l-4.6-1.5v6.8l4.6-2.4c.1.2.3.3.5.5l-2.6,8c-.9,2.8,1.2,5.7,4.1,5.7h0c3,0,5.1-2.9,4.1-5.7l-2.6-8ZM37,37.9s-3.4,3.8-4.1,6.1c2.2,0,4.2-.5,6.4-2.8l-.7,8.5c-2-2.8-4.4-4.1-5.7-3.8.1,3.1.5,6.7,5.8,7.2,3.7.3,6.7-1.5,7-3.8.4-2.6-2-4.3-3.7-1.6-1.4-4.5,2.4-6.1,4.9-3.2-1.9-4.5-1.8-7.7,2.4-10.9,3,4,2.6,7.3-1.2,11.1,2.4-1.3,6.2,0,4,4.6-1.2-2.8-3.7-2.2-4.2.2-.3,1.7.7,3.7,3,4.2,1.9.3,4.7-.9,7-5.9-1.3,0-2.4.7-3.9,1.7l2.4-8c.6,2.3,1.4,3.7,2.2,4.5.6-1.6.5-2.8,0-5.3l5,1.8c-2.6,3.6-5.2,8.7-7.3,17.5-7.4-1.1-15.7-1.7-24.5-1.7h0c-8.8,0-17.1.6-24.5,1.7-2.1-8.9-4.7-13.9-7.3-17.5l5-1.8c-.5,2.5-.6,3.7,0,5.3.8-.8,1.6-2.3,2.2-4.5l2.4,8c-1.5-1-2.6-1.7-3.9-1.7,2.3,5,5.2,6.2,7,5.9,2.3-.4,3.3-2.4,3-4.2-.5-2.4-3-3.1-4.2-.2-2.2-4.6,1.6-6,4-4.6-3.7-3.7-4.2-7.1-1.2-11.1,4.2,3.2,4.3,6.4,2.4,10.9,2.5-2.8,6.3-1.3,4.9,3.2-1.8-2.7-4.1-1-3.7,1.6.3,2.3,3.3,4.1,7,3.8,5.4-.5,5.7-4.2,5.8-7.2-1.3-.2-3.7,1-5.7,3.8l-.7-8.5c2.2,2.3,4.2,2.7,6.4,2.8-.7-2.3-4.1-6.1-4.1-6.1h10.6,0Z"></path>
140
- </g>
141
- <circle class="govuk-logo-dot" cx="226" cy="36" r="7.3"></circle>
142
- <path d="M93.94 41.25c.4 1.81 1.2 3.21 2.21 4.62 1 1.4 2.21 2.41 3.61 3.21s3.21 1.2 5.22 1.2 3.61-.4 4.82-1c1.4-.6 2.41-1.4 3.21-2.41.8-1 1.4-2.01 1.61-3.01s.4-2.01.4-3.01v.14h-10.86v-7.02h20.07v24.08h-8.03v-5.56c-.6.8-1.38 1.61-2.19 2.41-.8.8-1.81 1.2-2.81 1.81-1 .4-2.21.8-3.41 1.2s-2.41.4-3.81.4a18.56 18.56 0 0 1-14.65-6.63c-1.6-2.01-3.01-4.41-3.81-7.02s-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83a20.45 20.45 0 0 1 19.46-13.65c3.21 0 4.01.2 5.82.8 1.81.4 3.61 1.2 5.02 2.01 1.61.8 2.81 2.01 4.01 3.21s2.21 2.61 2.81 4.21l-7.63 4.41c-.4-1-1-1.81-1.61-2.61-.6-.8-1.4-1.4-2.21-2.01-.8-.6-1.81-1-2.81-1.4-1-.4-2.21-.4-3.61-.4-2.01 0-3.81.4-5.22 1.2-1.4.8-2.61 1.81-3.61 3.21s-1.61 2.81-2.21 4.62c-.4 1.81-.6 3.71-.6 5.42s.8 5.22.8 5.22Zm57.8-27.9c3.21 0 6.22.6 8.63 1.81 2.41 1.2 4.82 2.81 6.62 4.82S170.2 24.39 171 27s1.4 5.62 1.4 8.83-.4 6.02-1.4 8.83-2.41 5.02-4.01 7.02-4.01 3.61-6.62 4.82-5.42 1.81-8.63 1.81-6.22-.6-8.63-1.81-4.82-2.81-6.42-4.82-3.21-4.41-4.01-7.02-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83 2.41-5.02 4.01-7.02 4.01-3.61 6.42-4.82 5.42-1.81 8.63-1.81Zm0 36.73c1.81 0 3.61-.4 5.02-1s2.61-1.81 3.61-3.01 1.81-2.81 2.21-4.41c.4-1.81.8-3.61.8-5.62 0-2.21-.2-4.21-.8-6.02s-1.2-3.21-2.21-4.62c-1-1.2-2.21-2.21-3.61-3.01s-3.21-1-5.02-1-3.61.4-5.02 1c-1.4.8-2.61 1.81-3.61 3.01s-1.81 2.81-2.21 4.62c-.4 1.81-.8 3.61-.8 5.62 0 2.41.2 4.21.8 6.02.4 1.81 1.2 3.21 2.21 4.41s2.21 2.21 3.61 3.01c1.4.8 3.21 1 5.02 1Zm36.32 7.96-12.24-44.15h9.83l8.43 32.77h.4l8.23-32.77h9.83L200.3 58.04h-12.24Zm74.14-7.96c2.18 0 3.51-.6 3.51-.6 1.2-.6 2.01-1 2.81-1.81s1.4-1.81 1.81-2.81a13 13 0 0 0 .8-4.01V13.9h8.63v28.15c0 2.41-.4 4.62-1.4 6.62-.8 2.01-2.21 3.61-3.61 5.02s-3.41 2.41-5.62 3.21-4.62 1.2-7.02 1.2-5.02-.4-7.02-1.2c-2.21-.8-4.01-1.81-5.62-3.21s-2.81-3.01-3.61-5.02-1.4-4.21-1.4-6.62V13.9h8.63v26.95c0 1.61.2 3.01.8 4.01.4 1.2 1.2 2.21 2.01 2.81.8.8 1.81 1.4 2.81 1.81 0 0 1.34.6 3.51.6Zm34.22-36.18v18.92l15.65-18.92h10.82l-15.03 17.32 16.03 26.83h-10.21l-11.44-20.21-5.62 6.22v13.99h-8.83V13.9"></path>
143
- </symbol>
144
- </svg>
145
140
  </body>
146
141
  </html>
package/frontend/govuk-template/index.js CHANGED
@@ -10,9 +10,9 @@ const basedir = path.dirname(require.resolve('govuk-frontend/package.json'));
10
10
  const setup = (opts, router) => {
11
11
  buildTemplateLayout();
12
12
  const options = opts || {};
13
- options.path = options.path || '/assets';
13
+ options.path = options.path || '/assets/rebrand';
14
14
 
15
- router.use(options.path, servestatic(path.join(basedir, './govuk/assets'), options));
15
+ router.use(options.path, servestatic(path.join(basedir, './govuk/assets/rebrand'), options));
16
16
  router.use((req, res, next) => {
17
17
  res.locals.govukAssetPath = req.baseUrl + options.path + '/';
18
18
  res.locals.partials = res.locals.partials || {};
package/frontend/themes/gov-uk/client-js/cookieSettings.js CHANGED
@@ -1,22 +1,22 @@
1
- /* eslint-disable max-len, no-undef */
1
+ /* eslint-disable max-len, no-var, vars-on-top, no-undef */
2
2
  'use strict';
3
3
 
4
4
  // TODO: update package.json(s)
5
5
 
6
6
  function hideFallbackContent(containerId) {
7
- const container = document.getElementById(containerId);
7
+ var container = document.getElementById(containerId);
8
8
  if (container === null) return;
9
- const fallbackContent = container.getElementsByClassName('js-disabled');
10
- for (let i = 0; i < fallbackContent.length; i++) {
9
+ var fallbackContent = container.getElementsByClassName('js-disabled');
10
+ for (var i = 0; i < fallbackContent.length; i++) {
11
11
  fallbackContent[i].style.display = 'none';
12
12
  }
13
13
  }
14
14
 
15
15
  function showInteractiveContent(containerId) {
16
- const container = document.getElementById(containerId);
16
+ var container = document.getElementById(containerId);
17
17
  if (container === null) return;
18
- const interactiveContent = container.getElementsByClassName('js-enabled');
19
- for (let i = 0; i < interactiveContent.length; i++) {
18
+ var interactiveContent = container.getElementsByClassName('js-enabled');
19
+ for (var i = 0; i < interactiveContent.length; i++) {
20
20
  interactiveContent[i].style.display = 'block';
21
21
  }
22
22
  }
@@ -34,7 +34,7 @@ function setCookiePreferences(preferences) {
34
34
  function showCookieBannerSubmitted() {
35
35
  document.getElementById('cookie-banner-info').style.display = 'none';
36
36
  document.getElementById('cookie-banner-actions').style.display = 'none';
37
- let cookieBannerSubmitted;
37
+ var cookieBannerSubmitted;
38
38
  const cookieBannerDiv = document.getElementById('cookie-banner-submitted-accepted');
39
39
  if (cookieBannerDiv.dataset.acceptCookies === 'true') {
40
40
  cookieBannerSubmitted = document.getElementById('cookie-banner-submitted-accepted');
@@ -52,7 +52,7 @@ function hideCookieBanner() {
52
52
  function initialiseBannerButtons() {
53
53
  const acceptedCookieBannerDiv = document.getElementById('cookie-banner-submitted-accepted');
54
54
  document.getElementById('accept-cookies-button').addEventListener('click', function () {
55
- setCookiePreferences({ essential: true, usage: true });
55
+ setCookiePreferences({essential: true, usage: true});
56
56
  showCookieBannerSubmitted();
57
57
  sessionStorage.setItem('reloading', 'true');
58
58
  window.location = document.URL;
@@ -70,17 +70,17 @@ function initialiseBannerButtons() {
70
70
  }
71
71
 
72
72
  function initialiseCookieBanner() {
73
- const preferences = GOVUK.cookie('cookie_preferences');
73
+ var preferences = GOVUK.cookie('cookie_preferences');
74
74
 
75
75
  if (preferences !== null) {
76
76
  return;
77
77
  }
78
78
 
79
79
  // the default cookie message container from hof-govuk-template
80
- const bannerContainer = document.getElementById('global-cookie-message');
80
+ var bannerContainer = document.getElementById('global-cookie-message');
81
81
 
82
82
  // the cookie banner that will replace the container's default content if using google analytics
83
- const cookieBanner = document.getElementById('cookie-banner');
83
+ var cookieBanner = document.getElementById('cookie-banner');
84
84
 
85
85
  if (bannerContainer !== null && cookieBanner !== null) {
86
86
  hideFallbackContent('global-cookie-message');
@@ -94,8 +94,8 @@ function handleSaveSettings(e) {
94
94
  e.preventDefault();
95
95
  setCookiePreferences({ essential: true, usage: document.getElementById('radio-1').checked });
96
96
 
97
- const cookieNotification = document.getElementById('cookie-notification');
98
- const cookieBanner = document.getElementById('cookie-banner');
97
+ var cookieNotification = document.getElementById('cookie-notification');
98
+ var cookieBanner = document.getElementById('cookie-banner');
99
99
 
100
100
  if (cookieBanner !== null) {
101
101
  cookieBanner.style.display = 'none';
@@ -108,8 +108,8 @@ function handleSaveSettings(e) {
108
108
  }
109
109
 
110
110
  function initialiseFormControls() {
111
- const preferences = JSON.parse(GOVUK.cookie('cookie_preferences'));
112
- let usage;
111
+ var preferences = JSON.parse(GOVUK.cookie('cookie_preferences'));
112
+ var usage;
113
113
 
114
114
  if (preferences !== null && preferences.usage !== undefined && typeof preferences.usage === 'boolean') {
115
115
  usage = preferences.usage;
@@ -123,7 +123,7 @@ function initialiseFormControls() {
123
123
  }
124
124
 
125
125
  function initialiseCookiePage() {
126
- const shouldDisplayCookieControls = document.getElementById('cookie-settings') !== null;
126
+ var shouldDisplayCookieControls = document.getElementById('cookie-settings') !== null;
127
127
 
128
128
  if (shouldDisplayCookieControls) {
129
129
  hideFallbackContent('cookie-settings');
@@ -134,12 +134,12 @@ function initialiseCookiePage() {
134
134
 
135
135
  function onLoad() {
136
136
  window.onload = function () {
137
- const reloading = sessionStorage.getItem('reloading');
137
+ var reloading = sessionStorage.getItem('reloading');
138
138
  if (reloading) {
139
139
  sessionStorage.removeItem('reloading');
140
140
 
141
- const bannerContainer = document.getElementById('global-cookie-message');
142
- const cookieBanner = document.getElementById('cookie-banner');
141
+ var bannerContainer = document.getElementById('global-cookie-message');
142
+ var cookieBanner = document.getElementById('cookie-banner');
143
143
 
144
144
  if (bannerContainer !== null && cookieBanner !== null) {
145
145
  bannerContainer.style.display = 'block';
package/frontend/toolkit/index.js CHANGED
@@ -1,10 +1,10 @@
1
1
  module.exports = {
2
- helpers: require('./assets/javascript/helpers'),
3
- formFocus: require('./assets/javascript/form-focus'),
4
- progressiveReveal: require('./assets/javascript/progressive-reveal'),
5
- validation: require('./assets/javascript/validation'),
2
+ helpers: require('./assets/rebrand/javascript/helpers'),
3
+ formFocus: require('./assets/rebrand/javascript/form-focus'),
4
+ progressiveReveal: require('./assets/rebrand/javascript/progressive-reveal'),
5
+ validation: require('./assets/rebrand/javascript/validation'),
6
6
  detailsSummary: function () {
7
- require('./assets/javascript/vendor/details.polyfill');
7
+ require('./assets/rebrand/javascript/vendor/details.polyfill');
8
8
  },
9
- characterCount: require('./assets/javascript/character-count')
9
+ characterCount: require('./assets/rebrand/javascript/character-count')
10
10
  };
package/index.js CHANGED
@@ -77,7 +77,8 @@ const getContentSecurityPolicy = (config, res) => {
77
77
  imgSrc: ["'self'"],
78
78
  fontSrc: ["'self'", 'data:', 'https://design-system.service.gov.uk'],
79
79
  scriptSrc: ["'self'", `'nonce-${res.locals.nonce}'`],
80
- 'frame-ancestors': ["'none'"]
80
+ 'frame-ancestors': ["'none'"],
81
+ manifestSrc: ["'self'"]
81
82
  };
82
83
  /* eslint-enable quotes */
83
84
 
@@ -95,7 +96,8 @@ const getContentSecurityPolicy = (config, res) => {
95
96
  'https://www.google-analytics.com',
96
97
  'https://region1.google-analytics.com',
97
98
  'https://region1.analytics.google.com'
98
- ]
99
+ ],
100
+ manifestSrc: ["'self'"]
99
101
  };
100
102
 
101
103
  if (config.gaTagId) {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "hof",
3
3
  "description": "A bootstrap for HOF projects",
4
- "version": "22.11.0-frontend-v4-beta.2",
4
+ "version": "23.0.0-frontend-v4-beta.1",
5
5
  "license": "MIT",
6
6
  "main": "index.js",
7
7
  "author": "HomeOffice",
@@ -36,99 +36,99 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "aliasify": "^2.1.0",
39
- "axios": "^1.11.0",
39
+ "axios": "^1.12.2",
40
40
  "bluebird": "^3.7.2",
41
- "body-parser": "^1.15.1",
42
- "browserify": "^17.0.0",
41
+ "body-parser": "^1.20.3",
42
+ "browserify": "^17.0.1",
43
43
  "callsite": "^1.0.0",
44
- "chalk": "^2.0.0",
45
- "chokidar": "^3.4.0",
44
+ "chalk": "^2.4.2",
45
+ "chokidar": "^3.6.0",
46
46
  "connect-redis": "^5.2.0",
47
- "cookie-parser": "^1.4.6",
47
+ "cookie-parser": "^1.4.7",
48
48
  "cp": "^0.2.0",
49
49
  "csrf": "^3.1.0",
50
- "debug": "^4.3.1",
51
- "deprecate": "^1.0.0",
50
+ "debug": "^4.4.3",
51
+ "deprecate": "^1.1.1",
52
52
  "dialog-polyfill": "^0.5.6",
53
53
  "dotenv": "^4.0.0",
54
- "duplexify": "^3.5.0",
54
+ "duplexify": "^3.7.1",
55
55
  "exorcist": "^2.0.0",
56
- "express": "^4.17.1",
56
+ "express": "^4.21.2",
57
57
  "express-healthcheck": "^0.1.0",
58
58
  "express-partial-templates": "^0.2.1",
59
- "express-session": "^1.13.0",
59
+ "express-session": "^1.18.2",
60
60
  "findup": "^0.1.5",
61
- "glob": "^7.2.0",
61
+ "glob": "^7.2.3",
62
62
  "govuk-elements-sass": "^3.1.3",
63
- "govuk-frontend": "4.10.1",
63
+ "govuk-frontend": "4.10",
64
64
  "govuk_template_mustache": "^0.26.0",
65
- "helmet": "^3.22.0",
65
+ "helmet": "^3.23.3",
66
66
  "hogan-express-strict": "^0.5.4",
67
67
  "hogan.js": "^3.0.2",
68
68
  "homeoffice-countries": "^0.2.0",
69
- "i18n-future": "^2.0.0",
69
+ "i18n-future": "^2.0.1",
70
70
  "i18n-lookup": "^0.1.0",
71
71
  "is-pdf": "^1.0.0",
72
- "jquery": "^3.6.0",
73
- "libphonenumber-js": "^1.9.44",
72
+ "jquery": "^3.7.1",
73
+ "libphonenumber-js": "^1.12.23",
74
74
  "lodash": "^4.17.21",
75
75
  "markdown-it": "^12.3.2",
76
- "minimatch": "^3.0.7",
77
- "minimist": "^1.2.6",
76
+ "minimatch": "^3.1.2",
77
+ "minimist": "^1.2.8",
78
78
  "mixwith": "^0.1.1",
79
- "moment": "^2.29.4",
80
- "morgan": "^1.10.0",
79
+ "moment": "^2.30.1",
80
+ "morgan": "^1.10.1",
81
81
  "mustache": "^4.2.0",
82
- "nodemailer": "^6.6.3",
82
+ "nodemailer": "^6.10.1",
83
83
  "nodemailer-ses-transport": "^1.5.1",
84
84
  "nodemailer-stub-transport": "^1.1.0",
85
85
  "notifications-node-client": "^8.2.1",
86
86
  "redis": "^3.1.2",
87
87
  "reqres": "^3.0.1",
88
88
  "rimraf": "^3.0.2",
89
- "sass": "^1.56.2",
90
- "serve-static": "^1.14.1",
91
- "uglify-js": "^3.14.3",
89
+ "sass": "^1.93.2",
90
+ "serve-static": "^1.16.2",
91
+ "uglify-js": "^3.19.3",
92
92
  "underscore": "^1.13.7",
93
93
  "urijs": "^1.19.11",
94
94
  "uuid": "^8.3.2",
95
- "winston": "^3.7.2"
95
+ "winston": "^3.18.3"
96
96
  },
97
97
  "devDependencies": {
98
- "@cucumber/cucumber": "^7.3.0",
99
- "@cucumber/pretty-formatter": "^1.0.0-alpha.1",
100
- "@types/jest": "^26.0.14",
101
- "@xmldom/xmldom": "~0.8.4",
98
+ "@cucumber/cucumber": "^7.3.2",
99
+ "@cucumber/pretty-formatter": "^1.0.1",
100
+ "@types/jest": "^26.0.24",
101
+ "@xmldom/xmldom": "~0.8.11",
102
102
  "chai": "^3.5.0",
103
- "chai-as-promised": "^7.1.1",
103
+ "chai-as-promised": "^7.1.2",
104
104
  "chai-subset": "^1.6.0",
105
- "concat-stream": "^1.4.7",
106
- "csv": "^5.3.2",
107
- "eslint": "^8.57.0",
105
+ "concat-stream": "^1.6.2",
106
+ "csv": "^5.5.3",
107
+ "eslint": "^8.57.1",
108
108
  "eslint-config-hof": "^1.3.4",
109
109
  "funkie": "0.0.5",
110
110
  "funkie-phantom": "0.0.1",
111
- "istanbul": "^0.4.3",
112
- "jest": "^26.5.0",
113
- "jquery": "^3.6.0",
114
- "karma": "^6.3.4",
115
- "karma-browserify": "^8.0.0",
111
+ "istanbul": "^0.4.5",
112
+ "jest": "^26.6.3",
113
+ "jquery": "^3.7.1",
114
+ "karma": "^6.4.4",
115
+ "karma-browserify": "^8.1.0",
116
116
  "karma-chai": "^0.1.0",
117
117
  "karma-cli": "^2.0.0",
118
118
  "karma-mocha": "^2.0.1",
119
119
  "karma-phantomjs-launcher": "^1.0.4",
120
120
  "mocha": "^8.4.0",
121
121
  "mocha-sandbox": "^1.0.0",
122
- "node-mocks-http": "^1.6.2",
123
- "npm-run-all": "^3.1.1",
122
+ "node-mocks-http": "^1.17.2",
123
+ "npm-run-all": "^3.1.2",
124
124
  "nyc": "^15.1.0",
125
- "playwright": "^1.16.3",
125
+ "playwright": "^1.56.0",
126
126
  "postcode": "0.2.2",
127
- "proxyquire": "^1.7.11",
128
- "release-it": "^16.2.1",
129
- "sinon": "^11.1.1",
127
+ "proxyquire": "^1.8.0",
128
+ "release-it": "^16.3.0",
129
+ "sinon": "^11.1.2",
130
130
  "sinon-chai": "^3.7.0",
131
- "supertest": "^3.0.0",
131
+ "supertest": "^3.4.2",
132
132
  "travis-conditions": "0.0.0",
133
133
  "watchify": "^4.0.0",
134
134
  "webdriverio": "^4.14.4"
package/sandbox/assets/{js → rebrand/js}/index.js RENAMED
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable */
2
2
  'use strict'
3
3
 
4
- require('../../../frontend/themes/gov-uk/client-js');
4
+ require('../../../../frontend/themes/gov-uk/client-js');
5
5
 
6
6
  var $ = require('jquery');
7
7
  var typeahead = require('typeahead-aria');