@x-govuk/nhsuk-eleventy-plugin 1.0.5 → 1.1.0

package/README.md

@@ -23,7 +23,7 @@ export default function(eleventyConfig) {
 }
 ```
 
-Learn more about how to [get started](https://x-govuk.github.io/nhsuk-eleventy-plugin/get-started/) and which [options you can provide](https://x-govuk.github.io/nhsuk-eleventy-plugin/get-started/options/).
+Learn more about how to [get started](https://nhsuk-eleventy-plugin.x-govuk.org/get-started/) and which [options you can provide](https://nhsuk-eleventy-plugin.x-govuk.org/get-started/options/).
 
 ## Releasing a new version
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x-govuk/nhsuk-eleventy-plugin",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Write documentation using Markdown and publish it using NHS.UK styles",
   "keywords": [
     "nhsuk",
@@ -8,7 +8,7 @@
     "eleventy",
     "eleventy-plugin"
   ],
-  "homepage": "https://x-govuk.github.io/nhsuk-eleventy-plugin/",
+  "homepage": "https://nhsuk-eleventy-plugin.x-govuk.org",
   "bugs": {
     "url": "git+https://github.com/x-govuk/nhsuk-eleventy-plugin/issues"
   },
@@ -54,10 +54,10 @@
   "dependencies": {
     "@11ty/eleventy": "^3.0.0",
     "@11ty/eleventy-navigation": "^1.0.0",
-    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-terser": "^0.4.4",
-    "@x-govuk/govuk-eleventy-plugin": "^8.0.4",
+    "@x-govuk/govuk-eleventy-plugin": "^8.1.1",
     "accessible-autocomplete": "^3.0.1",
     "deepmerge": "^4.2.2",
     "markdown-it-abbr": "^2.0.0",
@@ -67,21 +67,21 @@
     "markdown-it-deflist": "^3.0.0",
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-github-alerts": "^1.0.0",
-    "markdown-it-govuk": "^0.7.0",
+    "markdown-it-govuk": "^0.8.0",
     "markdown-it-image-figures": "^2.0.0",
     "markdown-it-ins": "^4.0.0",
     "markdown-it-mark": "^4.0.0",
     "markdown-it-sub": "^2.0.0",
     "markdown-it-sup": "^2.0.0",
     "markdown-it-table-of-contents": "^1.0.0",
-    "nhsuk-frontend": "^10.0.0",
+    "nhsuk-frontend": "^10.3.0",
     "rollup": "^4.1.0",
     "sass": "^1.45.1"
   },
   "devDependencies": {
     "@x-govuk/eslint-config": "^0.0.1",
     "@x-govuk/nhsuk-eleventy-plugin": "file:./",
-    "np": "^10.0.0",
+    "np": "^11.0.0",
     "prettier": "^3.1.0",
     "stylelint": "^16.0.0",
     "stylelint-config-gds": "^2.0.0",

package/src/components/_index.scss

@@ -1,8 +1,8 @@
 @forward "attribution";
-@forward "blockquote";
 @forward "code";
 @forward "contents-list";
 @forward "footnotes-list";
+@forward "govspeak";
 @forward "hero";
 @forward "image";
 @forward "metadata";

package/src/components/card-group/template.njk

@@ -14,12 +14,11 @@
       primary: params.type == "primary",
       secondary: params.type == "secondary",
       heading: item.heading,
-      headingClasses: "nhsuk-u-font-size-22" if params.title else "nhsuk-u-font-size-26" + (" nhsuk-u-margin-bottom-2" if item.descriptionHtml else ""),
+      headingClasses: ("nhsuk-u-font-size-22" if params.title else "nhsuk-u-font-size-26") + (" nhsuk-u-margin-bottom-2" if item.descriptionHtml else ""),
       headingLevel: 3 if params.title else 2,
       href: item.href,
       descriptionHtml: item.descriptionHtml,
-      imgALT: item.imgALT,
-      imgURL: item.imgURL
+      image: item.image
     }) | indent(4) }}
   </li>
 {% endfor %}

package/src/components/govspeak/_index.scss

@@ -0,0 +1,31 @@
+@use "../../vendor/nhsuk-frontend" as *;
+
+@include nhsuk-exports("nhsuk-eleventy-plugin/components/govspeak") {
+  // Information callout
+  // https://components.publishing.service.gov.uk/component-guide/govspeak/information_callout
+  [data-govspeak="information-callout"] {
+    @extend .nhsuk-inset-text;
+  }
+
+  // Blockquote
+  // https://components.publishing.service.gov.uk/component-guide/govspeak/blockquote
+  // https://github.com/alphagov/govuk_publishing_components/blob/main/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss
+  blockquote[data-govspeak="blockquote"] {
+    margin: 0 0 nhsuk-spacing(4);
+    padding: 0 0 0 nhsuk-spacing(6);
+
+    p {
+      position: relative;
+
+      &::before {
+        content: "\201C";
+        position: absolute;
+        right: 100%;
+      }
+
+      &:last-of-type::after {
+        content: "\201D";
+      }
+    }
+  }
+}

package/src/data/options.js

@@ -3,7 +3,7 @@ import deepmerge from 'deepmerge'
 /**
  * Default option values
  *
- * @see {@link https://x-govuk.github.io/nhsuk-eleventy-plugin/options/}
+ * @see {@link https://nhsuk-eleventy-plugin.x-govuk.org/options/}
  */
 const defaults = {
   homeKey: 'Home',

package/src/filters/items-from-collection.js

@@ -70,8 +70,7 @@ export function itemsFromCollection(array, n) {
     ...(item.caption && { caption: item.caption }),
     heading: smart(item.title),
     descriptionHtml: getDescriptionHtml(item),
-    ...(item.image && { imgURL: item.image.src }),
-    ...(item.image && { imgALT: item.image.alt })
+    ...(item.image && { image: item.image })
   }))
 
   return sliceFromCollection(array, n)

package/src/markdown-it.js

@@ -43,6 +43,7 @@ export function md(markdownOptions = {}) {
     .use(markdownItGovuk, {
       brand: 'nhsuk',
       calvert: true,
+      govspeak: ['blockquote', 'information-callout'],
       headingsStartWith: markdownOptions.headingsStartWith
     })
     .use(markdownItAbbr)

package/src/components/blockquote/_index.scss

@@ -1,22 +0,0 @@
-@use "../../vendor/nhsuk-frontend" as *;
-
-@include nhsuk-exports("nhsuk-eleventy-plugin/components/blockquote") {
-  .app-blockquote {
-    margin: 0 0 nhsuk-spacing(4);
-    padding: 0 0 0 nhsuk-spacing(6);
-
-    p {
-      position: relative;
-
-      &::before {
-        content: "\201C";
-        position: absolute;
-        right: 100%;
-      }
-
-      &:last-of-type::after {
-        content: "\201D";
-      }
-    }
-  }
-}