diff --git a/.github/actions/prototype-kit-test/action.yml b/.github/actions/prototype-kit-test/action.yml index cc6da517..af9d117e 100644 --- a/.github/actions/prototype-kit-test/action.yml +++ b/.github/actions/prototype-kit-test/action.yml @@ -39,6 +39,7 @@ runs: echo -e "{% from \"nationalarchives/components/button/macro.njk\" import tnaButton %}\n$(cat prototype/app/views/index.html)" > prototype/app/views/index.html && echo -e "{% from \"nationalarchives/components/card/macro.njk\" import tnaCard %}\n$(cat prototype/app/views/index.html)" > prototype/app/views/index.html && echo -e "{% from \"nationalarchives/components/checkboxes/macro.njk\" import tnaCheckboxes %}\n$(cat prototype/app/views/index.html)" > prototype/app/views/index.html && + echo -e "{% from \"nationalarchives/components/compound-filters/macro.njk\" import tnaCompoundFilters %}\n$(cat prototype/app/views/index.html)" > prototype/app/views/index.html && echo -e "{% from \"nationalarchives/components/cookie-banner/macro.njk\" import tnaCookieBanner %}\n$(cat prototype/app/views/index.html)" > prototype/app/views/index.html && echo -e "{% from \"nationalarchives/components/date-input/macro.njk\" import tnaDateInput %}\n$(cat prototype/app/views/index.html)" > prototype/app/views/index.html && echo -e "{% from \"nationalarchives/components/date-search/macro.njk\" import tnaDateSearch %}\n$(cat prototype/app/views/index.html)" > prototype/app/views/index.html && @@ -70,6 +71,7 @@ runs: echo "{{ tnaButton({text:\"I am a button\",url:\"#\"}) }}" >> prototype/app/views/index.html && echo "{{ tnaCard({}) }}" >> prototype/app/views/index.html && echo "{{ tnaCheckboxes({}) }}" >> prototype/app/views/index.html && + echo "{{ tnaCompoundFilters({}) }}" >> prototype/app/views/index.html && echo "{{ tnaCookieBanner({}) }}" >> prototype/app/views/index.html && echo "{{ tnaDateInput({}) }}" >> prototype/app/views/index.html && echo "{{ tnaDateSearch({}) }}" >> prototype/app/views/index.html && diff --git a/.github/actions/tests/action.yml b/.github/actions/tests/action.yml index b13b8729..5ef9b7ae 100644 --- a/.github/actions/tests/action.yml +++ b/.github/actions/tests/action.yml @@ -17,7 +17,7 @@ runs: run: mkdir temp && npm run validatehtml shell: bash - name: Build Storybook - run: npm run build + run: npm run build --test shell: bash - name: Start Storybook run: npm start & diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index 941cf675..06360698 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -28,38 +28,3 @@ document.addEventListener("DOMContentLoaded", removeAllClasses, false); } </script> -<!-- <link - rel="preload" - href="/static/media/src/nationalarchives/assets/fonts/OpenSans-Medium.ttf" - as="font" - type="font/ttf" - crossorigin="anonymous" -/> -<link - rel="preload" - href="/static/media/src/nationalarchives/assets/fonts/OpenSans-Bold.ttf" - as="font" - type="font/ttf" - crossorigin="anonymous" -/> -<link - rel="preload" - href="/static/media/src/nationalarchives/assets/fonts/RobotoMono-Regular.ttf" - as="font" - type="font/ttf" - crossorigin="anonymous" -/> -<link - rel="preload" - href="/static/media/src/nationalarchives/assets/fonts/fa-solid-900.woff2" - as="font" - type="font/woff2" - crossorigin="anonymous" -/> -<link - rel="preload" - href="/static/media/src/nationalarchives/assets/fonts/fa-brands-400.woff2" - as="font" - type="font/woff2" - crossorigin="anonymous" -/> --> diff --git a/.storybook/preview.js b/.storybook/preview.js index 265b55c0..12bbb954 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,10 +1,12 @@ import "../src/nationalarchives/all.scss"; +import "../src/nationalarchives/font-awesome.scss"; import { a11yConfig } from "./storybook-config"; import { customViewports } from "./viewports"; import Cookies from "../src/nationalarchives/lib/cookies.mjs"; document.documentElement.classList.add( "tna-template", + "tna-template--light-theme", "tna-template--yellow-accent", ); if (window.self !== window.top) { @@ -42,13 +44,3 @@ export const decorators = [ return Story(); }, ]; - -// const fontLoader = async () => ({ -// fonts: await Promise.all([ -// document.fonts.load("normal 1em Open Sans"), -// document.fonts.load("bold 1em Open Sans"), -// document.fonts.load("normal 1em Roboto Mono"), -// ]), -// }); - -// export const loaders = isChromatic() && document.fonts ? [fontLoader] : []; diff --git a/.storybook/storybook.scss b/.storybook/storybook.scss index 9e98832b..8ee74084 100644 --- a/.storybook/storybook.scss +++ b/.storybook/storybook.scss @@ -155,10 +155,6 @@ max-width: 480px; } -.tna-picture--demo { - // max-width: 480px; -} - .tna-spacing-demo { p { padding-right: 0.5rem; @@ -259,6 +255,12 @@ flex-wrap: nowrap; } + .tna-form__group-contents, + .tna-form__heading { + font-size: 0; + line-height: 0; + } + .tna-pagination { margin-top: 1rem; } diff --git a/.storybook/test-runner.js b/.storybook/test-runner.js index 97abb811..ee898b69 100644 --- a/.storybook/test-runner.js +++ b/.storybook/test-runner.js @@ -1,61 +1,3 @@ -// https://storybook.js.org/addons/@storybook/test-runner - -// const { toMatchImageSnapshot } = require("jest-image-snapshot"); -// const customSnapshotsDir = `${process.cwd()}/__snapshots__`; - -// module.exports = { -// setup() { -// expect.extend({ toMatchImageSnapshot }); -// }, -// async postRender(page, context) { -// // the #root element wraps the story. From Storybook 7.0 onwards, the selector should be #storybook-root -// const elementHandler = await page.$("#storybook-root"); -// const innerHTML = await elementHandler.innerHTML(); -// expect(innerHTML).toMatchSnapshot(); - -// // If you want to take screenshot of multiple browsers, use -// // page.context().browser().browserType().name() to get the browser name to prefix the file name -// const image = await page.screenshot(); -// expect(image).toMatchImageSnapshot({ -// customSnapshotsDir, -// customSnapshotIdentifier: context.id, -// }); -// }, -// }; - -// const { getStoryContext } = require('@storybook/test-runner'); -// const { injectAxe, checkA11y, configureAxe } = require('axe-playwright'); - -// module.exports = { -// async preRender(page, context) { -// await injectAxe(page); -// }, -// async postRender(page, context) { -// // Get entire context of a story, including parameters, args, argTypes, etc. -// const storyContext = await getStoryContext(page, context); - -// // Do not test a11y for stories that disable a11y -// if (storyContext.parameters?.a11y?.disable) { -// return; -// } - -// // Apply story-level a11y rules -// await configureAxe(page, { -// rules: storyContext.parameters?.a11y?.config?.rules, -// }); - -// // from Storybook 7.0 onwards, the selector should be #storybook-root -// await checkA11y(page, '#root', { -// detailedReport: true, -// detailedReportOptions: { -// html: true, -// }, -// // pass axe options defined in @storybook/addon-a11y -// axeOptions: storyContext.parameters?.a11y?.options, -// }); -// }, -// }; - import { a11yConfig } from "./storybook-config"; import { customViewports } from "./viewports"; diff --git a/.storybook/viewports.js b/.storybook/viewports.js index e55285c0..7fab47c8 100644 --- a/.storybook/viewports.js +++ b/.storybook/viewports.js @@ -1,5 +1,4 @@ export const customViewports = { - // ...MINIMAL_VIEWPORTS, medium: { name: "Medium device", styles: { diff --git a/CHANGELOG.md b/CHANGELOG.md index c93372dd..ad3de899 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.1.32...HEAD) +## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.1.35...HEAD) ### Added ### Changed @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The default cookie banner colour is dark on light but can be changed with a `style` attribute or classes such as `tna-cookie-banner--contrast` - The card style of `boxed` has been changed to `contrast` in line with other components - The background tint colour on the light theme is slightly darker for better contrast with the page background +- Set smaller minimum width for search field inputs +- Added more space between the text and chevron in a heading link +- Split out Font Awesome into a separate CSS file +- Change the default `htmlLang` from `en-GB` to `en` ### Deprecated ### Removed @@ -22,6 +26,48 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security +## [0.1.35](https://github.com/nationalarchives/tna-frontend/compare/v0.1.34...v0.1.35) - 2024-01-16 + +### Added + +- More icon sizes added + +### Changed + +- Images on horizontal cards are now at least a 3:2 aspect ratio +- Icon assets have been renamed from `apple-touch-icon-xxx.png` to `icon-xxx.png` + +## [0.1.34](https://github.com/nationalarchives/tna-frontend/compare/v0.1.33...v0.1.34) - 2024-01-10 + +### Added + +- Base template can now accept `htmlAttributes` +- Compound filters can be used to show currently selected search filters + +### Changed + +- Changed `attributes` to `formGroupAttributes` and `classes` to `formClasses` on checkboxes and radios - `attributes` and `classes` now get applied to each checkbox and radio element + +### Fixed + +- Fixed `href` property of pagination `previous` and `next` links + +## [0.1.33](https://github.com/nationalarchives/tna-frontend/compare/v0.1.32...v0.1.33) - 2023-12-29 + +### Added + +- Added italic version of Open Sans + +### Changed + +- The default cookie banner colour is dark on light but can be changed with a `style` attribute or classes such as `tna-cookie-banner--contrast` +- The card style of `boxed` has been changed to `contrast` in line with other components +- Changed `tna-select--plain` to `tna-select--styled` +- Updated button styles - icon sizes, padding and gaps on small and icon-only buttons +- Removed slash on void elements (updating `<hr />` to `<hr>`) +- Italicise picture element captions to distinguish from regular text +- Use `text-wrap: pretty;` for headings + ## [0.1.32](https://github.com/nationalarchives/tna-frontend/compare/v0.1.31...v0.1.32) - 2023-12-18 ### Added diff --git a/package-lock.json b/package-lock.json index 41242f1f..e9f4edad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,29 +1,28 @@ { "name": "@nationalarchives/frontend", - "version": "0.1.32", + "version": "0.1.35", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nationalarchives/frontend", - "version": "0.1.32", + "version": "0.1.35", "license": "MIT", "devDependencies": { "@babel/core": "^7.23.2", "@babel/preset-env": "^7.23.2", "@chromaui/addon-visual-tests": "^0.0.124", "@mdx-js/react": "^3.0.0", - "@storybook/addon-a11y": "^7.6.4", - "@storybook/addon-docs": "^7.6.4", - "@storybook/addon-essentials": "^7.6.4", - "@storybook/addon-interactions": "^7.6.4", - "@storybook/addon-links": "^7.6.4", - "@storybook/addon-mdx-gfm": "^7.6.4", - "@storybook/html": "^7.6.4", - "@storybook/html-webpack5": "^7.6.4", - "@storybook/jest": "^0.2.3", + "@storybook/addon-a11y": "^7.6.6", + "@storybook/addon-docs": "^7.6.6", + "@storybook/addon-essentials": "^7.6.6", + "@storybook/addon-interactions": "^7.6.6", + "@storybook/addon-links": "^7.6.6", + "@storybook/addon-mdx-gfm": "^7.6.6", + "@storybook/html": "^7.6.6", + "@storybook/html-webpack5": "^7.6.6", + "@storybook/test": "^8.0.0-alpha.5", "@storybook/test-runner": "^0.16.0", - "@storybook/testing-library": "^0.2.2", "axe-playwright": "^1.2.3", "babel-jest": "^29.7.0", "babel-loader": "^9.0.1", @@ -45,7 +44,7 @@ "sass": "^1.69.4", "sass-loader": "^13.0.2", "simple-nunjucks-loader": "^3.2.0", - "storybook": "^7.6.4", + "storybook": "^7.6.6", "style-loader": "^3.3.1", "stylelint": "^16.0.2", "stylelint-config-standard-scss": "^12.0.0", @@ -4702,12 +4701,12 @@ } }, "node_modules/@storybook/addon-a11y": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-7.6.5.tgz", - "integrity": "sha512-mbwjgdlNDcp0nL29s9FoF+HEFmWn0fMXfTcgMNjQWHs+sfmOy6w3llk0n0RJeDjc+x2Y8Oj2c+JwLU1hhJBnag==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-7.6.6.tgz", + "integrity": "sha512-D7TlxmPB4qoqN1q1WoVvRCIAB6RhDN7s0JL4qvznK3cdDDkQyfk3zvip97NhbT5ZSLjpszyElV9CfWht1O341w==", "dev": true, "dependencies": { - "@storybook/addon-highlight": "7.6.5", + "@storybook/addon-highlight": "7.6.6", "axe-core": "^4.2.0" }, "funding": { @@ -4716,12 +4715,12 @@ } }, "node_modules/@storybook/addon-actions": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-7.6.5.tgz", - "integrity": "sha512-lW/m9YcaNfBZk+TZLxyzHdd563mBWpsUIveOKYjcPdl/q0FblWWZrRsFHqwLK1ldZ4AZXs8J/47G8CBr6Ew2uQ==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-7.6.6.tgz", + "integrity": "sha512-mLJip9Evb2Chj7ymKbpaybe5NgDy3Du7oSWeURPy/0qXJ2cBqHWnhZ8CTK2DasrstsUhQSJaZVXHhaENT+fn+g==", "dev": true, "dependencies": { - "@storybook/core-events": "7.6.5", + "@storybook/core-events": "7.6.6", "@storybook/global": "^5.0.0", "@types/uuid": "^9.0.1", "dequal": "^2.0.2", @@ -4734,9 +4733,9 @@ } }, "node_modules/@storybook/addon-backgrounds": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-7.6.5.tgz", - "integrity": "sha512-wZZOL19vg4TTRtOTl71XKqPe5hQx3XUh9Fle0wOi91FiFrBdqusrppnyS89wPS8RQG5lXEOFEUvYcMmdCcdZfw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-7.6.6.tgz", + "integrity": "sha512-w5dZ/0cOe55M2G/Lx9f+Ptk4txUPb+Ng+KqEvTaTNqHoh0Xw4QxEn/ciJwmh1u1g3aMZsOgOvwPwug7ykmLgsA==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0", @@ -4749,12 +4748,12 @@ } }, "node_modules/@storybook/addon-controls": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-7.6.5.tgz", - "integrity": "sha512-EdSZ2pYf74mOXZGGJ22lrDvdvL0YKc95iWv9FFEhUFOloMy/0OZPB2ybYmd2KVCy3SeIE4Zfeiw8pDXdCUniOQ==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-7.6.6.tgz", + "integrity": "sha512-VAXXfPLi1M3RXhBf3uIBZ2hrD9UPDe7yvXHIlCzgj1HIJELODCFyUc+RtvN0mPc/nnlEfzhGfJtenZou5LYwIw==", "dev": true, "dependencies": { - "@storybook/blocks": "7.6.5", + "@storybook/blocks": "7.6.6", "lodash": "^4.17.21", "ts-dedent": "^2.0.0" }, @@ -4764,26 +4763,26 @@ } }, "node_modules/@storybook/addon-docs": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-7.6.5.tgz", - "integrity": "sha512-D9tZyD41IujCHiPYdfS2bKtZRJPNwO4EydzyqODXppomluhFbY3uTEaf0H1UFnJLQxWNXZ7rr3aS0V3O6yu8pA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-7.6.6.tgz", + "integrity": "sha512-l4gtoNTn1wHE11x44te1cDkqfm+/w+eNonHe56bwgSqETclS5z18wvM9bQZF32G6C9fpSefaJW3cxVvcuJL1fg==", "dev": true, "dependencies": { "@jest/transform": "^29.3.1", "@mdx-js/react": "^2.1.5", - "@storybook/blocks": "7.6.5", - "@storybook/client-logger": "7.6.5", - "@storybook/components": "7.6.5", - "@storybook/csf-plugin": "7.6.5", - "@storybook/csf-tools": "7.6.5", + "@storybook/blocks": "7.6.6", + "@storybook/client-logger": "7.6.6", + "@storybook/components": "7.6.6", + "@storybook/csf-plugin": "7.6.6", + "@storybook/csf-tools": "7.6.6", "@storybook/global": "^5.0.0", "@storybook/mdx2-csf": "^1.0.0", - "@storybook/node-logger": "7.6.5", - "@storybook/postinstall": "7.6.5", - "@storybook/preview-api": "7.6.5", - "@storybook/react-dom-shim": "7.6.5", - "@storybook/theming": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/node-logger": "7.6.6", + "@storybook/postinstall": "7.6.6", + "@storybook/preview-api": "7.6.6", + "@storybook/react-dom-shim": "7.6.6", + "@storybook/theming": "7.6.6", + "@storybook/types": "7.6.6", "fs-extra": "^11.1.0", "remark-external-links": "^8.0.0", "remark-slug": "^6.0.0", @@ -4816,24 +4815,24 @@ } }, "node_modules/@storybook/addon-essentials": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-7.6.5.tgz", - "integrity": "sha512-VCLj1JAEpGoqF5iFJOo1CZFFck/tg4m/98DLdQuNuXvxT6jqaF0NI9UUQuJLIGteDCR7NKRbTFc1hV3/Ev+Ziw==", - "dev": true, - "dependencies": { - "@storybook/addon-actions": "7.6.5", - "@storybook/addon-backgrounds": "7.6.5", - "@storybook/addon-controls": "7.6.5", - "@storybook/addon-docs": "7.6.5", - "@storybook/addon-highlight": "7.6.5", - "@storybook/addon-measure": "7.6.5", - "@storybook/addon-outline": "7.6.5", - "@storybook/addon-toolbars": "7.6.5", - "@storybook/addon-viewport": "7.6.5", - "@storybook/core-common": "7.6.5", - "@storybook/manager-api": "7.6.5", - "@storybook/node-logger": "7.6.5", - "@storybook/preview-api": "7.6.5", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-7.6.6.tgz", + "integrity": "sha512-OQ8A6r06mg/HvyIk/j2Gt9DK5Qtqgtwq2Ydm5IgVW6gZsuRnv1FAeUG6okf8oXowAzpYoHdsDmCVwNOAGWGO7w==", + "dev": true, + "dependencies": { + "@storybook/addon-actions": "7.6.6", + "@storybook/addon-backgrounds": "7.6.6", + "@storybook/addon-controls": "7.6.6", + "@storybook/addon-docs": "7.6.6", + "@storybook/addon-highlight": "7.6.6", + "@storybook/addon-measure": "7.6.6", + "@storybook/addon-outline": "7.6.6", + "@storybook/addon-toolbars": "7.6.6", + "@storybook/addon-viewport": "7.6.6", + "@storybook/core-common": "7.6.6", + "@storybook/manager-api": "7.6.6", + "@storybook/node-logger": "7.6.6", + "@storybook/preview-api": "7.6.6", "ts-dedent": "^2.0.0" }, "funding": { @@ -4846,9 +4845,9 @@ } }, "node_modules/@storybook/addon-highlight": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-7.6.5.tgz", - "integrity": "sha512-CxzmIb30F9nLPQwT0lCPYhOAwGlGF4IkgkO8hYA7VfGCGUkJZEyyN/YkP/ZCUSdCIRChDBouR3KiFFd4mDFKzg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-7.6.6.tgz", + "integrity": "sha512-B85UaCts2uMpa0yHBSnupzy2WCdW4vfB+lfaBug9beyOyZQdel07BumblE0KwSJftYgdCNPUZ5MRlqEDzMLTWQ==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0" @@ -4859,13 +4858,13 @@ } }, "node_modules/@storybook/addon-interactions": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-interactions/-/addon-interactions-7.6.5.tgz", - "integrity": "sha512-8Hzt9u1DQzFvtGER/hCGIvGpCoVwzVoqpM98f2KAIVx/NMFmRW7UyKihXzw1j2t4q2ZaF2jZDYWCBqlP+iwILA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-interactions/-/addon-interactions-7.6.6.tgz", + "integrity": "sha512-EJWx6ciJPgv1c75tB/M4smWDpPDGM/L24v4DZxGpl1eV3oQOSQCKImG5btwoy6QcIi68ozroUHdUti/kzCKS1w==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0", - "@storybook/types": "7.6.5", + "@storybook/types": "7.6.6", "jest-mock": "^27.0.6", "polished": "^4.2.2", "ts-dedent": "^2.2.0" @@ -4876,9 +4875,9 @@ } }, "node_modules/@storybook/addon-links": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-7.6.5.tgz", - "integrity": "sha512-Lx4Ng+iXt0YpIrKGr+nOZlpN9ypOoEDoP/7bZ6m7GXuVAkDm3JrRCBp7e2ZKSKcTxPdjPuO9HVKkIjtqjINlpw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-7.6.6.tgz", + "integrity": "sha512-NEcqOz6zZ1dJnCcVmYdaQTAMAGIb8NFAZGnr9DU0q+t4B1fTaWUgqLtBM5V6YqIrXGSC/oKLpjWUkS5UpswlHA==", "dev": true, "dependencies": { "@storybook/csf": "^0.1.2", @@ -4899,12 +4898,12 @@ } }, "node_modules/@storybook/addon-mdx-gfm": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-mdx-gfm/-/addon-mdx-gfm-7.6.5.tgz", - "integrity": "sha512-TTqVD9rG4jdSXi1MBSDJLeGQP8bKzQ6KVUEF+uq8uDYCl3vj++6PcqtE/KZ7tKhmDrdM7W/PGUJoQZzsMZ3PSw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-mdx-gfm/-/addon-mdx-gfm-7.6.6.tgz", + "integrity": "sha512-M50Cx2CwnFKMCPDdnr081VFjtNIydDSD12uWfhOajoruNOvZyWanAIdvcft4Uk5irIJtClats/XhGxdYnFXNEg==", "dev": true, "dependencies": { - "@storybook/node-logger": "7.6.5", + "@storybook/node-logger": "7.6.6", "remark-gfm": "^3.0.1", "ts-dedent": "^2.0.0" }, @@ -4914,9 +4913,9 @@ } }, "node_modules/@storybook/addon-measure": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-7.6.5.tgz", - "integrity": "sha512-tlUudVQSrA+bwI4dhO8J7nYHtYdylcBZ86ybnqMmdTthsnyc7jnaFVQwbb6bbQJpPxvEvoNds5bVGUFocuvymQ==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-7.6.6.tgz", + "integrity": "sha512-b4hyCudlhsbYN1We8pfZHZJ0i0sfC8+GJvrqZQqdSqGicUmA00mggY1GE+gEoHziQ5/4auxFRS3HfUgaQWUNjg==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0", @@ -4928,9 +4927,9 @@ } }, "node_modules/@storybook/addon-outline": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-7.6.5.tgz", - "integrity": "sha512-P7X4+Z9L/l/RZW9UvvM+iuK2SUHD22KPc+dbYOifRXDovUqhfmcKVh1CUqTDMyZrg2ZAbropehMz1eI9BlQfxg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-7.6.6.tgz", + "integrity": "sha512-BMjpjzNEnN8LC7JK92WCXyWgmJwAaEQjRDinr7eD4cBt4Uas5kbciw1g8PtTnh0GbYUsImKao0nzakSVObAdzg==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0", @@ -4942,9 +4941,9 @@ } }, "node_modules/@storybook/addon-toolbars": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-7.6.5.tgz", - "integrity": "sha512-/zqWbVNE/SHc8I5Prnd2Q8U57RGEIYvHfeXjfkuLcE2Quc4Iss4x/9eU7SKu4jm+IOO2s0wlN6HcqI3XEf2XxA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-7.6.6.tgz", + "integrity": "sha512-sQm5+FcoSMSGn1ioXHoukO6OhUlcNZil0/fonAY50uvp6Z4DyI0FTU7BKIm/NoMqAExQk3sZRfAC/nZZ9Epb0Q==", "dev": true, "funding": { "type": "opencollective", @@ -4952,9 +4951,9 @@ } }, "node_modules/@storybook/addon-viewport": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-7.6.5.tgz", - "integrity": "sha512-9ghKTaduIUvQ6oShmWLuwMeTjtMR4RgKeKHrTJ7THMqvE/ydDPCYeL7ugF65ocXZSEz/QmxdK7uL686ZMKsqNA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-7.6.6.tgz", + "integrity": "sha512-/ijbzDf1Iq30LvZW2NE8cO4TeHusw0N+jTDUK1+vhxGNMFo9DUIgRkAi6VpFEfS0aQ5d82523WSWzVso7b/Hmg==", "dev": true, "dependencies": { "memoizerific": "^1.11.3" @@ -4965,22 +4964,22 @@ } }, "node_modules/@storybook/blocks": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-7.6.5.tgz", - "integrity": "sha512-/NjuYkPks5w9lKn47KLgVC5cBkwfc+ERAp0CY0Xe//BQJkP+bcI8lE8d9Qc9IXFbOTvYEULeQrFgCkesk5BmLg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-7.6.6.tgz", + "integrity": "sha512-QLqkiSNrtGnh8RK9ipD63jVAUenkRu+72xR31DViZWRV9V8G2hzky5E/RoZWPEx+DfmBIUJ7Tcef6cCRcxEj9A==", "dev": true, "dependencies": { - "@storybook/channels": "7.6.5", - "@storybook/client-logger": "7.6.5", - "@storybook/components": "7.6.5", - "@storybook/core-events": "7.6.5", + "@storybook/channels": "7.6.6", + "@storybook/client-logger": "7.6.6", + "@storybook/components": "7.6.6", + "@storybook/core-events": "7.6.6", "@storybook/csf": "^0.1.2", - "@storybook/docs-tools": "7.6.5", + "@storybook/docs-tools": "7.6.6", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.6.5", - "@storybook/preview-api": "7.6.5", - "@storybook/theming": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/manager-api": "7.6.6", + "@storybook/preview-api": "7.6.6", + "@storybook/theming": "7.6.6", + "@storybook/types": "7.6.6", "@types/lodash": "^4.14.167", "color-convert": "^2.0.1", "dequal": "^2.0.2", @@ -5004,15 +5003,15 @@ } }, "node_modules/@storybook/builder-manager": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-7.6.5.tgz", - "integrity": "sha512-FQyI+tfzMam2XKXq7k921YVafIJs9Vqvos5qx8vyRnRffo55UU8tgunwjGn0PswtbMm6sThVqE0C0ZzVr7RG8A==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-7.6.6.tgz", + "integrity": "sha512-96vmtUqh016H2n80xhvBZU2w5flTOzY7S0nW9nfxbY4UY4b39WajgwJ5wpg8l0YmCwQTrxCwY9/VE2Pd6CCqPA==", "dev": true, "dependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/core-common": "7.6.5", - "@storybook/manager": "7.6.5", - "@storybook/node-logger": "7.6.5", + "@storybook/core-common": "7.6.6", + "@storybook/manager": "7.6.6", + "@storybook/node-logger": "7.6.6", "@types/ejs": "^3.1.1", "@types/find-cache-dir": "^3.2.1", "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10", @@ -5032,20 +5031,20 @@ } }, "node_modules/@storybook/builder-webpack5": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-7.6.5.tgz", - "integrity": "sha512-Lf4jVHGTQRSLIcgXHG2webiFlNwEV8uo2CmDucU2IDV9p3NdloyOmCou40G6Du1hobBTflx8Zj2j9n3A5/+0GA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-7.6.6.tgz", + "integrity": "sha512-V3pVdhlhqBdVhrE1M3ip07X8Ma6FXBeTtcZsT+oFVX7A+wxMfA9fhGWVjL6yOB/E+87jF5SvlvYbo+18Xw6hqg==", "dev": true, "dependencies": { "@babel/core": "^7.23.2", - "@storybook/channels": "7.6.5", - "@storybook/client-logger": "7.6.5", - "@storybook/core-common": "7.6.5", - "@storybook/core-events": "7.6.5", - "@storybook/core-webpack": "7.6.5", - "@storybook/node-logger": "7.6.5", - "@storybook/preview": "7.6.5", - "@storybook/preview-api": "7.6.5", + "@storybook/channels": "7.6.6", + "@storybook/client-logger": "7.6.6", + "@storybook/core-common": "7.6.6", + "@storybook/core-events": "7.6.6", + "@storybook/core-webpack": "7.6.6", + "@storybook/node-logger": "7.6.6", + "@storybook/preview": "7.6.6", + "@storybook/preview-api": "7.6.6", "@swc/core": "^1.3.82", "@types/node": "^18.0.0", "@types/semver": "^7.3.4", @@ -5128,13 +5127,13 @@ "dev": true }, "node_modules/@storybook/channels": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.6.5.tgz", - "integrity": "sha512-FIlNkyfQy9uHoJfAFL2/wO3ASGJELFvBzURBE2rcEF/TS7GcUiqWnBfiDxAbwSEjSOm2F0eEq3UXhaZEjpJHDw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.6.6.tgz", + "integrity": "sha512-vvo7fBe2WffPonNNOA7Xx7jcHAto8qJYlq+VMysfheXrsRRbhHl3WQOA18Vm8hV9txtqdqk0hwQiXOWvhYVpeQ==", "dev": true, "dependencies": { - "@storybook/client-logger": "7.6.5", - "@storybook/core-events": "7.6.5", + "@storybook/client-logger": "7.6.6", + "@storybook/core-events": "7.6.6", "@storybook/global": "^5.0.0", "qs": "^6.10.0", "telejson": "^7.2.0", @@ -5146,23 +5145,23 @@ } }, "node_modules/@storybook/cli": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-7.6.5.tgz", - "integrity": "sha512-w+Y8dx5oCLQVESOVmpsQuFksr/ewARKrnSKl9kwnVMN4sMgjOgoZ3zmV66J7SKexvwyuwlOjf840pmEglGdPPg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-7.6.6.tgz", + "integrity": "sha512-FLmWrbmGOqe1VYwqyIWxU2lJcYPssORmSbSVVPw6OqQIXx3NrNBrmZDLncMwbVCDQ8eU54J1zb+MyDmSqMbVFg==", "dev": true, "dependencies": { "@babel/core": "^7.23.2", "@babel/preset-env": "^7.23.2", "@babel/types": "^7.23.0", "@ndelangen/get-tarball": "^3.0.7", - "@storybook/codemod": "7.6.5", - "@storybook/core-common": "7.6.5", - "@storybook/core-events": "7.6.5", - "@storybook/core-server": "7.6.5", - "@storybook/csf-tools": "7.6.5", - "@storybook/node-logger": "7.6.5", - "@storybook/telemetry": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/codemod": "7.6.6", + "@storybook/core-common": "7.6.6", + "@storybook/core-events": "7.6.6", + "@storybook/core-server": "7.6.6", + "@storybook/csf-tools": "7.6.6", + "@storybook/node-logger": "7.6.6", + "@storybook/telemetry": "7.6.6", + "@storybook/types": "7.6.6", "@types/semver": "^7.3.4", "@yarnpkg/fslib": "2.10.3", "@yarnpkg/libzip": "2.3.0", @@ -5470,9 +5469,9 @@ "dev": true }, "node_modules/@storybook/client-logger": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.6.5.tgz", - "integrity": "sha512-S5aROWgssqg7tcs9lgW5wmCAz4SxMAtioiyVj5oFecmPCbQtFVIAREYzeoxE4GfJL+plrfRkum4BzziANn8EhQ==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.6.6.tgz", + "integrity": "sha512-WEvVyuQR5oNF8jcMmGA13zDjxP/l46kOBBvB6JSc8toUdtLZ/kZWSnU0ioNM8+ECpFqXHjBcF2K6uSJOEb6YEg==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0" @@ -5483,18 +5482,18 @@ } }, "node_modules/@storybook/codemod": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-7.6.5.tgz", - "integrity": "sha512-K5C9ltBClZ0aSyujGt3RJFtRicrUZy8nzhHrcADUj27rrQD26jH/p+Y05jWKj9JcI8SyMg978GN5X/1aw2Y31A==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-7.6.6.tgz", + "integrity": "sha512-6QwW6T6ZgwwbTkEoZ7CAoX7lUUob7Sy7bRkMHhSjJe2++wEVFOYLvzHcLUJCupK59+WhmsJU9PpUMlXEKi40TQ==", "dev": true, "dependencies": { "@babel/core": "^7.23.2", "@babel/preset-env": "^7.23.2", "@babel/types": "^7.23.0", "@storybook/csf": "^0.1.2", - "@storybook/csf-tools": "7.6.5", - "@storybook/node-logger": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/csf-tools": "7.6.6", + "@storybook/node-logger": "7.6.6", + "@storybook/types": "7.6.6", "@types/cross-spawn": "^6.0.2", "cross-spawn": "^7.0.3", "globby": "^11.0.2", @@ -5544,18 +5543,18 @@ } }, "node_modules/@storybook/components": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/components/-/components-7.6.5.tgz", - "integrity": "sha512-w4ZucbBBZ+NKMWlJKVj2I/bMBBq7gzDp9lzc4+8QaQ3vUPXKqc1ilIPYo/7UR5oxwDVMZocmMSgl9L8lvf7+Mw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/components/-/components-7.6.6.tgz", + "integrity": "sha512-FSfcRxdmV4+LJHjMk0eodGVnZdb2qrKKmbtsn0O/434z586zPA287/wJJsm4JS/Xr1WS9oTvU6mYMDChkcxgeQ==", "dev": true, "dependencies": { "@radix-ui/react-select": "^1.2.2", "@radix-ui/react-toolbar": "^1.0.4", - "@storybook/client-logger": "7.6.5", + "@storybook/client-logger": "7.6.6", "@storybook/csf": "^0.1.2", "@storybook/global": "^5.0.0", - "@storybook/theming": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/theming": "7.6.6", + "@storybook/types": "7.6.6", "memoizerific": "^1.11.3", "use-resize-observer": "^9.1.0", "util-deprecate": "^1.0.2" @@ -5570,13 +5569,13 @@ } }, "node_modules/@storybook/core-client": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/core-client/-/core-client-7.6.5.tgz", - "integrity": "sha512-6FtyJcz8MSl+JYwNJZ53FM6rkT27pFHWcJPdtw/9229Ec8as9RpkNeZ/NBZjRTeDkn9Ki0VOiVAefNie9tZ/8Q==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/core-client/-/core-client-7.6.6.tgz", + "integrity": "sha512-P100aNf+WpvzlfULZp1NPd60/nxsppLmft2DdIyAx1j4QPMZvUJyJB+hdBMzTFiPEhIUncIMoIVf2R3UXC5DfA==", "dev": true, "dependencies": { - "@storybook/client-logger": "7.6.5", - "@storybook/preview-api": "7.6.5" + "@storybook/client-logger": "7.6.6", + "@storybook/preview-api": "7.6.6" }, "funding": { "type": "opencollective", @@ -5584,14 +5583,14 @@ } }, "node_modules/@storybook/core-common": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-7.6.5.tgz", - "integrity": "sha512-z4EgzZSIVbID6Ib0jhh3jimKeaDWU8OOhoZYfn3galFmgQWowWOv1oMgipWiXfRLWw9DaLFQiCHIdLANH+VO2g==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-7.6.6.tgz", + "integrity": "sha512-DpbFSYw8LHuwpeU2ec5uWryxrSqslFJnWTfNA7AvpzCviWXkz4kq+YYrDee9XExF6OozNwILmG6m52SnraysBA==", "dev": true, "dependencies": { - "@storybook/core-events": "7.6.5", - "@storybook/node-logger": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/core-events": "7.6.6", + "@storybook/node-logger": "7.6.6", + "@storybook/types": "7.6.6", "@types/find-cache-dir": "^3.2.1", "@types/node": "^18.0.0", "@types/node-fetch": "^2.6.4", @@ -5680,9 +5679,9 @@ } }, "node_modules/@storybook/core-events": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.6.5.tgz", - "integrity": "sha512-zk2q/qicYXAzHA4oV3GDbIql+Kd4TOHUgDE8e4jPCOPp856z2ScqEKUAbiJizs6eEJOH4nW9Db1kuzgrBVEykQ==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.6.6.tgz", + "integrity": "sha512-7+q9HiZiLxaQcwpaSLQrLdjHNHBoOoUY9ZcZXI9iNFSopOgb/ItDnzzlpv08NC7CbKae1hVKJM/t5aSTl7tCMw==", "dev": true, "dependencies": { "ts-dedent": "^2.0.0" @@ -5693,26 +5692,26 @@ } }, "node_modules/@storybook/core-server": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-7.6.5.tgz", - "integrity": "sha512-BfKzK/ObTjUcPvE5/r1pogCifM/4nLRhOUYJl7XekwHkOQwn19e6H3/ku1W3jDoYXBu642Dc9X7l/ERjKTqxFg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-7.6.6.tgz", + "integrity": "sha512-QFVahaExgGtq9swBXgQAMUiCqpCcyVXOiKTIy1j+1uAhPVqhpCxBkkFoXruih5hbIMZyohE4mLPCAr/ivicoDg==", "dev": true, "dependencies": { "@aw-web-design/x-default-browser": "1.4.126", "@discoveryjs/json-ext": "^0.5.3", - "@storybook/builder-manager": "7.6.5", - "@storybook/channels": "7.6.5", - "@storybook/core-common": "7.6.5", - "@storybook/core-events": "7.6.5", + "@storybook/builder-manager": "7.6.6", + "@storybook/channels": "7.6.6", + "@storybook/core-common": "7.6.6", + "@storybook/core-events": "7.6.6", "@storybook/csf": "^0.1.2", - "@storybook/csf-tools": "7.6.5", + "@storybook/csf-tools": "7.6.6", "@storybook/docs-mdx": "^0.1.0", "@storybook/global": "^5.0.0", - "@storybook/manager": "7.6.5", - "@storybook/node-logger": "7.6.5", - "@storybook/preview-api": "7.6.5", - "@storybook/telemetry": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/manager": "7.6.6", + "@storybook/node-logger": "7.6.6", + "@storybook/preview-api": "7.6.6", + "@storybook/telemetry": "7.6.6", + "@storybook/types": "7.6.6", "@types/detect-port": "^1.3.0", "@types/node": "^18.0.0", "@types/pretty-hrtime": "^1.0.0", @@ -5860,14 +5859,14 @@ "dev": true }, "node_modules/@storybook/core-webpack": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-7.6.5.tgz", - "integrity": "sha512-if5ixN2W3e8vwYvgFHq+k0FOSVwgolbPRLDeOToPXHAJjH/TmgGEANZLFAVVwEzsS4KOfRGJQ48KzF0knTsqzA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-7.6.6.tgz", + "integrity": "sha512-VQyA6nb7K5uAWp/bqntW9Dtv2mVQWOp99v52ilHI/aCR9gEIC2XKBB7PTs/l5L9PKTcES6UJTcFJmOp+s7kFOA==", "dev": true, "dependencies": { - "@storybook/core-common": "7.6.5", - "@storybook/node-logger": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/core-common": "7.6.6", + "@storybook/node-logger": "7.6.6", + "@storybook/types": "7.6.6", "@types/node": "^18.0.0", "ts-dedent": "^2.0.0" }, @@ -5895,12 +5894,12 @@ } }, "node_modules/@storybook/csf-plugin": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-7.6.5.tgz", - "integrity": "sha512-iQ8Y/Qq1IUhHRddjDVicWJA2sM7OZA1FR97OvWUT2240WjCuQSCfy32JD8TQlYjqXgEolJeLPv3zW4qH5om4LQ==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-7.6.6.tgz", + "integrity": "sha512-SqdffT14+XNpf+7vA29Elur28VArXtFv4cXMlsCbswbRuY+a0A8vYNwVIfCUy9u4WHTcQX1/tUkDAMh80lrVRQ==", "dev": true, "dependencies": { - "@storybook/csf-tools": "7.6.5", + "@storybook/csf-tools": "7.6.6", "unplugin": "^1.3.1" }, "funding": { @@ -5909,9 +5908,9 @@ } }, "node_modules/@storybook/csf-tools": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-7.6.5.tgz", - "integrity": "sha512-1iaCh7nt+WE7Q5UwRhLLc5flMNoAV/vBr0tvDSCKiHaO+D3dZzlZOe/U+S6wegdyN2QNcvT2xs179CcrX6Qp6w==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-7.6.6.tgz", + "integrity": "sha512-VXOZCzfSVJL832u17pPhFu1x3PPaAN9d8VXNFX+t/2raga7tK3T7Qhe7lWfP7EZcrVvSCEEp0aMRz2EzzDGVtw==", "dev": true, "dependencies": { "@babel/generator": "^7.23.0", @@ -5919,7 +5918,7 @@ "@babel/traverse": "^7.23.2", "@babel/types": "^7.23.0", "@storybook/csf": "^0.1.2", - "@storybook/types": "7.6.5", + "@storybook/types": "7.6.6", "fs-extra": "^11.1.0", "recast": "^0.23.1", "ts-dedent": "^2.0.0" @@ -5936,14 +5935,14 @@ "dev": true }, "node_modules/@storybook/docs-tools": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-7.6.5.tgz", - "integrity": "sha512-UyHkHu5Af6jMpYsR4lZ69D32GQGeA0pLAn7jaBbQndgAjBdK1ykZcifiUC7Wz1hG7+YpuYspEGuDEddOh+X8FQ==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-7.6.6.tgz", + "integrity": "sha512-nc5ZjN2s8SC2PtsZoFf9Wm6gD8TcSlkYbF/mjtyLCGN+Fi+k5B5iudqoa65H19hwiLlzBdcnpQ8C89AiK33J9Q==", "dev": true, "dependencies": { - "@storybook/core-common": "7.6.5", - "@storybook/preview-api": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/core-common": "7.6.6", + "@storybook/preview-api": "7.6.6", + "@storybook/types": "7.6.6", "@types/doctrine": "^0.0.3", "assert": "^2.1.0", "doctrine": "^3.0.0", @@ -5954,15 +5953,6 @@ "url": "https://opencollective.com/storybook" } }, - "node_modules/@storybook/expect": { - "version": "28.1.3-5", - "resolved": "https://registry.npmjs.org/@storybook/expect/-/expect-28.1.3-5.tgz", - "integrity": "sha512-lS1oJnY1qTAxnH87C765NdfvGhksA6hBcbUVI5CHiSbNsEtr456wtg/z+dT9XlPriq1D5t2SgfNL9dBAoIGyIA==", - "dev": true, - "dependencies": { - "@types/jest": "28.1.3" - } - }, "node_modules/@storybook/global": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@storybook/global/-/global-5.0.0.tgz", @@ -5970,16 +5960,16 @@ "dev": true }, "node_modules/@storybook/html": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/html/-/html-7.6.5.tgz", - "integrity": "sha512-P5zFVCLhfYnZuW9EuuhUy+abZ93gKcsJ+y3sZ7mUJJbu0FKHtVx/YcYgsMIllOD8xbAl6vzXHVADIrYKj9FFzg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/html/-/html-7.6.6.tgz", + "integrity": "sha512-igfvJAaTo+mtuDrNZX699zBCq4v+6XV3kILT1HaC3SVtDfuDgEmXqjIS6fcsVEZpbjrbXyaZwCd9NcqmIvWB9g==", "dev": true, "dependencies": { - "@storybook/core-client": "7.6.5", - "@storybook/docs-tools": "7.6.5", + "@storybook/core-client": "7.6.6", + "@storybook/docs-tools": "7.6.6", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/preview-api": "7.6.6", + "@storybook/types": "7.6.6", "ts-dedent": "^2.0.0" }, "engines": { @@ -5994,16 +5984,16 @@ } }, "node_modules/@storybook/html-webpack5": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/html-webpack5/-/html-webpack5-7.6.5.tgz", - "integrity": "sha512-xCDTrEVVM70iCS6vVy6tGqwhwOSl7iUHA2Kb/Ic6a4h6fZNGifRB0qSYs1zdmdQ6TezyGKD5IZ7PIAEwiW+WJA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/html-webpack5/-/html-webpack5-7.6.6.tgz", + "integrity": "sha512-n1VuLokGO9z2uQKyNkKJnzDVCefLRmhKzExjla0zhv7xDk97RMQjFst69cooXoQ1JZG20qdx8nKXwLW6Q3EWwg==", "dev": true, "dependencies": { - "@storybook/builder-webpack5": "7.6.5", - "@storybook/core-common": "7.6.5", + "@storybook/builder-webpack5": "7.6.6", + "@storybook/core-common": "7.6.6", "@storybook/global": "^5.0.0", - "@storybook/html": "7.6.5", - "@storybook/preset-html-webpack": "7.6.5", + "@storybook/html": "7.6.6", + "@storybook/preset-html-webpack": "7.6.6", "@types/node": "^18.0.0" }, "engines": { @@ -6026,22 +6016,115 @@ "undici-types": "~5.26.4" } }, - "node_modules/@storybook/jest": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@storybook/jest/-/jest-0.2.3.tgz", - "integrity": "sha512-ov5izrmbAFObzKeh9AOC5MlmFxAcf0o5i6YFGae9sDx6DGh6alXsRM+chIbucVkUwVHVlSzdfbLDEFGY/ShaYw==", + "node_modules/@storybook/instrumenter": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/instrumenter/-/instrumenter-8.0.0-alpha.5.tgz", + "integrity": "sha512-v4lgHxSJdR8b8IdOlyE3q6H5A8n1KYVzEEv0oeKvMlPg12BO5JLGSFzmzm3F9TARUe0Lfyc2MfFqzwRTkAjA3g==", + "dev": true, + "dependencies": { + "@storybook/channels": "8.0.0-alpha.5", + "@storybook/client-logger": "8.0.0-alpha.5", + "@storybook/core-events": "8.0.0-alpha.5", + "@storybook/global": "^5.0.0", + "@storybook/preview-api": "8.0.0-alpha.5", + "@vitest/utils": "^0.34.6", + "util": "^0.12.4" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/instrumenter/node_modules/@storybook/channels": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-8.0.0-alpha.5.tgz", + "integrity": "sha512-pKjGmy2ptMTqx8j83WVCTBCUwpf+uBPbSk2xVPK47YZspQjuFKWFEhPbJ9Epjvd56zgP/L9W9gaAfZAgLjG0tA==", "dev": true, "dependencies": { - "@storybook/expect": "storybook-jest", - "@testing-library/jest-dom": "^6.1.2", - "@types/jest": "28.1.3", - "jest-mock": "^27.3.0" + "@storybook/client-logger": "8.0.0-alpha.5", + "@storybook/core-events": "8.0.0-alpha.5", + "@storybook/global": "^5.0.0", + "qs": "^6.10.0", + "telejson": "^7.2.0", + "tiny-invariant": "^1.3.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/instrumenter/node_modules/@storybook/client-logger": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-8.0.0-alpha.5.tgz", + "integrity": "sha512-X+imMSJCvpknq7IgRGR2lUjMKSPB7pnEy74a8BsQy/6mzEMzps7VQ0wXsk+lIjakzgN48X+KWfX8OKTIePS4Kg==", + "dev": true, + "dependencies": { + "@storybook/global": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/instrumenter/node_modules/@storybook/core-events": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-8.0.0-alpha.5.tgz", + "integrity": "sha512-LofmGs/7U2ExGHGFBcx5CHiX0jEx0KUv4PLT5+t5bGeJRGYwUmHRcb4v/if03DtnmztgELYW3RP3+kMkWk3rEg==", + "dev": true, + "dependencies": { + "ts-dedent": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/instrumenter/node_modules/@storybook/preview-api": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.0.0-alpha.5.tgz", + "integrity": "sha512-dFaOOjYtkXsbdyzXD3dTadPp3PZ/h5esS0Q5DH+CmwWdLMhZ2dkYgvsEF000iS5cqhhMk7AUgNHiOvIIkhJvlQ==", + "dev": true, + "dependencies": { + "@storybook/channels": "8.0.0-alpha.5", + "@storybook/client-logger": "8.0.0-alpha.5", + "@storybook/core-events": "8.0.0-alpha.5", + "@storybook/csf": "^0.1.2", + "@storybook/global": "^5.0.0", + "@storybook/types": "8.0.0-alpha.5", + "@types/qs": "^6.9.5", + "dequal": "^2.0.2", + "lodash": "^4.17.21", + "memoizerific": "^1.11.3", + "qs": "^6.10.0", + "synchronous-promise": "^2.0.15", + "ts-dedent": "^2.0.0", + "util-deprecate": "^1.0.2" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/instrumenter/node_modules/@storybook/types": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/types/-/types-8.0.0-alpha.5.tgz", + "integrity": "sha512-flLvDh2RezBivPCK9jfipWwvNRmX/er+wiyttPsXjaFZ2wc0sXJSKFWmhKdYcdQmAOAWj3O0sfXP3doqJBlMpA==", + "dev": true, + "dependencies": { + "@storybook/channels": "8.0.0-alpha.5", + "@types/babel__core": "^7.0.0", + "@types/express": "^4.7.0", + "file-system-cache": "2.3.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" } }, "node_modules/@storybook/manager": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-7.6.5.tgz", - "integrity": "sha512-y1KLH0O1PGPyMxGMvOhppzFSO7r4ibjTve5iqsI0JZwxUjNuBKRLYbrhXdAyC2iacvxYNrHgevae1k9XdD+FQw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-7.6.6.tgz", + "integrity": "sha512-Ga3LcSu/xxSyg+cLlO9AS8QjW+D667V+c9qQPmsFyU6qfFc6m6mVqcRLSmFVD5e7P/o0FL7STOf9jAKkDcW8xw==", "dev": true, "funding": { "type": "opencollective", @@ -6049,19 +6132,19 @@ } }, "node_modules/@storybook/manager-api": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-7.6.5.tgz", - "integrity": "sha512-tE3OShOcs6A3XtI3NJd6hYQOZLaP++Fn0dCtowBwYh/vS1EN/AyroVmL97tsxn1DZTyoRt0GidwbB6dvLMBOwA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-7.6.6.tgz", + "integrity": "sha512-euRAbSZAUzHDt6z1Pq/g45N/RNqta9RaQAym18zt/oLWiYOIrkLmdf7kCuFYsmuA5XQBytiJqwkAD7uF1aLe0g==", "dev": true, "dependencies": { - "@storybook/channels": "7.6.5", - "@storybook/client-logger": "7.6.5", - "@storybook/core-events": "7.6.5", + "@storybook/channels": "7.6.6", + "@storybook/client-logger": "7.6.6", + "@storybook/core-events": "7.6.6", "@storybook/csf": "^0.1.2", "@storybook/global": "^5.0.0", - "@storybook/router": "7.6.5", - "@storybook/theming": "7.6.5", - "@storybook/types": "7.6.5", + "@storybook/router": "7.6.6", + "@storybook/theming": "7.6.6", + "@storybook/types": "7.6.6", "dequal": "^2.0.2", "lodash": "^4.17.21", "memoizerific": "^1.11.3", @@ -6115,9 +6198,9 @@ "dev": true }, "node_modules/@storybook/node-logger": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-7.6.5.tgz", - "integrity": "sha512-xKw6IH1wLkIssekdBv3bd13xYKUF1t8EwqDR8BYcN8AVjZlqJMTifssqG4bYV+G/B7J3tz4ugJ5nmtWg6RQ0Qw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-7.6.6.tgz", + "integrity": "sha512-b2OF9GRNI01MlBlnDGS8S6/yOpBNl8eH/0ONafuMPzFEZs5PouHGsFflJvQwwcdVTknMjF5uVS2eSmnLZ8spvA==", "dev": true, "funding": { "type": "opencollective", @@ -6125,9 +6208,9 @@ } }, "node_modules/@storybook/postinstall": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/postinstall/-/postinstall-7.6.5.tgz", - "integrity": "sha512-12WxfpqGKsk7GQ3KWiZSbamsYK8vtRmhOTkavZ9IQkcJ/zuVfmqK80/Mds+njJMudUPzuREuSFGWACczo17EDA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/postinstall/-/postinstall-7.6.6.tgz", + "integrity": "sha512-jamn7QNTJPZiu22nu25LqfSTJohugFhCu4b48yqP+pdMdkQ3qVd3NdDYhBlgkH/Btar+kppiJP1gRtoiJF761w==", "dev": true, "funding": { "type": "opencollective", @@ -6135,12 +6218,12 @@ } }, "node_modules/@storybook/preset-html-webpack": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/preset-html-webpack/-/preset-html-webpack-7.6.5.tgz", - "integrity": "sha512-LALTDfws641x70ClUJP/9cAACgJjc+TBLls/4Y9I+1mf6GgeQmpTffnZti/rgN0YAuDdyXzgIUGYp4DtlCD7Ww==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/preset-html-webpack/-/preset-html-webpack-7.6.6.tgz", + "integrity": "sha512-bsFoLIVYvlkSzTi+ZGG1Zi/X472VtZGgvOVLK6owUhJ3IFtjDv0P+RYJrqxnNaVX1iKf7vrNjWLTNz64vzwYWw==", "dev": true, "dependencies": { - "@storybook/core-webpack": "7.6.5", + "@storybook/core-webpack": "7.6.6", "@types/node": "^18.0.0", "html-loader": "^3.1.0", "webpack": "5" @@ -6166,9 +6249,9 @@ } }, "node_modules/@storybook/preview": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-7.6.5.tgz", - "integrity": "sha512-zmLa7C7yFGTYhgGZXoecdww9rx0Z5HpNi/GDBRWoNSK+FEdE8Jj2jF5NJ2ncldtYIyegz9ku29JFMKbhMj9K5Q==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-7.6.6.tgz", + "integrity": "sha512-Rl+Pom2bNwzc0MdlbFALmvxsbCkbIwlpTZlRZZTh5Ah8JViV9htQgP9e8uwo3NZA2BhjbDLkmnZeloWxQnI5Ig==", "dev": true, "funding": { "type": "opencollective", @@ -6176,17 +6259,17 @@ } }, "node_modules/@storybook/preview-api": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-7.6.5.tgz", - "integrity": "sha512-9XzuDXXgNuA6dDZ3DXsUwEG6ElxeTbzLuYuzcjtS1FusSICZ2iYmxfS0GfSud9MjPPYOJYoSOvMdIHjorjgByA==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-7.6.6.tgz", + "integrity": "sha512-Bt6xIAR5yZ/JWc90X4BbLOA97iL65glZ1SOBgFFv2mHrdZ1lcdKhAlQr2aeJAf1mLvBtalPjvKzi9EuVY3FZ4w==", "dev": true, "dependencies": { - "@storybook/channels": "7.6.5", - "@storybook/client-logger": "7.6.5", - "@storybook/core-events": "7.6.5", + "@storybook/channels": "7.6.6", + "@storybook/client-logger": "7.6.6", + "@storybook/core-events": "7.6.6", "@storybook/csf": "^0.1.2", "@storybook/global": "^5.0.0", - "@storybook/types": "7.6.5", + "@storybook/types": "7.6.6", "@types/qs": "^6.9.5", "dequal": "^2.0.2", "lodash": "^4.17.21", @@ -6202,9 +6285,9 @@ } }, "node_modules/@storybook/react-dom-shim": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-7.6.5.tgz", - "integrity": "sha512-Qp3N3zENdvx20ikHmz5yI03z+mAWF8bUAwUofqXarVtZUkBNtvfTfUwgAezOAF0eClClH+ktIziIKd976tLSPw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-7.6.6.tgz", + "integrity": "sha512-WWNlXtCVoBWXX/kLNulUeMgzmlAEHi2aBrdIv2jz0DScPf0YxeWAkWmgK7F0zMot9mdwYncr+pk1AILbTBJSyg==", "dev": true, "funding": { "type": "opencollective", @@ -6216,12 +6299,12 @@ } }, "node_modules/@storybook/router": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/router/-/router-7.6.5.tgz", - "integrity": "sha512-QiTC86gRuoepzzmS6HNJZTwfz/n27NcqtaVEIxJi1Yvsx2/kLa9NkRhylNkfTuZ1gEry9stAlKWanMsB2aKyjQ==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/router/-/router-7.6.6.tgz", + "integrity": "sha512-dkn81MtxrG7JMDbOHEcVZkTDVKsneg72CyqJ8ELZfC81iKQcDMQkV9mdmnMl45aKn6UrscudI4K23OxQmsevkw==", "dev": true, "dependencies": { - "@storybook/client-logger": "7.6.5", + "@storybook/client-logger": "7.6.6", "memoizerific": "^1.11.3", "qs": "^6.10.0" }, @@ -6231,14 +6314,14 @@ } }, "node_modules/@storybook/telemetry": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-7.6.5.tgz", - "integrity": "sha512-FiLRh9k9LoGphqgBqPYySWdGqplihiZyDwqdo+Qs19RcQ/eiKg0W7fdA09nStcdcsHmDl/1cMfRhz9KUiMtwOw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-7.6.6.tgz", + "integrity": "sha512-2WdDcrMrt1bPVgdMVO0tFmVxT6YIjiPRfKbH/7wwYMOGmV75m4mJ9Ha2gzZc/oXTSK1M4/fiK12IgW+S3ErcMg==", "dev": true, "dependencies": { - "@storybook/client-logger": "7.6.5", - "@storybook/core-common": "7.6.5", - "@storybook/csf-tools": "7.6.5", + "@storybook/client-logger": "7.6.6", + "@storybook/core-common": "7.6.6", + "@storybook/csf-tools": "7.6.6", "chalk": "^4.1.0", "detect-package-manager": "^2.0.1", "fetch-retry": "^5.0.2", @@ -6302,6 +6385,30 @@ "node": ">=8" } }, + "node_modules/@storybook/test": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/test/-/test-8.0.0-alpha.5.tgz", + "integrity": "sha512-WX0v2wD0es1t0WL8eI+Ly76PSyFMB4B3cKouF5HlGzn1bwhC8vJItc9gRAd/eHtaVVwQZuxSqpRGr067Udxkgg==", + "dev": true, + "dependencies": { + "@storybook/client-logger": "8.0.0-alpha.5", + "@storybook/core-events": "8.0.0-alpha.5", + "@storybook/instrumenter": "8.0.0-alpha.5", + "@storybook/preview-api": "8.0.0-alpha.5", + "@testing-library/dom": "^9.3.1", + "@testing-library/jest-dom": "^6.1.3", + "@testing-library/user-event": "14.3.0", + "@types/chai": "^4", + "@vitest/expect": "^0.34.2", + "@vitest/spy": "^0.34.1", + "chai": "^4.3.7", + "util": "^0.12.4" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, "node_modules/@storybook/test-runner": { "version": "0.16.0", "resolved": "https://registry.npmjs.org/@storybook/test-runner/-/test-runner-0.16.0.tgz", @@ -6344,25 +6451,113 @@ "node": "^16.10.0 || ^18.0.0 || >=20.0.0" } }, - "node_modules/@storybook/testing-library": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@storybook/testing-library/-/testing-library-0.2.2.tgz", - "integrity": "sha512-L8sXFJUHmrlyU2BsWWZGuAjv39Jl1uAqUHdxmN42JY15M4+XCMjGlArdCCjDe1wpTSW6USYISA9axjZojgtvnw==", + "node_modules/@storybook/test/node_modules/@storybook/channels": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-8.0.0-alpha.5.tgz", + "integrity": "sha512-pKjGmy2ptMTqx8j83WVCTBCUwpf+uBPbSk2xVPK47YZspQjuFKWFEhPbJ9Epjvd56zgP/L9W9gaAfZAgLjG0tA==", "dev": true, "dependencies": { - "@testing-library/dom": "^9.0.0", - "@testing-library/user-event": "^14.4.0", - "ts-dedent": "^2.2.0" + "@storybook/client-logger": "8.0.0-alpha.5", + "@storybook/core-events": "8.0.0-alpha.5", + "@storybook/global": "^5.0.0", + "qs": "^6.10.0", + "telejson": "^7.2.0", + "tiny-invariant": "^1.3.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/test/node_modules/@storybook/client-logger": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-8.0.0-alpha.5.tgz", + "integrity": "sha512-X+imMSJCvpknq7IgRGR2lUjMKSPB7pnEy74a8BsQy/6mzEMzps7VQ0wXsk+lIjakzgN48X+KWfX8OKTIePS4Kg==", + "dev": true, + "dependencies": { + "@storybook/global": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/test/node_modules/@storybook/core-events": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-8.0.0-alpha.5.tgz", + "integrity": "sha512-LofmGs/7U2ExGHGFBcx5CHiX0jEx0KUv4PLT5+t5bGeJRGYwUmHRcb4v/if03DtnmztgELYW3RP3+kMkWk3rEg==", + "dev": true, + "dependencies": { + "ts-dedent": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/test/node_modules/@storybook/preview-api": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.0.0-alpha.5.tgz", + "integrity": "sha512-dFaOOjYtkXsbdyzXD3dTadPp3PZ/h5esS0Q5DH+CmwWdLMhZ2dkYgvsEF000iS5cqhhMk7AUgNHiOvIIkhJvlQ==", + "dev": true, + "dependencies": { + "@storybook/channels": "8.0.0-alpha.5", + "@storybook/client-logger": "8.0.0-alpha.5", + "@storybook/core-events": "8.0.0-alpha.5", + "@storybook/csf": "^0.1.2", + "@storybook/global": "^5.0.0", + "@storybook/types": "8.0.0-alpha.5", + "@types/qs": "^6.9.5", + "dequal": "^2.0.2", + "lodash": "^4.17.21", + "memoizerific": "^1.11.3", + "qs": "^6.10.0", + "synchronous-promise": "^2.0.15", + "ts-dedent": "^2.0.0", + "util-deprecate": "^1.0.2" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/test/node_modules/@storybook/types": { + "version": "8.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@storybook/types/-/types-8.0.0-alpha.5.tgz", + "integrity": "sha512-flLvDh2RezBivPCK9jfipWwvNRmX/er+wiyttPsXjaFZ2wc0sXJSKFWmhKdYcdQmAOAWj3O0sfXP3doqJBlMpA==", + "dev": true, + "dependencies": { + "@storybook/channels": "8.0.0-alpha.5", + "@types/babel__core": "^7.0.0", + "@types/express": "^4.7.0", + "file-system-cache": "2.3.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, + "node_modules/@storybook/test/node_modules/@testing-library/user-event": { + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.3.0.tgz", + "integrity": "sha512-P02xtBBa8yMaLhK8CzJCIns8rqwnF6FxhR9zs810flHOBXUYCFjLd8Io1rQrAkQRWEmW2PGdZIEdMxf/KLsqFA==", + "dev": true, + "engines": { + "node": ">=12", + "npm": ">=6" + }, + "peerDependencies": { + "@testing-library/dom": ">=7.21.4" } }, "node_modules/@storybook/theming": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-7.6.5.tgz", - "integrity": "sha512-RpcWT0YEgiobO41McVPDfQQHHFnjyr1sJnNTPJIvOUgSfURdgSj17mQVxtD5xcXcPWUdle5UhIOrCixHbL/NNw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-7.6.6.tgz", + "integrity": "sha512-hNZOOxaF55iAGUEM0dvAIP6LfGMgPKCJQIk/qyotFk+SKkg3PBqzph89XfFl9yCD3KiX5cryqarULgVuNawLJg==", "dev": true, "dependencies": { "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", - "@storybook/client-logger": "7.6.5", + "@storybook/client-logger": "7.6.6", "@storybook/global": "^5.0.0", "memoizerific": "^1.11.3" }, @@ -6376,12 +6571,12 @@ } }, "node_modules/@storybook/types": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@storybook/types/-/types-7.6.5.tgz", - "integrity": "sha512-Q757v+fYZZSaEpks/zDL5YgXRozxkgKakXFc+BoQHK5q5sVhJ+0jvpLJiAQAniIIaMIkqY/G24Kd6Uo6UdKBCg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@storybook/types/-/types-7.6.6.tgz", + "integrity": "sha512-77vbQp3GX93OD8UzFkY4a0fAmkZrqLe61XVo6yABrwbVDY0EcAwaCF5gcXRhOHldlH7KYbLfEQkDkkKTBjX7ow==", "dev": true, "dependencies": { - "@storybook/channels": "7.6.5", + "@storybook/channels": "7.6.6", "@types/babel__core": "^7.0.0", "@types/express": "^4.7.0", "file-system-cache": "2.3.0" @@ -6778,19 +6973,6 @@ "node": ">=8" } }, - "node_modules/@testing-library/user-event": { - "version": "14.5.1", - "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.1.tgz", - "integrity": "sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==", - "dev": true, - "engines": { - "node": ">=12", - "npm": ">=6" - }, - "peerDependencies": { - "@testing-library/dom": ">=7.21.4" - } - }, "node_modules/@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", @@ -6867,6 +7049,12 @@ "@types/node": "*" } }, + "node_modules/@types/chai": { + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz", + "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==", + "dev": true + }, "node_modules/@types/connect": { "version": "3.4.38", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", @@ -7068,6 +7256,8 @@ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.3.tgz", "integrity": "sha512-Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "jest-matcher-utils": "^28.0.0", "pretty-format": "^28.0.0" @@ -7078,6 +7268,8 @@ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@sinclair/typebox": "^0.24.1" }, @@ -7089,13 +7281,17 @@ "version": "0.24.51", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@types/jest/node_modules/ansi-styles": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=10" }, @@ -7108,6 +7304,8 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@jest/schemas": "^28.1.3", "ansi-regex": "^5.0.1", @@ -7122,7 +7320,9 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@types/jsdom": { "version": "20.0.1", @@ -7616,6 +7816,87 @@ "wonka": "^6.3.2" } }, + "node_modules/@vitest/expect": { + "version": "0.34.7", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.7.tgz", + "integrity": "sha512-G9iEtwrD6ZQ4MVHZufif9Iqz3eLtuwBBNx971fNAGPaugM7ftAWjQN+ob2zWhtzURp8RK3zGXOxVb01mFo3zAQ==", + "dev": true, + "dependencies": { + "@vitest/spy": "0.34.7", + "@vitest/utils": "0.34.7", + "chai": "^4.3.10" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/spy": { + "version": "0.34.7", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.7.tgz", + "integrity": "sha512-NMMSzOY2d8L0mcOt4XcliDOS1ISyGlAXuQtERWVOoVHnKwmG+kKhinAiGw3dTtMQWybfa89FG8Ucg9tiC/FhTQ==", + "dev": true, + "dependencies": { + "tinyspy": "^2.1.1" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/utils": { + "version": "0.34.7", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.7.tgz", + "integrity": "sha512-ziAavQLpCYS9sLOorGrFFKmy2gnfiNU0ZJ15TsMz/K92NAPS/rp9K4z6AJQQk5Y8adCy4Iwpxy7pQumQ/psnRg==", + "dev": true, + "dependencies": { + "diff-sequences": "^29.4.3", + "loupe": "^2.3.6", + "pretty-format": "^29.5.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/utils/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@vitest/utils/node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@vitest/utils/node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@vitest/utils/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/@webassemblyjs/ast": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", @@ -8233,6 +8514,15 @@ "util": "^0.12.5" } }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/ast-types": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz", @@ -9072,6 +9362,24 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/chai": { + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", + "dev": true, + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", + "pathval": "^1.1.1", + "type-detect": "^4.0.8" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -9138,6 +9446,18 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/check-error": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, + "dependencies": { + "get-func-name": "^2.0.2" + }, + "engines": { + "node": "*" + } + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -9221,6 +9541,15 @@ "node": ">=8" } }, + "node_modules/citty": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.5.tgz", + "integrity": "sha512-AS7n5NSc0OQVMV9v6wt3ByujNIrne0/cTjiC2MYqhvao57VNfiuVksTSr2p17nVOhEr2KtqiAkGwHcgMC/qUuQ==", + "dev": true, + "dependencies": { + "consola": "^3.2.3" + } + }, "node_modules/cjs-module-lexer": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", @@ -9603,6 +9932,15 @@ "safe-buffer": "~5.1.0" } }, + "node_modules/consola": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz", + "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==", + "dev": true, + "engines": { + "node": "^14.18.0 || >=16.10.0" + } + }, "node_modules/constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", @@ -10790,6 +11128,18 @@ } } }, + "node_modules/deep-eql": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", + "dev": true, + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/deep-equal": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", @@ -11101,6 +11451,8 @@ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } @@ -12725,9 +13077,9 @@ "dev": true }, "node_modules/flow-parser": { - "version": "0.224.0", - "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.224.0.tgz", - "integrity": "sha512-S1P78o0VLB1FZvkoGSIpaRiiTUQ3xDhm9I4Z1qc3lglmkjehfR2sjM0vhwKS7UC1G12VT4Leb/GGV/KlactqjA==", + "version": "0.225.1", + "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.225.1.tgz", + "integrity": "sha512-50fjR6zbLQcpq5IFNkheUSY/AFPxVeeLiBM5B3NQBSKId2G0cUuExOlDDOguxc49dl9lnh8hI1xcYlPJWNp4KQ==", "dev": true, "engines": { "node": ">=0.4.0" @@ -13096,6 +13448,15 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-func-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/get-intrinsic": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", @@ -13163,16 +13524,17 @@ } }, "node_modules/giget": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/giget/-/giget-1.1.3.tgz", - "integrity": "sha512-zHuCeqtfgqgDwvXlR84UNgnJDuUHQcNI5OqWqFxxuk2BshuKbYhJWdxBsEo4PvKqoGh23lUAIvBNpChMLv7/9Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.1.tgz", + "integrity": "sha512-4VG22mopWtIeHwogGSy1FViXVo0YT+m6BrqZfz0JJFwbSsePsCdOzdLIIli5BtMp7Xe8f/o2OmBpQX2NBOC24g==", "dev": true, "dependencies": { - "colorette": "^2.0.20", - "defu": "^6.1.2", - "https-proxy-agent": "^7.0.2", - "mri": "^1.2.0", - "node-fetch-native": "^1.4.0", + "citty": "^0.1.5", + "consola": "^3.2.3", + "defu": "^6.1.3", + "node-fetch-native": "^1.6.1", + "nypm": "^0.3.3", + "ohash": "^1.1.3", "pathe": "^1.1.1", "tar": "^6.2.0" }, @@ -13180,31 +13542,6 @@ "giget": "dist/cli.mjs" } }, - "node_modules/giget/node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", - "dev": true, - "dependencies": { - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/giget/node_modules/https-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", - "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", - "dev": true, - "dependencies": { - "agent-base": "^7.0.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/github-slugger": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.5.0.tgz", @@ -13901,9 +14238,9 @@ "dev": true }, "node_modules/html-webpack-plugin": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.4.tgz", - "integrity": "sha512-3wNSaVVxdxcu0jd4FpQFoICdqgxs4zIQQvj+2yQKFfBOnLETQ6X5CDWdeasuGlSsooFlMkEioWDTqBv1wvw5Iw==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz", + "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==", "dev": true, "dependencies": { "@types/html-minifier-terser": "^6.0.0", @@ -13920,7 +14257,16 @@ "url": "https://opencollective.com/html-webpack-plugin" }, "peerDependencies": { + "@rspack/core": "0.x || 1.x", "webpack": "^5.20.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } } }, "node_modules/htmlparser2": { @@ -15524,6 +15870,8 @@ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^28.1.1", @@ -15539,6 +15887,8 @@ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@sinclair/typebox": "^0.24.1" }, @@ -15550,13 +15900,17 @@ "version": "0.24.51", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/jest-diff/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -15572,6 +15926,8 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -15588,6 +15944,8 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=8" } @@ -15597,6 +15955,8 @@ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } @@ -15606,6 +15966,8 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@jest/schemas": "^28.1.3", "ansi-regex": "^5.0.1", @@ -15621,6 +15983,8 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=10" }, @@ -15632,13 +15996,17 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/jest-diff/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -15938,6 +16306,8 @@ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "chalk": "^4.0.0", "jest-diff": "^28.1.3", @@ -15953,6 +16323,8 @@ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@sinclair/typebox": "^0.24.1" }, @@ -15964,13 +16336,17 @@ "version": "0.24.51", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/jest-matcher-utils/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -15986,6 +16362,8 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -16002,6 +16380,8 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=8" } @@ -16011,6 +16391,8 @@ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } @@ -16020,6 +16402,8 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@jest/schemas": "^28.1.3", "ansi-regex": "^5.0.1", @@ -16035,6 +16419,8 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=10" }, @@ -16046,13 +16432,17 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/jest-matcher-utils/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -17814,6 +18204,15 @@ "loose-envify": "cli.js" } }, + "node_modules/loupe": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "dev": true, + "dependencies": { + "get-func-name": "^2.0.1" + } + }, "node_modules/lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -19346,9 +19745,9 @@ } }, "node_modules/node-fetch-native": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.4.1.tgz", - "integrity": "sha512-NsXBU0UgBxo2rQLOeWNZqS3fvflWePMECr8CoSWoSTqCqGbVVsvl9vZu1HfQicYN0g5piV9Gh8RTEvo/uP752w==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.1.tgz", + "integrity": "sha512-bW9T/uJDPAJB2YNYEpWzE54U5O3MQidXsOyTfnbKYtTtFexRvGzb1waphBN4ZwP6EcIvYYEOwW0b72BpAqydTw==", "dev": true }, "node_modules/node-fetch/node_modules/tr46": { @@ -19758,6 +20157,146 @@ "node": ">=6" } }, + "node_modules/nypm": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.3.3.tgz", + "integrity": "sha512-FHoxtTscAE723e80d2M9cJRb4YVjL82Ra+ZV+YqC6rfNZUWahi+ZhPF+krnR+bdMvibsfHCtgKXnZf5R6kmEPA==", + "dev": true, + "dependencies": { + "citty": "^0.1.4", + "execa": "^8.0.1", + "pathe": "^1.1.1", + "ufo": "^1.3.0" + }, + "bin": { + "nypm": "dist/cli.mjs" + }, + "engines": { + "node": "^14.16.0 || >=16.10.0" + } + }, + "node_modules/nypm/node_modules/execa": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^4.1.0", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": ">=16.17" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/nypm/node_modules/get-stream": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nypm/node_modules/human-signals": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", + "dev": true, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/nypm/node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nypm/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nypm/node_modules/npm-run-path": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", + "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "dev": true, + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nypm/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nypm/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nypm/node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -19819,6 +20358,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/ohash": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz", + "integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==", + "dev": true + }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -20234,6 +20779,15 @@ "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==", "dev": true }, + "node_modules/pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/peek-stream": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz", @@ -22486,12 +23040,12 @@ "dev": true }, "node_modules/storybook": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/storybook/-/storybook-7.6.5.tgz", - "integrity": "sha512-uHPrL+g/0v6iIVtDA8J0uWd3jDZcdr51lCR/vPXTkrCY1uVaFjswzl8EMy5PR05I7jMpKUzkJWZtFbgbh9e1Bw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/storybook/-/storybook-7.6.6.tgz", + "integrity": "sha512-PmJxpjGdLvDOHaRzqLOvcJ3ALQPaNeW6D5Lv7rPPVbuO24wdDzd/75dPRP7gJKYcGE0NnDZ6cLQq3UlCfbkIBA==", "dev": true, "dependencies": { - "@storybook/cli": "7.6.5" + "@storybook/cli": "7.6.6" }, "bin": { "sb": "index.js", @@ -23606,6 +24160,15 @@ "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==", "dev": true }, + "node_modules/tinyspy": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.0.tgz", + "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==", + "dev": true, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -23826,6 +24389,12 @@ "node": ">=14.17" } }, + "node_modules/ufo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz", + "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==", + "dev": true + }, "node_modules/uglify-js": { "version": "3.17.4", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", @@ -24598,9 +25167,9 @@ } }, "node_modules/webpack-hot-middleware": { - "version": "2.25.4", - "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.4.tgz", - "integrity": "sha512-IRmTspuHM06aZh98OhBJtqLpeWFM8FXJS5UYpKYxCJzyFoyWj1w6VGFfomZU7OPA55dMLrQK0pRT1eQ3PACr4w==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.26.0.tgz", + "integrity": "sha512-okzjec5sAEy4t+7rzdT8eRyxsk0FDSmBPN2KwX4Qd+6+oQCfe5Ve07+u7cJvofgB+B4w5/4dO4Pz0jhhHyyPLQ==", "dev": true, "dependencies": { "ansi-html-community": "0.0.8", diff --git a/package.json b/package.json index ae4fda12..a81c894e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nationalarchives/frontend", - "version": "0.1.32", + "version": "0.1.35", "description": "The National Archives frontend styles", "scripts": { "start": "storybook dev -p 6006", @@ -40,17 +40,16 @@ "@babel/preset-env": "^7.23.2", "@chromaui/addon-visual-tests": "^0.0.124", "@mdx-js/react": "^3.0.0", - "@storybook/addon-a11y": "^7.6.4", - "@storybook/addon-docs": "^7.6.4", - "@storybook/addon-essentials": "^7.6.4", - "@storybook/addon-interactions": "^7.6.4", - "@storybook/addon-links": "^7.6.4", - "@storybook/addon-mdx-gfm": "^7.6.4", - "@storybook/html": "^7.6.4", - "@storybook/html-webpack5": "^7.6.4", - "@storybook/jest": "^0.2.3", + "@storybook/addon-a11y": "^7.6.6", + "@storybook/addon-docs": "^7.6.6", + "@storybook/addon-essentials": "^7.6.6", + "@storybook/addon-interactions": "^7.6.6", + "@storybook/addon-links": "^7.6.6", + "@storybook/addon-mdx-gfm": "^7.6.6", + "@storybook/html": "^7.6.6", + "@storybook/html-webpack5": "^7.6.6", + "@storybook/test": "^8.0.0-alpha.5", "@storybook/test-runner": "^0.16.0", - "@storybook/testing-library": "^0.2.2", "axe-playwright": "^1.2.3", "babel-jest": "^29.7.0", "babel-loader": "^9.0.1", @@ -72,7 +71,7 @@ "sass": "^1.69.4", "sass-loader": "^13.0.2", "simple-nunjucks-loader": "^3.2.0", - "storybook": "^7.6.4", + "storybook": "^7.6.6", "style-loader": "^3.3.1", "stylelint": "^16.0.2", "stylelint-config-standard-scss": "^12.0.0", diff --git a/src/nationalarchives/all.scss b/src/nationalarchives/all.scss index 7c7352f8..9669538b 100644 --- a/src/nationalarchives/all.scss +++ b/src/nationalarchives/all.scss @@ -1,17 +1,18 @@ /*! - * ------------------------------------------------ - * The National Archives Frontend - * https://github.com/nationalarchives/tna-frontend - * ------------------------------------------------ + * ------------------------------------------ + * + * TNA Frontend + * github.com/nationalarchives/tna-frontend + * * Explore 1,000 years of history - * https://www.nationalarchives.gov.uk/ - * ------------------------------------------------ + * www.nationalarchives.gov.uk + * + * ------------------------------------------ * MIT Licence - * ------------------------------------------------ + * ------------------------------------------ */ @use "variables"; @use "tools"; -@use "lib"; @use "utilities"; @use "components"; diff --git a/src/nationalarchives/assets/fonts/OpenSans-Italic.ttf b/src/nationalarchives/assets/fonts/OpenSans-Italic.ttf new file mode 100644 index 00000000..29ff6938 Binary files /dev/null and b/src/nationalarchives/assets/fonts/OpenSans-Italic.ttf differ diff --git a/src/nationalarchives/assets/images/apple-touch-icon-152x152.png b/src/nationalarchives/assets/images/apple-touch-icon-152x152.png deleted file mode 100644 index 3f38e4f2..00000000 Binary files a/src/nationalarchives/assets/images/apple-touch-icon-152x152.png and /dev/null differ diff --git a/src/nationalarchives/assets/images/apple-touch-icon-167x167.png b/src/nationalarchives/assets/images/apple-touch-icon-167x167.png deleted file mode 100644 index e066bb32..00000000 Binary files a/src/nationalarchives/assets/images/apple-touch-icon-167x167.png and /dev/null differ diff --git a/src/nationalarchives/assets/images/apple-touch-icon-180x180.png b/src/nationalarchives/assets/images/apple-touch-icon-180x180.png deleted file mode 100644 index ab744df1..00000000 Binary files a/src/nationalarchives/assets/images/apple-touch-icon-180x180.png and /dev/null differ diff --git a/src/nationalarchives/assets/images/apple-touch-icon.png b/src/nationalarchives/assets/images/apple-touch-icon.png deleted file mode 100644 index ab744df1..00000000 Binary files a/src/nationalarchives/assets/images/apple-touch-icon.png and /dev/null differ diff --git a/src/nationalarchives/assets/images/icon-1024x1024.png b/src/nationalarchives/assets/images/icon-1024x1024.png new file mode 100644 index 00000000..8ff0a276 Binary files /dev/null and b/src/nationalarchives/assets/images/icon-1024x1024.png differ diff --git a/src/nationalarchives/assets/images/icon-120x120.png b/src/nationalarchives/assets/images/icon-120x120.png new file mode 100644 index 00000000..4085959b Binary files /dev/null and b/src/nationalarchives/assets/images/icon-120x120.png differ diff --git a/src/nationalarchives/assets/images/icon-144x144.png b/src/nationalarchives/assets/images/icon-144x144.png new file mode 100644 index 00000000..1f11ffcc Binary files /dev/null and b/src/nationalarchives/assets/images/icon-144x144.png differ diff --git a/src/nationalarchives/assets/images/icon-152x152.png b/src/nationalarchives/assets/images/icon-152x152.png new file mode 100644 index 00000000..e5bfee94 Binary files /dev/null and b/src/nationalarchives/assets/images/icon-152x152.png differ diff --git a/src/nationalarchives/assets/images/icon-167x167.png b/src/nationalarchives/assets/images/icon-167x167.png new file mode 100644 index 00000000..2ddcccd6 Binary files /dev/null and b/src/nationalarchives/assets/images/icon-167x167.png differ diff --git a/src/nationalarchives/assets/images/icon-180x180.png b/src/nationalarchives/assets/images/icon-180x180.png new file mode 100644 index 00000000..9419691c Binary files /dev/null and b/src/nationalarchives/assets/images/icon-180x180.png differ diff --git a/src/nationalarchives/assets/images/icon-192x192.png b/src/nationalarchives/assets/images/icon-192x192.png new file mode 100644 index 00000000..aaf6eb36 Binary files /dev/null and b/src/nationalarchives/assets/images/icon-192x192.png differ diff --git a/src/nationalarchives/assets/images/icon-256x256.png b/src/nationalarchives/assets/images/icon-256x256.png new file mode 100644 index 00000000..bd77463e Binary files /dev/null and b/src/nationalarchives/assets/images/icon-256x256.png differ diff --git a/src/nationalarchives/assets/images/icon-48x48.png b/src/nationalarchives/assets/images/icon-48x48.png new file mode 100644 index 00000000..117ac8a2 Binary files /dev/null and b/src/nationalarchives/assets/images/icon-48x48.png differ diff --git a/src/nationalarchives/assets/images/icon-512x512.png b/src/nationalarchives/assets/images/icon-512x512.png new file mode 100644 index 00000000..a34b1f60 Binary files /dev/null and b/src/nationalarchives/assets/images/icon-512x512.png differ diff --git a/src/nationalarchives/assets/images/icon-72x72.png b/src/nationalarchives/assets/images/icon-72x72.png new file mode 100644 index 00000000..60503207 Binary files /dev/null and b/src/nationalarchives/assets/images/icon-72x72.png differ diff --git a/src/nationalarchives/assets/images/icon-96x96.png b/src/nationalarchives/assets/images/icon-96x96.png new file mode 100644 index 00000000..8529bf4d Binary files /dev/null and b/src/nationalarchives/assets/images/icon-96x96.png differ diff --git a/src/nationalarchives/components/_index.scss b/src/nationalarchives/components/_index.scss index 84e3d131..51625f3d 100644 --- a/src/nationalarchives/components/_index.scss +++ b/src/nationalarchives/components/_index.scss @@ -2,6 +2,7 @@ @use "button"; @use "card"; @use "checkboxes"; +@use "compound-filters"; @use "cookie-banner"; @use "date-input"; @use "date-search"; diff --git a/src/nationalarchives/components/breadcrumbs/breadcrumbs.stories.js b/src/nationalarchives/components/breadcrumbs/breadcrumbs.stories.js index 44d08df7..aced72d3 100644 --- a/src/nationalarchives/components/breadcrumbs/breadcrumbs.stories.js +++ b/src/nationalarchives/components/breadcrumbs/breadcrumbs.stories.js @@ -1,7 +1,6 @@ import Breadcrumbs from "./template.njk"; import macroOptions from "./macro-options.json"; -import { expect } from "@storybook/jest"; -import { within, userEvent } from "@storybook/testing-library"; +import { within, userEvent, expect } from "@storybook/test"; import { customViewports } from "../../../../.storybook/viewports"; const argTypes = { diff --git a/src/nationalarchives/components/button/button.scss b/src/nationalarchives/components/button/button.scss index ffd97165..90dc7180 100644 --- a/src/nationalarchives/components/button/button.scss +++ b/src/nationalarchives/components/button/button.scss @@ -9,14 +9,15 @@ padding: 0.25rem 1rem; display: inline-flex; - align-items: center; + align-items: baseline; justify-content: center; - gap: 0.5rem; + gap: 0.75rem; + @include typography.relative-font-size(18); @include typography.main-font-weight-bold; + line-height: #{math.div(16, 18) * 2}; text-decoration: none; text-align: center; - line-height: #{math.div(16, 18) * 2}; text-wrap: balance; @include colour.colour-background("button-background"); @@ -25,13 +26,6 @@ cursor: pointer; - &, - .fa-solid, - .fa-brands { - @include typography.relative-font-size(18); - line-height: #{math.div(16, 18) * 2}; - } - &, &:link, &:visited { @@ -45,6 +39,14 @@ background: transparent; } + .fa-solid, + .fa-brands { + display: block; + + font-size: 0.9em; + line-height: #{math.div(16, 18) * 2}; + } + &--plain { @include typography.main-font-weight; @@ -83,13 +85,6 @@ flex-direction: row-reverse; } - .fa-solid, - .fa-brands { - min-width: 1.25rem; - - display: block; - } - &--small, &-group--small & { padding: 0 0.5rem; @@ -99,7 +94,6 @@ .fa-solid, .fa-brands { - @include typography.relative-font-size(18); line-height: 2rem; } } @@ -111,10 +105,13 @@ gap: 0; font-size: 0; + line-height: 0; .fa-solid, .fa-brands { width: 2.5rem; + + @include typography.relative-font-size(18); } } @@ -125,6 +122,8 @@ .fa-solid, .fa-brands { width: 2rem; + + @include typography.relative-font-size(18 * 0.9); } } diff --git a/src/nationalarchives/components/card/card.scss b/src/nationalarchives/components/card/card.scss index 645d2051..bbdb6801 100644 --- a/src/nationalarchives/components/card/card.scss +++ b/src/nationalarchives/components/card/card.scss @@ -118,6 +118,8 @@ } &--horizontal { + aspect-ratio: auto 3/1; + position: relative; @include media.on-larger-than-mobile { @@ -128,6 +130,7 @@ .tna-card__image-container { height: auto; + min-height: 50%; margin-bottom: 0; padding-bottom: 0; diff --git a/src/nationalarchives/components/card/card.stories.js b/src/nationalarchives/components/card/card.stories.js index cee60fd1..af7352b0 100644 --- a/src/nationalarchives/components/card/card.stories.js +++ b/src/nationalarchives/components/card/card.stories.js @@ -1,5 +1,6 @@ import Card from "./template.njk"; import macroOptions from "./macro-options.json"; +import { customViewports } from "../../../../.storybook/viewports"; const argTypes = { supertitle: { control: "text" }, @@ -288,6 +289,44 @@ HorizontalAccent.args = { classes: "tna-card--demo", }; +export const HorizontalMinimal = Template.bind({}); +HorizontalMinimal.args = { + title: "Card title", + headingLevel: 3, + headingSize: "l", + imageSrc: + "https://www.nationalarchives.gov.uk/wp-content/uploads/sites/24/2023/07/tna-building-compress.jpg", + imageAlt: "The National Archives office", + imageWidth: 499, + imageHeight: 333, + horizontal: true, + htmlElement: "article", + classes: "tna-card--demo", +}; + +export const HorizontalMobile = Template.bind({}); +HorizontalMobile.parameters = { + viewport: { + defaultViewport: "small", + }, + chromatic: { + viewports: [customViewports["small"].styles.width.replace(/px$/, "")], + }, +}; +HorizontalMobile.args = { + title: "Card title", + headingLevel: 3, + headingSize: "l", + imageSrc: + "https://www.nationalarchives.gov.uk/wp-content/uploads/sites/24/2023/07/tna-building-compress.jpg", + imageAlt: "The National Archives office", + imageWidth: 499, + imageHeight: 333, + horizontal: true, + htmlElement: "article", + classes: "tna-card--demo", +}; + export const Sources = Template.bind({}); Sources.args = { supertitle: "Card supertitle", diff --git a/src/nationalarchives/components/checkboxes/macro-options.json b/src/nationalarchives/components/checkboxes/macro-options.json index 1af137a5..6e7892d4 100644 --- a/src/nationalarchives/components/checkboxes/macro-options.json +++ b/src/nationalarchives/components/checkboxes/macro-options.json @@ -87,16 +87,28 @@ "required": false, "description": "" }, + { + "name": "formGroupClasses", + "type": "string", + "required": false, + "description": "Classes to add to the checkboxes form group." + }, + { + "name": "formGroupAttributes", + "type": "string", + "required": false, + "description": "HTML attributes (for example data attributes) to add to the checkboxes form group." + }, { "name": "classes", "type": "string", "required": false, - "description": "Classes to add to the checkboxes." + "description": "Classes to add to the checkbox elements." }, { "name": "attributes", "type": "object", "required": false, - "description": "HTML attributes (for example data attributes) to add to the checkboxes." + "description": "HTML attributes (for example data attributes) to add to the checkbox elements." } ] diff --git a/src/nationalarchives/components/checkboxes/template.njk b/src/nationalarchives/components/checkboxes/template.njk index 9656e9a8..99119748 100644 --- a/src/nationalarchives/components/checkboxes/template.njk +++ b/src/nationalarchives/components/checkboxes/template.njk @@ -2,7 +2,7 @@ {%- if params.inline -%} {%- set containerClasses = containerClasses.concat('tna-form__group--inline') -%} {%- endif -%} -<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ containerClasses | join(' ') }}"{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}> +<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ containerClasses | join(' ') }}"{% for attribute, value in params.formGroupAttributes %} {{ attribute }}="{{ value }}"{% endfor %}> <fieldset class="tna-form__fieldset"{%- if params.hint or params.error %} aria-describedby="{%- if params.hint -%}tna-form__{{ params.id }}-hint{%- endif %} {% if params.error -%}tna-form__{{ params.id }}-error{%- endif -%}"{%- endif %}> <legend class="tna-form__legend"> <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}"> @@ -22,7 +22,7 @@ <div class="tna-checkboxes{% if params.small or params.inline %} tna-checkboxes--small{% endif %}{% if params.inline %} tna-checkboxes--inline{% endif %}"> {%- for item in params.items %} <div class="tna-checkboxes__item"> - <input type="checkbox" id="tna-form__{{ params.id }}-{{ item.value }}" value="{{ item.value }}" name="{{ params.name }}"{% if item.checked %} checked{% endif %}> + <input type="checkbox" id="tna-form__{{ params.id }}-{{ item.value }}" value="{{ item.value }}" name="{{ params.name }}"{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}{% if item.checked %} checked{% endif %}> <label for="tna-form__{{ params.id }}-{{ item.value }}" class="tna-checkboxes__item-label"> {{ item.text }} </label> diff --git a/src/nationalarchives/components/compound-filters/_index.scss b/src/nationalarchives/components/compound-filters/_index.scss new file mode 100644 index 00000000..70aed9d7 --- /dev/null +++ b/src/nationalarchives/components/compound-filters/_index.scss @@ -0,0 +1 @@ +@use "compound-filters"; diff --git a/src/nationalarchives/components/compound-filters/compound-filters.scss b/src/nationalarchives/components/compound-filters/compound-filters.scss new file mode 100644 index 00000000..b93d70b5 --- /dev/null +++ b/src/nationalarchives/components/compound-filters/compound-filters.scss @@ -0,0 +1,78 @@ +@use "../../tools/colour"; +@use "../../tools/spacing"; +@use "../../tools/typography"; +@use "../../utilities"; + +.tna-compound-filters { + @include spacing.space-above; + + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 0.75rem 1rem; + + &__item { + padding: 0 0.125rem 0 0.75rem; + + display: flex; + gap: 0.5rem; + align-items: center; + + @include typography.relative-font-size(16); + line-height: 1.75; + + @include colour.colour-border("keyline", 1px); + border-radius: 1rem; + + &--remove { + padding-right: 0; + padding-left: 0; + + background: none; + border: none; + border-radius: 0; + } + } + + &__link { + width: 1.5rem; + height: 1.5rem; + + position: relative; + + text-decoration: none; + font-size: 0; + line-height: 0; + + border-radius: 100%; + + &::before, + &::after { + width: 2px; + height: 1rem; + margin-left: -1px; + + display: block; + + position: absolute; + top: 0.25rem; + left: 50%; + + @include colour.colour-background("font-base"); + + content: ""; + } + + &::before { + transform: rotate(45deg); + } + + &::after { + transform: rotate(-45deg); + } + + &:hover { + @include colour.contrast; + } + } +} diff --git a/src/nationalarchives/components/compound-filters/compound-filters.stories.js b/src/nationalarchives/components/compound-filters/compound-filters.stories.js new file mode 100644 index 00000000..ee85bafa --- /dev/null +++ b/src/nationalarchives/components/compound-filters/compound-filters.stories.js @@ -0,0 +1,61 @@ +import Filters from "./template.njk"; +import macroOptions from "./macro-options.json"; + +const argTypes = { + items: { control: "object" }, + removeAllText: { control: "text" }, + removeAllHref: { control: "text" }, + classes: { control: "text" }, + attributes: { control: "object" }, +}; + +Object.keys(argTypes).forEach((argType) => { + argTypes[argType].description = macroOptions.find( + (option) => option.name === argType, + )?.description; +}); + +export default { + title: "Components/Compound filters", + argTypes, +}; + +const Template = ({ + items, + removeAllText, + removeAllHref, + classes, + attributes, +}) => + Filters({ + params: { + items, + removeAllText, + removeAllHref, + classes, + attributes, + }, + }); + +export const Standard = Template.bind({}); +Standard.args = { + items: [ + { + label: "AIR - Air Ministry and Royal Air Force records", + href: "#", + title: "Remove Air Ministry and Royal Air Force records filter", + }, + { + label: "Item", + href: "#", + title: "Remove item filter", + }, + { + label: "Closed Or Retained Document, Open Description", + href: "#", + title: "Remove filter for Closed Or Retained Document, Open Description", + }, + ], + removeAllHref: "#", + classes: "tna-filters--demo", +}; diff --git a/src/nationalarchives/components/compound-filters/fixtures.json b/src/nationalarchives/components/compound-filters/fixtures.json new file mode 100644 index 00000000..f9ed88da --- /dev/null +++ b/src/nationalarchives/components/compound-filters/fixtures.json @@ -0,0 +1,46 @@ +{ + "component": "compound-filters", + "fixtures": [ + { + "name": "plain compound filters", + "options": { + "items": [ + { + "label": "Medieval (974—1485)", + "href": "#?filter=alpha" + }, + { + "label": "Early Modern (1485—1714)", + "href": "#?filter=beta" + }, + { + "label": "Georgians (1714—1837)", + "href": "#?filter=gamma" + }, + { + "label": "Victorians (1837—1901)", + "href": "#?filter=delta" + }, + { + "label": "Early 20th century (1901—1918)", + "href": "#?filter=epsilon" + }, + { + "label": "Interwar (1918—1939)", + "href": "#?filter=zeta" + }, + { + "label": "Second World War (1939—1945)", + "href": "#?filter=eta" + }, + { + "label": "Postwar (1945—2000)", + "href": "#?filter=theta" + } + ] + }, + "html": "<ul class=\"tna-compound-filters tna-ul tna-ul--plain \"><li class=\"tna-compound-filters__item\"><span class=\"tna-compound-filters__label\">Medieval (974—1485)</span><a href=\"#?filter=alpha\" class=\"tna-compound-filters__link\">Remove filter</a></li><li class=\"tna-compound-filters__item\"><span class=\"tna-compound-filters__label\">Early Modern (1485—1714)</span><a href=\"#?filter=beta\" class=\"tna-compound-filters__link\">Remove filter</a></li><li class=\"tna-compound-filters__item\"><span class=\"tna-compound-filters__label\">Georgians (1714—1837)</span><a href=\"#?filter=gamma\" class=\"tna-compound-filters__link\">Remove filter</a></li><li class=\"tna-compound-filters__item\"><span class=\"tna-compound-filters__label\">Victorians (1837—1901)</span><a href=\"#?filter=delta\" class=\"tna-compound-filters__link\">Remove filter</a></li><li class=\"tna-compound-filters__item\"><span class=\"tna-compound-filters__label\">Early 20th century (1901—1918)</span><a href=\"#?filter=epsilon\" class=\"tna-compound-filters__link\">Remove filter</a></li><li class=\"tna-compound-filters__item\"><span class=\"tna-compound-filters__label\">Interwar (1918—1939)</span><a href=\"#?filter=zeta\" class=\"tna-compound-filters__link\">Remove filter</a></li><li class=\"tna-compound-filters__item\"><span class=\"tna-compound-filters__label\">Second World War (1939—1945)</span><a href=\"#?filter=eta\" class=\"tna-compound-filters__link\">Remove filter</a></li><li class=\"tna-compound-filters__item\"><span class=\"tna-compound-filters__label\">Postwar (1945—2000)</span><a href=\"#?filter=theta\" class=\"tna-compound-filters__link\">Remove filter</a></li></ul>", + "hidden": false + } + ] +} diff --git a/src/nationalarchives/components/compound-filters/macro-options.json b/src/nationalarchives/components/compound-filters/macro-options.json new file mode 100644 index 00000000..c4e86e72 --- /dev/null +++ b/src/nationalarchives/components/compound-filters/macro-options.json @@ -0,0 +1,52 @@ +[ + { + "name": "items", + "type": "array", + "required": true, + "description": "", + "params": [ + { + "name": "label", + "type": "string", + "required": true, + "description": "" + }, + { + "name": "href", + "type": "string", + "required": true, + "description": "" + }, + { + "name": "title", + "type": "string", + "required": false, + "description": "" + } + ] + }, + { + "name": "removeAllText", + "type": "string", + "required": false, + "description": "" + }, + { + "name": "removeAllHref", + "type": "string", + "required": false, + "description": "" + }, + { + "name": "classes", + "type": "string", + "required": false, + "description": "Classes to add to the compound filters." + }, + { + "name": "attributes", + "type": "object", + "required": false, + "description": "HTML attributes (for example data attributes) to add to the compound filters." + } +] diff --git a/src/nationalarchives/components/compound-filters/macro.njk b/src/nationalarchives/components/compound-filters/macro.njk new file mode 100644 index 00000000..48cdfcc7 --- /dev/null +++ b/src/nationalarchives/components/compound-filters/macro.njk @@ -0,0 +1,3 @@ +{% macro tnaCompoundFilters(params) %} + {%- include "nationalarchives/components/compound-filters/template.njk" -%} +{% endmacro %} \ No newline at end of file diff --git a/src/nationalarchives/components/compound-filters/template.njk b/src/nationalarchives/components/compound-filters/template.njk new file mode 100644 index 00000000..c77e16e6 --- /dev/null +++ b/src/nationalarchives/components/compound-filters/template.njk @@ -0,0 +1,16 @@ +{%- set containerClasses = [params.classes] if params.classes else [] -%} +<ul class="tna-compound-filters tna-ul tna-ul--plain {{ containerClasses | join(' ') }}"{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}> + {%- for item in params.items -%} + <li class="tna-compound-filters__item"> + <span class="tna-compound-filters__label">{{ item.label }}</span> + <a href="{{ item.href }}" class="tna-compound-filters__link">{{ item.title if item.title else 'Remove filter' }}</a> + </li> + {%- endfor -%} + {% if params.removeAllHref %} + <li class="tna-compound-filters__item tna-compound-filters__item--remove"> + <a href="{{ params.removeAllHref }}"> + {{ params.removeAllText if params.removeAllText else 'Remove all filters' }} + </a> + </li> + {% endif %} +</ul> diff --git a/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js b/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js index c034bbd6..7ae083a4 100644 --- a/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js +++ b/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js @@ -1,7 +1,6 @@ import CookieBanner from "./template.njk"; import macroOptions from "./macro-options.json"; -import { expect } from "@storybook/jest"; -import { within, userEvent } from "@storybook/testing-library"; +import { within, userEvent, expect } from "@storybook/test"; import Cookies from "../../lib/cookies.mjs"; const argTypes = { diff --git a/src/nationalarchives/components/footer/fixtures.json b/src/nationalarchives/components/footer/fixtures.json index db3bd80d..2d4c52d0 100644 --- a/src/nationalarchives/components/footer/fixtures.json +++ b/src/nationalarchives/components/footer/fixtures.json @@ -4,7 +4,7 @@ { "name": "minimal", "options": {}, - "html": "<footer class=\"tna-footer \"><div class=\"tna-container\"><div class=\"tna-column tna-column--flex-1 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-1\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\"/><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\"/><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\"/></g></svg><h2 class=\"tna-heading-m tna-footer__title\">The National Archives</h2><address class=\"tna-footer__address\">Kew, Richmond<br />TW9 4DU</address></div></div><div class=\"tna-container\"><div class=\"tna-column--full\"><hr /></div></div><div class=\"tna-container tna-footer__licence\"><div class=\"tna-column tna-column--full-tiny\"><svg class=\"tna-footer__licence-logo\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 483.2 195.7\" width=\"60\" height=\"24\"><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></div><div class=\"tna-column tna-column--flex-1\"><p>All content is available under the <a href=\"https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/\" class=\"tna-footer__link\">Open Government Licence v3.0</a>, except where otherwise stated</p></div><div class=\"tna-column tna-column--full-tiny tna-footer__govuk\"><a href=\"https://www.gov.uk/\" class=\"tna-footer__govuk-link\"><svg class=\"tna-footer__govuk-logotype-crown\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 132 97\" width=\"44\" height=\"32\"><path fill=\"currentColor\" 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>GOV.UK</a></div></div></footer>", + "html": "<footer class=\"tna-footer \"><div class=\"tna-container\"><div class=\"tna-column tna-column--flex-1 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-1\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\"/><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\"/><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\"/></g></svg><h2 class=\"tna-heading-m tna-footer__title\">The National Archives</h2><address class=\"tna-footer__address\">Kew, Richmond<br />TW9 4DU</address></div></div><div class=\"tna-container\"><div class=\"tna-column--full\"><hr></div></div><div class=\"tna-container tna-footer__licence\"><div class=\"tna-column tna-column--full-tiny\"><svg class=\"tna-footer__licence-logo\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 483.2 195.7\" width=\"60\" height=\"24\"><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></div><div class=\"tna-column tna-column--flex-1\"><p>All content is available under the <a href=\"https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/\" class=\"tna-footer__link\">Open Government Licence v3.0</a>, except where otherwise stated</p></div><div class=\"tna-column tna-column--full-tiny tna-footer__govuk\"><a href=\"https://www.gov.uk/\" class=\"tna-footer__govuk-link\"><svg class=\"tna-footer__govuk-logotype-crown\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 132 97\" width=\"44\" height=\"32\"><path fill=\"currentColor\" 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>GOV.UK</a></div></div></footer>", "hidden": false }, { @@ -152,7 +152,7 @@ } ] }, - "html": "<footer class=\"tna-footer \"><div class=\"tna-container\"><div class=\"tna-column tna-column--flex-1 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-1\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\"/><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\"/><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\"/></g></svg><h2 class=\"tna-heading-m tna-footer__title\">The National Archives</h2><address class=\"tna-footer__address\">Kew, Richmond<br />TW9 4DU</address><div class=\"tna-footer__meta\"><p>Open today<br />09:00—19:00</p></div><nav class=\"tna-footer__social\" role=\"navigation\" aria-label=\"Social links\"><ul class=\"tna-ul tna-ul--plain tna-footer__social-items\"><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-twitter\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Twitter</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-youtube\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">YouTube</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-facebook\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Facebook</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-flickr\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Flickr</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-instagram\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Instagram</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-solid fa-fw fa-rss\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">RSS</span></a></li></ul></nav></div><div class=\"tna-footer__navigation tna-column tna-column--width-1-2 tna-column--full-medium tna-column--full-small tna-column--full-tiny tna-column--order-2 tna-column--order-4-medium tna-columns tna-columns--2 tna-columns--1-tiny\"><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"About us\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">About us</h3><ul class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our role</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our history</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our collection</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our people</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">How we are run</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our research and academic collaboration</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">News</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Contact us</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Jobs & careers</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Get involved</a></li></ul></nav><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"Our websites help\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Our websites help</h3><ul class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\" title=\"UK Government Web Archive (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">UK Government Web Archive<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\" title=\"Legislation.gov.uk (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">Legislation.gov.uk<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\" title=\"Find case law (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">Find case law<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\" title=\"The Gazette (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">The Gazette<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></li></ul></nav><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"Quick links\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Quick links</h3><ul class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Press room</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Venue hire</a></li></ul></nav></div><div class=\"tna-column tna-column--width-1-4 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-3\"><div class=\"tna-footer__mailing-list\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Join the National Archives' mailing list</h3><p>Subscribe for regular news, updates and priority booking for events.</p><div class=\"tna-button-group\"><a href=\"#\" class=\"tna-button tna-button--accent\"><i class=\"fa-solid fa-envelope\" aria-hidden=\"true\"></i>Subscribe</a></div></div></div></div><div class=\"tna-container\"><nav class=\"tna-footer__legal tna-column tna-column--full\" role=\"navigation\" aria-label=\"General site links\"><ul class=\"tna-footer__legal-items tna-ul tna-ul--plain\"><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Accessibility statement</a></li><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Freedom of information</a></li><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Terms and conditions</a></li><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Privacy policy</a></li><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Cookies</a></li></ul><hr /></nav></div><div class=\"tna-container tna-footer__licence\"><div class=\"tna-column tna-column--full-tiny\"><svg class=\"tna-footer__licence-logo\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 483.2 195.7\" width=\"60\" height=\"24\"><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></div><div class=\"tna-column tna-column--flex-1\"><p>All content is available under the <a href=\"https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/\" class=\"tna-footer__link\">Open Government Licence v3.0</a>, except where otherwise stated</p></div><div class=\"tna-column tna-column--full-tiny tna-footer__govuk\"><a href=\"https://www.gov.uk/\" class=\"tna-footer__govuk-link\"><svg class=\"tna-footer__govuk-logotype-crown\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 132 97\" width=\"44\" height=\"32\"><path fill=\"currentColor\" 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>GOV.UK</a></div></div></footer>", + "html": "<footer class=\"tna-footer \"><div class=\"tna-container\"><div class=\"tna-column tna-column--flex-1 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-1\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\"/><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\"/><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\"/></g></svg><h2 class=\"tna-heading-m tna-footer__title\">The National Archives</h2><address class=\"tna-footer__address\">Kew, Richmond<br />TW9 4DU</address><div class=\"tna-footer__meta\"><p>Open today<br />09:00—19:00</p></div><nav class=\"tna-footer__social\" role=\"navigation\" aria-label=\"Social links\"><ul class=\"tna-ul tna-ul--plain tna-footer__social-items\"><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-twitter\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Twitter</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-youtube\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">YouTube</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-facebook\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Facebook</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-flickr\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Flickr</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-brands fa-fw fa-instagram\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Instagram</span></a></li><li class=\"tna-footer__social-item\"><a href=\"#\" class=\"tna-footer__social-item-link\"><i class=\"fa-solid fa-fw fa-rss\"></i><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">RSS</span></a></li></ul></nav></div><div class=\"tna-footer__navigation tna-column tna-column--width-1-2 tna-column--full-medium tna-column--full-small tna-column--full-tiny tna-column--order-2 tna-column--order-4-medium tna-columns tna-columns--2 tna-columns--1-tiny\"><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"About us\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">About us</h3><ul class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our role</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our history</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our collection</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our people</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">How we are run</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Our research and academic collaboration</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">News</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Contact us</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Jobs & careers</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Get involved</a></li></ul></nav><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"Our websites help\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Our websites help</h3><ul class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\" title=\"UK Government Web Archive (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">UK Government Web Archive<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\" title=\"Legislation.gov.uk (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">Legislation.gov.uk<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\" title=\"Find case law (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">Find case law<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\" title=\"The Gazette (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">The Gazette<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></li></ul></nav><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"Quick links\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Quick links</h3><ul class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Press room</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"#\" class=\"tna-footer__navigation-block-item-link\">Venue hire</a></li></ul></nav></div><div class=\"tna-column tna-column--width-1-4 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-3\"><div class=\"tna-footer__mailing-list\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Join the National Archives' mailing list</h3><p>Subscribe for regular news, updates and priority booking for events.</p><div class=\"tna-button-group\"><a href=\"#\" class=\"tna-button tna-button--accent\"><i class=\"fa-solid fa-envelope\" aria-hidden=\"true\"></i>Subscribe</a></div></div></div></div><div class=\"tna-container\"><nav class=\"tna-footer__legal tna-column tna-column--full\" role=\"navigation\" aria-label=\"General site links\"><ul class=\"tna-footer__legal-items tna-ul tna-ul--plain\"><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Accessibility statement</a></li><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Freedom of information</a></li><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Terms and conditions</a></li><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Privacy policy</a></li><li class=\"tna-footer__legal-item\"><a href=\"#\" class=\"tna-footer__legal-item-link\">Cookies</a></li></ul><hr></nav></div><div class=\"tna-container tna-footer__licence\"><div class=\"tna-column tna-column--full-tiny\"><svg class=\"tna-footer__licence-logo\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 483.2 195.7\" width=\"60\" height=\"24\"><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></div><div class=\"tna-column tna-column--flex-1\"><p>All content is available under the <a href=\"https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/\" class=\"tna-footer__link\">Open Government Licence v3.0</a>, except where otherwise stated</p></div><div class=\"tna-column tna-column--full-tiny tna-footer__govuk\"><a href=\"https://www.gov.uk/\" class=\"tna-footer__govuk-link\"><svg class=\"tna-footer__govuk-logotype-crown\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 132 97\" width=\"44\" height=\"32\"><path fill=\"currentColor\" 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>GOV.UK</a></div></div></footer>", "hidden": false } ] diff --git a/src/nationalarchives/components/footer/template.njk b/src/nationalarchives/components/footer/template.njk index 991ae25d..51236bdb 100644 --- a/src/nationalarchives/components/footer/template.njk +++ b/src/nationalarchives/components/footer/template.njk @@ -104,11 +104,11 @@ </li> {%- endfor -%} </ul> - <hr /> + <hr> </nav> {%- else -%} <div class="tna-column--full"> - <hr /> + <hr> </div> {%- endif -%} </div> diff --git a/src/nationalarchives/components/header/header.stories.js b/src/nationalarchives/components/header/header.stories.js index 111cccf9..a2b55fef 100644 --- a/src/nationalarchives/components/header/header.stories.js +++ b/src/nationalarchives/components/header/header.stories.js @@ -1,7 +1,6 @@ import Header from "./template.njk"; import macroOptions from "./macro-options.json"; -import { expect } from "@storybook/jest"; -import { within, userEvent } from "@storybook/testing-library"; +import { within, userEvent, expect } from "@storybook/test"; import { customViewports } from "../../../../.storybook/viewports"; const argTypes = { diff --git a/src/nationalarchives/components/header/template.njk b/src/nationalarchives/components/header/template.njk index ca165d05..de3e8913 100644 --- a/src/nationalarchives/components/header/template.njk +++ b/src/nationalarchives/components/header/template.njk @@ -7,7 +7,7 @@ <div class="tna-header__exit"> <div class="tna-container"> <div class="tna-column tna-column--full"> - <a href="{{ params.exit.href }}" class="tna-header__exit-link"{%- if params.exit.target %} target="{{ params.exit.target }}"{%- endif -%}> + <a href="{{ params.exit.href }}" class="tna-header__exit-link"{%- if params.exit.target %} target="{{ params.exit.target }}"{% endif %}> {{ params.exit.text }} {%- if params.exit.target == "_blank" -%} <i class="fa-solid fa-arrow-up-right-from-square"></i> diff --git a/src/nationalarchives/components/hero/hero.stories.js b/src/nationalarchives/components/hero/hero.stories.js index c6cd7abf..eb09ba1a 100644 --- a/src/nationalarchives/components/hero/hero.stories.js +++ b/src/nationalarchives/components/hero/hero.stories.js @@ -1,7 +1,6 @@ import Hero from "./template.njk"; import macroOptions from "./macro-options.json"; -import { expect } from "@storybook/jest"; -import { within, userEvent } from "@storybook/testing-library"; +import { within, userEvent, expect } from "@storybook/test"; import { customViewports } from "../../../../.storybook/viewports"; const argTypes = { diff --git a/src/nationalarchives/components/pagination/fixtures.json b/src/nationalarchives/components/pagination/fixtures.json index afb0c3b8..51392bbe 100644 --- a/src/nationalarchives/components/pagination/fixtures.json +++ b/src/nationalarchives/components/pagination/fixtures.json @@ -5,42 +5,42 @@ "name": "default", "options": { "previous": { - "href": "#" + "href": "#previous" }, "items": [ { "number": 1, - "href": "#" + "href": "#1" }, { "ellipsis": true }, { "number": 6, - "href": "#" + "href": "#6" }, { "number": 7, "current": true, - "href": "#" + "href": "#7" }, { "number": 8, - "href": "#" + "href": "#8" }, { "ellipsis": true }, { "number": 42, - "href": "#" + "href": "#42" } ], "next": { - "href": "#" + "href": "#next" } }, - "html": "<nav class=\"tna-pagination \" role=\"navigation\" aria-label=\"Pagination\"><div class=\"tna-pagination__prev\"><a href=\"#\" class=\"tna-button tna-button--icon-only-mobile\" rel=\"prev\"><i class=\"fa-solid fa-arrow-left\" aria-hidden=\"true\"></i>Previous</a></div><ul class=\"tna-pagination__list\"><li class=\"tna-pagination__item\"><a href=\"#\" class=\"tna-button tna-pagination__link\" aria-label=\"\">1</a></li><li class=\"tna-pagination__item tna-pagination__item--ellipses\">⋯</li><li class=\"tna-pagination__item\"><a href=\"#\" class=\"tna-button tna-pagination__link\" aria-label=\"\">6</a></li><li class=\"tna-pagination__item tna-pagination__item--current\"><a href=\"#\" class=\"tna-button tna-pagination__link tna-button--accent\" aria-label=\"\">7</a></li><li class=\"tna-pagination__item\"><a href=\"#\" class=\"tna-button tna-pagination__link\" aria-label=\"\">8</a></li><li class=\"tna-pagination__item tna-pagination__item--ellipses\">⋯</li><li class=\"tna-pagination__item\"><a href=\"#\" class=\"tna-button tna-pagination__link\" aria-label=\"\">42</a></li></ul><div class=\"tna-pagination__next\"><a href=\"#\" class=\"tna-button tna-button--icon-right tna-button--icon-only-mobile\" rel=\"next\"><i class=\"fa-solid fa-arrow-right\" aria-hidden=\"true\"></i>Next</a></div></nav>", + "html": "<nav class=\"tna-pagination \" role=\"navigation\" aria-label=\"Pagination\"><div class=\"tna-pagination__prev\"><a href=\"#previous\" class=\"tna-button tna-button--icon-only-mobile\" rel=\"prev\"><i class=\"fa-solid fa-arrow-left\" aria-hidden=\"true\"></i>Previous</a></div><ul class=\"tna-pagination__list\"><li class=\"tna-pagination__item\"><a href=\"#1\" class=\"tna-button tna-pagination__link\" aria-label=\"\">1</a></li><li class=\"tna-pagination__item tna-pagination__item--ellipses\">⋯</li><li class=\"tna-pagination__item\"><a href=\"#6\" class=\"tna-button tna-pagination__link\" aria-label=\"\">6</a></li><li class=\"tna-pagination__item tna-pagination__item--current\"><a href=\"#7\" class=\"tna-button tna-pagination__link tna-button--accent\" aria-label=\"\">7</a></li><li class=\"tna-pagination__item\"><a href=\"#8\" class=\"tna-button tna-pagination__link\" aria-label=\"\">8</a></li><li class=\"tna-pagination__item tna-pagination__item--ellipses\">⋯</li><li class=\"tna-pagination__item\"><a href=\"#42\" class=\"tna-button tna-pagination__link\" aria-label=\"\">42</a></li></ul><div class=\"tna-pagination__next\"><a href=\"#next\" class=\"tna-button tna-button--icon-right tna-button--icon-only-mobile\" rel=\"next\"><i class=\"fa-solid fa-arrow-right\" aria-hidden=\"true\"></i>Next</a></div></nav>", "hidden": false } ] diff --git a/src/nationalarchives/components/pagination/template.njk b/src/nationalarchives/components/pagination/template.njk index f417c35d..65eb3819 100644 --- a/src/nationalarchives/components/pagination/template.njk +++ b/src/nationalarchives/components/pagination/template.njk @@ -9,7 +9,7 @@ <div class="tna-pagination__prev"> {{ tnaButton({ text: params.previous.text if params.previous.text else "Previous", - href: "#", + href: params.previous.href, title: params.previous.title, icon: "arrow-left", iconOnlyOnMobile: true, @@ -46,7 +46,7 @@ <div class="tna-pagination__next"> {{ tnaButton({ text: params.next.text if params.next.text else "Next", - href: "#", + href: params.next.href, title: params.next.title, icon: "arrow-right", iconOnlyOnMobile: true, diff --git a/src/nationalarchives/components/picture/picture.scss b/src/nationalarchives/components/picture/picture.scss index caa834f9..c1215ad9 100644 --- a/src/nationalarchives/components/picture/picture.scss +++ b/src/nationalarchives/components/picture/picture.scss @@ -47,10 +47,11 @@ } &__caption { - margin: 0 2rem; + margin: 0 1rem; padding: 1rem; @include typography.relative-font-size(16); + font-style: italic; @include colour.colour-border("keyline", 1px, solid, bottom); } @@ -79,6 +80,14 @@ margin-right: 0; margin-left: 0; } + + @if grid.$gutter-width-tiny != 1.5rem { + &__caption, + &__transcript { + padding-right: grid.$gutter-width-tiny; + padding-left: grid.$gutter-width-tiny; + } + } } @include colour.on-high-contrast-and-forced-colours { diff --git a/src/nationalarchives/components/radios/macro-options.json b/src/nationalarchives/components/radios/macro-options.json index 60929808..5a267824 100644 --- a/src/nationalarchives/components/radios/macro-options.json +++ b/src/nationalarchives/components/radios/macro-options.json @@ -87,16 +87,28 @@ "required": false, "description": "" }, + { + "name": "formGroupClasses", + "type": "string", + "required": false, + "description": "Classes to add to the radios form group." + }, + { + "name": "formGroupAttributes", + "type": "string", + "required": false, + "description": "HTML attributes (for example data attributes) to add to the radios form group." + }, { "name": "classes", "type": "string", "required": false, - "description": "Classes to add to the radios." + "description": "Classes to add to the radio elements." }, { "name": "attributes", "type": "object", "required": false, - "description": "HTML attributes (for example data attributes) to add to the radios." + "description": "HTML attributes (for example data attributes) to add to the radio elements." } ] diff --git a/src/nationalarchives/components/radios/template.njk b/src/nationalarchives/components/radios/template.njk index de6e1a45..69b4dacd 100644 --- a/src/nationalarchives/components/radios/template.njk +++ b/src/nationalarchives/components/radios/template.njk @@ -2,7 +2,7 @@ {%- if params.inline -%} {%- set containerClasses = containerClasses.concat('tna-form__group--inline') -%} {%- endif -%} -<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ containerClasses | join(' ') }}"{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}> +<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ containerClasses | join(' ') }}"{% for attribute, value in params.formGroupAttributes %} {{ attribute }}="{{ value }}"{% endfor %}> <fieldset class="tna-form__fieldset"{%- if params.hint or params.error %} aria-describedby="{%- if params.hint -%}tna-form__{{ params.id }}-hint{%- endif %} {% if params.error -%}tna-form__{{ params.id }}-error{%- endif -%}"{%- endif %}> <legend class="tna-form__legend"> <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}"> @@ -22,7 +22,7 @@ <div class="tna-radios{% if params.small or params.inline %} tna-radios--small{% endif %}{% if params.inline %} tna-radios--inline{% endif %}"> {%- for item in params.items %} <div class="tna-radios__item"> - <input type="radio" id="tna-form__{{ params.id }}-{{ item.value }}" value="{{ item.value }}" name="{{ params.name }}"{% if params.selected and item.value === params.selected %} checked{% endif %}> + <input type="radio" id="tna-form__{{ params.id }}-{{ item.value }}" value="{{ item.value }}" name="{{ params.name }}"{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}{% if params.selected and item.value === params.selected %} checked{% endif %}> <label for="tna-form__{{ params.id }}-{{ item.value }}" class="tna-radios__item-label"> {{ item.text }} </label> diff --git a/src/nationalarchives/components/search-field/fixtures.json b/src/nationalarchives/components/search-field/fixtures.json index a1c3d9c4..17c0cddf 100644 --- a/src/nationalarchives/components/search-field/fixtures.json +++ b/src/nationalarchives/components/search-field/fixtures.json @@ -10,7 +10,7 @@ "id": "search1", "name": "q" }, - "html": "<div class=\"tna-search-field \"><div class=\"tna-form__group \"><div class=\"tna-form__group-contents\"><h1 class=\"tna-form__heading tna-form__heading--l\"><label class=\"tna-form__label\" for=\"tna-form__search1\">Catalogue search results</label></h1></div><div class=\"tna-search-field__fields\"><input type=\"search\" id=\"tna-form__search1\" class=\"tna-search-field__input \" name=\"q\" value=\"\" spellcheck=\"false\"><button type=\"submit\" class=\"tna-button tna-search-field__button\">Search<i class=\"fa-solid fa-fw fa-arrow-right tna-!--hide-on-tiny\"></i></button></div></div></div>", + "html": "<div class=\"tna-search-field \"><div class=\"tna-form__group\"><div class=\"tna-form__group-contents\"><h1 class=\"tna-form__heading tna-form__heading--l\"><label class=\"tna-form__label\" for=\"tna-form__search1\">Catalogue search results</label></h1></div><div class=\"tna-search-field__fields\"><input type=\"search\" id=\"tna-form__search1\" class=\"tna-search-field__input \" name=\"q\" value=\"\" spellcheck=\"false\"><button type=\"submit\" class=\"tna-button tna-search-field__button\">Search<i class=\"fa-solid fa-fw fa-arrow-right tna-!--hide-on-tiny\"></i></button></div></div></div>", "hidden": false }, { @@ -23,7 +23,7 @@ "name": "q", "value": "badgers" }, - "html": "<div class=\"tna-search-field \"><div class=\"tna-form__group \"><div class=\"tna-form__group-contents\"><h1 class=\"tna-form__heading tna-form__heading--l\"><label class=\"tna-form__label\" for=\"tna-form__search1\">Catalogue search results</label></h1></div><div class=\"tna-search-field__fields\"><input type=\"search\" id=\"tna-form__search1\" class=\"tna-search-field__input \" name=\"q\" value=\"badgers\" spellcheck=\"false\"><button type=\"submit\" class=\"tna-button tna-search-field__button\">Search<i class=\"fa-solid fa-fw fa-arrow-right tna-!--hide-on-tiny\"></i></button></div></div></div>", + "html": "<div class=\"tna-search-field \"><div class=\"tna-form__group\"><div class=\"tna-form__group-contents\"><h1 class=\"tna-form__heading tna-form__heading--l\"><label class=\"tna-form__label\" for=\"tna-form__search1\">Catalogue search results</label></h1></div><div class=\"tna-search-field__fields\"><input type=\"search\" id=\"tna-form__search1\" class=\"tna-search-field__input \" name=\"q\" value=\"badgers\" spellcheck=\"false\"><button type=\"submit\" class=\"tna-button tna-search-field__button\">Search<i class=\"fa-solid fa-fw fa-arrow-right tna-!--hide-on-tiny\"></i></button></div></div></div>", "hidden": false }, { @@ -36,7 +36,7 @@ "name": "q", "hint": "Try searching for something interesting" }, - "html": "<div class=\"tna-search-field \"><div class=\"tna-form__group \"><div class=\"tna-form__group-contents\"><h1 class=\"tna-form__heading tna-form__heading--l\"><label class=\"tna-form__label\" for=\"tna-form__search1\">Catalogue search results</label></h1><p id=\"tna-form__search1-hint\" class=\"tna-form__hint\">Try searching for something interesting</p></div><div class=\"tna-search-field__fields\"><input type=\"search\" id=\"tna-form__search1\" class=\"tna-search-field__input \" name=\"q\" value=\"\" spellcheck=\"false\" aria-describedby=\"tna-form__search1-hint\"><button type=\"submit\" class=\"tna-button tna-search-field__button\">Search<i class=\"fa-solid fa-fw fa-arrow-right tna-!--hide-on-tiny\"></i></button></div></div></div>", + "html": "<div class=\"tna-search-field \"><div class=\"tna-form__group\"><div class=\"tna-form__group-contents\"><h1 class=\"tna-form__heading tna-form__heading--l\"><label class=\"tna-form__label\" for=\"tna-form__search1\">Catalogue search results</label></h1><p id=\"tna-form__search1-hint\" class=\"tna-form__hint\">Try searching for something interesting</p></div><div class=\"tna-search-field__fields\"><input type=\"search\" id=\"tna-form__search1\" class=\"tna-search-field__input \" name=\"q\" value=\"\" spellcheck=\"false\" aria-describedby=\"tna-form__search1-hint\"><button type=\"submit\" class=\"tna-button tna-search-field__button\">Search<i class=\"fa-solid fa-fw fa-arrow-right tna-!--hide-on-tiny\"></i></button></div></div></div>", "hidden": false } ] diff --git a/src/nationalarchives/components/search-field/search-field.scss b/src/nationalarchives/components/search-field/search-field.scss index f9713553..918d9fb6 100644 --- a/src/nationalarchives/components/search-field/search-field.scss +++ b/src/nationalarchives/components/search-field/search-field.scss @@ -9,6 +9,7 @@ } &__input { + min-width: 8rem; padding: 0 0.375rem; display: block; diff --git a/src/nationalarchives/components/search-field/template.njk b/src/nationalarchives/components/search-field/template.njk index 31e148b2..bc46eb12 100644 --- a/src/nationalarchives/components/search-field/template.njk +++ b/src/nationalarchives/components/search-field/template.njk @@ -1,7 +1,7 @@ {%- set containerClasses = [params.formGroupClasses] if params.formGroupClasses else [] -%} {%- set inputClasses = [params.classes] if params.classes else [] -%} <div class="tna-search-field {{ containerClasses | join(' ') }}" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}> - <div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ containerClasses | join(' ') }}"> + <div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %}"> <div class="tna-form__group-contents"> <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}"> <label class="tna-form__label" for="tna-form__{{ params.id }}"> diff --git a/src/nationalarchives/components/select/select.scss b/src/nationalarchives/components/select/select.scss index a8b98f8e..88cefcb1 100644 --- a/src/nationalarchives/components/select/select.scss +++ b/src/nationalarchives/components/select/select.scss @@ -19,7 +19,7 @@ @include colour.colour-border("input-border", forms.$form-field-border-width); border-radius: 0; - &--plain { + &--styled { padding: 0 2.5rem 0 0.75rem; appearance: none; diff --git a/src/nationalarchives/components/sensitive-image/sensitive-image.stories.js b/src/nationalarchives/components/sensitive-image/sensitive-image.stories.js index d7db1eca..a23c37fa 100644 --- a/src/nationalarchives/components/sensitive-image/sensitive-image.stories.js +++ b/src/nationalarchives/components/sensitive-image/sensitive-image.stories.js @@ -1,7 +1,6 @@ import SensitiveImage from "./template.njk"; import macroOptions from "./macro-options.json"; -import { expect } from "@storybook/jest"; -import { within, userEvent } from "@storybook/testing-library"; +import { within, userEvent, expect } from "@storybook/test"; const argTypes = { src: { control: "text" }, diff --git a/src/nationalarchives/components/skip-link/skip-link.stories.js b/src/nationalarchives/components/skip-link/skip-link.stories.js index 9b3ccff5..8bf02caf 100644 --- a/src/nationalarchives/components/skip-link/skip-link.stories.js +++ b/src/nationalarchives/components/skip-link/skip-link.stories.js @@ -1,7 +1,6 @@ import SkipLink from "./template.njk"; import macroOptions from "./macro-options.json"; -import { expect } from "@storybook/jest"; -import { within, userEvent } from "@storybook/testing-library"; +import { within, userEvent, expect } from "@storybook/test"; const argTypes = { text: { control: "text" }, diff --git a/src/nationalarchives/components/tabs/tabs.stories.js b/src/nationalarchives/components/tabs/tabs.stories.js index 2d4dafe0..1266b355 100644 --- a/src/nationalarchives/components/tabs/tabs.stories.js +++ b/src/nationalarchives/components/tabs/tabs.stories.js @@ -1,7 +1,6 @@ import Tabs from "./template.njk"; import macroOptions from "./macro-options.json"; -import { expect } from "@storybook/jest"; -import { within, userEvent } from "@storybook/testing-library"; +import { within, userEvent, expect } from "@storybook/test"; const argTypes = { items: { control: "object" }, diff --git a/src/nationalarchives/font-awesome.scss b/src/nationalarchives/font-awesome.scss new file mode 100644 index 00000000..39f08768 --- /dev/null +++ b/src/nationalarchives/font-awesome.scss @@ -0,0 +1,6 @@ +@use "variables/assets"; + +$fa-font-path: assets.$fa-font-path; +@import "lib/font-awesome/fontawesome"; +@import "lib/font-awesome/solid"; +@import "lib/font-awesome/brands"; diff --git a/src/nationalarchives/lib/_font-awesome.scss b/src/nationalarchives/lib/_font-awesome.scss deleted file mode 100644 index 6022720c..00000000 --- a/src/nationalarchives/lib/_font-awesome.scss +++ /dev/null @@ -1,6 +0,0 @@ -@use "../variables/assets"; - -$fa-font-path: assets.$fa-font-path; -@import "font-awesome/fontawesome"; -@import "font-awesome/solid"; -@import "font-awesome/brands"; diff --git a/src/nationalarchives/lib/_index.scss b/src/nationalarchives/lib/_index.scss deleted file mode 100644 index f2622b93..00000000 --- a/src/nationalarchives/lib/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@use "font-awesome"; diff --git a/src/nationalarchives/stories/utilities/colour-schemes/colour-combinations.stories.js b/src/nationalarchives/stories/utilities/colour-schemes/colour-combinations.stories.js index 27d8a694..74de0c5c 100644 --- a/src/nationalarchives/stories/utilities/colour-schemes/colour-combinations.stories.js +++ b/src/nationalarchives/stories/utilities/colour-schemes/colour-combinations.stories.js @@ -87,9 +87,10 @@ const Template = () => { </ul> ${TextInput({ params: { + label: "Input", id: `name-${theme}-${block}-${accent}`, name: `name-${theme}-${block}-${accent}`, - value: `name-${theme}-${block}-${accent}`, + value: `Lorem ipsum`, }, })} ${Checkboxes({ @@ -132,6 +133,7 @@ const Template = () => { })} ${Select({ params: { + label: "Select", id: `sort-${theme}-${block}-${accent}`, name: `sort-${theme}-${block}-${accent}`, items: [ diff --git a/src/nationalarchives/templates/layouts/_generic.njk b/src/nationalarchives/templates/layouts/_generic.njk index c03cdddd..19711413 100644 --- a/src/nationalarchives/templates/layouts/_generic.njk +++ b/src/nationalarchives/templates/layouts/_generic.njk @@ -1,13 +1,18 @@ {# Based on https://github.com/alphagov/govuk-frontend/blob/8b6bf304b9fc891f64459c25a08f3d623f3fea72/packages/govuk-frontend/src/govuk/template.njk #} + {% from "nationalarchives/components/cookie-banner/macro.njk" import tnaCookieBanner -%} {% from "nationalarchives/components/footer/macro.njk" import tnaFooter -%} {% from "nationalarchives/components/header/macro.njk" import tnaHeader -%} {% from "nationalarchives/components/skip-link/macro.njk" import tnaSkipLink -%} + +{% set siteTitle = 'The National Archives' %} +{% set pageTitle = '' %} + <!DOCTYPE html> -<html lang="{{ htmlLang | default('en-GB') }}" class="tna-template tna-template--{{ theme | default('system') }}-theme tna-template--{{ themeAccent | default('black') }}-accent {{ htmlClasses }}"> +<html lang="{{ htmlLang | default('en') }}" class="tna-template tna-template--{{ theme | default('system') }}-theme tna-template--{{ themeAccent | default('black') }}-accent {{ htmlClasses }}"{% for attribute, value in htmlAttributes %} {{attribute}}="{{value}}"{% endfor %}> <head> <meta charset="utf-8"> - <title>{% block pageTitle %}The National Archives{% endblock %}</title> + <title>{% block pageTitle %}{% if pageTitle %}{{ pageTitle }} - {{ siteTitle }}{% else %}{{ siteTitle }}{% endif %}{% endblock %}</title> <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover"> <meta name="theme-color" content="{{ themeColor | default('#000000') }}"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> @@ -15,10 +20,18 @@ {% block headIcons %} <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{ assetPath | default('/assets') }}/images/favicon.ico" type="image/x-icon"> <link rel="mask-icon" href="{{ assetPath | default('/assets') }}/images/mask-icon.svg" color="{{ themeColor | default('#000000') }}"> - <link rel="apple-touch-icon" sizes="180x180" href="{{ assetPath | default('/assets') }}/images/apple-touch-icon-180x180.png"> - <link rel="apple-touch-icon" sizes="167x167" href="{{ assetPath | default('/assets') }}/images/apple-touch-icon-167x167.png"> - <link rel="apple-touch-icon" sizes="152x152" href="{{ assetPath | default('/assets') }}/images/apple-touch-icon-152x152.png"> - <link rel="apple-touch-icon" href="{{ assetPath | default('/assets') }}/images/apple-touch-icon.png"> + <link rel="apple-touch-icon" sizes="48x48" href="{{ assetPath | default('/assets') }}/images/icon-48x48.png"> + <link rel="apple-touch-icon" sizes="72x72" href="{{ assetPath | default('/assets') }}/images/icon-72x72.png"> + <link rel="apple-touch-icon" sizes="96x96" href="{{ assetPath | default('/assets') }}/images/icon-96x96.png"> + <link rel="apple-touch-icon" sizes="120x120" href="{{ assetPath | default('/assets') }}/images/icon-120x120.png"> + <link rel="apple-touch-icon" sizes="144x144" href="{{ assetPath | default('/assets') }}/images/icon-144x144.png"> + <link rel="apple-touch-icon" sizes="152x152" href="{{ assetPath | default('/assets') }}/images/icon-152x152.png"> + <link rel="apple-touch-icon" sizes="167x167" href="{{ assetPath | default('/assets') }}/images/icon-167x167.png"> + <link rel="apple-touch-icon" sizes="180x180" href="{{ assetPath | default('/assets') }}/images/icon-180x180.png"> + <link rel="apple-touch-icon" sizes="192x192" href="{{ assetPath | default('/assets') }}/images/icon-192x192.png"> + <link rel="apple-touch-icon" sizes="256x256" href="{{ assetPath | default('/assets') }}/images/icon-256x256.png"> + <link rel="apple-touch-icon" sizes="512x512" href="{{ assetPath | default('/assets') }}/images/icon-512x512.png"> + <link rel="apple-touch-icon" sizes="1024x1024" href="{{ assetPath | default('/assets') }}/images/icon-1024x1024.png"> {% endblock %} {% block head %}{% endblock %} diff --git a/src/nationalarchives/tools/_colour.scss b/src/nationalarchives/tools/_colour.scss index 2407a6e7..16f4bcdb 100644 --- a/src/nationalarchives/tools/_colour.scss +++ b/src/nationalarchives/tools/_colour.scss @@ -150,18 +150,38 @@ fill: var(--#{$colour}) if($important, !important, null); } +%light { + @include colour-css-vars; + + @media (prefers-contrast: more) { + @include colour-css-vars-high-contrast; + } +} + +@mixin light { + @extend %light; +} + +%dark { + @include colour-css-vars-dark; + + @media (prefers-contrast: more) { + @include colour-css-vars-high-contrast-dark; + } +} + +@mixin dark { + @extend %dark; +} + %plain { .tna-template--system-theme & { - @include colour-css-vars; + @extend %light; @media (prefers-color-scheme: dark) { @include colour-css-vars-dark; } - @media (prefers-contrast: more) { - @include colour-css-vars-high-contrast; - } - @media (prefers-contrast: more) and (prefers-color-scheme: dark) { @include colour-css-vars-high-contrast-dark; } @@ -190,22 +210,6 @@ @extend %plain; } -@mixin light { - @include colour-css-vars; - - @media (prefers-contrast: more) { - @include colour-css-vars-high-contrast; - } -} - -@mixin dark { - @include colour-css-vars-dark; - - @media (prefers-contrast: more) { - @include colour-css-vars-high-contrast-dark; - } -} - %contrast { --background: var(--contrast-background); --font-base: var(--contrast-font-base); diff --git a/src/nationalarchives/utilities/_colour.scss b/src/nationalarchives/utilities/_colour.scss index 7c6a4e87..494994a8 100644 --- a/src/nationalarchives/utilities/_colour.scss +++ b/src/nationalarchives/utilities/_colour.scss @@ -1,8 +1,8 @@ @use "../tools/colour"; -:root { - @include colour.colour-css-vars; -} +// :root { +// @include colour.colour-css-vars; +// } .tna-template { @include colour.colour-background("page-background"); diff --git a/src/nationalarchives/utilities/_typography.scss b/src/nationalarchives/utilities/_typography.scss index e8cf4f64..815ce0ae 100644 --- a/src/nationalarchives/utilities/_typography.scss +++ b/src/nationalarchives/utilities/_typography.scss @@ -17,6 +17,14 @@ // font-display: swap; } + @font-face { + font-family: "Open Sans"; + src: url("#{assets.$tna-font-path}/OpenSans-Italic.ttf"); + font-weight: typographyVars.$main-font-weight; + font-style: italic; + // font-display: swap; + } + @font-face { font-family: "Open Sans"; src: url("#{assets.$tna-font-path}/OpenSans-Bold.ttf"); @@ -41,7 +49,7 @@ // font-display: swap; } } @else { - @import url("https://fonts.googleapis.com/css2?family=Open+Sans:wght@#{typographyVars.$main-font-weight};#{typographyVars.$main-font-weight-bold}&family=Roboto+Mono:wght@#{typographyVars.$detail-font-weight};#{typographyVars.$detail-font-weight-bold}&display=swap"); /* stylelint-disable-line */ + @import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,#{typographyVars.$main-font-weight};0,#{typographyVars.$main-font-weight-bold};1,#{typographyVars.$main-font-weight}&family=Roboto+Mono:wght@#{typographyVars.$detail-font-weight};#{typographyVars.$detail-font-weight-bold}&display=swap"); /* stylelint-disable-line */ } .tna-template { @@ -208,15 +216,14 @@ small { %heading { @include colour.colour-font("font-dark"); + text-wrap: pretty; &:not(.tna-heading--no-link-arrow) { a { display: inline-block; - // text-wrap: balance; - &::after { - padding-left: 0.25rem; + padding-left: 0.5rem; display: inline-block; @@ -225,11 +232,11 @@ small { content: "\203A"; } - // &:hover { - // &::after { - // padding-left: 0.5rem; - // } - // } + &:hover { + &::after { + padding-left: 0.75rem; + } + } } } } diff --git a/src/nationalarchives/variables/_typography.scss b/src/nationalarchives/variables/_typography.scss index 667dda0f..66333ad9 100644 --- a/src/nationalarchives/variables/_typography.scss +++ b/src/nationalarchives/variables/_typography.scss @@ -10,7 +10,8 @@ $body-line-height: #{math.div($relative-1rem-px, $body-font-size-px) * 2} !defau $interactive-text-decoration-thickness: 3.5px !default; -$main-font-family: "Open Sans", sans-serif !default; +$main-font: "Open Sans" !default; +$main-font-family: $main-font, sans-serif !default; $main-font-weight: 400 !default; $main-font-weight-bold: 700 !default; diff --git a/tasks/test-package.js b/tasks/test-package.js index 2f9005fd..f893f182 100644 --- a/tasks/test-package.js +++ b/tasks/test-package.js @@ -41,6 +41,12 @@ const checkExists = [ "nationalarchives/all.js.map", "nationalarchives/all.mjs", "nationalarchives/all.scss", + "nationalarchives/font-awesome.css", + "nationalarchives/font-awesome.css.map", + "nationalarchives/font-awesome.scss", + "nationalarchives/prototype-kit.css", + "nationalarchives/prototype-kit.css.map", + "nationalarchives/prototype-kit.scss", // Assets "nationalarchives/assets/fonts/fa-brands-400.ttf", "nationalarchives/assets/fonts/fa-brands-400.woff2", @@ -50,10 +56,18 @@ const checkExists = [ "nationalarchives/assets/fonts/OpenSans-Regular.ttf", "nationalarchives/assets/fonts/RobotoMono-Medium.ttf", "nationalarchives/assets/fonts/RobotoMono-Regular.ttf", - "nationalarchives/assets/images/apple-touch-icon-152x152.png", - "nationalarchives/assets/images/apple-touch-icon-167x167.png", - "nationalarchives/assets/images/apple-touch-icon-180x180.png", - "nationalarchives/assets/images/apple-touch-icon.png", + "nationalarchives/assets/images/icon-48x48.png", + "nationalarchives/assets/images/icon-72x72.png", + "nationalarchives/assets/images/icon-96x96.png", + "nationalarchives/assets/images/icon-120x120.png", + "nationalarchives/assets/images/icon-144x144.png", + "nationalarchives/assets/images/icon-152x152.png", + "nationalarchives/assets/images/icon-167x167.png", + "nationalarchives/assets/images/icon-180x180.png", + "nationalarchives/assets/images/icon-192x192.png", + "nationalarchives/assets/images/icon-256x256.png", + "nationalarchives/assets/images/icon-512x512.png", + "nationalarchives/assets/images/icon-1024x1024.png", "nationalarchives/assets/images/favicon.ico", "nationalarchives/assets/images/mask-icon.svg", "nationalarchives/assets/images/mstile-150x150.png", @@ -64,6 +78,7 @@ const checkExists = [ ...componentFiles("button"), ...componentFiles("card"), ...componentFiles("checkboxes"), + ...componentFiles("compound-filters"), ...componentFiles("cookie-banner", "CookieBanner"), ...componentFiles("date-input"), ...componentFiles("date-search"),