@moduk/frontend 1.0.0 → 1.0.2

package/dist/lib/nunjucks/moduk/components/fieldset/__examples__/default.njk

@@ -1,5 +1,5 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
-{% from "moduk/components/fieldset/macro.njk" import modukFieldset %}
+{% from "moduk/components/input/macro.njk" import modukInput -%}
+{% from "moduk/components/fieldset/macro.njk" import modukFieldset -%}
 
 {% call modukFieldset({
   legend: {
@@ -7,7 +7,7 @@
     classes: "govuk-fieldset__legend--l",
     isPageHeading: true
   }
-}) %}
+}) -%}
   {{ modukInput({
     label: {
       text: 'Address line 1'
@@ -15,7 +15,7 @@
     id: "address-line-1",
     name: "address-line-1",
     autocomplete: "address-line1"
-  }) }}
+  }) -}}
   {{ modukInput({
     label: {
       text: 'Address line 2 (optional)'
@@ -23,7 +23,7 @@
     id: "address-line-2",
     name: "address-line-2",
     autocomplete: "address-line2"
-  }) }}
+  }) -}}
   {{ modukInput({
     label: {
       text: "Town or city"
@@ -32,7 +32,7 @@
     id: "address-town",
     name: "address-town",
     autocomplete: "address-level2"
-  }) }}
+  }) -}}
   {{ modukInput({
     label: {
       text: "Postcode"
@@ -41,5 +41,5 @@
     id: "address-postcode",
     name: "address-postcode",
     autocomplete: "postal-code"
-  }) }}
-{% endcall %}
+  }) -}}
+{% endcall -%}

