@x-govuk/govuk-eleventy-plugin 6.5.0 → 6.6.1

package/components/footer/template.njk

@@ -53,20 +53,22 @@
           <span class="govuk-footer__licence-description">
             {{ params.contentLicence.html | safe if params.contentLicence.html else params.contentLicence.text }}
           </span>
-        {% else %}
+        {% elseif params.contentLicence != false %}
           {% include "./_ogl.svg" %}
           <span class="govuk-footer__licence-description">
             All content is available under the <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated
           </span>
         {% endif %}
       </div>
-      <div class="govuk-footer__meta-item">
-      {%- if params.copyright.html or params.copyright.text -%}
-        {{ params.copyright.html | safe if params.copyright.html else params.copyright.text }}
-      {% else %}
-        <a class="govuk-footer__link govuk-footer__copyright-logo" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">©&nbsp;Crown copyright</a>
+      {%- if params.copyright != false -%}
+        <div class="govuk-footer__meta-item">
+          {%- if params.copyright.html or params.copyright.text -%}
+            {{ params.copyright.html | safe if params.copyright.html else params.copyright.text }}
+          {% else %}
+            <a class="govuk-footer__link govuk-footer__copyright-logo" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">©&nbsp;Crown copyright</a>
+          {% endif %}
+        </div>
       {% endif %}
-      </div>
     </div>
   </div>
 </footer>

package/components/site-search/template.njk

@@ -1,4 +1,4 @@
-<site-search class="app-site-search govuk-!-display-none-print" index="{{ params.indexPath | htmlBaseUrl }}" label="{{ params.label | default("Search site") }}">
+<site-search class="app-site-search govuk-!-display-none-print" index="{{ params.indexPath | canonicalUrl }}" label="{{ params.label | default("Search site") }}">
 {%- if params.sitemapPath -%}
   <a class="app-site-search__link" href="{{ params.sitemapPath }}">Sitemap</a>
 {%- endif -%}

package/lib/collections/ordered.js

@@ -1,6 +1,6 @@
 module.exports = (collection) =>
   collection
-    .getFilteredByGlob('**/*.md')
+    .getFilteredByGlob(['**/*.md', '**/*.njk'])
     .filter((item) => !/^tag/.test(item.data.layout))
     .sort((a, b) => {
       if (

package/lib/filters/canonical-url.js

@@ -6,14 +6,19 @@ const path = require('node:path')
  * @returns {string} Canonical site URL with resolved path
  */
 module.exports = function (string = '') {
-  const { url } = this.ctx.options
+  const { options } = this.ctx
+
+  // No site URL configured
+  if (!options?.url) {
+    return string
+  }
 
   // If plugin options do not provide a site URL, return the path
-  if (!URL.canParse(url)) {
+  if (!URL.canParse(options.url)) {
     return string
   }
 
-  const siteUrl = new URL(url)
+  const siteUrl = new URL(options.url)
 
   // If incoming string is a URL, return that if it’s an external URL
   if (URL.canParse(string)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x-govuk/govuk-eleventy-plugin",
-  "version": "6.5.0",
+  "version": "6.6.1",
   "description": "Write documentation using Markdown and publish it using GOV.UK styles",
   "keywords": [
     "govuk",
@@ -71,7 +71,7 @@
     "markdown-it-mark": "^4.0.0",
     "markdown-it-sub": "^2.0.0",
     "markdown-it-sup": "^2.0.0",
-    "markdown-it-table-of-contents": "^0.6.0",
+    "markdown-it-table-of-contents": "^0.8.0",
     "rimraf": "^5.0.0",
     "rollup": "^4.1.0",
     "sass": "^1.45.1",