From 2132841cc7a4232a2d4ac309d1b823f67d57edc6 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Tue, 26 Dec 2023 16:13:23 +0000 Subject: [PATCH 01/34] Storybook updates (#68) * Update Storybook and use new test library * Remove test parameter from build * Edit Storybook config --- .github/actions/tests/action.yml | 2 +- package-lock.json | 1269 ++++++++++++----- package.json | 21 +- .../breadcrumbs/breadcrumbs.stories.js | 3 +- .../cookie-banner/cookie-banner.stories.js | 3 +- .../components/header/header.stories.js | 3 +- .../components/hero/hero.stories.js | 3 +- .../sensitive-image.stories.js | 3 +- .../components/skip-link/skip-link.stories.js | 3 +- .../components/tabs/tabs.stories.js | 3 +- 10 files changed, 937 insertions(+), 376 deletions(-) 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/package-lock.json b/package-lock.json index 41242f1f..7304cb18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,17 +13,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", @@ -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..df630191 100644 --- a/package.json +++ b/package.json @@ -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/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/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/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/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/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" }, From 9c7363be3a2cb32d5364cc474e28675689e0f8dc Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Fri, 29 Dec 2023 11:24:00 +0000 Subject: [PATCH 02/34] Button icons, picture captions, headings (#69) * Update button and picture elements * Fix test issues * Fix colour combinations --- .storybook/storybook.scss | 6 ++++ CHANGELOG.md | 5 +++ src/nationalarchives/all.scss | 16 +++++---- .../components/button/button.scss | 35 +++++++++---------- .../components/footer/fixtures.json | 4 +-- .../components/footer/template.njk | 4 +-- .../components/header/template.njk | 2 +- .../components/picture/picture.scss | 11 +++++- .../components/select/select.scss | 2 +- .../colour-combinations.stories.js | 4 ++- .../templates/layouts/_generic.njk | 7 +++- .../utilities/_typography.scss | 13 ++++--- 12 files changed, 68 insertions(+), 41 deletions(-) diff --git a/.storybook/storybook.scss b/.storybook/storybook.scss index 9e98832b..9501e218 100644 --- a/.storybook/storybook.scss +++ b/.storybook/storybook.scss @@ -259,6 +259,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/CHANGELOG.md b/CHANGELOG.md index fb2367b0..e5c60a5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ 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 +- 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 `
` to `
`) +- Italicise picture element captions to distinguish from regular text +- Use `text-wrap: pretty;` for headings ### Deprecated ### Removed diff --git a/src/nationalarchives/all.scss b/src/nationalarchives/all.scss index 7c7352f8..60630fc1 100644 --- a/src/nationalarchives/all.scss +++ b/src/nationalarchives/all.scss @@ -1,13 +1,15 @@ /*! - * ------------------------------------------------ - * 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"; 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/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": "", + "html": "", "hidden": false }, { @@ -152,7 +152,7 @@ } ] }, - "html": "", + "html": "", "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 @@ {%- endfor -%} -
+
{%- else -%}
-
+
{%- endif -%} 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 @@
- + {{ params.exit.text }} {%- if params.exit.target == "_blank" -%} 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/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/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 = () => { ${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..543bd2fe 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 = '' %} + - {% block pageTitle %}The National Archives{% endblock %} + {% block pageTitle %}{% if pageTitle %}{{ pageTitle }} - {{ siteTitle }}{% else %}{{ siteTitle }}{% endif %}{% endblock %} diff --git a/src/nationalarchives/utilities/_typography.scss b/src/nationalarchives/utilities/_typography.scss index e8cf4f64..324d6e6d 100644 --- a/src/nationalarchives/utilities/_typography.scss +++ b/src/nationalarchives/utilities/_typography.scss @@ -208,13 +208,12 @@ 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; @@ -225,11 +224,11 @@ small { content: "\203A"; } - // &:hover { - // &::after { - // padding-left: 0.5rem; - // } - // } + &:hover { + &::after { + padding-left: 0.5rem; + } + } } } } From 9f28a2b73a80fde75fb4c722228d1f36e71e4e3b Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Fri, 29 Dec 2023 11:45:11 +0000 Subject: [PATCH 03/34] Add italic version of Open Sans (#70) --- CHANGELOG.md | 3 +++ .../assets/fonts/OpenSans-Italic.ttf | Bin 0 -> 136604 bytes .../utilities/_typography.scss | 10 +++++++++- .../variables/_typography.scss | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 src/nationalarchives/assets/fonts/OpenSans-Italic.ttf diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c60a5b..23aab921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.1.32...HEAD) ### 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` diff --git a/src/nationalarchives/assets/fonts/OpenSans-Italic.ttf b/src/nationalarchives/assets/fonts/OpenSans-Italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..29ff69386f7b74fe24f0cc85dea86771f5b7dc47 GIT binary patch literal 136604 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π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 Date: Fri, 29 Dec 2023 12:06:25 +0000 Subject: [PATCH 04/34] v0.1.33 --- CHANGELOG.md | 16 ++++++++++------ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23aab921..75be3a72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,16 @@ 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.33...HEAD) + +### Added +### Changed +### Deprecated +### Removed +### Fixed +### Security + +## [0.1.33](https://github.com/nationalarchives/tna-frontend/compare/v0.1.32...v0.1.33) - 2023-12-29 ### Added @@ -21,11 +30,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Italicise picture element captions to distinguish from regular text - Use `text-wrap: pretty;` for headings -### Deprecated -### Removed -### Fixed -### Security - ## [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 7304cb18..38439bc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nationalarchives/frontend", - "version": "0.1.32", + "version": "0.1.33", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nationalarchives/frontend", - "version": "0.1.32", + "version": "0.1.33", "license": "MIT", "devDependencies": { "@babel/core": "^7.23.2", diff --git a/package.json b/package.json index df630191..23e82f2e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nationalarchives/frontend", - "version": "0.1.32", + "version": "0.1.33", "description": "The National Archives frontend styles", "scripts": { "start": "storybook dev -p 6006", From b366bbdd2fd2f5a7e8fa7288fddb7bedeb86a3a4 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Fri, 5 Jan 2024 18:19:13 +0000 Subject: [PATCH 05/34] Add htmlAttributes to base template --- CHANGELOG.md | 3 +++ src/nationalarchives/templates/layouts/_generic.njk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75be3a72..2b8e23db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.1.33...HEAD) ### Added + +- Base template can now accept `htmlAttributes` + ### Changed ### Deprecated ### Removed diff --git a/src/nationalarchives/templates/layouts/_generic.njk b/src/nationalarchives/templates/layouts/_generic.njk index 543bd2fe..b1aff982 100644 --- a/src/nationalarchives/templates/layouts/_generic.njk +++ b/src/nationalarchives/templates/layouts/_generic.njk @@ -9,7 +9,7 @@ {% set pageTitle = '' %} - + {% block pageTitle %}{% if pageTitle %}{{ pageTitle }} - {{ siteTitle }}{% else %}{{ siteTitle }}{% endif %}{% endblock %} From ab84054912a69b26c4203389740372c0dbcd4ce2 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Mon, 8 Jan 2024 15:20:24 +0000 Subject: [PATCH 06/34] Switch classes and attributes on checkboxes and radios (#71) --- CHANGELOG.md | 3 +++ .../components/checkboxes/macro-options.json | 16 ++++++++++++++-- .../components/checkboxes/template.njk | 4 ++-- .../components/radios/macro-options.json | 16 ++++++++++++++-- .../components/radios/template.njk | 4 ++-- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b8e23db..5a2b6dba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Base template can now accept `htmlAttributes` ### 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 + ### Deprecated ### Removed ### Fixed 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 -%} -