package/dist/lib/nunjucks/moduk/components/file-upload/__examples__/default.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/file-upload/macro.njk" import modukFileUpload %}
+{% from "moduk/components/file-upload/macro.njk" import modukFileUpload -%}
 
 {{ modukFileUpload({
   id: "file-upload-1",
@@ -6,4 +6,4 @@
   label: {
     text: "Upload a file"
   }
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/file-upload/__examples__/with-error.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/file-upload/macro.njk" import modukFileUpload %}
+{% from "moduk/components/file-upload/macro.njk" import modukFileUpload -%}
 
 {{ modukFileUpload({
   id: "file-upload-with-error",
@@ -9,4 +9,4 @@
   errorMessage: {
     text: "The CSV must be smaller than 2MB"
   }
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/file-upload/macro.njk

@@ -1,5 +1,5 @@
 {% from "govuk/components/file-upload/macro.njk" import govukFileUpload %}
 
-{% macro modukFileUpload(params) %}
+{% macro modukFileUpload(params) -%}
   {{ govukFileUpload(params) }}
-{% endmacro %}
+{%- endmacro %}

package/dist/lib/nunjucks/moduk/components/footer/__examples__/default.njk

@@ -1,3 +1,3 @@
-{%- from "moduk/components/footer/macro.njk" import modukFooter -%}
+{% from "moduk/components/footer/macro.njk" import modukFooter -%}
 
-{{ modukFooter({}) }}
+{{ modukFooter({}) -}}

package/dist/lib/nunjucks/moduk/components/footer/__examples__/with-links.njk

@@ -1,4 +1,4 @@
-{%- from "moduk/components/footer/macro.njk" import modukFooter -%}
+{% from "moduk/components/footer/macro.njk" import modukFooter -%}
 
 {{ modukFooter({
   meta: {
@@ -17,4 +17,4 @@
       }
     ]
   }
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/footer/__examples__/with-secondary-navigation-and-links.njk

@@ -1,4 +1,4 @@
-{%- from "moduk/components/footer/macro.njk" import modukFooter -%}
+{% from "moduk/components/footer/macro.njk" import modukFooter -%}
 
 {{ modukFooter({
   navigation: [
@@ -69,4 +69,4 @@
     ],
     html: 'Built by <a href="#" class="govuk-footer__link">Defence Digital</a>'
   }
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/footer/__examples__/with-secondary-navigation.njk

@@ -1,4 +1,4 @@
-{%- from "moduk/components/footer/macro.njk" import modukFooter -%}
+{% from "moduk/components/footer/macro.njk" import modukFooter -%}
 
 {{ modukFooter({
   navigation: [
@@ -52,4 +52,4 @@
       ]
     }
   ]
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/footer/macro.njk

@@ -1,5 +1,5 @@
 {% from "govuk/components/footer/macro.njk" import govukFooter %}
 
-{% macro modukFooter(params) %}
+{% macro modukFooter(params) -%}
   {{ govukFooter(params) }}
-{% endmacro %}
+{%- endmacro %}

package/dist/lib/nunjucks/moduk/components/header/__examples__/default.njk

@@ -1,3 +1,3 @@
-{%- from "moduk/components/header/macro.njk" import modukHeader -%}
+{% from "moduk/components/header/macro.njk" import modukHeader -%}
 
-{{ modukHeader({}) }}
+{{ modukHeader({}) -}}

package/dist/lib/nunjucks/moduk/components/header/__examples__/with-service-name-and-navigation.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/header/macro.njk" import modukHeader %}
+{% from "moduk/components/header/macro.njk" import modukHeader -%}
 
 {{ modukHeader({
   homepageUrl: "#",
@@ -23,4 +23,4 @@
       text: "Navigation item 4"
     }
   ]
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/header/__examples__/with-service-name-and-no-service-url.njk

@@ -1,6 +1,6 @@
-{% from "moduk/components/header/macro.njk" import modukHeader %}
+{% from "moduk/components/header/macro.njk" import modukHeader -%}
 
 {{ modukHeader({
   homepageUrl: "#",
   serviceName: "Service name"
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/header/__examples__/with-service-name.njk

@@ -1,7 +1,7 @@
-{% from "moduk/components/header/macro.njk" import modukHeader %}
+{%- from "moduk/components/header/macro.njk" import modukHeader -%}
 
 {{ modukHeader({
   homepageUrl: "#",
   serviceName: "Service name",
   serviceUrl: "#"
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/header/macro.njk

@@ -5,9 +5,9 @@
  The logo has been changed, some CSS classes have been added and there are some slight markup changes.
 #}
 
-{% macro modukHeader(params) %}
+{% macro modukHeader(params) -%}
 
-{% set menuButtonText = params.menuButtonText if params.menuButtonText else 'Menu' %}
+{% set menuButtonText = params.menuButtonText if params.menuButtonText else 'Menu' -%}
 
 <header class="govuk-header {{ params.classes if params.classes }}" role="banner" data-module="govuk-header"
         {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
@@ -35,43 +35,42 @@
         </span>
       </a>
     </div>
-    {% if params.serviceName or params.navigation  %}
+    {%- if params.serviceName or params.navigation %}
     <div class="govuk-header__content">
-    {% if params.serviceName %}
-    {% if params.serviceUrl %}
+    {%- if params.serviceName %}
+    {%- if params.serviceUrl %}
       <a href="{{ params.serviceUrl }}" class="govuk-header__link moduk-header__service-name govuk-header__service-name">
         {{ params.serviceName }}
       </a>
-    {% else%}
+    {%- else %}
       <span class="moduk-header__service-name govuk-header__service-name">
         {{ params.serviceName }}
       </span>
-    {% endif %}
-    {% endif %}
-    {% if params.navigation %}
-    <nav aria-label="{{ params.navigationLabel | default(menuButtonText) }}" class="govuk-header__navigation {{ params.navigationClasses if params.navigationClasses }}">
-      <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="{{ params.menuButtonLabel | default('Show or hide menu') }}" hidden>{{ menuButtonText }}</button>
-
-      <ul id="navigation" class="govuk-header__navigation-list">
-        {% for item in params.navigation %}
-          {% if item.text or item.html %}
-            <li class="govuk-header__navigation-item{{ ' govuk-header__navigation-item--active moduk-header__navigation-item--active' if item.active }}">
-              {% if item.href %}
-                <a class="govuk-header__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
-              {% endif %}
-                {{ item.html | safe if item.html else item.text }}
-              {% if item.href %}
-                </a>
-              {% endif %}
-            </li>
-          {% endif %}
-        {% endfor %}
-      </ul>
-    </nav>
-    {% endif %}
+    {% endif -%}
+    {%- endif -%}
+    {%- if params.navigation %}
+      <nav aria-label="{{ params.navigationLabel | default(menuButtonText) }}" class="govuk-header__navigation {{ params.navigationClasses if params.navigationClasses }}">
+        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="{{ params.menuButtonLabel | default('Show or hide menu') }}" hidden>{{ menuButtonText }}</button>
+        <ul id="navigation" class="govuk-header__navigation-list">
+        {%- for item in params.navigation -%}
+        {%- if item.text or item.html %}
+          <li class="govuk-header__navigation-item{{ ' govuk-header__navigation-item--active moduk-header__navigation-item--active' if item.active }}">
+            {% if item.href -%}
+              <a class="govuk-header__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
+            {%- endif -%}
+              {{ item.html | safe if item.html else item.text }}
+            {%- if item.href -%}
+              </a>
+            {%- endif %}
+          </li>
+        {%- endif %}
+        {%- endfor %}
+        </ul>
+      </nav>
+    {%- endif %}
     </div>
-    {% endif %}
+    {%- endif %}
   </div>
 </header>
 
-{% endmacro %}
+{%- endmacro -%}

package/dist/lib/nunjucks/moduk/components/input/__examples__/default.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput -%}
 
 {{ modukInput({
   label: {
@@ -8,4 +8,4 @@
   },
   id: "default",
   name: "event-name-default"
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/__examples__/not-as-page-heading.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 {{ modukInput({
   label: {
@@ -6,4 +6,4 @@
   },
   id: "with-not-as-page-heading",
   name: "event-name-with-not-as-page-heading"
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-error.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 {{ modukInput({
   label: {
@@ -14,4 +14,4 @@
   errorMessage: {
     text: "Enter an event name"
   }
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-fixed-width.njk

@@ -1,14 +1,14 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 <div>
-  {{ modukInput({
+  {{- modukInput({
     label: {
       text: "20 character width"
     },
     classes: "govuk-input--width-20",
     id: "width-20",
     name: "width-20"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -17,7 +17,7 @@
     classes: "govuk-input--width-10",
     id: "width-10",
     name: "width-10"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -26,7 +26,7 @@
     classes: "govuk-input--width-5",
     id: "width-5",
     name: "width-5"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -35,7 +35,7 @@
     classes: "govuk-input--width-4",
     id: "width-4",
     name: "width-4"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -44,14 +44,14 @@
     classes: "govuk-input--width-3",
     id: "width-3",
     name: "width-3"
-  }) }}
+  }) -}}
 
-    {{ modukInput({
-      label: {
-        text: "2 character width"
-      },
-      classes: "govuk-input--width-2",
-      id: "width-2",
-      name: "width-2"
-    }) }}
+  {{ modukInput({
+    label: {
+      text: "2 character width"
+    },
+    classes: "govuk-input--width-2",
+    id: "width-2",
+    name: "width-2"
+  }) -}}
 </div>

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-fluid-width.njk

@@ -1,14 +1,14 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 <div>
-  {{ modukInput({
+  {{- modukInput({
     label: {
       text: "Full width"
     },
     classes: "govuk-!-width-full",
     id: "full",
     name: "full"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -17,7 +17,7 @@
     classes: "govuk-!-width-three-quarters",
     id: "three-quarters",
     name: "three-quarters"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -26,7 +26,7 @@
     classes: "govuk-!-width-two-thirds",
     id: "two-thirds",
     name: "two-thirds"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -35,7 +35,7 @@
     classes: "govuk-!-width-one-half",
     id: "one-half",
     name: "one-half"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -44,7 +44,7 @@
     classes: "govuk-!-width-one-third",
     id: "one-third",
     name: "one-third"
-  }) }}
+  }) -}}
 
   {{ modukInput({
     label: {
@@ -53,5 +53,5 @@
     classes: "govuk-!-width-one-quarter",
     id: "one-quarter",
     name: "one-quarter"
-  }) }}
+  }) -}}
 </div>

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-hint.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 {{ modukInput({
   label: {
@@ -11,4 +11,4 @@
   },
   id: "with-hint",
   name: "event-name-with-hint"
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-numeric.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 {{ modukInput({
   label: {
@@ -14,4 +14,4 @@
   name: "account-number-with-numeric",
   inputmode: "numeric",
   spellcheck: false
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-prefix-and-suffix-error.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 {{ modukInput({
   id: "with-prefix-and-suffix-error",
@@ -19,4 +19,4 @@
   },
   classes: "govuk-input--width-5",
   spellcheck: false
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-prefix-and-suffix.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 {{ modukInput({
   id: "with-prefix-and-suffix",
@@ -16,4 +16,4 @@
   },
   classes: "govuk-input--width-5",
   spellcheck: false
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-prefix.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 {{ modukInput({
   id: "with-prefix",
@@ -13,4 +13,4 @@
   },
   classes: "govuk-input--width-5",
   spellcheck: false
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/__examples__/with-suffix.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/input/macro.njk" import modukInput %}
+{% from "moduk/components/input/macro.njk" import modukInput  -%}
 
 {{ modukInput({
   id: "with-suffix",
@@ -13,4 +13,4 @@
   },
   classes: "govuk-input--width-5",
   spellcheck: false
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/input/macro.njk

@@ -1,5 +1,5 @@
 {% from "govuk/components/input/macro.njk" import govukInput %}
 
-{% macro modukInput(params) %}
+{% macro modukInput(params) -%}
   {{ govukInput(params) }}
-{% endmacro %}
+{%- endmacro %}

package/dist/lib/nunjucks/moduk/components/inset-text/__examples__/default.njk

@@ -1,5 +1,5 @@
-{%- from "moduk/components/inset-text/macro.njk" import modukInsetText -%}
+{% from "moduk/components/inset-text/macro.njk" import modukInsetText -%}
 
-{{ modukInsetText({ 
+{{ modukInsetText({
   text: "You’ll get confirmation that we have received your report within 5 working days."
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/inset-text/macro.njk

@@ -7,5 +7,5 @@
     {%- endcall %}
   {%- else -%}
     {{ govukInsetText(params) }}
-  {%- endif %}
+  {%- endif -%}
 {%- endmacro %}

package/dist/lib/nunjucks/moduk/components/notification-banner/__examples__/default.njk

@@ -1,5 +1,5 @@
-{% from "moduk/components/notification-banner/macro.njk" import modukNotificationBanner %}
+{% from "moduk/components/notification-banner/macro.njk" import modukNotificationBanner -%}
 
 {{ modukNotificationBanner({
   text: 'There may be a delay in processing your application because of the coronavirus outbreak.'
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/notification-banner/__examples__/success.njk

@@ -1,13 +1,13 @@
-{% from "moduk/components/notification-banner/macro.njk" import modukNotificationBanner %}
+{% from "moduk/components/notification-banner/macro.njk" import modukNotificationBanner -%}
 
 {% set html %}
   <h3 class="govuk-notification-banner__heading">
     Training outcome recorded and trainee withdrawn
   </h3>
   <p class="govuk-body">Contact <a class="govuk-notification-banner__link" href="#">example@department.gov.uk</a> if you think there’s a problem.</p>
-{% endset %}
+{% endset -%}
 
 {{ modukNotificationBanner({
   html: html,
   type: 'success'
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/notification-banner/__examples__/with-html.njk

@@ -1,12 +1,12 @@
-{% from "moduk/components/notification-banner/macro.njk" import modukNotificationBanner %}
+{% from "moduk/components/notification-banner/macro.njk" import modukNotificationBanner -%}
 
 {% set html %}
   <p class="govuk-notification-banner__heading">
     You have 7 days left to send your application.
     <a class="govuk-notification-banner__link" href="#">View application</a>.
   </p>
-{% endset %}
+{% endset -%}
 
 {{ modukNotificationBanner({
   html: html
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/notification-banner/macro.njk

@@ -3,9 +3,9 @@
 {% macro modukNotificationBanner(params) -%}
   {% if caller -%}
     {% call govukNotificationBanner(params) -%}
-      {{ caller() }}
+      {{- caller() -}}
     {%- endcall %}
   {%- else -%}
-    {{ govukNotificationBanner(params) }}
+    {{- govukNotificationBanner(params) -}}
   {%- endif %}
 {%- endmacro %}

package/dist/lib/nunjucks/moduk/components/pagination/__examples__/default.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/pagination/macro.njk" import modukPagination %}
+{% from "moduk/components/pagination/macro.njk" import modukPagination -%}
 
 {{ modukPagination({
   previous: {
@@ -22,4 +22,4 @@
       href: "#"
     }
   ]
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/pagination/__examples__/on-the-first-page.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/pagination/macro.njk" import modukPagination %}
+{% from "moduk/components/pagination/macro.njk" import modukPagination -%}
 
 {{ modukPagination({
   next: {
@@ -19,4 +19,4 @@
       href: "#"
     }
   ]
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/pagination/__examples__/on-the-last-page.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/pagination/macro.njk" import modukPagination %}
+{% from "moduk/components/pagination/macro.njk" import modukPagination -%}
 
 {{ modukPagination({
   previous: {
@@ -19,4 +19,4 @@
       href: "#"
     }
   ]
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/pagination/__examples__/with-ellipses.njk

@@ -1,4 +1,4 @@
-{% from "moduk/components/pagination/macro.njk" import modukPagination %}
+{% from "moduk/components/pagination/macro.njk" import modukPagination -%}
 
 {{ modukPagination({
   previous: {
@@ -36,4 +36,4 @@
       href: "#"
     }
   ]
-}) }}
+}) -}}

package/dist/lib/nunjucks/moduk/components/pagination/__examples__/with-link-labels.njk

@@ -1,6 +1,6 @@
-{%- from "moduk/components/pagination/macro.njk" import modukPagination -%}
+{% from "moduk/components/pagination/macro.njk" import modukPagination -%}
 
-{{- modukPagination({
+{{ modukPagination({
   previous: {
     labelText: "Understanding military personnel",
     href: "#"