+
@@ -22,7 +22,7 @@
{%- for item in params.items %}
- + 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 -%} -
+
@@ -22,7 +22,7 @@
{%- for item in params.items %}
- + From dc363d63aed9230cd78c9beb73ba3249e35e28fb Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Tue, 9 Jan 2024 12:49:45 +0000 Subject: [PATCH 07/34] Add compound filters (#72) * Add initial commit for compound filters * Remove background tint from filter items --- .github/actions/prototype-kit-test/action.yml | 2 + CHANGELOG.md | 1 + src/nationalarchives/components/_index.scss | 1 + .../components/compound-filters/_index.scss | 1 + .../compound-filters/compound-filters.scss | 78 +++++++++++++++++++ .../compound-filters.stories.js | 61 +++++++++++++++ .../components/compound-filters/fixtures.json | 46 +++++++++++ .../compound-filters/macro-options.json | 52 +++++++++++++ .../components/compound-filters/macro.njk | 3 + .../components/compound-filters/template.njk | 16 ++++ tasks/test-package.js | 1 + 11 files changed, 262 insertions(+) create mode 100644 src/nationalarchives/components/compound-filters/_index.scss create mode 100644 src/nationalarchives/components/compound-filters/compound-filters.scss create mode 100644 src/nationalarchives/components/compound-filters/compound-filters.stories.js create mode 100644 src/nationalarchives/components/compound-filters/fixtures.json create mode 100644 src/nationalarchives/components/compound-filters/macro-options.json create mode 100644 src/nationalarchives/components/compound-filters/macro.njk create mode 100644 src/nationalarchives/components/compound-filters/template.njk 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/CHANGELOG.md b/CHANGELOG.md index 5a2b6dba..9213cf88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Base template can now accept `htmlAttributes` +- Compound filters can be used to show currently selected search filters ### Changed 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/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": "", + "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 [] -%} + diff --git a/tasks/test-package.js b/tasks/test-package.js index 2f9005fd..e8285f48 100644 --- a/tasks/test-package.js +++ b/tasks/test-package.js @@ -64,6 +64,7 @@ const checkExists = [ ...componentFiles("button"), ...componentFiles("card"), ...componentFiles("checkboxes"), + ...componentFiles("compound-filters"), ...componentFiles("cookie-banner", "CookieBanner"), ...componentFiles("date-input"), ...componentFiles("date-search"), From 55d865cb005c7bf9cf75ad79fb7f3dcebf339c81 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Wed, 10 Jan 2024 00:26:47 +0000 Subject: [PATCH 08/34] Fix pagination previous and next links --- CHANGELOG.md | 3 +++ .../components/pagination/fixtures.json | 16 ++++++++-------- .../components/pagination/template.njk | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9213cf88..fa8707c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated ### Removed ### Fixed + +- Fixed `href` property of pagination `previous` and `next` links + ### Security ## [0.1.33](https://github.com/nationalarchives/tna-frontend/compare/v0.1.32...v0.1.33) - 2023-12-29 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": "", + "html": "", "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 @@
{{ 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 @@
{{ 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, From 46594ce9a4cf39d045bba6bf5a2e6cbb5d61a1ba Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Wed, 10 Jan 2024 09:40:02 +0000 Subject: [PATCH 09/34] v0.1.34 --- CHANGELOG.md | 15 ++++++++++----- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa8707c0..96fe700a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,16 @@ 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.33...HEAD) +## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.1.34...HEAD) + +### Added +### Changed +### Deprecated +### Removed +### Fixed +### Security + +## [0.1.34](https://github.com/nationalarchives/tna-frontend/compare/v0.1.33...v0.1.34) - 2024-01-10 ### Added @@ -16,14 +25,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Changed `attributes` to `formGroupAttributes` and `classes` to `formClasses` on checkboxes and radios - `attributes` and `classes` now get applied to each checkbox and radio element -### Deprecated -### Removed ### Fixed - Fixed `href` property of pagination `previous` and `next` links -### Security - ## [0.1.33](https://github.com/nationalarchives/tna-frontend/compare/v0.1.32...v0.1.33) - 2023-12-29 ### Added diff --git a/package-lock.json b/package-lock.json index 38439bc0..27c28751 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nationalarchives/frontend", - "version": "0.1.33", + "version": "0.1.34", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nationalarchives/frontend", - "version": "0.1.33", + "version": "0.1.34", "license": "MIT", "devDependencies": { "@babel/core": "^7.23.2", diff --git a/package.json b/package.json index 23e82f2e..5d8616f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nationalarchives/frontend", - "version": "0.1.33", + "version": "0.1.34", "description": "The National Archives frontend styles", "scripts": { "start": "storybook dev -p 6006", From e6cb72d2e910900ba076ae1c4a76e0cdb0d7ddba Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Tue, 16 Jan 2024 11:41:17 +0000 Subject: [PATCH 10/34] Fix horizontal card image aspect ratios (#73) --- CHANGELOG.md | 1 + .../components/card/card.scss | 3 ++ .../components/card/card.stories.js | 39 +++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96fe700a..7df6c865 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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 +- Images on horizontal cards are now at least a 3:2 aspect ratio ### Fixed 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", From 123302c5275751f2c6972ab7b3ad1a4e0e9f4816 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Tue, 16 Jan 2024 14:56:05 +0000 Subject: [PATCH 11/34] Add more icon sizes and rename existing icons --- CHANGELOG.md | 8 +++++++- .../assets/images/apple-touch-icon-152x152.png | Bin 6391 -> 0 bytes .../assets/images/apple-touch-icon-167x167.png | Bin 6794 -> 0 bytes .../assets/images/apple-touch-icon-180x180.png | Bin 7404 -> 0 bytes .../assets/images/apple-touch-icon.png | Bin 7404 -> 0 bytes .../assets/images/icon-1024x1024.png | Bin 0 -> 50923 bytes .../assets/images/icon-120x120.png | Bin 0 -> 2260 bytes .../assets/images/icon-144x144.png | Bin 0 -> 2806 bytes .../assets/images/icon-152x152.png | Bin 0 -> 3095 bytes .../assets/images/icon-167x167.png | Bin 0 -> 3532 bytes .../assets/images/icon-180x180.png | Bin 0 -> 3826 bytes .../assets/images/icon-192x192.png | Bin 0 -> 4144 bytes .../assets/images/icon-256x256.png | Bin 0 -> 5877 bytes .../assets/images/icon-48x48.png | Bin 0 -> 811 bytes .../assets/images/icon-512x512.png | Bin 0 -> 17212 bytes .../assets/images/icon-72x72.png | Bin 0 -> 1291 bytes .../assets/images/icon-96x96.png | Bin 0 -> 1771 bytes .../templates/layouts/_generic.njk | 16 ++++++++++++---- 18 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 src/nationalarchives/assets/images/apple-touch-icon-152x152.png delete mode 100644 src/nationalarchives/assets/images/apple-touch-icon-167x167.png delete mode 100644 src/nationalarchives/assets/images/apple-touch-icon-180x180.png delete mode 100644 src/nationalarchives/assets/images/apple-touch-icon.png create mode 100644 src/nationalarchives/assets/images/icon-1024x1024.png create mode 100644 src/nationalarchives/assets/images/icon-120x120.png create mode 100644 src/nationalarchives/assets/images/icon-144x144.png create mode 100644 src/nationalarchives/assets/images/icon-152x152.png create mode 100644 src/nationalarchives/assets/images/icon-167x167.png create mode 100644 src/nationalarchives/assets/images/icon-180x180.png create mode 100644 src/nationalarchives/assets/images/icon-192x192.png create mode 100644 src/nationalarchives/assets/images/icon-256x256.png create mode 100644 src/nationalarchives/assets/images/icon-48x48.png create mode 100644 src/nationalarchives/assets/images/icon-512x512.png create mode 100644 src/nationalarchives/assets/images/icon-72x72.png create mode 100644 src/nationalarchives/assets/images/icon-96x96.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 7df6c865..5c94676a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.1.34...HEAD) ### 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` + ### Deprecated ### Removed ### Fixed @@ -24,7 +31,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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 -- Images on horizontal cards are now at least a 3:2 aspect ratio ### Fixed 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 3f38e4f2d4642ffee19f4a1c2bcf0a55c4d67f2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6391 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 AV*mgE 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 e066bb32429caf0e3e3ccd0019a2da41d55ac5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6794 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 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 ab744df146a46a432bfc003031e11439976da534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7404 zcmbtZcTf{=yA6nlN)b^}sz^r&5K6!hdjACwK}6{yy%*_CDUq%sLg-BasY+-Gh=71d zkkBD?P^5<55%0_Q*S+)2+_`0jBukRr>^|>#&U4P$=)1ZabQf4IKp+r0Elt&X;1zrN zprHoO$Zl#FcscK``Opgjxs-nTpzw~)_y@ds!&}YR+rZ7%+t8tYN~2b^ZdLbRk7KLOCNI6 zK76&W&>H-pl@_2CG4R27Ogn9$z3}S?hw9=^CjCoSxX)i!Q*5wMp;S^*t*5~)lYgu+ zgdj#okD&Ol!Y%)-EjfhOWc^CU+7JI8LIyh{gpyw4<_kQIk}U!0(HA7+F-xVatc?2v zeXjcM9+#XP8^rz3;ZseX*U<7;>qQ?vfDb7lB1-4Zo#Pf3F6|QHH8d2u`iJe>wf3{C z5SoK#r+Mf(jl1qjUQ}n9CI1f_kxBkcTXI4Bm+(HTpJW?VZ#7qh{&9MfoSa)(`LbOv z^UhU$eSN-uX-P@To-Cv!8zbYh#r{GG>2nMms`u|F-+y{Jw$1o+Q2l)enTa!$VdD+{ zNh8|#?_cfxY2C$@tbLv43JVLHy>xVRwyQLGo}q7c=^VoayKDG#8-u|7oMLO8}iOaQk+6N=k|rtCJmsV*2=CYkhZDIzXO>hwAg^ z&qlwy76WkAIT8{QuP_*gy&xtgCY`Lm%NBoQEdDG#@DWX!^Q-G>X1robWK-%bGfUXs z_U7T`#bE2fuh0L;bh`i9B531mP*6}@76UCUR!Bj2FW2Pa9RUFv6*PTy;OAGbUIi_g z4 zTR)zEcP~1{Jm5Se^lU6QtxU_S{r}%rc`q85-SrE89+Tz?~6-H zRGge{)9o$xcdVF5`mRm3wW1j?buV9DI;=QgaddP{Z7AcFk-1)8ULJ4|5fP!tmxR#? z-C4SCXlR&IQ*$li(*Dtr_5S+Ii

CMaOHOkLZPxW1`MbQclm$+rqj5A~*IotXasz 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 XetfeOF5w-xQwh;h(^V~3wtW5{!Rwu= 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 ab744df146a46a432bfc003031e11439976da534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7404 zcmbtZcTf{=yA6nlN)b^}sz^r&5K6!hdjACwK}6{yy%*_CDUq%sLg-BasY+-Gh=71d zkkBD?P^5<55%0_Q*S+)2+_`0jBukRr>^|>#&U4P$=)1ZabQf4IKp+r0Elt&X;1zrN zprHoO$Zl#FcscK``Opgjxs-nTpzw~)_y@ds!&}YR+rZ7%+t8tYN~2b^ZdLbRk7KLOCNI6 zK76&W&>H-pl@_2CG4R27Ogn9$z3}S?hw9=^CjCoSxX)i!Q*5wMp;S^*t*5~)lYgu+ zgdj#okD&Ol!Y%)-EjfhOWc^CU+7JI8LIyh{gpyw4<_kQIk}U!0(HA7+F-xVatc?2v zeXjcM9+#XP8^rz3;ZseX*U<7;>qQ?vfDb7lB1-4Zo#Pf3F6|QHH8d2u`iJe>wf3{C z5SoK#r+Mf(jl1qjUQ}n9CI1f_kxBkcTXI4Bm+(HTpJW?VZ#7qh{&9MfoSa)(`LbOv z^UhU$eSN-uX-P@To-Cv!8zbYh#r{GG>2nMms`u|F-+y{Jw$1o+Q2l)enTa!$VdD+{ zNh8|#?_cfxY2C$@tbLv43JVLHy>xVRwyQLGo}q7c=^VoayKDG#8-u|7oMLO8}iOaQk+6N=k|rtCJmsV*2=CYkhZDIzXO>hwAg^ z&qlwy76WkAIT8{QuP_*gy&xtgCY`Lm%NBoQEdDG#@DWX!^Q-G>X1robWK-%bGfUXs z_U7T`#bE2fuh0L;bh`i9B531mP*6}@76UCUR!Bj2FW2Pa9RUFv6*PTy;OAGbUIi_g z4 zTR)zEcP~1{Jm5Se^lU6QtxU_S{r}%rc`q85-SrE89+Tz?~6-H zRGge{)9o$xcdVF5`mRm3wW1j?buV9DI;=QgaddP{Z7AcFk-1)8ULJ4|5fP!tmxR#? z-C4SCXlR&IQ*$li(*Dtr_5S+Ii

CMaOHOkLZPxW1`MbQclm$+rqj5A~*IotXasz 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 XetfeOF5w-xQwh;h(^V~3wtW5{!Rwu= diff --git a/src/nationalarchives/assets/images/icon-1024x1024.png b/src/nationalarchives/assets/images/icon-1024x1024.png new file mode 100644 index 0000000000000000000000000000000000000000..8ff0a27667df8924ac5062eabffd43c7e555b186 GIT binary patch literal 50923 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

;tz57WijoFYVU@uu;q~hX6>Q^zB1oUX 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

4LI9=*j;}x;-U+A+%Qaa}JWwh&gGV%nD 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 Wy?K?ny%qrfZfWY>$i8Ox=l=lTE9ImB literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-120x120.png b/src/nationalarchives/assets/images/icon-120x120.png new file mode 100644 index 0000000000000000000000000000000000000000..4085959b4264af96e68f704b30e71a4ecfa7c290 GIT binary patch literal 2260 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 pYi`OG_=Cdosl<@d%Hl;0sa9y{fls^#{r~3lNm! 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 literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-167x167.png b/src/nationalarchives/assets/images/icon-167x167.png new file mode 100644 index 0000000000000000000000000000000000000000..2ddcccd6a1568f6a7b3242819000911943bd3748 GIT binary patch literal 3532 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 KbhB+>`hNmP^ym)& literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-180x180.png b/src/nationalarchives/assets/images/icon-180x180.png new file mode 100644 index 0000000000000000000000000000000000000000..9419691cc9a13ed2a70292a11240f556da812308 GIT binary patch literal 3826 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 literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-192x192.png b/src/nationalarchives/assets/images/icon-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..aaf6eb36a7fe43e3a95e3c9c6bad5d1e1a976059 GIT binary patch literal 4144 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 literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-256x256.png b/src/nationalarchives/assets/images/icon-256x256.png new file mode 100644 index 0000000000000000000000000000000000000000..bd77463eda556af9a43066bd9364967b2aee5056 GIT binary patch literal 5877 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 LT_`($Ip#kAAbmy% literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-48x48.png b/src/nationalarchives/assets/images/icon-48x48.png new file mode 100644 index 0000000000000000000000000000000000000000..117ac8a2d2189d510815bad71ea7f0a93e4426af GIT binary patch literal 811 zcmV+`1JwM9P)Px%2#{1|Mhyk%N>THihSwa0L+=Td0-*%k|89kozLe^XJVHm zBv<;r@1|+$j>qG}6qn28;eJyOpsdb*Ee##OIF8vQ-4y^WSyEPqERP4|9eFCX((DcZ zp`;M=5Xynr6#!X2l>;9WLOB3lWn)3y)B{r3SEAH43bORXJlGsSY5i{i-YI0IR`>D$ z;sMcV*7r4)Cx>dXQ5opYMr+aCwG9&GsUB6O)3pIq?*|%yl2s^I#Js@8LY69MaV2uO zbHy^gOJSJ}AyH=WdnI_J)=D0@zxNKJ6*Tc0L%$%UwbJ=Bji>iOmgdxaelOCPI~DfGp#iQ(Su(r91%G7|(o*SBQBx z6b;iV05lQ8-Kw5|DFAax?B0_6xM_eqonZ;7#%VT*<1(6CA~iwkTPA*X8O_b-2^=X; ztHiab!jk;&@IdYD^(8Boy#L!?Z~Z`t84JdKM-J5dLsMYfr-m*TG8Gp{maZvEz5^GZ z$HK+#c5V}l_b!voVr1ujfz1NYOL)Ho!tG&_Fi7YH-$szW6%S>AtU*Ua6PzPa-JN&E ze-CoeVm|=?008$nN}cNi;#NFhv1}xMPQPiWQeMacaLX`RY*YXhJ0?8mT*v{?Q^=xF zb7!VBG|~aDyc|MKq2s>*36?@k002TK=0N-z0!t-qkmX>UAYzbIYnk;xjCXHf=%`Rc zVM8MN(t*`t4(K@^W^C+@V+iH?f-C?ZfN%-*UrgQ)>m7{=iZ221@W7iGfO%vr=6xv# po?3)=@KLM8TRY)9Jn-rLzz<;->+RI{Zn6LX002ovPDHLkV1k;;Z8-n{ literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-512x512.png b/src/nationalarchives/assets/images/icon-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..a34b1f604c5152f55ef6d05092c80a8658acebfa GIT binary patch literal 17212 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 literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-72x72.png b/src/nationalarchives/assets/images/icon-72x72.png new file mode 100644 index 0000000000000000000000000000000000000000..60503207bd48229930d39e4b0b743487c5fd5be1 GIT binary patch literal 1291 zcmV+m1@!ufP)Px(#Ysd#RCr$PoDELvKn#S_lTl6voD4WwpQh4>Mt}LiycAF$w(n`S}GB8+&?sIv>}^Qv{8FdwbhX zr_=e|;c)m53|-p_<97!T%wgjK1CV5&GXTB3yiDgc1<=6e9}*y$3?IxfnwXF2Wyuc* zP`r1-p|^Zc&;R%>#@*d&ln)x*tQJ5w1V~X&k&I8TobhlzXeP|Zz|{-;cMH(IJDT~c z3!q2MgXTG~Z)7p37*q_}hrqou$n%t&A~2X-w<@}yTSXp~ZVu{;ts>BGDkoc8%37)~ zwi-ao)uaoc)esoSQw%DA_EEMNbPWb6H&H$i%ca?U6Kx`;4XXR_ca(z~wZdp@8&TJ0 z4(dm7Zq12ojP+w#DJHHr;@1>|B!stkdTk%|!SvA>ZQN_i0$Ilej=tF(^=qn@jL~>D z3E0d5sL1B+DCY5N^?U5ujlj|QivR)`go}MKFU#s28%L`;mTklf{9a6B^A2_dEdxmF z(Aad={|G=5h)s?Faxi+D7C>3e8x6t)XBfw_dBtJ@9Xr1_2PiHY0YWed;=j)@s3pAC z5C{=O*a(Oy!{-6KXu{6yk(pg&VmLyCbGjo8CKAD$Wl$7814v_-U+cN)W&ma2jez0& z#Q;eFgkut%F%FdDX#NrgxmmVMOaQq;v@X|qkYL^D!>-OCE#xNSQH{mXv{waO@DYQe zLv~PMWi&(9^l+|YL_r<*R`|_)Py`6g(sq{iqR-(P02~42VHl7x;g%1H=|@Z(B6B@w zaue&dxu;AFKs;o6@+c6r8Bf;OFo{_&q016QHjpKN*?5iPxq!G~!aj03IHP9;rU9CD zYL7Oq02*kt04jj?8GSLR7<45D`7?z3rhKfc&wVky4pn`zT(MsOt@6IuYWyoFT~2x* zCyPPFpdVxqcgy}5FUKTC@A2N=wedR2D3mLhJDYOk{9zSyJYiwIXD93O$Jx!%v(s)0MWGbt_A|@n|e&_Tk*aa=c({X zXlg`z0Lp66u`cC3HS)dq(oM?{rvdU_lO}8R##&tnHvx+5mja|YVl%-1&Z?GdJZmCQ z67G4aX@FY2rnsp$IkUv=Inut!?7j7{K;So6c44*$^8LZJf{(h{t zf;>vah~+?yT0m0((Q9%od%Fjp)H1iMAO9UE9Uq#Y0zr|!=YtqCGxj1Ab1nNKXfAV- zu*fwUue}C9ZqDv!G9NUfyv$h-8I(2KTvOhD#wU0xkolSK=0PzMYQ5|Uk}MDMl!Qlb zu!3DtOdHfhnH~E=E<8~x9wQ@;$73JM*VJ74>5XB7jLm|9j`cMhc)AfRs+GM(vg4`3LK2MJfYd)5QP)002ovPDHLkV1fdD BT*?3d literal 0 HcmV?d00001 diff --git a/src/nationalarchives/assets/images/icon-96x96.png b/src/nationalarchives/assets/images/icon-96x96.png new file mode 100644 index 0000000000000000000000000000000000000000..8529bf4d7edae7e477d2b1f13294d8bd692fbfbe GIT binary patch literal 1771 zcmV;P)Px*rAb6VRCr$PU29t0FbrHy2Am8y8E~>~wO@x$r;=ZZal&fBNS%Y+!6`0efO^7#08O4&a?J}xHzjez&}_fsz7_4W0}9ll42 zTydQd@cjIo1grqx=1c-sA^&IIBp?acjzGqM?HFzvAqm(7-}Z}>fbAG=8sTmTu!UOE zQ2Jc2*UQ6$r4_$3yX*hSwYHVUw4~5-liKHQ2td{bKaQ19~jS%2v;FjICBv*Gs z0Ba)lub!rl5Mak3Ens`rkOYXUNdjt4^KbibB9<1=4sxmIR02G|j<|sU%|TfEw*+85 zgd25X`#?E1%2WbsyCr}Z?X0|ARK@@~L@EVgPlN5~m9K#Xc=sY&?@eS7&LBMIf3_S) zXAmC7{GSV_#( zUC?w?J0?g1I>4IIH3^u3YR8yKKnGYex+VcLQ0*8q3FrW8M%N@@2C5xn{ul!6IN*$* z&(F`B*p|4R?PIcAGJ30yZaw}z+aixH?-v1QEl)o>z%}{o9{Q=D52!8h=FTuNCFlkuz32kfHM++^xu*>Jfh`29|V%|s*QM6_EnsvVD`2wx7;C`BLqRlG;C|zgrmI{$u z4QmqtHVH4NM1TQk?a)pTz#56O5$l7q9rRZMlu!emZ}Kw<5&6(!E06RDVC5*ax0X?Q zq--XD1*?^-08H!W9esc#ZNs=c7r;?%_heu#*SRAL;Ic_5h626R0z5Dy0<;FyfZjqt ziD=U@C6eb?ZSNsKWnM}E+z-2k9s)d*Znc0`0$?2svdPU>5D~!OdKP$y7+@yJph5fW zo6S`<1=pxaw-QhaoSt9j{zeKbjW?D8erN(%I4q6{@Pv|4s=hhBm0W6#mfCn!0DHz__@NS1o7{7}EPidF{-mzgfhIMfqSRMlaGA{@T58AMp zXkW~3sFwiU24fE0A$e}56qrl7iMJD5whi^b0|;otVzgM-G)lLGtpupmaW27oe$NV7 z4sV~Y@dE4N97ET32m*L#f*4Q=mH?ag@jV3ad|XffSK%dMrA!)ap8p34Dj!>#TDTs0 zL>^#MA{OmplmPDmjGo{e1>N4Gh*CC-HnvzjQ{vdbZw2tcZMBMS0Fzc>5;jl<vLKw+aMobAKhn0UoOQ#We3_uUOu>)0GnKk zR!g-&rM_J7%j51vfQ_j)%cCl~$k}K~iuUsqvgEji2q=|%+hksO36oN**U@s8tpr3e z+23nrj2?JwB~U1@9;qc_Y$CuW_nutw2=GAE3N{F=efK0lHB{YKt?<_)&2wcf;9H*| z0$6CT(m5)y;_GUl+8Fjh(G`Agc_FM&D z>au{ECPG8F@YV!^xwbx0iCxQ{F~G)R0`M?N^hj$7NG)gNvF+!ccQ17jz}lfMg58T& zKG%G*CvZ=|t|elsagf!tc7%Z16Fxl&Sr-9bNx5nkwx$NUS9;!CHg3C~+K#D*0IqPh zaihenWC21UMk4}Bfu6@unWx2o+Wwf$5@#f8 zik{}E_8{2t|CO0VfafY&&w{KU@9sRgBNB&$aLa)A*k>dGW6zN - - - - + + + + + + + + + + + + {% endblock %} {% block head %}{% endblock %} From 27666e8af68f294742aa51d5e310aea189b1b70a Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Tue, 16 Jan 2024 15:32:41 +0000 Subject: [PATCH 12/34] Update package test --- tasks/test-package.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tasks/test-package.js b/tasks/test-package.js index e8285f48..f9efef42 100644 --- a/tasks/test-package.js +++ b/tasks/test-package.js @@ -50,10 +50,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", From 6430796d13144be0d447ae1961719036811f0b41 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Tue, 16 Jan 2024 15:36:55 +0000 Subject: [PATCH 13/34] v0.1.35 --- CHANGELOG.md | 16 ++++++++++------ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c94676a..8bdb85f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,16 @@ 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.34...HEAD) +## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.1.35...HEAD) + +### Added +### Changed +### Deprecated +### Removed +### Fixed +### Security + +## [0.1.35](https://github.com/nationalarchives/tna-frontend/compare/v0.1.34...v0.1.35) - 2024-01-16 ### Added @@ -16,11 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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` -### Deprecated -### Removed -### Fixed -### Security - ## [0.1.34](https://github.com/nationalarchives/tna-frontend/compare/v0.1.33...v0.1.34) - 2024-01-10 ### Added diff --git a/package-lock.json b/package-lock.json index 27c28751..e9f4edad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nationalarchives/frontend", - "version": "0.1.34", + "version": "0.1.35", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nationalarchives/frontend", - "version": "0.1.34", + "version": "0.1.35", "license": "MIT", "devDependencies": { "@babel/core": "^7.23.2", diff --git a/package.json b/package.json index 5d8616f2..a81c894e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nationalarchives/frontend", - "version": "0.1.34", + "version": "0.1.35", "description": "The National Archives frontend styles", "scripts": { "start": "storybook dev -p 6006", From db8b3aa8eda9a3b9e94d0625b0a943e81fc10634 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Wed, 17 Jan 2024 11:17:51 +0000 Subject: [PATCH 14/34] Add more space between text and chevron in heading links (#74) --- CHANGELOG.md | 3 +++ src/nationalarchives/utilities/_typography.scss | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bdb85f0..f2efb4b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed + +- Added more space between the text and chevron in a heading link + ### Deprecated ### Removed ### Fixed diff --git a/src/nationalarchives/utilities/_typography.scss b/src/nationalarchives/utilities/_typography.scss index 3adeedfe..815ce0ae 100644 --- a/src/nationalarchives/utilities/_typography.scss +++ b/src/nationalarchives/utilities/_typography.scss @@ -223,7 +223,7 @@ small { display: inline-block; &::after { - padding-left: 0.25rem; + padding-left: 0.5rem; display: inline-block; @@ -234,7 +234,7 @@ small { &:hover { &::after { - padding-left: 0.5rem; + padding-left: 0.75rem; } } } From 39e36467fac56752b7935f74717a6af23a251c12 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Mon, 22 Jan 2024 14:52:27 +0000 Subject: [PATCH 15/34] Fix search input min width, remove comments (#75) --- .storybook/preview-head.html | 35 ----------- .storybook/preview.js | 10 ---- .storybook/storybook.scss | 4 -- .storybook/test-runner.js | 58 ------------------- .storybook/viewports.js | 1 - CHANGELOG.md | 1 + .../components/search-field/fixtures.json | 6 +- .../components/search-field/search-field.scss | 1 + .../components/search-field/template.njk | 2 +- 9 files changed, 6 insertions(+), 112 deletions(-) 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); } - diff --git a/.storybook/preview.js b/.storybook/preview.js index 265b55c0..2c5657b0 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -42,13 +42,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 9501e218..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; 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 f2efb4b5..47f6cf99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- Set smaller minimum width for search field inputs - Added more space between the text and chevron in a heading link ### Deprecated 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": "

", + "html": "

", "hidden": false }, { @@ -23,7 +23,7 @@ "name": "q", "value": "badgers" }, - "html": "

", + "html": "

", "hidden": false }, { @@ -36,7 +36,7 @@ "name": "q", "hint": "Try searching for something interesting" }, - "html": "

Try searching for something interesting

", + "html": "

Try searching for something interesting

", "hidden": false } ] diff --git a/src/nationalarchives/components/search-field/search-field.scss b/src/nationalarchives/components/search-field/search-field.scss index 58c50eb4..bbd7015c 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 [] -%}
-
+
Open Government Licence

All content is available under the Open Government Licence v3.0, except where otherwise stated

GOV.UKGOV.UK
", "hidden": false }, { @@ -152,7 +152,7 @@ } ] }, - "html": "", + "html": "", "hidden": false } ] diff --git a/src/nationalarchives/components/footer/template.njk b/src/nationalarchives/components/footer/template.njk index 51236bdb..4f279653 100644 --- a/src/nationalarchives/components/footer/template.njk +++ b/src/nationalarchives/components/footer/template.njk @@ -5,73 +5,71 @@

The National Archives

- Kew, Richmond
+ Kew, Richmond
TW9 4DU
- {%- if params.meta -%} + {%- if params.meta %}
{{ params.meta | safe }}
- {%- endif -%} - {%- if params.social -%} + {%- endif %} + {%- if params.social %} - {%- endif -%} + {%- endif %}
- {%- if params.navigation -%} + {%- if params.navigation %}
- {%- for group in params.navigation -%} + {%- for group in params.navigation %} - {%- endfor -%} + {%- endfor %}
- {%- endif -%} - {%- if params.showNewsletter -%} + {%- endif %} + {%- if params.showNewsletter %}

@@ -83,39 +81,40 @@
{{ tnaButton({ text: "Subscribe", - href: "#", + href: "https://www.nationalarchives.gov.uk/contact-us/email-updates/", accent: true, icon: "envelope" }) }}

- {%- endif -%} + {%- endif %}
- {%- if params.legal -%} + {%- if params.legal %} - {%- else -%} + {%- else %}
- {%- endif -%} + {%- endif %}
@@ -124,7 +123,8 @@
GOV.UK diff --git a/src/nationalarchives/components/global-header/README.md b/src/nationalarchives/components/global-header/README.md new file mode 100644 index 00000000..7cc65fbc --- /dev/null +++ b/src/nationalarchives/components/global-header/README.md @@ -0,0 +1,52 @@ +The National Archives logo + +# TNA Frontend Global Header and Footer + +[![Latest release](https://img.shields.io/github/v/release/nationalarchives/tna-frontend?style=flat-square&logo=github&logoColor=white&sort=semver)](https://github.com/nationalarchives/tna-frontend/releases) +[![NPM version](https://img.shields.io/npm/v/@nationalarchives/frontend-global-header?style=flat-square&logo=npm&logoColor=white)](https://www.npmjs.com/package/@nationalarchives/frontend-global-header) +[![Licence](https://img.shields.io/github/license/nationalarchives/tna-frontend?style=flat-square)](https://github.com/nationalarchives/tna-frontend/blob/main/LICENCE) + +Use the cookie banner from TNA Frontend in your service. + +## Preparation + +### HTML + +1. Add the class `tna-template` to your `` element +1. Add the class `tna-template--light-theme`, `tna-template--light-theme` or `tna-template--system-theme` to your `` element based on what [colour theme](https://nationalarchives.github.io/design-system/styles/colours/#theme-colours) you need (`tna-template--light-theme` suggested) +1. Add the class `tna-template__body` to your `` element +1. Add the HTML for the header and footer to the appropriate part of your page (HTML found below) +1. Modify the HTML as necessary + +### Assets + +1. Include the `global-header-package.css` file in your page using a `` element +1. Ensure the Font Awesome assets can be loaded - if they are not served from the same relative location as the `global-header-package.css` then you need to edit the include paths in the CSS or build the SCSS yourself +1. Include the `global-header.js` file in your page using a `