diff --git a/.github/workflows/psammead-deploy-storybook.yml b/.github/workflows/psammead-deploy-storybook.yml deleted file mode 100644 index ba4e897fc1..0000000000 --- a/.github/workflows/psammead-deploy-storybook.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Deploy Storybook - -on: - push: - branches: - - latest - -jobs: - deploy-storybook: - name: Deploy Storybook to GitHub pages - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - persist-credentials: false - - - name: Install Node Modules and Build - run: | - ./scripts/installNodeModules.sh - yarn build:storybook - git config --global user.name "simorgh-bbc" - git config --global user.email "DENewsSimorghDev@bbc.co.uk" - - - name: Deploy Storybook - uses: JamesIves/github-pages-deploy-action@3.7.1 - with: - GITHUB_TOKEN: ${{ secrets.SIMORGH_DEV_STORYBOOK_RELEASE }} - BRANCH: gh-pages - FOLDER: storybook_dist - CLEAN: true # Automatically remove deleted files from the deploy branch diff --git a/.prettierrc b/.prettierrc index db4178ce97..5393aaf2da 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ { - "singleQuote": true, - "trailingComma": "all", - "arrowParens": "avoid" + "singleQuote": true, + "trailingComma": "all", + "arrowParens": "avoid" } diff --git a/.storybook/preview.js b/.storybook/preview.js index 4fde81ccec..87fe07887e 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -67,15 +67,15 @@ export const parameters = { }; const fontPathMap = [ - { prefix: 'F_ISKOOLA_POTA_BBC', path: 'fonts/IskoolaPota/' }, - { prefix: 'F_LATHA', path: 'fonts/Latha/' }, { prefix: 'F_MALLANNA', path: 'fonts/Mallanna/' }, { prefix: 'F_NOTO_SANS_ETHIOPIC', path: 'fonts/NotoSansEthiopic/' }, + { prefix: 'F_NOTO_SANS_TAMIL', path: 'fonts/NotoSerifTamil/' }, + { prefix: 'F_NOTO_SERIF_BENGALI', path: 'fonts/NotoSerifBengali/' }, + { prefix: 'F_NOTO_SERIF_SINHALA', path: 'fonts/NotoSerifSinhala/' }, { prefix: 'F_PADAUK', path: 'fonts/Padauk/' }, { prefix: 'F_REITH_QALAM', path: 'fonts/ReithQalam/' }, { prefix: 'F_REITH_SANS', path: 'fonts/Reith/' }, { prefix: 'F_REITH_SERIF', path: 'fonts/Reith/' }, - { prefix: 'F_SHONAR_BANGLA', path: 'fonts/ShonarBangla/' }, ]; addDecorator(story => ( diff --git a/.storybook/static/fonts/IskoolaPota/bold.eot b/.storybook/static/fonts/IskoolaPota/bold.eot deleted file mode 100755 index 28a4a67693..0000000000 Binary files a/.storybook/static/fonts/IskoolaPota/bold.eot and /dev/null differ diff --git a/.storybook/static/fonts/IskoolaPota/bold.ttf b/.storybook/static/fonts/IskoolaPota/bold.ttf deleted file mode 100755 index f339573d57..0000000000 Binary files a/.storybook/static/fonts/IskoolaPota/bold.ttf and /dev/null differ diff --git a/.storybook/static/fonts/IskoolaPota/bold.woff b/.storybook/static/fonts/IskoolaPota/bold.woff deleted file mode 100755 index 9529d51f7e..0000000000 Binary files a/.storybook/static/fonts/IskoolaPota/bold.woff and /dev/null differ diff --git a/.storybook/static/fonts/IskoolaPota/normal.eot b/.storybook/static/fonts/IskoolaPota/normal.eot deleted file mode 100755 index 83f4c529df..0000000000 Binary files a/.storybook/static/fonts/IskoolaPota/normal.eot and /dev/null differ diff --git a/.storybook/static/fonts/IskoolaPota/normal.ttf b/.storybook/static/fonts/IskoolaPota/normal.ttf deleted file mode 100755 index 28a0a35d23..0000000000 Binary files a/.storybook/static/fonts/IskoolaPota/normal.ttf and /dev/null differ diff --git a/.storybook/static/fonts/IskoolaPota/normal.woff b/.storybook/static/fonts/IskoolaPota/normal.woff deleted file mode 100755 index 5aff0c2645..0000000000 Binary files a/.storybook/static/fonts/IskoolaPota/normal.woff and /dev/null differ diff --git a/.storybook/static/fonts/Latha/bold.eot b/.storybook/static/fonts/Latha/bold.eot deleted file mode 100755 index a4a889b733..0000000000 Binary files a/.storybook/static/fonts/Latha/bold.eot and /dev/null differ diff --git a/.storybook/static/fonts/Latha/bold.ttf b/.storybook/static/fonts/Latha/bold.ttf deleted file mode 100755 index 489a036ef3..0000000000 Binary files a/.storybook/static/fonts/Latha/bold.ttf and /dev/null differ diff --git a/.storybook/static/fonts/Latha/bold.woff b/.storybook/static/fonts/Latha/bold.woff deleted file mode 100755 index cd8c94af87..0000000000 Binary files a/.storybook/static/fonts/Latha/bold.woff and /dev/null differ diff --git a/.storybook/static/fonts/Latha/normal.eot b/.storybook/static/fonts/Latha/normal.eot deleted file mode 100755 index 1490002027..0000000000 Binary files a/.storybook/static/fonts/Latha/normal.eot and /dev/null differ diff --git a/.storybook/static/fonts/Latha/normal.ttf b/.storybook/static/fonts/Latha/normal.ttf deleted file mode 100755 index 7982880db4..0000000000 Binary files a/.storybook/static/fonts/Latha/normal.ttf and /dev/null differ diff --git a/.storybook/static/fonts/Latha/normal.woff b/.storybook/static/fonts/Latha/normal.woff deleted file mode 100755 index d9dd1016cd..0000000000 Binary files a/.storybook/static/fonts/Latha/normal.woff and /dev/null differ diff --git a/.storybook/static/fonts/NotoSansTamil/bold.eot b/.storybook/static/fonts/NotoSansTamil/bold.eot new file mode 100644 index 0000000000..b81fa0f33f Binary files /dev/null and b/.storybook/static/fonts/NotoSansTamil/bold.eot differ diff --git a/.storybook/static/fonts/NotoSansTamil/bold.ttf b/.storybook/static/fonts/NotoSansTamil/bold.ttf new file mode 100644 index 0000000000..426ed73f39 Binary files /dev/null and b/.storybook/static/fonts/NotoSansTamil/bold.ttf differ diff --git a/.storybook/static/fonts/NotoSansTamil/bold.woff b/.storybook/static/fonts/NotoSansTamil/bold.woff new file mode 100644 index 0000000000..17de17d00a Binary files /dev/null and b/.storybook/static/fonts/NotoSansTamil/bold.woff differ diff --git a/.storybook/static/fonts/NotoSansTamil/bold.woff2 b/.storybook/static/fonts/NotoSansTamil/bold.woff2 new file mode 100644 index 0000000000..26a1e45f46 Binary files /dev/null and b/.storybook/static/fonts/NotoSansTamil/bold.woff2 differ diff --git a/.storybook/static/fonts/NotoSansTamil/normal.eot b/.storybook/static/fonts/NotoSansTamil/normal.eot new file mode 100644 index 0000000000..7a89da7358 Binary files /dev/null and b/.storybook/static/fonts/NotoSansTamil/normal.eot differ diff --git a/.storybook/static/fonts/NotoSansTamil/normal.ttf b/.storybook/static/fonts/NotoSansTamil/normal.ttf new file mode 100644 index 0000000000..7160088ad0 Binary files /dev/null and b/.storybook/static/fonts/NotoSansTamil/normal.ttf differ diff --git a/.storybook/static/fonts/NotoSansTamil/normal.woff b/.storybook/static/fonts/NotoSansTamil/normal.woff new file mode 100644 index 0000000000..31c503ced9 Binary files /dev/null and b/.storybook/static/fonts/NotoSansTamil/normal.woff differ diff --git a/.storybook/static/fonts/NotoSansTamil/normal.woff2 b/.storybook/static/fonts/NotoSansTamil/normal.woff2 new file mode 100644 index 0000000000..cca8a186c3 Binary files /dev/null and b/.storybook/static/fonts/NotoSansTamil/normal.woff2 differ diff --git a/.storybook/static/fonts/NotoSerifBengali/bold.eot b/.storybook/static/fonts/NotoSerifBengali/bold.eot new file mode 100644 index 0000000000..4cefb6081e Binary files /dev/null and b/.storybook/static/fonts/NotoSerifBengali/bold.eot differ diff --git a/.storybook/static/fonts/NotoSerifBengali/bold.ttf b/.storybook/static/fonts/NotoSerifBengali/bold.ttf new file mode 100644 index 0000000000..cafeaf005d Binary files /dev/null and b/.storybook/static/fonts/NotoSerifBengali/bold.ttf differ diff --git a/.storybook/static/fonts/NotoSerifBengali/bold.woff b/.storybook/static/fonts/NotoSerifBengali/bold.woff new file mode 100644 index 0000000000..684294c161 Binary files /dev/null and b/.storybook/static/fonts/NotoSerifBengali/bold.woff differ diff --git a/.storybook/static/fonts/NotoSerifBengali/bold.woff2 b/.storybook/static/fonts/NotoSerifBengali/bold.woff2 new file mode 100644 index 0000000000..ff71f01bef Binary files /dev/null and b/.storybook/static/fonts/NotoSerifBengali/bold.woff2 differ diff --git a/.storybook/static/fonts/NotoSerifBengali/normal.eot b/.storybook/static/fonts/NotoSerifBengali/normal.eot new file mode 100644 index 0000000000..1e6ecfc75b Binary files /dev/null and b/.storybook/static/fonts/NotoSerifBengali/normal.eot differ diff --git a/.storybook/static/fonts/NotoSerifBengali/normal.ttf b/.storybook/static/fonts/NotoSerifBengali/normal.ttf new file mode 100644 index 0000000000..32329df067 Binary files /dev/null and b/.storybook/static/fonts/NotoSerifBengali/normal.ttf differ diff --git a/.storybook/static/fonts/NotoSerifBengali/normal.woff b/.storybook/static/fonts/NotoSerifBengali/normal.woff new file mode 100644 index 0000000000..9ffec48b5f Binary files /dev/null and b/.storybook/static/fonts/NotoSerifBengali/normal.woff differ diff --git a/.storybook/static/fonts/NotoSerifBengali/normal.woff2 b/.storybook/static/fonts/NotoSerifBengali/normal.woff2 new file mode 100644 index 0000000000..22c85b39d5 Binary files /dev/null and b/.storybook/static/fonts/NotoSerifBengali/normal.woff2 differ diff --git a/.storybook/static/fonts/NotoSerifSinhala/bold.eot b/.storybook/static/fonts/NotoSerifSinhala/bold.eot new file mode 100644 index 0000000000..7c1e7dcbf8 Binary files /dev/null and b/.storybook/static/fonts/NotoSerifSinhala/bold.eot differ diff --git a/.storybook/static/fonts/NotoSerifSinhala/bold.ttf b/.storybook/static/fonts/NotoSerifSinhala/bold.ttf new file mode 100644 index 0000000000..0d6ecc4dec Binary files /dev/null and b/.storybook/static/fonts/NotoSerifSinhala/bold.ttf differ diff --git a/.storybook/static/fonts/NotoSerifSinhala/bold.woff b/.storybook/static/fonts/NotoSerifSinhala/bold.woff new file mode 100644 index 0000000000..307a2974f3 Binary files /dev/null and b/.storybook/static/fonts/NotoSerifSinhala/bold.woff differ diff --git a/.storybook/static/fonts/NotoSerifSinhala/bold.woff2 b/.storybook/static/fonts/NotoSerifSinhala/bold.woff2 new file mode 100644 index 0000000000..e89311b928 Binary files /dev/null and b/.storybook/static/fonts/NotoSerifSinhala/bold.woff2 differ diff --git a/.storybook/static/fonts/NotoSerifSinhala/normal.eot b/.storybook/static/fonts/NotoSerifSinhala/normal.eot new file mode 100644 index 0000000000..553eb7b5f9 Binary files /dev/null and b/.storybook/static/fonts/NotoSerifSinhala/normal.eot differ diff --git a/.storybook/static/fonts/NotoSerifSinhala/normal.ttf b/.storybook/static/fonts/NotoSerifSinhala/normal.ttf new file mode 100644 index 0000000000..d439819856 Binary files /dev/null and b/.storybook/static/fonts/NotoSerifSinhala/normal.ttf differ diff --git a/.storybook/static/fonts/NotoSerifSinhala/normal.woff b/.storybook/static/fonts/NotoSerifSinhala/normal.woff new file mode 100644 index 0000000000..07bb41603f Binary files /dev/null and b/.storybook/static/fonts/NotoSerifSinhala/normal.woff differ diff --git a/.storybook/static/fonts/NotoSerifSinhala/normal.woff2 b/.storybook/static/fonts/NotoSerifSinhala/normal.woff2 new file mode 100644 index 0000000000..190d305dee Binary files /dev/null and b/.storybook/static/fonts/NotoSerifSinhala/normal.woff2 differ diff --git a/.storybook/static/fonts/ShonarBangla/bold.eot b/.storybook/static/fonts/ShonarBangla/bold.eot deleted file mode 100755 index 197d6882c3..0000000000 Binary files a/.storybook/static/fonts/ShonarBangla/bold.eot and /dev/null differ diff --git a/.storybook/static/fonts/ShonarBangla/bold.ttf b/.storybook/static/fonts/ShonarBangla/bold.ttf deleted file mode 100755 index dd9b5ec466..0000000000 Binary files a/.storybook/static/fonts/ShonarBangla/bold.ttf and /dev/null differ diff --git a/.storybook/static/fonts/ShonarBangla/bold.woff b/.storybook/static/fonts/ShonarBangla/bold.woff deleted file mode 100755 index a4db38ca99..0000000000 Binary files a/.storybook/static/fonts/ShonarBangla/bold.woff and /dev/null differ diff --git a/.storybook/static/fonts/ShonarBangla/normal.eot b/.storybook/static/fonts/ShonarBangla/normal.eot deleted file mode 100755 index 1d903d0c6c..0000000000 Binary files a/.storybook/static/fonts/ShonarBangla/normal.eot and /dev/null differ diff --git a/.storybook/static/fonts/ShonarBangla/normal.ttf b/.storybook/static/fonts/ShonarBangla/normal.ttf deleted file mode 100755 index 89de6bac34..0000000000 Binary files a/.storybook/static/fonts/ShonarBangla/normal.ttf and /dev/null differ diff --git a/.storybook/static/fonts/ShonarBangla/normal.woff b/.storybook/static/fonts/ShonarBangla/normal.woff deleted file mode 100755 index 1e6196ed0a..0000000000 Binary files a/.storybook/static/fonts/ShonarBangla/normal.woff and /dev/null differ diff --git a/.yarn/cache/@actions-core-npm-1.4.0-82fe1c0286-bdad9fedeb.zip b/.yarn/cache/@actions-core-npm-1.4.0-82fe1c0286-bdad9fedeb.zip deleted file mode 100644 index 3ac90818b5..0000000000 Binary files a/.yarn/cache/@actions-core-npm-1.4.0-82fe1c0286-bdad9fedeb.zip and /dev/null differ diff --git a/.yarn/cache/@actions-github-npm-4.0.0-80bcb91a08-0a1dd8e11b.zip b/.yarn/cache/@actions-github-npm-4.0.0-80bcb91a08-0a1dd8e11b.zip deleted file mode 100644 index 2138264a06..0000000000 Binary files a/.yarn/cache/@actions-github-npm-4.0.0-80bcb91a08-0a1dd8e11b.zip and /dev/null differ diff --git a/.yarn/cache/@actions-http-client-npm-1.0.11-f7fe88143c-2c72834ec3.zip b/.yarn/cache/@actions-http-client-npm-1.0.11-f7fe88143c-2c72834ec3.zip deleted file mode 100644 index 16b042bca6..0000000000 Binary files a/.yarn/cache/@actions-http-client-npm-1.0.11-f7fe88143c-2c72834ec3.zip and /dev/null differ diff --git a/.yarn/cache/@chromaui-localtunnel-npm-2.0.3-2048654341-ca568183b1.zip b/.yarn/cache/@chromaui-localtunnel-npm-2.0.3-2048654341-ca568183b1.zip deleted file mode 100644 index 3da7acf92e..0000000000 Binary files a/.yarn/cache/@chromaui-localtunnel-npm-2.0.3-2048654341-ca568183b1.zip and /dev/null differ diff --git a/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.13.5-8922ece963-7dc7b625c1.zip b/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.13.5-8922ece963-7dc7b625c1.zip deleted file mode 100644 index ecbfa67314..0000000000 Binary files a/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.13.5-8922ece963-7dc7b625c1.zip and /dev/null differ diff --git a/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-4.15.1-fdbe2481fd-6913c54997.zip b/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-4.15.1-fdbe2481fd-6913c54997.zip deleted file mode 100644 index 43d55e7ce3..0000000000 Binary files a/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-4.15.1-fdbe2481fd-6913c54997.zip and /dev/null differ diff --git a/.yarn/cache/@samverschueren-stream-to-observable-npm-0.3.1-aeb89f731e-8ec6d43370.zip b/.yarn/cache/@samverschueren-stream-to-observable-npm-0.3.1-aeb89f731e-8ec6d43370.zip deleted file mode 100644 index 671387494f..0000000000 Binary files a/.yarn/cache/@samverschueren-stream-to-observable-npm-0.3.1-aeb89f731e-8ec6d43370.zip and /dev/null differ diff --git a/.yarn/cache/ansi-escapes-npm-3.2.0-a9d573100e-0f94695b67.zip b/.yarn/cache/ansi-escapes-npm-3.2.0-a9d573100e-0f94695b67.zip deleted file mode 100644 index 6faf69c10b..0000000000 Binary files a/.yarn/cache/ansi-escapes-npm-3.2.0-a9d573100e-0f94695b67.zip and /dev/null differ diff --git a/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip b/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip new file mode 100644 index 0000000000..088e552d0f Binary files /dev/null and b/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip differ diff --git a/.yarn/cache/ansi-styles-npm-2.2.1-f3297e782c-ebc0e00381.zip b/.yarn/cache/ansi-styles-npm-2.2.1-f3297e782c-ebc0e00381.zip deleted file mode 100644 index 5581240ca2..0000000000 Binary files a/.yarn/cache/ansi-styles-npm-2.2.1-f3297e782c-ebc0e00381.zip and /dev/null differ diff --git a/.yarn/cache/ansi-styles-npm-6.1.0-4f6a594d04-7a7f8528c0.zip b/.yarn/cache/ansi-styles-npm-6.1.0-4f6a594d04-7a7f8528c0.zip new file mode 100644 index 0000000000..27d0a18c83 Binary files /dev/null and b/.yarn/cache/ansi-styles-npm-6.1.0-4f6a594d04-7a7f8528c0.zip differ diff --git a/.yarn/cache/any-observable-npm-0.3.0-4832f4f3ed-e715563ebb.zip b/.yarn/cache/any-observable-npm-0.3.0-4832f4f3ed-e715563ebb.zip deleted file mode 100644 index d0b5d7db89..0000000000 Binary files a/.yarn/cache/any-observable-npm-0.3.0-4832f4f3ed-e715563ebb.zip and /dev/null differ diff --git a/.yarn/cache/async-retry-npm-1.3.1-a013434040-42b518505c.zip b/.yarn/cache/async-retry-npm-1.3.1-a013434040-42b518505c.zip deleted file mode 100644 index e40b698b2a..0000000000 Binary files a/.yarn/cache/async-retry-npm-1.3.1-a013434040-42b518505c.zip and /dev/null differ diff --git a/.yarn/cache/chalk-npm-1.1.3-59144c3a87-9d2ea6b98f.zip b/.yarn/cache/chalk-npm-1.1.3-59144c3a87-9d2ea6b98f.zip deleted file mode 100644 index e7d3003b97..0000000000 Binary files a/.yarn/cache/chalk-npm-1.1.3-59144c3a87-9d2ea6b98f.zip and /dev/null differ diff --git a/.yarn/cache/chromatic-npm-5.9.2-9561fc1d25-395b78f107.zip b/.yarn/cache/chromatic-npm-5.9.2-9561fc1d25-395b78f107.zip deleted file mode 100644 index ad5167ffda..0000000000 Binary files a/.yarn/cache/chromatic-npm-5.9.2-9561fc1d25-395b78f107.zip and /dev/null differ diff --git a/.yarn/cache/chromatic-npm-6.0.4-138ff17d66-5f59af0908.zip b/.yarn/cache/chromatic-npm-6.0.4-138ff17d66-5f59af0908.zip new file mode 100644 index 0000000000..27b63102d3 Binary files /dev/null and b/.yarn/cache/chromatic-npm-6.0.4-138ff17d66-5f59af0908.zip differ diff --git a/.yarn/cache/cli-cursor-npm-2.1.0-3920629c9c-d88e97bfda.zip b/.yarn/cache/cli-cursor-npm-2.1.0-3920629c9c-d88e97bfda.zip deleted file mode 100644 index b8aff0b465..0000000000 Binary files a/.yarn/cache/cli-cursor-npm-2.1.0-3920629c9c-d88e97bfda.zip and /dev/null differ diff --git a/.yarn/cache/cli-truncate-npm-0.2.1-f053d59b0b-c2e4b8d952.zip b/.yarn/cache/cli-truncate-npm-0.2.1-f053d59b0b-c2e4b8d952.zip deleted file mode 100644 index f3c17eb560..0000000000 Binary files a/.yarn/cache/cli-truncate-npm-0.2.1-f053d59b0b-c2e4b8d952.zip and /dev/null differ diff --git a/.yarn/cache/cli-truncate-npm-3.1.0-654d2989ef-c3243e4197.zip b/.yarn/cache/cli-truncate-npm-3.1.0-654d2989ef-c3243e4197.zip new file mode 100644 index 0000000000..6ad23df2a1 Binary files /dev/null and b/.yarn/cache/cli-truncate-npm-3.1.0-654d2989ef-c3243e4197.zip differ diff --git a/.yarn/cache/clone-npm-2.1.2-1d491c6629-aaf106e9bc.zip b/.yarn/cache/clone-npm-2.1.2-1d491c6629-aaf106e9bc.zip new file mode 100644 index 0000000000..6ae29b32e5 Binary files /dev/null and b/.yarn/cache/clone-npm-2.1.2-1d491c6629-aaf106e9bc.zip differ diff --git a/.yarn/cache/colorette-npm-2.0.16-7b996485d7-cd55596a3a.zip b/.yarn/cache/colorette-npm-2.0.16-7b996485d7-cd55596a3a.zip new file mode 100644 index 0000000000..0d086dd378 Binary files /dev/null and b/.yarn/cache/colorette-npm-2.0.16-7b996485d7-cd55596a3a.zip differ diff --git a/.yarn/cache/commander-npm-7.2.0-19178180f8-53501cbeee.zip b/.yarn/cache/commander-npm-7.2.0-19178180f8-53501cbeee.zip deleted file mode 100644 index 1c86bf7181..0000000000 Binary files a/.yarn/cache/commander-npm-7.2.0-19178180f8-53501cbeee.zip and /dev/null differ diff --git a/.yarn/cache/commander-npm-8.3.0-c0d18c66d5-0f82321821.zip b/.yarn/cache/commander-npm-8.3.0-c0d18c66d5-0f82321821.zip new file mode 100644 index 0000000000..4f07a5cda2 Binary files /dev/null and b/.yarn/cache/commander-npm-8.3.0-c0d18c66d5-0f82321821.zip differ diff --git a/.yarn/cache/cosmiconfig-npm-7.0.1-dd19ae2403-4be63e7117.zip b/.yarn/cache/cosmiconfig-npm-7.0.1-dd19ae2403-4be63e7117.zip new file mode 100644 index 0000000000..6cb92f2fb7 Binary files /dev/null and b/.yarn/cache/cosmiconfig-npm-7.0.1-dd19ae2403-4be63e7117.zip differ diff --git a/.yarn/cache/date-fns-npm-1.30.1-b974a8f1e1-86b1f3269c.zip b/.yarn/cache/date-fns-npm-1.30.1-b974a8f1e1-86b1f3269c.zip deleted file mode 100644 index 394bce56c4..0000000000 Binary files a/.yarn/cache/date-fns-npm-1.30.1-b974a8f1e1-86b1f3269c.zip and /dev/null differ diff --git a/.yarn/cache/date-format-npm-0.0.2-766404fccb-01a95d6b55.zip b/.yarn/cache/date-format-npm-0.0.2-766404fccb-01a95d6b55.zip deleted file mode 100644 index 0ff3e7481a..0000000000 Binary files a/.yarn/cache/date-format-npm-0.0.2-766404fccb-01a95d6b55.zip and /dev/null differ diff --git a/.yarn/cache/debug-npm-4.3.2-f0148b6afe-820ea160e2.zip b/.yarn/cache/debug-npm-4.3.2-f0148b6afe-820ea160e2.zip new file mode 100644 index 0000000000..57db42a849 Binary files /dev/null and b/.yarn/cache/debug-npm-4.3.2-f0148b6afe-820ea160e2.zip differ diff --git a/.yarn/cache/elegant-spinner-npm-1.0.1-8b799f39a6-d6a773d950.zip b/.yarn/cache/elegant-spinner-npm-1.0.1-8b799f39a6-d6a773d950.zip deleted file mode 100644 index 99d41f7b10..0000000000 Binary files a/.yarn/cache/elegant-spinner-npm-1.0.1-8b799f39a6-d6a773d950.zip and /dev/null differ diff --git a/.yarn/cache/env-ci-npm-5.0.2-6d81f85981-d3c9d54663.zip b/.yarn/cache/env-ci-npm-5.0.2-6d81f85981-d3c9d54663.zip deleted file mode 100644 index 671c05e898..0000000000 Binary files a/.yarn/cache/env-ci-npm-5.0.2-6d81f85981-d3c9d54663.zip and /dev/null differ diff --git a/.yarn/cache/eslint-plugin-json-npm-2.1.2-5b4ca34e18-c3da24699d.zip b/.yarn/cache/eslint-plugin-json-npm-2.1.2-5b4ca34e18-c3da24699d.zip deleted file mode 100644 index e0b6316a17..0000000000 Binary files a/.yarn/cache/eslint-plugin-json-npm-2.1.2-5b4ca34e18-c3da24699d.zip and /dev/null differ diff --git a/.yarn/cache/eslint-plugin-json-npm-3.1.0-2165d5ec5d-bc7fa4c2e1.zip b/.yarn/cache/eslint-plugin-json-npm-3.1.0-2165d5ec5d-bc7fa4c2e1.zip new file mode 100644 index 0000000000..3eb4a408b2 Binary files /dev/null and b/.yarn/cache/eslint-plugin-json-npm-3.1.0-2165d5ec5d-bc7fa4c2e1.zip differ diff --git a/.yarn/cache/esm-npm-3.2.25-762b3ebd40-978aabe2de.zip b/.yarn/cache/esm-npm-3.2.25-762b3ebd40-978aabe2de.zip deleted file mode 100644 index c1bfaf13f9..0000000000 Binary files a/.yarn/cache/esm-npm-3.2.25-762b3ebd40-978aabe2de.zip and /dev/null differ diff --git a/.yarn/cache/fake-tag-npm-2.0.0-24b5e38cac-019f402a86.zip b/.yarn/cache/fake-tag-npm-2.0.0-24b5e38cac-019f402a86.zip deleted file mode 100644 index a1a75e7111..0000000000 Binary files a/.yarn/cache/fake-tag-npm-2.0.0-24b5e38cac-019f402a86.zip and /dev/null differ diff --git a/.yarn/cache/figures-npm-1.7.0-1542644df9-d77206deba.zip b/.yarn/cache/figures-npm-1.7.0-1542644df9-d77206deba.zip deleted file mode 100644 index 68c76d5aa8..0000000000 Binary files a/.yarn/cache/figures-npm-1.7.0-1542644df9-d77206deba.zip and /dev/null differ diff --git a/.yarn/cache/figures-npm-2.0.0-f2db814eec-081beb16ea.zip b/.yarn/cache/figures-npm-2.0.0-f2db814eec-081beb16ea.zip deleted file mode 100644 index 6f6dfbb7d4..0000000000 Binary files a/.yarn/cache/figures-npm-2.0.0-f2db814eec-081beb16ea.zip and /dev/null differ diff --git a/.yarn/cache/get-own-enumerable-property-symbols-npm-3.0.2-f143f9e8d3-8f0331f141.zip b/.yarn/cache/get-own-enumerable-property-symbols-npm-3.0.2-f143f9e8d3-8f0331f141.zip deleted file mode 100644 index 382d29fb16..0000000000 Binary files a/.yarn/cache/get-own-enumerable-property-symbols-npm-3.0.2-f143f9e8d3-8f0331f141.zip and /dev/null differ diff --git a/.yarn/cache/glob-parent-npm-5.1.2-021ab32634-f4f2bfe242.zip b/.yarn/cache/glob-parent-npm-5.1.2-021ab32634-f4f2bfe242.zip deleted file mode 100644 index 8a94317ecb..0000000000 Binary files a/.yarn/cache/glob-parent-npm-5.1.2-021ab32634-f4f2bfe242.zip and /dev/null differ diff --git a/.yarn/cache/glob-parent-npm-6.0.1-f522c2d082-0468cf300b.zip b/.yarn/cache/glob-parent-npm-6.0.1-f522c2d082-0468cf300b.zip new file mode 100644 index 0000000000..4347c48315 Binary files /dev/null and b/.yarn/cache/glob-parent-npm-6.0.1-f522c2d082-0468cf300b.zip differ diff --git a/.yarn/cache/has-ansi-npm-2.0.0-9bf0cff2af-1b51daa021.zip b/.yarn/cache/has-ansi-npm-2.0.0-9bf0cff2af-1b51daa021.zip deleted file mode 100644 index 61a5a3439f..0000000000 Binary files a/.yarn/cache/has-ansi-npm-2.0.0-9bf0cff2af-1b51daa021.zip and /dev/null differ diff --git a/.yarn/cache/indent-string-npm-3.2.0-9930503310-a0b72603bb.zip b/.yarn/cache/indent-string-npm-3.2.0-9930503310-a0b72603bb.zip deleted file mode 100644 index c599ac7f1c..0000000000 Binary files a/.yarn/cache/indent-string-npm-3.2.0-9930503310-a0b72603bb.zip and /dev/null differ diff --git a/.yarn/cache/is-fullwidth-code-point-npm-4.0.0-848488b60d-8ae89bf505.zip b/.yarn/cache/is-fullwidth-code-point-npm-4.0.0-848488b60d-8ae89bf505.zip new file mode 100644 index 0000000000..dbeb234d28 Binary files /dev/null and b/.yarn/cache/is-fullwidth-code-point-npm-4.0.0-848488b60d-8ae89bf505.zip differ diff --git a/.yarn/cache/is-obj-npm-1.0.1-7d391539d7-3ccf0efdea.zip b/.yarn/cache/is-obj-npm-1.0.1-7d391539d7-3ccf0efdea.zip deleted file mode 100644 index 23d9777e4c..0000000000 Binary files a/.yarn/cache/is-obj-npm-1.0.1-7d391539d7-3ccf0efdea.zip and /dev/null differ diff --git a/.yarn/cache/is-observable-npm-1.1.0-fd19f68a6c-ab3d7e7409.zip b/.yarn/cache/is-observable-npm-1.1.0-fd19f68a6c-ab3d7e7409.zip deleted file mode 100644 index db6563ef89..0000000000 Binary files a/.yarn/cache/is-observable-npm-1.1.0-fd19f68a6c-ab3d7e7409.zip and /dev/null differ diff --git a/.yarn/cache/is-promise-npm-2.2.2-afbf94db67-18bf7d1c59.zip b/.yarn/cache/is-promise-npm-2.2.2-afbf94db67-18bf7d1c59.zip deleted file mode 100644 index c47eb5f909..0000000000 Binary files a/.yarn/cache/is-promise-npm-2.2.2-afbf94db67-18bf7d1c59.zip and /dev/null differ diff --git a/.yarn/cache/is-regexp-npm-1.0.0-8f95f51a0c-be692828e2.zip b/.yarn/cache/is-regexp-npm-1.0.0-8f95f51a0c-be692828e2.zip deleted file mode 100644 index bb8bedec16..0000000000 Binary files a/.yarn/cache/is-regexp-npm-1.0.0-8f95f51a0c-be692828e2.zip and /dev/null differ diff --git a/.yarn/cache/java-properties-npm-1.0.2-5b04acc097-9a08677834.zip b/.yarn/cache/java-properties-npm-1.0.2-5b04acc097-9a08677834.zip deleted file mode 100644 index 9692703446..0000000000 Binary files a/.yarn/cache/java-properties-npm-1.0.2-5b04acc097-9a08677834.zip and /dev/null differ diff --git a/.yarn/cache/junit-report-builder-npm-2.1.0-6c2394523b-f781a0c641.zip b/.yarn/cache/junit-report-builder-npm-2.1.0-6c2394523b-f781a0c641.zip deleted file mode 100644 index 5c4794edbc..0000000000 Binary files a/.yarn/cache/junit-report-builder-npm-2.1.0-6c2394523b-f781a0c641.zip and /dev/null differ diff --git a/.yarn/cache/lint-staged-npm-11.1.2-a47d5d9f47-0050d1836d.zip b/.yarn/cache/lint-staged-npm-11.1.2-a47d5d9f47-0050d1836d.zip deleted file mode 100644 index 8ca1756fb0..0000000000 Binary files a/.yarn/cache/lint-staged-npm-11.1.2-a47d5d9f47-0050d1836d.zip and /dev/null differ diff --git a/.yarn/cache/lint-staged-npm-12.0.3-b82f18aacd-08a20d9c93.zip b/.yarn/cache/lint-staged-npm-12.0.3-b82f18aacd-08a20d9c93.zip new file mode 100644 index 0000000000..4b2722b9e8 Binary files /dev/null and b/.yarn/cache/lint-staged-npm-12.0.3-b82f18aacd-08a20d9c93.zip differ diff --git a/.yarn/cache/listr-npm-0.14.3-f9030beb58-932d69430c.zip b/.yarn/cache/listr-npm-0.14.3-f9030beb58-932d69430c.zip deleted file mode 100644 index 8f703887d2..0000000000 Binary files a/.yarn/cache/listr-npm-0.14.3-f9030beb58-932d69430c.zip and /dev/null differ diff --git a/.yarn/cache/listr-silent-renderer-npm-1.1.1-01f9e73935-81982612e4.zip b/.yarn/cache/listr-silent-renderer-npm-1.1.1-01f9e73935-81982612e4.zip deleted file mode 100644 index 778ae11473..0000000000 Binary files a/.yarn/cache/listr-silent-renderer-npm-1.1.1-01f9e73935-81982612e4.zip and /dev/null differ diff --git a/.yarn/cache/listr-update-renderer-npm-0.5.0-3e539fc2df-2dddc76383.zip b/.yarn/cache/listr-update-renderer-npm-0.5.0-3e539fc2df-2dddc76383.zip deleted file mode 100644 index 96ca54212c..0000000000 Binary files a/.yarn/cache/listr-update-renderer-npm-0.5.0-3e539fc2df-2dddc76383.zip and /dev/null differ diff --git a/.yarn/cache/listr-verbose-renderer-npm-0.5.0-e15abcfcc9-3e504be729.zip b/.yarn/cache/listr-verbose-renderer-npm-0.5.0-e15abcfcc9-3e504be729.zip deleted file mode 100644 index 02e02d6a53..0000000000 Binary files a/.yarn/cache/listr-verbose-renderer-npm-0.5.0-e15abcfcc9-3e504be729.zip and /dev/null differ diff --git a/.yarn/cache/listr2-npm-3.11.1-7967628574-758b9d463d.zip b/.yarn/cache/listr2-npm-3.11.1-7967628574-758b9d463d.zip deleted file mode 100644 index 54e08ec262..0000000000 Binary files a/.yarn/cache/listr2-npm-3.11.1-7967628574-758b9d463d.zip and /dev/null differ diff --git a/.yarn/cache/listr2-npm-3.13.4-5c385c2429-67801b3373.zip b/.yarn/cache/listr2-npm-3.13.4-5c385c2429-67801b3373.zip new file mode 100644 index 0000000000..6f0af33338 Binary files /dev/null and b/.yarn/cache/listr2-npm-3.13.4-5c385c2429-67801b3373.zip differ diff --git a/.yarn/cache/log-symbols-npm-1.0.2-2224ede6fd-5214ade938.zip b/.yarn/cache/log-symbols-npm-1.0.2-2224ede6fd-5214ade938.zip deleted file mode 100644 index ed1a19e8a7..0000000000 Binary files a/.yarn/cache/log-symbols-npm-1.0.2-2224ede6fd-5214ade938.zip and /dev/null differ diff --git a/.yarn/cache/log-update-npm-2.3.0-2ab0d1b479-84fd8e93bf.zip b/.yarn/cache/log-update-npm-2.3.0-2ab0d1b479-84fd8e93bf.zip deleted file mode 100644 index a72fa7906b..0000000000 Binary files a/.yarn/cache/log-update-npm-2.3.0-2ab0d1b479-84fd8e93bf.zip and /dev/null differ diff --git a/.yarn/cache/make-dir-npm-1.3.0-692810d225-c564f6e7bb.zip b/.yarn/cache/make-dir-npm-1.3.0-692810d225-c564f6e7bb.zip deleted file mode 100644 index 7c33e9ff14..0000000000 Binary files a/.yarn/cache/make-dir-npm-1.3.0-692810d225-c564f6e7bb.zip and /dev/null differ diff --git a/.yarn/cache/meow-npm-8.1.2-bcfe48d4f3-bc23bf1b44.zip b/.yarn/cache/meow-npm-8.1.2-bcfe48d4f3-bc23bf1b44.zip deleted file mode 100644 index 26b795a846..0000000000 Binary files a/.yarn/cache/meow-npm-8.1.2-bcfe48d4f3-bc23bf1b44.zip and /dev/null differ diff --git a/.yarn/cache/mimic-fn-npm-1.2.0-960bf15ab7-69c0820515.zip b/.yarn/cache/mimic-fn-npm-1.2.0-960bf15ab7-69c0820515.zip deleted file mode 100644 index ae711478fd..0000000000 Binary files a/.yarn/cache/mimic-fn-npm-1.2.0-960bf15ab7-69c0820515.zip and /dev/null differ diff --git a/.yarn/cache/node-ask-npm-1.0.1-61e715f1fd-e5f064e86d.zip b/.yarn/cache/node-ask-npm-1.0.1-61e715f1fd-e5f064e86d.zip deleted file mode 100644 index 1ba13ee37d..0000000000 Binary files a/.yarn/cache/node-ask-npm-1.0.1-61e715f1fd-e5f064e86d.zip and /dev/null differ diff --git a/.yarn/cache/node-loggly-bulk-npm-2.2.5-3671810c41-7071604755.zip b/.yarn/cache/node-loggly-bulk-npm-2.2.5-3671810c41-7071604755.zip deleted file mode 100644 index 1463f9b9e5..0000000000 Binary files a/.yarn/cache/node-loggly-bulk-npm-2.2.5-3671810c41-7071604755.zip and /dev/null differ diff --git a/.yarn/cache/object-inspect-npm-1.11.0-c9d4bd1487-8c64f89ce3.zip b/.yarn/cache/object-inspect-npm-1.11.0-c9d4bd1487-8c64f89ce3.zip new file mode 100644 index 0000000000..ad7eb8319e Binary files /dev/null and b/.yarn/cache/object-inspect-npm-1.11.0-c9d4bd1487-8c64f89ce3.zip differ diff --git a/.yarn/cache/onetime-npm-2.0.1-6c39ecc911-bb44015ac7.zip b/.yarn/cache/onetime-npm-2.0.1-6c39ecc911-bb44015ac7.zip deleted file mode 100644 index df76b4087b..0000000000 Binary files a/.yarn/cache/onetime-npm-2.0.1-6c39ecc911-bb44015ac7.zip and /dev/null differ diff --git a/.yarn/cache/openurl-npm-1.1.1-67b69d9f28-c90f2f065b.zip b/.yarn/cache/openurl-npm-1.1.1-67b69d9f28-c90f2f065b.zip deleted file mode 100644 index 4a4d921419..0000000000 Binary files a/.yarn/cache/openurl-npm-1.1.1-67b69d9f28-c90f2f065b.zip and /dev/null differ diff --git a/.yarn/cache/picomatch-npm-2.2.2-1ce736a913-897a589f94.zip b/.yarn/cache/picomatch-npm-2.2.2-1ce736a913-897a589f94.zip deleted file mode 100644 index 7f63c446d9..0000000000 Binary files a/.yarn/cache/picomatch-npm-2.2.2-1ce736a913-897a589f94.zip and /dev/null differ diff --git a/.yarn/cache/please-upgrade-node-npm-3.2.0-3f653350ed-d87c41581a.zip b/.yarn/cache/please-upgrade-node-npm-3.2.0-3f653350ed-d87c41581a.zip deleted file mode 100644 index f65fb91278..0000000000 Binary files a/.yarn/cache/please-upgrade-node-npm-3.2.0-3f653350ed-d87c41581a.zip and /dev/null differ diff --git a/.yarn/cache/pluralize-npm-8.0.0-f5f044ed52-08931d4a6a.zip b/.yarn/cache/pluralize-npm-8.0.0-f5f044ed52-08931d4a6a.zip deleted file mode 100644 index cb849f4bd8..0000000000 Binary files a/.yarn/cache/pluralize-npm-8.0.0-f5f044ed52-08931d4a6a.zip and /dev/null differ diff --git a/.yarn/cache/progress-stream-npm-2.0.0-07560cac17-6aab6a9cf2.zip b/.yarn/cache/progress-stream-npm-2.0.0-07560cac17-6aab6a9cf2.zip deleted file mode 100644 index e923a838e1..0000000000 Binary files a/.yarn/cache/progress-stream-npm-2.0.0-07560cac17-6aab6a9cf2.zip and /dev/null differ diff --git a/.yarn/cache/restore-cursor-npm-2.0.0-80278eb6b7-482e13d02d.zip b/.yarn/cache/restore-cursor-npm-2.0.0-80278eb6b7-482e13d02d.zip deleted file mode 100644 index 3b01b88c0e..0000000000 Binary files a/.yarn/cache/restore-cursor-npm-2.0.0-80278eb6b7-482e13d02d.zip and /dev/null differ diff --git a/.yarn/cache/rxjs-npm-6.6.7-055046ea3c-bc334edef1.zip b/.yarn/cache/rxjs-npm-6.6.7-055046ea3c-bc334edef1.zip deleted file mode 100644 index ba92cebbd3..0000000000 Binary files a/.yarn/cache/rxjs-npm-6.6.7-055046ea3c-bc334edef1.zip and /dev/null differ diff --git a/.yarn/cache/rxjs-npm-7.4.0-b0fbf63f73-6b33172a76.zip b/.yarn/cache/rxjs-npm-7.4.0-b0fbf63f73-6b33172a76.zip new file mode 100644 index 0000000000..4691267ca6 Binary files /dev/null and b/.yarn/cache/rxjs-npm-7.4.0-b0fbf63f73-6b33172a76.zip differ diff --git a/.yarn/cache/semver-compare-npm-1.0.0-33f7033df0-dd1d7e2909.zip b/.yarn/cache/semver-compare-npm-1.0.0-33f7033df0-dd1d7e2909.zip deleted file mode 100644 index 934ec434d1..0000000000 Binary files a/.yarn/cache/semver-compare-npm-1.0.0-33f7033df0-dd1d7e2909.zip and /dev/null differ diff --git a/.yarn/cache/slice-ansi-npm-0.0.4-c4208829d1-481d969c6a.zip b/.yarn/cache/slice-ansi-npm-0.0.4-c4208829d1-481d969c6a.zip deleted file mode 100644 index 891e759343..0000000000 Binary files a/.yarn/cache/slice-ansi-npm-0.0.4-c4208829d1-481d969c6a.zip and /dev/null differ diff --git a/.yarn/cache/slice-ansi-npm-5.0.0-8cd4f226df-7e600a2a55.zip b/.yarn/cache/slice-ansi-npm-5.0.0-8cd4f226df-7e600a2a55.zip new file mode 100644 index 0000000000..d3e5c6f1ab Binary files /dev/null and b/.yarn/cache/slice-ansi-npm-5.0.0-8cd4f226df-7e600a2a55.zip differ diff --git a/.yarn/cache/speedometer-npm-1.0.0-8940560fb9-6b322bbb06.zip b/.yarn/cache/speedometer-npm-1.0.0-8940560fb9-6b322bbb06.zip deleted file mode 100644 index 3b27eb1f66..0000000000 Binary files a/.yarn/cache/speedometer-npm-1.0.0-8940560fb9-6b322bbb06.zip and /dev/null differ diff --git a/.yarn/cache/string-width-npm-5.0.1-8356eb320f-2a7cbd6a41.zip b/.yarn/cache/string-width-npm-5.0.1-8356eb320f-2a7cbd6a41.zip new file mode 100644 index 0000000000..78d1237d1a Binary files /dev/null and b/.yarn/cache/string-width-npm-5.0.1-8356eb320f-2a7cbd6a41.zip differ diff --git a/.yarn/cache/stringify-object-npm-3.3.0-3e6784f7df-6827a3f359.zip b/.yarn/cache/stringify-object-npm-3.3.0-3e6784f7df-6827a3f359.zip deleted file mode 100644 index 9af1377314..0000000000 Binary files a/.yarn/cache/stringify-object-npm-3.3.0-3e6784f7df-6827a3f359.zip and /dev/null differ diff --git a/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip b/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip new file mode 100644 index 0000000000..84c011395c Binary files /dev/null and b/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip differ diff --git a/.yarn/cache/stylelint-config-recommended-npm-3.0.0-6b3f20fde3-8f02b2cd20.zip b/.yarn/cache/stylelint-config-recommended-npm-3.0.0-6b3f20fde3-8f02b2cd20.zip deleted file mode 100644 index 245dffe240..0000000000 Binary files a/.yarn/cache/stylelint-config-recommended-npm-3.0.0-6b3f20fde3-8f02b2cd20.zip and /dev/null differ diff --git a/.yarn/cache/stylelint-config-recommended-npm-5.0.0-5268d1a05e-574468542e.zip b/.yarn/cache/stylelint-config-recommended-npm-5.0.0-5268d1a05e-574468542e.zip new file mode 100644 index 0000000000..5cc654f0bf Binary files /dev/null and b/.yarn/cache/stylelint-config-recommended-npm-5.0.0-5268d1a05e-574468542e.zip differ diff --git a/.yarn/cache/supports-color-npm-2.0.0-22c0f0adbc-602538c581.zip b/.yarn/cache/supports-color-npm-2.0.0-22c0f0adbc-602538c581.zip deleted file mode 100644 index c4608ecfe9..0000000000 Binary files a/.yarn/cache/supports-color-npm-2.0.0-22c0f0adbc-602538c581.zip and /dev/null differ diff --git a/.yarn/cache/supports-color-npm-9.1.0-7ab43de836-90794e2a31.zip b/.yarn/cache/supports-color-npm-9.1.0-7ab43de836-90794e2a31.zip new file mode 100644 index 0000000000..40892bca8d Binary files /dev/null and b/.yarn/cache/supports-color-npm-9.1.0-7ab43de836-90794e2a31.zip differ diff --git a/.yarn/cache/symbol-observable-npm-1.2.0-9e812a0a39-48ffbc22e3.zip b/.yarn/cache/symbol-observable-npm-1.2.0-9e812a0a39-48ffbc22e3.zip deleted file mode 100644 index 4dba6d8fb3..0000000000 Binary files a/.yarn/cache/symbol-observable-npm-1.2.0-9e812a0a39-48ffbc22e3.zip and /dev/null differ diff --git a/.yarn/cache/tmp-npm-0.2.1-a9c8d9c0ca-8b12146541.zip b/.yarn/cache/tmp-npm-0.2.1-a9c8d9c0ca-8b12146541.zip deleted file mode 100644 index d47a2298ad..0000000000 Binary files a/.yarn/cache/tmp-npm-0.2.1-a9c8d9c0ca-8b12146541.zip and /dev/null differ diff --git a/.yarn/cache/tmp-promise-npm-3.0.2-11aa78184c-2d8457c951.zip b/.yarn/cache/tmp-promise-npm-3.0.2-11aa78184c-2d8457c951.zip deleted file mode 100644 index 3e198cda4a..0000000000 Binary files a/.yarn/cache/tmp-promise-npm-3.0.2-11aa78184c-2d8457c951.zip and /dev/null differ diff --git a/.yarn/cache/tree-kill-npm-1.2.2-3da0e5a759-49117f5f41.zip b/.yarn/cache/tree-kill-npm-1.2.2-3da0e5a759-49117f5f41.zip deleted file mode 100644 index c9ef401371..0000000000 Binary files a/.yarn/cache/tree-kill-npm-1.2.2-3da0e5a759-49117f5f41.zip and /dev/null differ diff --git a/.yarn/cache/ts-dedent-npm-1.2.0-7f6134b3b7-69f654beb3.zip b/.yarn/cache/ts-dedent-npm-1.2.0-7f6134b3b7-69f654beb3.zip deleted file mode 100644 index a6c2e073e6..0000000000 Binary files a/.yarn/cache/ts-dedent-npm-1.2.0-7f6134b3b7-69f654beb3.zip and /dev/null differ diff --git a/.yarn/cache/tslib-npm-1.14.1-102499115e-dbe628ef87.zip b/.yarn/cache/tslib-npm-1.14.1-102499115e-dbe628ef87.zip deleted file mode 100644 index 5569f012b5..0000000000 Binary files a/.yarn/cache/tslib-npm-1.14.1-102499115e-dbe628ef87.zip and /dev/null differ diff --git a/.yarn/cache/tslib-npm-2.1.0-81c9ac9b82-aa189c8179.zip b/.yarn/cache/tslib-npm-2.1.0-81c9ac9b82-aa189c8179.zip new file mode 100644 index 0000000000..88d2e3b1d6 Binary files /dev/null and b/.yarn/cache/tslib-npm-2.1.0-81c9ac9b82-aa189c8179.zip differ diff --git a/.yarn/cache/tunnel-npm-0.0.6-b1c0830ea4-c362948df9.zip b/.yarn/cache/tunnel-npm-0.0.6-b1c0830ea4-c362948df9.zip deleted file mode 100644 index 0cd96f658c..0000000000 Binary files a/.yarn/cache/tunnel-npm-0.0.6-b1c0830ea4-c362948df9.zip and /dev/null differ diff --git a/.yarn/cache/vscode-json-languageservice-npm-3.11.0-ab1ba9ea19-3bd64f9180.zip b/.yarn/cache/vscode-json-languageservice-npm-3.11.0-ab1ba9ea19-3bd64f9180.zip deleted file mode 100644 index b35f3e2f69..0000000000 Binary files a/.yarn/cache/vscode-json-languageservice-npm-3.11.0-ab1ba9ea19-3bd64f9180.zip and /dev/null differ diff --git a/.yarn/cache/vscode-json-languageservice-npm-4.1.7-71657520e8-5d9f82f3ab.zip b/.yarn/cache/vscode-json-languageservice-npm-4.1.7-71657520e8-5d9f82f3ab.zip new file mode 100644 index 0000000000..711ecce5d2 Binary files /dev/null and b/.yarn/cache/vscode-json-languageservice-npm-4.1.7-71657520e8-5d9f82f3ab.zip differ diff --git a/.yarn/cache/vscode-languageserver-types-npm-3.16.0-bd03fd2d40-7a44fb10b9.zip b/.yarn/cache/vscode-languageserver-types-npm-3.16.0-bd03fd2d40-7a44fb10b9.zip new file mode 100644 index 0000000000..8a3578e99c Binary files /dev/null and b/.yarn/cache/vscode-languageserver-types-npm-3.16.0-bd03fd2d40-7a44fb10b9.zip differ diff --git a/.yarn/cache/vscode-languageserver-types-npm-3.16.0-next.2-3e8f0ef4d9-e7c3020408.zip b/.yarn/cache/vscode-languageserver-types-npm-3.16.0-next.2-3e8f0ef4d9-e7c3020408.zip deleted file mode 100644 index 66cc6a16d4..0000000000 Binary files a/.yarn/cache/vscode-languageserver-types-npm-3.16.0-next.2-3e8f0ef4d9-e7c3020408.zip and /dev/null differ diff --git a/.yarn/cache/vscode-uri-npm-2.1.2-818cfab1f1-58c2d21018.zip b/.yarn/cache/vscode-uri-npm-2.1.2-818cfab1f1-58c2d21018.zip deleted file mode 100644 index b6b55187ca..0000000000 Binary files a/.yarn/cache/vscode-uri-npm-2.1.2-818cfab1f1-58c2d21018.zip and /dev/null differ diff --git a/.yarn/cache/vscode-uri-npm-3.0.2-04c5161925-5ed2c95a48.zip b/.yarn/cache/vscode-uri-npm-3.0.2-04c5161925-5ed2c95a48.zip new file mode 100644 index 0000000000..53a5019efd Binary files /dev/null and b/.yarn/cache/vscode-uri-npm-3.0.2-04c5161925-5ed2c95a48.zip differ diff --git a/.yarn/cache/wrap-ansi-npm-3.0.1-876d294274-1ceed09986.zip b/.yarn/cache/wrap-ansi-npm-3.0.1-876d294274-1ceed09986.zip deleted file mode 100644 index 0d60091485..0000000000 Binary files a/.yarn/cache/wrap-ansi-npm-3.0.1-876d294274-1ceed09986.zip and /dev/null differ diff --git a/.yarn/cache/xmlbuilder-npm-10.1.1-6d5c6c3a97-1543fdf148.zip b/.yarn/cache/xmlbuilder-npm-10.1.1-6d5c6c3a97-1543fdf148.zip deleted file mode 100644 index 80bcdaf382..0000000000 Binary files a/.yarn/cache/xmlbuilder-npm-10.1.1-6d5c6c3a97-1543fdf148.zip and /dev/null differ diff --git a/.yarn/cache/yargs-parser-npm-21.0.0-d564c0a5d4-1e205fca1c.zip b/.yarn/cache/yargs-parser-npm-21.0.0-d564c0a5d4-1e205fca1c.zip new file mode 100644 index 0000000000..61fad7c565 Binary files /dev/null and b/.yarn/cache/yargs-parser-npm-21.0.0-d564c0a5d4-1e205fca1c.zip differ diff --git a/.yarn/cache/yarn-or-npm-npm-3.0.1-dcd2057654-94421b4315.zip b/.yarn/cache/yarn-or-npm-npm-3.0.1-dcd2057654-94421b4315.zip deleted file mode 100644 index b144405adc..0000000000 Binary files a/.yarn/cache/yarn-or-npm-npm-3.0.1-dcd2057654-94421b4315.zip and /dev/null differ diff --git a/.yarn/versions/115ae74b.yml b/.yarn/versions/115ae74b.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.yarn/versions/bc6a1846.yml b/.yarn/versions/bc6a1846.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.yarn/versions/d20b2bc1.yml b/.yarn/versions/d20b2bc1.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.yarn/versions/e4d654fd.yml b/.yarn/versions/e4d654fd.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json index 1180913101..77f970ff18 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "moment": "2.24.0", "trim": "1.0.1", "ejs": "3.1.6", - "glob-parent": "5.1.2", + "glob-parent": "6.0.1", "semver-regex": "4.0.0", "postcss": "8.3.5", "autoprefixer": "10.2.6", @@ -89,14 +89,14 @@ "babel-plugin-dynamic-import-node": "^2.3.3", "browserslist": "^4.16.5", "chalk": "^4.1.0", - "chromatic": "^5.2.0", + "chromatic": "6.0.4", "enquirer": "^2.3.6", "eslint": "^7.10.0", "eslint-config-airbnb": "^18.2.0", "eslint-config-prettier": "^8.0.0", "eslint-plugin-es5": "^1.5.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-json": "^2.1.2", + "eslint-plugin-json": "3.1.0", "eslint-plugin-jsx-a11y": "^6.3.1", "eslint-plugin-prettier": "4.0.0", "eslint-plugin-react": "7.22.0", @@ -106,7 +106,7 @@ "husky": "7.0.2", "jest": "26.6.3", "json5": "^2.1.3", - "lint-staged": "11.1.2", + "lint-staged": "12.0.3", "postcss": "^8.3.5", "prettier": "2.2.1", "prop-types": "^15.7.2", @@ -120,8 +120,8 @@ "shelljs": "^0.8.4", "strip-ansi": "^6.0.0", "stylelint": "^13.7.2", - "stylelint-config-recommended": "^3.0.0", - "yargs-parser": "^20.2.1" + "stylelint-config-recommended": "5.0.0", + "yargs-parser": "21.0.0" }, "config": { "babel_ignore": "'**/*.test.js,**/*.test.jsx,**/*.stories.js,**/*.stories.jsx'" diff --git a/packages/components/psammead-brand/CHANGELOG.md b/packages/components/psammead-brand/CHANGELOG.md index 1914203347..13f0e8331f 100644 --- a/packages/components/psammead-brand/CHANGELOG.md +++ b/packages/components/psammead-brand/CHANGELOG.md @@ -3,6 +3,19 @@ | Version | Description | | ------- | ----------- | +| 7.3.16 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 7.3.15 | [PR#4598](https://github.com/bbc/psammead/pull/4598) Fix missing ID to fix lighthouse failure in Simorgh | +| 7.3.14 | [PR#4586](https://github.com/bbc/psammead/pull/4586) Fix TalkBack reading nested spans incorrectly | +| 7.3.13 | [PR#4589](https://github.com/bbc/psammead/pull/4589) Fix comma bug in TalkBack | +| 7.3.12 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 7.3.11 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 7.3.10 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 7.3.9 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 7.3.8 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 7.3.7 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 7.3.6 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 7.3.5 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 7.3.4 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 7.3.3 | [PR#4530](https://github.com/bbc/psammead/pull/4530) SVG Wrapper component max-width updated | | 7.3.2 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 7.3.1 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | diff --git a/packages/components/psammead-brand/package.json b/packages/components/psammead-brand/package.json index 1abf25d7e3..653b132b9c 100644 --- a/packages/components/psammead-brand/package.json +++ b/packages/components/psammead-brand/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-brand", - "version": "7.3.3", + "version": "7.3.16", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,12 +19,12 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-brand/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", + "@bbc/gel-foundations": "7.0.0", "@bbc/psammead-visually-hidden-text": "2.0.7" }, "devDependencies": { - "@bbc/psammead-script-link": "3.0.20", - "@bbc/psammead-styles": "7.3.0", + "@bbc/psammead-script-link": "3.0.30", + "@bbc/psammead-styles": "8.0.2", "@emotion/styled": "^11.3.0", "react": "^17.0.2" }, diff --git a/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap index 8397c7f996..417b7dd592 100644 --- a/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap @@ -122,15 +122,17 @@ exports[`Brand should render correctly with link not provided 1`] = ` - Default Brand Name + Default Brand Name, + + + Service - , - Service @@ -259,6 +261,7 @@ exports[`Brand should render correctly with link provided 1`] = ` class="emotion-2 emotion-3" > @@ -280,15 +283,17 @@ exports[`Brand should render correctly with link provided 1`] = ` - Default Brand Name + Default Brand Name, + + + Service - , - Service @@ -418,6 +423,7 @@ exports[`Brand should render correctly with no service Localised Name 1`] = ` BBC News @@ -550,6 +556,7 @@ exports[`Brand should render correctly with transparent borders 1`] = ` BBC News diff --git a/packages/components/psammead-brand/src/index.jsx b/packages/components/psammead-brand/src/index.jsx index dcd57bc293..9700206b5e 100644 --- a/packages/components/psammead-brand/src/index.jsx +++ b/packages/components/psammead-brand/src/index.jsx @@ -122,17 +122,22 @@ const BrandSvg = styled.svg` /* stylelint-enable */ `; -const LocalisedBrandName = ({ product, serviceLocalisedName }) => - serviceLocalisedName ? ( +const LocalisedBrandName = ({ linkId, product, serviceLocalisedName }) => { + const brandId = `BrandLink-${linkId}`; + return serviceLocalisedName ? ( + // id={`BrandLink-${linkId}` is a temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 // eslint-disable-next-line jsx-a11y/aria-role - - {product}, {serviceLocalisedName} + + {`${product}, `} + {serviceLocalisedName} ) : ( - {product} + {product} ); +}; LocalisedBrandName.propTypes = { + linkId: string.isRequired, product: string.isRequired, serviceLocalisedName: string, }; @@ -142,6 +147,7 @@ LocalisedBrandName.defaultProps = { }; const StyledBrand = ({ + linkId, product, serviceLocalisedName, svgHeight, @@ -169,6 +175,7 @@ const StyledBrand = ({ {svg.group} @@ -178,6 +185,7 @@ const StyledBrand = ({ ); const brandProps = { + linkId: string.isRequired, product: string.isRequired, serviceLocalisedName: string, maxWidth: number.isRequired, @@ -234,6 +242,8 @@ const Brand = forwardRef((props, ref) => { maxWidth={maxWidth} minWidth={minWidth} id={linkId} + // This is a temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 + aria-labelledby={`BrandLink-${linkId}`} > diff --git a/packages/components/psammead-bulleted-list/CHANGELOG.md b/packages/components/psammead-bulleted-list/CHANGELOG.md index 2dd71c8ee9..e20f10e329 100644 --- a/packages/components/psammead-bulleted-list/CHANGELOG.md +++ b/packages/components/psammead-bulleted-list/CHANGELOG.md @@ -2,6 +2,16 @@ | Version | Description | | ------------- | --------------------------------------------------------------------------------------------------------------------------- | +| 3.1.10 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.1.9 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.1.8 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.1.7 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.1.6 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.1.5 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.1.4 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.1.3 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.1.2 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.1.1 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.1.0 | [PR#4529](https://github.com/bbc/psammead/pull/4529) Allow bullet point shape and colour to be customised | | 3.0.18 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.0.17 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | diff --git a/packages/components/psammead-bulleted-list/package.json b/packages/components/psammead-bulleted-list/package.json index 63452377cc..9b42add3b3 100644 --- a/packages/components/psammead-bulleted-list/package.json +++ b/packages/components/psammead-bulleted-list/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-bulleted-list", - "version": "3.1.0", + "version": "3.1.10", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-bulleted-list/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-bulletin/CHANGELOG.md b/packages/components/psammead-bulletin/CHANGELOG.md index efaefe2686..1337ee9040 100644 --- a/packages/components/psammead-bulletin/CHANGELOG.md +++ b/packages/components/psammead-bulletin/CHANGELOG.md @@ -3,6 +3,26 @@ | Version | Description | |---------|-------------| +| 5.0.56 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 5.0.55 | [PR#4608](https://github.com/bbc/psammead/pull/4608) Bump dependencies | +| 5.0.54 | [PR#4606](https://github.com/bbc/psammead/pull/4606) Bump dependencies | +| 5.0.53 | [PR#4600](https://github.com/bbc/psammead/pull/4600) Fix TalkBack reading nested spans incorrectly | +| 5.0.52 | [PR#4601](https://github.com/bbc/psammead/pull/4601) Bumps dependencies | +| 5.0.51 | [PR#4603](https://github.com/bbc/psammead/pull/4603) Bumps dependencies | +| 5.0.50 | [PR#4602](https://github.com/bbc/psammead/pull/4602) Bumps dependencies | +| 5.0.49 | [PR#4597](https://github.com/bbc/psammead/pull/4597) Bumps dependencies | +| 5.0.48 | [PR#4588](https://github.com/bbc/psammead/pull/4588) Bumps dependencies | +| 5.0.47 | [PR#4591](https://github.com/bbc/psammead/pull/4591) Bumps dependencies | +| 5.0.46 | [PR#4578](https://github.com/bbc/psammead/pull/4578) Bumps dependencies | +| 5.0.45 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 5.0.44 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 5.0.43 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 5.0.42 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 5.0.41 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 5.0.40 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 5.0.39 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 5.0.38 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 5.0.37 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 5.0.36 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 5.0.35 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 5.0.33 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-bulletin/package.json b/packages/components/psammead-bulletin/package.json index 69c3a15928..704301649f 100644 --- a/packages/components/psammead-bulletin/package.json +++ b/packages/components/psammead-bulletin/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-bulletin", - "version": "5.0.36", + "version": "5.0.56", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,11 +19,11 @@ }, "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-bulletin/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-live-label": "2.0.21", - "@bbc/psammead-story-promo": "8.0.21", - "@bbc/psammead-styles": "7.3.0", + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-assets": "3.1.10", + "@bbc/psammead-live-label": "2.0.33", + "@bbc/psammead-story-promo": "8.0.37", + "@bbc/psammead-styles": "8.0.2", "@bbc/psammead-visually-hidden-text": "2.0.7" }, "peerDependencies": { diff --git a/packages/components/psammead-bulletin/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-bulletin/src/__snapshots__/index.test.jsx.snap index 52db6cf6b3..7868fe90d6 100644 --- a/packages/components/psammead-bulletin/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-bulletin/src/__snapshots__/index.test.jsx.snap @@ -49,32 +49,37 @@ exports[`Bulletin should render audio correctly 1`] = ` } .emotion-6 { + display: block; + width: 100%; +} + +.emotion-8 { display: inline-block; width: 100%; } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-6 { + .emotion-8 { width: 66.67%; padding-right: 1rem; } } @supports (grid-template-columns: fit-content(200px)) { - .emotion-6 { + .emotion-8 { width: initial; grid-column: 1/span 6; } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-6 { + .emotion-8 { grid-column: 3/span 4; padding: 0; } } } -.emotion-8 { +.emotion-10 { color: #222222; margin: 0; padding: 0.5rem; @@ -86,28 +91,28 @@ exports[`Bulletin should render audio correctly 1`] = ` } @media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-8 { + .emotion-10 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) { - .emotion-8 { + .emotion-10 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-8 { + .emotion-10 { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 0; } } -.emotion-10 { +.emotion-12 { position: static; color: #222222; -webkit-text-decoration: none; @@ -115,7 +120,7 @@ exports[`Bulletin should render audio correctly 1`] = ` overflow-wrap: break-word; } -.emotion-10:before { +.emotion-12:before { bottom: 0; content: ''; left: 0; @@ -127,17 +132,17 @@ exports[`Bulletin should render audio correctly 1`] = ` z-index: 1; } -.emotion-10:hover, -.emotion-10:focus { +.emotion-12:hover, +.emotion-12:focus { -webkit-text-decoration: underline; text-decoration: underline; } -.emotion-10:visited { +.emotion-12:visited { color: #6E6E73; } -.emotion-12 { +.emotion-14 { -webkit-clip-path: inset(100%); clip-path: inset(100%); clip: rect(1px, 1px, 1px, 1px); @@ -148,7 +153,7 @@ exports[`Bulletin should render audio correctly 1`] = ` margin: 0; } -.emotion-14 { +.emotion-16 { color: #3F3F42; margin: 0; padding: 0 0.5rem 1rem; @@ -160,26 +165,26 @@ exports[`Bulletin should render audio correctly 1`] = ` } @media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-14 { + .emotion-16 { font-size: 0.9375rem; line-height: 1.125rem; } } @media (min-width: 37.5rem) { - .emotion-14 { + .emotion-16 { font-size: 0.875rem; line-height: 1.125rem; } } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-14 { + .emotion-16 { padding-left: 0; } } -.emotion-16 { +.emotion-18 { background-color: #222222; border: 0.0625rem solid transparent; color: #FFFFFF; @@ -204,21 +209,21 @@ exports[`Bulletin should render audio correctly 1`] = ` } @media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-16 { + .emotion-18 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) { - .emotion-16 { + .emotion-18 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-16 { + .emotion-18 { display: -webkit-inline-box; display: -webkit-inline-flex; display: -ms-inline-flexbox; @@ -228,7 +233,7 @@ exports[`Bulletin should render audio correctly 1`] = ` } } -.emotion-18 { +.emotion-20 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -240,7 +245,7 @@ exports[`Bulletin should render audio correctly 1`] = ` padding-right: 0.5rem; } -.emotion-18>svg { +.emotion-20>svg { color: #FFFFFF; fill: currentColor; width: 1.0625rem; @@ -248,7 +253,7 @@ exports[`Bulletin should render audio correctly 1`] = ` margin: 0; } -.emotion-20 { +.emotion-22 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -264,29 +269,43 @@ exports[`Bulletin should render audio correctly 1`] = ` - + > + + + + Listen, @@ -297,23 +316,23 @@ exports[`Bulletin should render audio correctly 1`] = ` This is the summary text svg { +.emotion-20>svg { color: #FFFFFF; fill: currentColor; width: 1.0625rem; @@ -582,7 +606,7 @@ exports[`Bulletin should render audio correctly with lang prop passed in 1`] = ` margin: 0; } -.emotion-20 { +.emotion-22 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -598,29 +622,43 @@ exports[`Bulletin should render audio correctly with lang prop passed in 1`] = ` - + > + + + + Listen, @@ -632,23 +670,23 @@ exports[`Bulletin should render audio correctly with lang prop passed in 1`] = ` This is the summary text svg { +.emotion-22>svg { color: #FFFFFF; fill: currentColor; width: 1.0625rem; @@ -926,7 +969,7 @@ exports[`Bulletin should render live audio correctly 1`] = ` margin: 0; } -.emotion-22 { +.emotion-24 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -942,36 +985,50 @@ exports[`Bulletin should render live audio correctly 1`] = ` - + > + + + + LIVE Listen LIVE, @@ -981,23 +1038,23 @@ exports[`Bulletin should render live audio correctly 1`] = ` This is the summary text svg { +.emotion-22>svg { color: #FFFFFF; fill: currentColor; width: 1.0625rem; @@ -1278,7 +1340,7 @@ exports[`Bulletin should render live video correctly 1`] = ` margin: 0; } -.emotion-22 { +.emotion-24 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -1294,36 +1356,50 @@ exports[`Bulletin should render live video correctly 1`] = ` - + > + + + + LIVE Watch LIVE, @@ -1333,23 +1409,23 @@ exports[`Bulletin should render live video correctly 1`] = ` This is the summary text `; -exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` +exports[`Bulletin should render radio bulletin without ariaId 1`] = ` .emotion-0 { position: relative; background-color: #F2F2F2; @@ -1416,32 +1492,37 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` } .emotion-6 { + display: block; + width: 100%; +} + +.emotion-8 { display: inline-block; width: 100%; } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-6 { + .emotion-8 { width: 66.67%; padding-right: 1rem; } } @supports (grid-template-columns: fit-content(200px)) { - .emotion-6 { + .emotion-8 { width: initial; grid-column: 1/span 6; } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-6 { + .emotion-8 { grid-column: 3/span 4; padding: 0; } } } -.emotion-8 { +.emotion-10 { color: #222222; margin: 0; padding: 0.5rem; @@ -1453,28 +1534,28 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` } @media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-8 { + .emotion-10 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) { - .emotion-8 { + .emotion-10 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-8 { + .emotion-10 { padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 0; } } -.emotion-10 { +.emotion-12 { position: static; color: #222222; -webkit-text-decoration: none; @@ -1482,7 +1563,7 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` overflow-wrap: break-word; } -.emotion-10:before { +.emotion-12:before { bottom: 0; content: ''; left: 0; @@ -1494,17 +1575,17 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` z-index: 1; } -.emotion-10:hover, -.emotion-10:focus { +.emotion-12:hover, +.emotion-12:focus { -webkit-text-decoration: underline; text-decoration: underline; } -.emotion-10:visited { +.emotion-12:visited { color: #6E6E73; } -.emotion-12 { +.emotion-14 { -webkit-clip-path: inset(100%); clip-path: inset(100%); clip: rect(1px, 1px, 1px, 1px); @@ -1515,7 +1596,38 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` margin: 0; } -.emotion-14 { +.emotion-16 { + color: #3F3F42; + margin: 0; + padding: 0 0.5rem 1rem; + font-size: 0.9375rem; + line-height: 1.125rem; + font-family: ReithSans,Helvetica,Arial,sans-serif; + font-weight: 400; + font-style: normal; +} + +@media (min-width: 20rem) and (max-width: 37.4375rem) { + .emotion-16 { + font-size: 0.9375rem; + line-height: 1.125rem; + } +} + +@media (min-width: 37.5rem) { + .emotion-16 { + font-size: 0.875rem; + line-height: 1.125rem; + } +} + +@media (min-width: 37.5rem) and (max-width: 62.9375rem) { + .emotion-16 { + padding-left: 0; + } +} + +.emotion-18 { background-color: #222222; border: 0.0625rem solid transparent; color: #FFFFFF; @@ -1540,21 +1652,21 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` } @media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-14 { + .emotion-18 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) { - .emotion-14 { + .emotion-18 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-14 { + .emotion-18 { display: -webkit-inline-box; display: -webkit-inline-flex; display: -ms-inline-flexbox; @@ -1564,7 +1676,7 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` } } -.emotion-16 { +.emotion-20 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -1576,7 +1688,7 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` padding-right: 0.5rem; } -.emotion-16>svg { +.emotion-20>svg { color: #FFFFFF; fill: currentColor; width: 1.0625rem; @@ -1584,7 +1696,7 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` margin: 0; } -.emotion-18 { +.emotion-22 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -1600,29 +1712,43 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` - + > + + + + Listen, @@ -1632,18 +1758,24 @@ exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` + + This is the summary text + `; -exports[`Bulletin should render video correctly 1`] = ` +exports[`Bulletin should render radio bulletin without summary correctly 1`] = ` .emotion-0 { position: relative; background-color: #F2F2F2; display: grid; grid-template-columns: repeat(6, 1fr); grid-column-gap: 1rem; -} - -@media (min-width: 37.5rem) { - .emotion-0 { - padding: 1rem; - } + background-color: #F2F2F2; } .emotion-2 { @@ -1686,9 +1813,330 @@ exports[`Bulletin should render video correctly 1`] = ` padding: 0.5rem 0.5rem 0 0.5rem; } -@media (min-width: 37.5rem) { +@media (min-width: 37.5rem) and (max-width: 62.9375rem) { .emotion-2 { - width: 50%; + width: 33.33%; + } +} + +@media (min-width: 37.5rem) { + .emotion-2 { + padding: 0; + } +} + +@supports (grid-template-columns: fit-content(200px)) { + .emotion-2 { + width: initial; + grid-column: 1/span 6; + } + + @media (min-width: 37.5rem) and (max-width: 62.9375rem) { + .emotion-2 { + grid-column: 1/span 2; + } + } +} + +.emotion-4 { + display: block; + width: 100%; + visibility: visible; +} + +.emotion-6 { + display: block; + width: 100%; +} + +.emotion-8 { + display: inline-block; + width: 100%; +} + +@media (min-width: 37.5rem) and (max-width: 62.9375rem) { + .emotion-8 { + width: 66.67%; + padding-right: 1rem; + } +} + +@supports (grid-template-columns: fit-content(200px)) { + .emotion-8 { + width: initial; + grid-column: 1/span 6; + } + + @media (min-width: 37.5rem) and (max-width: 62.9375rem) { + .emotion-8 { + grid-column: 3/span 4; + padding: 0; + } + } +} + +.emotion-10 { + color: #222222; + margin: 0; + padding: 0.5rem; + font-family: ReithSerif,Helvetica,Arial,sans-serif; + font-weight: 500; + font-style: normal; + font-size: 0.9375rem; + line-height: 1.25rem; +} + +@media (min-width: 20rem) and (max-width: 37.4375rem) { + .emotion-10 { + font-size: 1rem; + line-height: 1.25rem; + } +} + +@media (min-width: 37.5rem) { + .emotion-10 { + font-size: 1rem; + line-height: 1.25rem; + } +} + +@media (min-width: 37.5rem) and (max-width: 62.9375rem) { + .emotion-10 { + padding-top: 0.5rem; + padding-bottom: 0.5rem; + padding-left: 0; + } +} + +.emotion-12 { + position: static; + color: #222222; + -webkit-text-decoration: none; + text-decoration: none; + overflow-wrap: break-word; +} + +.emotion-12:before { + bottom: 0; + content: ''; + left: 0; + overflow: hidden; + position: absolute; + right: 0; + top: 0; + white-space: nowrap; + z-index: 1; +} + +.emotion-12:hover, +.emotion-12:focus { + -webkit-text-decoration: underline; + text-decoration: underline; +} + +.emotion-12:visited { + color: #6E6E73; +} + +.emotion-14 { + -webkit-clip-path: inset(100%); + clip-path: inset(100%); + clip: rect(1px, 1px, 1px, 1px); + height: 1px; + overflow: hidden; + position: absolute; + width: 1px; + margin: 0; +} + +.emotion-16 { + background-color: #222222; + border: 0.0625rem solid transparent; + color: #FFFFFF; + padding: 0.75rem; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + font-size: 0.9375rem; + line-height: 1.25rem; + font-family: ReithSans,Helvetica,Arial,sans-serif; + font-weight: 400; + font-style: normal; +} + +@media (min-width: 20rem) and (max-width: 37.4375rem) { + .emotion-16 { + font-size: 1rem; + line-height: 1.25rem; + } +} + +@media (min-width: 37.5rem) { + .emotion-16 { + font-size: 1rem; + line-height: 1.25rem; + } +} + +@media (min-width: 37.5rem) and (max-width: 62.9375rem) { + .emotion-16 { + display: -webkit-inline-box; + display: -webkit-inline-flex; + display: -ms-inline-flexbox; + display: inline-flex; + padding: 0.5rem 1rem; + margin-bottom: 1rem; + } +} + +.emotion-18 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + padding-right: 0.5rem; +} + +.emotion-18>svg { + color: #FFFFFF; + fill: currentColor; + width: 1.0625rem; + height: 1rem; + margin: 0; +} + +.emotion-20 { + vertical-align: middle; + margin: 0 0.25rem; + color: #222222; + fill: currentColor; + width: 0.8125rem; + height: 0.75rem; +} + + + + + + + + + + + + + + + + Listen, + + + This is the headline + + + + + + + + + + + + Listen + + + + +`; + +exports[`Bulletin should render video correctly 1`] = ` +.emotion-0 { + position: relative; + background-color: #F2F2F2; + display: grid; + grid-template-columns: repeat(6, 1fr); + grid-column-gap: 1rem; +} + +@media (min-width: 37.5rem) { + .emotion-0 { + padding: 1rem; + } +} + +.emotion-2 { + vertical-align: top; + display: inline-block; + width: 100%; + padding: 0.5rem 0.5rem 0 0.5rem; +} + +@media (min-width: 37.5rem) { + .emotion-2 { + width: 50%; } } @@ -1718,32 +2166,37 @@ exports[`Bulletin should render video correctly 1`] = ` } .emotion-6 { + display: block; + width: 100%; +} + +.emotion-8 { display: inline-block; width: 100%; } @media (min-width: 37.5rem) { - .emotion-6 { + .emotion-8 { width: 50%; padding-right: 1rem; } } @supports (grid-template-columns: fit-content(200px)) { - .emotion-6 { + .emotion-8 { width: initial; grid-column: 1/span 6; } @media (min-width: 37.5rem) { - .emotion-6 { + .emotion-8 { grid-column: 4/span 3; padding: 0; } } } -.emotion-8 { +.emotion-10 { color: #222222; margin: 0; padding: 0.5rem; @@ -1755,26 +2208,26 @@ exports[`Bulletin should render video correctly 1`] = ` } @media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-8 { + .emotion-10 { font-size: 1.125rem; line-height: 1.375rem; } } @media (min-width: 37.5rem) { - .emotion-8 { + .emotion-10 { font-size: 1.25rem; line-height: 1.5rem; } } @media (min-width: 37.5rem) { - .emotion-8 { + .emotion-10 { padding: 0 0 0.5rem 0; } } -.emotion-10 { +.emotion-12 { position: static; color: #222222; -webkit-text-decoration: none; @@ -1782,7 +2235,7 @@ exports[`Bulletin should render video correctly 1`] = ` overflow-wrap: break-word; } -.emotion-10:before { +.emotion-12:before { bottom: 0; content: ''; left: 0; @@ -1794,17 +2247,17 @@ exports[`Bulletin should render video correctly 1`] = ` z-index: 1; } -.emotion-10:hover, -.emotion-10:focus { +.emotion-12:hover, +.emotion-12:focus { -webkit-text-decoration: underline; text-decoration: underline; } -.emotion-10:visited { +.emotion-12:visited { color: #6E6E73; } -.emotion-12 { +.emotion-14 { -webkit-clip-path: inset(100%); clip-path: inset(100%); clip: rect(1px, 1px, 1px, 1px); @@ -1815,7 +2268,7 @@ exports[`Bulletin should render video correctly 1`] = ` margin: 0; } -.emotion-14 { +.emotion-16 { color: #3F3F42; margin: 0; padding: 0 0.5rem 1rem; @@ -1827,27 +2280,27 @@ exports[`Bulletin should render video correctly 1`] = ` } @media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-14 { + .emotion-16 { font-size: 0.9375rem; line-height: 1.125rem; } } @media (min-width: 37.5rem) { - .emotion-14 { + .emotion-16 { font-size: 0.875rem; line-height: 1.125rem; } } @media (min-width: 37.5rem) { - .emotion-14 { + .emotion-16 { padding-left: 0; padding-right: 0; } } -.emotion-16 { +.emotion-18 { background-color: #222222; border: 0.0625rem solid transparent; color: #FFFFFF; @@ -1872,21 +2325,21 @@ exports[`Bulletin should render video correctly 1`] = ` } @media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-16 { + .emotion-18 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) { - .emotion-16 { + .emotion-18 { font-size: 1rem; line-height: 1.25rem; } } @media (min-width: 37.5rem) { - .emotion-16 { + .emotion-18 { display: -webkit-inline-box; display: -webkit-inline-flex; display: -ms-inline-flexbox; @@ -1895,7 +2348,7 @@ exports[`Bulletin should render video correctly 1`] = ` } } -.emotion-18 { +.emotion-20 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -1907,7 +2360,7 @@ exports[`Bulletin should render video correctly 1`] = ` padding-right: 0.5rem; } -.emotion-18>svg { +.emotion-20>svg { color: #FFFFFF; fill: currentColor; width: 1.0625rem; @@ -1915,7 +2368,7 @@ exports[`Bulletin should render video correctly 1`] = ` margin: 0; } -.emotion-20 { +.emotion-22 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -1931,29 +2384,43 @@ exports[`Bulletin should render video correctly 1`] = ` - + > + + + + Watch, @@ -1964,23 +2431,23 @@ exports[`Bulletin should render video correctly 1`] = ` This is the summary text { + const sanitisedAriaId = ariaId ? ariaId.replace(/\W/g, '') : null; const isAudio = mediaType === 'audio'; const bulletinType = isAudio ? 'radio' : 'tv'; const BulletinWrapper = isAudio ? RadioBulletinWrapper : TVBulletinWrapper; - + // aria-labelledby in {image && ( @@ -203,7 +205,7 @@ const Bulletin = ({ bulletinType={bulletinType} dir={dir} > - + {isLive ? ( {headlineText} ) : ( // eslint-disable-next-line jsx-a11y/aria-role - + {offScreenText && ( {`${offScreenText}, `} @@ -266,6 +269,7 @@ Bulletin.propTypes = { liveText: string, offScreenText: string.isRequired, lang: string, + ariaId: string.isRequired, }; Bulletin.defaultProps = { diff --git a/packages/components/psammead-bulletin/src/index.stories.jsx b/packages/components/psammead-bulletin/src/index.stories.jsx index 94ab6b99c6..b00236f4b0 100644 --- a/packages/components/psammead-bulletin/src/index.stories.jsx +++ b/packages/components/psammead-bulletin/src/index.stories.jsx @@ -21,11 +21,22 @@ const BulletinComponent = ({ const withSummary = boolean('With summary', true); const ctaText = mediaType === 'audio' ? 'Listen' : 'Watch'; const offScreenText = isLive ? `${ctaText} Live` : ctaText; + const imageSizes = [300, 450, 600, 1024]; + const imageSrc = + 'https://ichef.bbci.co.uk/news/[WIDTH]/cpsprodpb/11897/production/_106613817_999_al_.jpg'; const image = ( `${imageSrc.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', ')} + fallbackSrcset={imageSizes + .map(size => `${imageSrc.replace('[WIDTH]', size)} ${size}w`) + .join(', ')} + primaryMimeType="image/webp" + fallbackMimeType="image/jpeg" /> ); @@ -42,6 +53,7 @@ const BulletinComponent = ({ ctaText={ctaText} isLive={isLive} offScreenText={offScreenText} + ariaId={ctaLink} /> ); }; diff --git a/packages/components/psammead-bulletin/src/index.test.jsx b/packages/components/psammead-bulletin/src/index.test.jsx index 0ae5686f27..04db9ffaea 100644 --- a/packages/components/psammead-bulletin/src/index.test.jsx +++ b/packages/components/psammead-bulletin/src/index.test.jsx @@ -14,18 +14,30 @@ const BulletinComponent = ({ withSummary = true, dir = 'ltr', lang = null, + ariaId, }) => { const summaryText = 'This is the summary text'; const headlineText = 'This is the headline'; const ctaLink = 'https://bbc.co.uk'; + const imageSizes = [300, 450, 600, 1024]; + const imageSrc = + 'https://ichef.bbci.co.uk/news/[WIDTH]/cpsprodpb/11897/production/_106613817_999_al_.jpg'; const playCtaText = isLive ? `${ctaText} Live` : ctaText; const offScreenText = isLive ? `${ctaText} LIVE` : ctaText; const image = ( `${imageSrc.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', ')} + fallbackSrcset={imageSizes + .map(size => `${imageSrc.replace('[WIDTH]', size)} ${size}w`) + .join(', ')} + primaryMimeType="image/webp" + fallbackMimeType="image/jpeg" /> ); return ( @@ -42,6 +54,7 @@ const BulletinComponent = ({ offScreenText={offScreenText} dir={dir} lang={lang} + ariaId={ariaId} /> ); }; @@ -54,6 +67,7 @@ describe('Bulletin', () => { service="news" mediaType="audio" ctaText="Listen" + ariaId="https://bbc.co.uk" />, ); @@ -66,6 +80,7 @@ describe('Bulletin', () => { ctaText="Listen" dir="rtl" lang="en-GB" + ariaId="https://bbc.co.uk" />, ); @@ -76,6 +91,7 @@ describe('Bulletin', () => { service="news" mediaType="video" ctaText="Watch" + ariaId="https://bbc.co.uk" />, ); @@ -86,6 +102,7 @@ describe('Bulletin', () => { service="news" mediaType="audio" ctaText="Listen" + ariaId="https://bbc.co.uk" isLive />, ); @@ -97,6 +114,7 @@ describe('Bulletin', () => { service="news" mediaType="video" ctaText="Watch" + ariaId="https://bbc.co.uk" isLive />, ); @@ -108,7 +126,19 @@ describe('Bulletin', () => { service="news" mediaType="audio" ctaText="Listen" + ariaId="https://bbc.co.uk" withSummary={false} />, ); + + // the below test is a temporary test for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 + shouldMatchSnapshot( + 'should render radio bulletin without ariaId', + , + ); }); diff --git a/packages/components/psammead-byline/CHANGELOG.md b/packages/components/psammead-byline/CHANGELOG.md index bb987bab6f..0d5a423a76 100644 --- a/packages/components/psammead-byline/CHANGELOG.md +++ b/packages/components/psammead-byline/CHANGELOG.md @@ -1,43 +1,54 @@ # Byline Changelog -| Version | Description | -| ------------- | ----------------------------------------------------------------------------------------------------------- | -| 3.0.19 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | -| 3.0.18 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | -| 3.0.16 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | -| 3.0.15 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | -| 3.0.14 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | -| 3.0.13 | [PR#4304](https://github.com/bbc/psammead/pull/4304) Talos - Bump Dependencies - @bbc/gel-foundations, @bbc/psammead-styles | -| 3.0.12 | [PR#4303](https://github.com/bbc/psammead/pull/4303) Trigger rebuild following babel config update for emotion 11 | -| 3.0.11 | [PR#4271](https://github.com/bbc/psammead/pull/4271) change react peer dep to >=16.9.0 | -| 3.0.10 | [PR#4260](https://github.com/bbc/psammead/pull/4260) Talos - Bump Dependencies - @bbc/gel-foundations | -| 3.0.9 | [PR#4256](https://github.com/bbc/psammead/pull/4256) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.8 | [PR#4193](https://github.com/bbc/psammead/pull/4193) Upgrade Emotion to v11 | -| 3.0.7 | [PR#4226](https://github.com/bbc/psammead/pull/4226) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.6 | [PR#4189](https://github.com/bbc/psammead/pull/4189) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.5 | [PR#4072](https://github.com/bbc/psammead/pull/4072) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.4 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations | -| 3.0.3 | [PR#4029](https://github.com/bbc/psammead/pull/4029) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.2 | [PR#3944](https://github.com/bbc/psammead/pull/3944) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.1 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.0 | [PR#3891](https://github.com/bbc/psammead/pull/3891) Migrate to Emotion. | -| 2.0.3 | [PR#3883](https://github.com/bbc/psammead/pull/3883) Talos - Bump Dependencies - @bbc/psammead-styles | -| 2.0.2 | [PR#3855](https://github.com/bbc/psammead/pull/3855) Talos - Bump Dependencies - @bbc/gel-foundations | -| 2.0.1 | [PR#3854](https://github.com/bbc/psammead/pull/3854) Talos - Bump Dependencies - @bbc/psammead-styles | -| 2.0.0-alpha.0 | [PR#3843](https://github.com/bbc/psammead/pull/3843) Bump Dependencies - @bbc/psammead-styles alpha version | -| 1.0.14 | [PR#3836](https://github.com/bbc/psammead/pull/3836) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.13 | [PR#3816](https://github.com/bbc/psammead/pull/3816) Talos - Bump Dependencies | -| 1.0.12 | [PR#3728](https://github.com/bbc/psammead/pull/3728) Tweaks following Storybook v5.3.19 to v6.0.22 update | -| 1.0.11 | [PR#3811](https://github.com/bbc/psammead/pull/3811) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.10 | [PR#3785](https://github.com/bbc/psammead/pull/3785) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.9 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.8 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.7 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.6 | [PR#3604](https://github.com/bbc/psammead/pull/3604) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.5 | [PR#3512](https://github.com/bbc/psammead/pull/3512) Update Byline text colour | -| 1.0.4 | [PR#3467](https://github.com/bbc/psammead/pull/3467) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.3 | [PR#3397](https://github.com/bbc/psammead/pull/3397) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.2 | [PR#3135](https://github.com/bbc/psammead/pull/3135) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.1 | [PR#3129](https://github.com/bbc/psammead/pull/3129) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.0 | [PR#3117](https://github.com/bbc/psammead/pull/3117) Remove alpha tag. | -| 0.1.0-alpha.0 | [PR#3061](https://github.com/bbc/psammead/pull/3061) Initial creation of package. | +| Version | Description | +| ------------- | --------------------------------------------------------------------------------------------------------------------------- | +| 3.0.30 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.29 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.28 | [PR#4569](https://github.com/bbc/psammead/pull/4569) fixing line-height not being in line with specification | +| 3.0.27 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.26 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.25 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.24 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.23 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.22 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.21 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.20 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | +| 3.0.19 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | +| 3.0.18 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | +| 3.0.16 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | +| 3.0.15 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | +| 3.0.14 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | +| 3.0.13 | [PR#4304](https://github.com/bbc/psammead/pull/4304) Talos - Bump Dependencies - @bbc/gel-foundations, @bbc/psammead-styles | +| 3.0.12 | [PR#4303](https://github.com/bbc/psammead/pull/4303) Trigger rebuild following babel config update for emotion 11 | +| 3.0.11 | [PR#4271](https://github.com/bbc/psammead/pull/4271) change react peer dep to >=16.9.0 | +| 3.0.10 | [PR#4260](https://github.com/bbc/psammead/pull/4260) Talos - Bump Dependencies - @bbc/gel-foundations | +| 3.0.9 | [PR#4256](https://github.com/bbc/psammead/pull/4256) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.8 | [PR#4193](https://github.com/bbc/psammead/pull/4193) Upgrade Emotion to v11 | +| 3.0.7 | [PR#4226](https://github.com/bbc/psammead/pull/4226) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.6 | [PR#4189](https://github.com/bbc/psammead/pull/4189) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.5 | [PR#4072](https://github.com/bbc/psammead/pull/4072) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.4 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations | +| 3.0.3 | [PR#4029](https://github.com/bbc/psammead/pull/4029) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.2 | [PR#3944](https://github.com/bbc/psammead/pull/3944) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.1 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.0 | [PR#3891](https://github.com/bbc/psammead/pull/3891) Migrate to Emotion. | +| 2.0.3 | [PR#3883](https://github.com/bbc/psammead/pull/3883) Talos - Bump Dependencies - @bbc/psammead-styles | +| 2.0.2 | [PR#3855](https://github.com/bbc/psammead/pull/3855) Talos - Bump Dependencies - @bbc/gel-foundations | +| 2.0.1 | [PR#3854](https://github.com/bbc/psammead/pull/3854) Talos - Bump Dependencies - @bbc/psammead-styles | +| 2.0.0-alpha.0 | [PR#3843](https://github.com/bbc/psammead/pull/3843) Bump Dependencies - @bbc/psammead-styles alpha version | +| 1.0.14 | [PR#3836](https://github.com/bbc/psammead/pull/3836) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.13 | [PR#3816](https://github.com/bbc/psammead/pull/3816) Talos - Bump Dependencies | +| 1.0.12 | [PR#3728](https://github.com/bbc/psammead/pull/3728) Tweaks following Storybook v5.3.19 to v6.0.22 update | +| 1.0.11 | [PR#3811](https://github.com/bbc/psammead/pull/3811) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.10 | [PR#3785](https://github.com/bbc/psammead/pull/3785) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.9 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.8 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.7 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.6 | [PR#3604](https://github.com/bbc/psammead/pull/3604) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.5 | [PR#3512](https://github.com/bbc/psammead/pull/3512) Update Byline text colour | +| 1.0.4 | [PR#3467](https://github.com/bbc/psammead/pull/3467) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.3 | [PR#3397](https://github.com/bbc/psammead/pull/3397) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.2 | [PR#3135](https://github.com/bbc/psammead/pull/3135) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.1 | [PR#3129](https://github.com/bbc/psammead/pull/3129) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.0 | [PR#3117](https://github.com/bbc/psammead/pull/3117) Remove alpha tag. | +| 0.1.0-alpha.0 | [PR#3061](https://github.com/bbc/psammead/pull/3061) Initial creation of package. | diff --git a/packages/components/psammead-byline/package.json b/packages/components/psammead-byline/package.json index d9d6017c5d..8eff9f3c23 100644 --- a/packages/components/psammead-byline/package.json +++ b/packages/components/psammead-byline/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-byline", - "version": "3.0.19", + "version": "3.0.30", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-byline/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-byline/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-byline/src/__snapshots__/index.test.jsx.snap index 30a52a30cd..6809f3311d 100644 --- a/packages/components/psammead-byline/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-byline/src/__snapshots__/index.test.jsx.snap @@ -35,9 +35,17 @@ exports[`Byline should render correctly 1`] = ` line-height: 1.125rem; } +@media (min-width: 20rem) and (max-width: 37.4375rem) { + .emotion-4 { + font-size: 0.9375rem; + line-height: 1.125rem; + } +} + @media (min-width: 37.5rem) { .emotion-4 { font-size: 0.875rem; + line-height: 1.125rem; } } @@ -104,9 +112,17 @@ exports[`Byline should render correctly without an avatar 1`] = ` line-height: 1.125rem; } +@media (min-width: 20rem) and (max-width: 37.4375rem) { + .emotion-2 { + font-size: 0.9375rem; + line-height: 1.125rem; + } +} + @media (min-width: 37.5rem) { .emotion-2 { font-size: 0.875rem; + line-height: 1.125rem; } } diff --git a/packages/components/psammead-byline/src/index.jsx b/packages/components/psammead-byline/src/index.jsx index 964a7c3120..13be89284c 100644 --- a/packages/components/psammead-byline/src/index.jsx +++ b/packages/components/psammead-byline/src/index.jsx @@ -4,7 +4,7 @@ import styled from '@emotion/styled'; import { getSansRegular } from '@bbc/psammead-styles/font-styles'; import { GEL_SPACING } from '@bbc/gel-foundations/spacings'; import { C_METAL, C_SHADOW } from '@bbc/psammead-styles/colours'; -import { GEL_LONG_PRIMER } from '@bbc/gel-foundations/typography'; +import { getLongPrimer } from '@bbc/gel-foundations/typography'; const AVATAR_DIAMETER = '4rem'; @@ -36,7 +36,7 @@ const Person = styled.ul` padding-right: 0; padding-left: 0; ${({ service }) => getSansRegular(service)} - ${GEL_LONG_PRIMER} + ${({ script }) => getLongPrimer(script)} `; const Name = styled.li` @@ -46,10 +46,10 @@ const Title = styled.li` color: ${C_METAL}; `; -const Byline = ({ service, name, title, avatar }) => ( +const Byline = ({ service, script, name, title, avatar }) => ( {avatar && } - + {name} @@ -64,6 +64,7 @@ Byline.defaultProps = { Byline.propTypes = { service: string.isRequired, + script: string.isRequired, avatar: shape({ src: string.isRequired, alt: string, diff --git a/packages/components/psammead-byline/src/index.stories.jsx b/packages/components/psammead-byline/src/index.stories.jsx index 5d05a4bd3d..6dbe4b5563 100644 --- a/packages/components/psammead-byline/src/index.stories.jsx +++ b/packages/components/psammead-byline/src/index.stories.jsx @@ -10,9 +10,10 @@ storiesOf('Components/Byline', module) .addDecorator(withServicesKnob()) .add( 'default', - ({ service }) => ( + ({ service, script }) => ( ( + ({ service, script }) => ( diff --git a/packages/components/psammead-byline/src/index.test.jsx b/packages/components/psammead-byline/src/index.test.jsx index cb15cebdad..8acf484bc9 100644 --- a/packages/components/psammead-byline/src/index.test.jsx +++ b/packages/components/psammead-byline/src/index.test.jsx @@ -1,5 +1,6 @@ import React from 'react'; import { shouldMatchSnapshot } from '@bbc/psammead-test-helpers'; +import { latin } from '@bbc/gel-foundations/dist/scripts'; import Byline from './index'; describe('Byline', () => { @@ -7,6 +8,7 @@ describe('Byline', () => { 'should render correctly', { ); shouldMatchSnapshot( 'should render correctly without an avatar', - , + , ); }); diff --git a/packages/components/psammead-caption/CHANGELOG.md b/packages/components/psammead-caption/CHANGELOG.md index d6c42068bf..392d7d957e 100644 --- a/packages/components/psammead-caption/CHANGELOG.md +++ b/packages/components/psammead-caption/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 4.1.24| [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 4.1.23 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 4.1.22 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 4.1.21 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 4.1.20 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 4.1.19 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 4.1.18 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 4.1.17 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 4.1.16 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 4.1.15 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 4.1.14 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 4.1.13 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 4.1.11 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-caption/package.json b/packages/components/psammead-caption/package.json index c74770bdaa..9ccf32fe9b 100644 --- a/packages/components/psammead-caption/package.json +++ b/packages/components/psammead-caption/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-caption", - "version": "4.1.14", + "version": "4.1.24", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-caption/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-consent-banner/CHANGELOG.md b/packages/components/psammead-consent-banner/CHANGELOG.md index f1f8a408f3..ba65fbe8f3 100644 --- a/packages/components/psammead-consent-banner/CHANGELOG.md +++ b/packages/components/psammead-consent-banner/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 5.5.13 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 5.5.12 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 5.5.11 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 5.5.10 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 5.5.9 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 5.5.8 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 5.5.7 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 5.5.6 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 5.5.5 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 5.5.4 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 5.5.3 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 5.5.2 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 5.5.0 | [PR#4426](https://github.com/bbc/psammead/pull/4426) Change focusRef to headingRef | diff --git a/packages/components/psammead-consent-banner/package.json b/packages/components/psammead-consent-banner/package.json index 15b4587c10..5823fe6b24 100644 --- a/packages/components/psammead-consent-banner/package.json +++ b/packages/components/psammead-consent-banner/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-consent-banner", - "version": "5.5.3", + "version": "5.5.13", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-consent-banner/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-content-anchor/CHANGELOG.md b/packages/components/psammead-content-anchor/CHANGELOG.md index d970a7febd..213a4d92b0 100644 --- a/packages/components/psammead-content-anchor/CHANGELOG.md +++ b/packages/components/psammead-content-anchor/CHANGELOG.md @@ -3,8 +3,19 @@ | Version | Description | |---------|-------------| +| 2.0.0-alpha.30 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 2.0.0-alpha.29 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles transitive packages | +| 2.0.0-alpha.28 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 2.0.0-alpha.27 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 2.0.0-alpha.26 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 2.0.0-alpha.25 | [PR#4561](https://github.com/bbc/psammead/pull/4561) bump dependencies | +| 2.0.0-alpha.24 | [PR#4534](https://github.com/bbc/psammead/pull/4534) Fixes prop warnings in storybook | +| 2.0.0-alpha.23 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 2.0.0-alpha.22 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 2.0.0-alpha.21 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 2.0.0-alpha.20 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 2.0.0-alpha.19 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | -| 2.0.0-alpha.19 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | +| 2.0.0-alpha.18 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 2.0.0-alpha.17 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | | 2.0.0-alpha.16 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | | 2.0.0-alpha.15 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | diff --git a/packages/components/psammead-content-anchor/package.json b/packages/components/psammead-content-anchor/package.json index e2e56641db..65e3fa749f 100644 --- a/packages/components/psammead-content-anchor/package.json +++ b/packages/components/psammead-content-anchor/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-content-anchor", - "version": "2.0.0-alpha.19", + "version": "2.0.0-alpha.30", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -28,12 +28,13 @@ "react": ">=16.9.0" }, "devDependencies": { - "@bbc/psammead-headings": "5.0.18", + "@bbc/psammead-headings": "5.0.28", "@emotion/react": "^11.4.0", "@emotion/styled": "^11.3.0", "react": "^17.0.2" }, "publishConfig": { "tag": "alpha" - } + }, + "stableVersion": "2.0.0-alpha.29" } diff --git a/packages/components/psammead-content-anchor/src/index.stories.jsx b/packages/components/psammead-content-anchor/src/index.stories.jsx index 401e5bdede..bf38a8685d 100644 --- a/packages/components/psammead-content-anchor/src/index.stories.jsx +++ b/packages/components/psammead-content-anchor/src/index.stories.jsx @@ -90,7 +90,9 @@ storiesOf('Components/ContentAnchor', module) ({ text, script, service }) => { return ( - {text} + + {text} + {renderParagraphs({ text, script, service })} {Array(2).fill(renderParagraphs({ text, script, service }))} @@ -104,7 +106,9 @@ storiesOf('Components/ContentAnchor', module) ({ text, script, service }) => { return ( - {text} + + {text} + {renderParagraphs({ text, script, service })} {renderParagraphs({ text, script, service })} @@ -123,7 +127,9 @@ storiesOf('Components/ContentAnchor', module) ({ text, script, service }) => { return ( - {text} + + {text} + {renderParagraphs({ text, script, service })} {renderParagraphs({ text, script, service })} diff --git a/packages/components/psammead-copyright/CHANGELOG.md b/packages/components/psammead-copyright/CHANGELOG.md index d051816874..12e31c26eb 100644 --- a/packages/components/psammead-copyright/CHANGELOG.md +++ b/packages/components/psammead-copyright/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 3.0.29 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.28 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.27 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.26 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.25 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.24 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.23 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.22 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.21 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.20 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.0.19 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.0.18 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.0.17 | [PR#4457](https://github.com/bbc/psammead/pull/4457) Remove mention of deprecated psammead-sitewide-links from README | diff --git a/packages/components/psammead-copyright/package.json b/packages/components/psammead-copyright/package.json index d71fe113c6..1b77e44616 100644 --- a/packages/components/psammead-copyright/package.json +++ b/packages/components/psammead-copyright/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-copyright", - "version": "3.0.19", + "version": "3.0.29", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-copyright/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-embed-error/CHANGELOG.md b/packages/components/psammead-embed-error/CHANGELOG.md index a27ca76c8c..e5c5615742 100644 --- a/packages/components/psammead-embed-error/CHANGELOG.md +++ b/packages/components/psammead-embed-error/CHANGELOG.md @@ -1,61 +1,72 @@ # Embed Error Changelog -| Version | Description | -| -------------- | --------------------------------------------------------------------------------------------------------------------------- | -| 3.0.22 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | -| 3.0.21 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | -| 3.0.19 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | -| 3.0.18 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | -| 3.0.17 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | -| 3.0.16 | [PR#4304](https://github.com/bbc/psammead/pull/4304) Talos - Bump Dependencies - @bbc/gel-foundations, @bbc/psammead-assets, @bbc/psammead-styles | -| 3.0.15 | [PR#4303](https://github.com/bbc/psammead/pull/4303) Trigger rebuild following babel config update for emotion 11 | -| 3.0.14 | [PR#4271](https://github.com/bbc/psammead/pull/4271) change react peer dep to >=16.9.0 | -| 3.0.13 | [PR#4266](https://github.com/bbc/psammead/pull/4266) Talos - Bump Dependencies - @bbc/psammead-assets | -| 3.0.12 | [PR#4260](https://github.com/bbc/psammead/pull/4260) Talos - Bump Dependencies - @bbc/gel-foundations | -| 3.0.11 | [PR#4256](https://github.com/bbc/psammead/pull/4256) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.10 | [PR#4193](https://github.com/bbc/psammead/pull/4193) Upgrade Emotion to v11 | -| 3.0.9 | [PR#4226](https://github.com/bbc/psammead/pull/4226) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.8 | [PR#4189](https://github.com/bbc/psammead/pull/4189) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | -| 3.0.7 | [PR#4087](https://github.com/bbc/psammead/pull/4087) Talos - Bump Dependencies - @bbc/psammead-assets | -| 3.0.6 | [PR#4072](https://github.com/bbc/psammead/pull/4072) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.5 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations | -| 3.0.4 | [PR#4029](https://github.com/bbc/psammead/pull/4029) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.3 | [PR#4010](https://github.com/bbc/psammead/pull/4010) Talos - Bump Dependencies - @bbc/psammead-assets | -| 3.0.2 | [PR#3944](https://github.com/bbc/psammead/pull/3944) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.1 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | -| 3.0.0 | [PR#3896](https://github.com/bbc/psammead/pull/3896) Migrate to emotion | -| 2.0.3 | [PR#3883](https://github.com/bbc/psammead/pull/3883) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | -| 2.0.2 | [PR#3855](https://github.com/bbc/psammead/pull/3855) Talos - Bump Dependencies - @bbc/gel-foundations | -| 2.0.1 | [PR#3854](https://github.com/bbc/psammead/pull/3854) Talos - Bump Dependencies - @bbc/psammead-styles | -| 2.0.0-alpha.0 | [PR#3843](https://github.com/bbc/psammead/pull/3843) Bump Dependencies - @bbc/psammead-styles alpha version | -| 1.1.7 | [PR#3836](https://github.com/bbc/psammead/pull/3836) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.6 | [PR#3816](https://github.com/bbc/psammead/pull/3816) Talos - Bump Dependencies | -| 1.1.5 | [PR#3728](https://github.com/bbc/psammead/pull/3728) Tweaks following Storybook v5.3.19 to v6.0.22 update | -| 1.1.4 | [PR#3811](https://github.com/bbc/psammead/pull/3811) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.3 | [PR#3785](https://github.com/bbc/psammead/pull/3785) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.1.2 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.1 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.0 | [PR#3627](https://github.com/bbc/psammead/pull/3627) Add spacing between embed error elements | -| 1.0.1 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.0 | [PR#3615](https://github.com/bbc/psammead/pull/3615) Resolve a11y issues and release of version 1.0. | -| 1.0.0-alpha.21 | [PR#3613](https://github.com/bbc/psammead/pull/3613) Talos - Bump Dependencies - @bbc/psammead-assets | -| 1.0.0-alpha.20 | [PR#3604](https://github.com/bbc/psammead/pull/3604) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.0-alpha.19 | [PR#3573](https://github.com/bbc/psammead/pull/3573) Add option to render a link. | -| 1.0.0-alpha.18 | [PR#3467](https://github.com/bbc/psammead/pull/3467) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.0-alpha.17 | [PR#3397](https://github.com/bbc/psammead/pull/3397) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.0-alpha.16 | [PR#3381](https://github.com/bbc/psammead/pull/3381) Talos - Bump Dependencies - @bbc/psammead-assets | -| 1.0.0-alpha.15 | [PR#3135](https://github.com/bbc/psammead/pull/3135) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.0-alpha.14 | [PR#3129](https://github.com/bbc/psammead/pull/3129) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.0-alpha.13 | [PR#3030](https://github.com/bbc/psammead/pull/3030) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | -| 1.0.0-alpha.12 | [PR#2996](https://github.com/bbc/psammead/pull/2996) Talos - Bump Dependencies - @bbc/psammead-assets | -| 1.0.0-alpha.11 | [PR#2989](https://github.com/bbc/psammead/pull/2989) Talos - Bump Dependencies - @bbc/psammead-assets | -| 1.0.0-alpha.10 | [PR#2978](https://github.com/bbc/psammead/pull/2978) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.0-alpha.9 | [PR#2973](https://github.com/bbc/psammead/pull/2973) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.0-alpha.8 | [PR#2920](https://github.com/bbc/psammead/pull/2920) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.0.0-alpha.7 | [PR#2827](https://github.com/bbc/psammead/pull/2827) Talos - Bump Dependencies - @bbc/psammead-assets | -| 1.0.0-alpha.6 | [PR#2705](https://github.com/bbc/psammead/pull/2705) Talos - Bump Dependencies - @bbc/psammead-assets | -| 1.0.0-alpha.5 | [PR#2701](https://github.com/bbc/psammead/pull/2701) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | -| 1.0.0-alpha.4 | [PR#2697](https://github.com/bbc/psammead/pull/2697) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.0-alpha.3 | [PR#2663](https://github.com/bbc/psammead/pull/2663) Talos - Bump Dependencies - @bbc/psammead-assets | -| 1.0.0-alpha.2 | [PR#2656](https://github.com/bbc/psammead/pull/2656) Talos - Bump Dependencies - @bbc/psammead-assets | -| 1.0.0-alpha.1 | [PR#2625](https://github.com/bbc/psammead/pull/2625) Initial creation of package. | +| Version | Description | +| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | +| 3.0.33 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.32 | [PR#4601](https://github.com/bbc/psammead/pull/4601) Bumps dependencies | +| 3.0.31 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.30 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.29 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.28 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.27 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.26 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.25 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.24 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.23 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | +| 3.0.22 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | +| 3.0.21 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | +| 3.0.19 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | +| 3.0.18 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | +| 3.0.17 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | +| 3.0.16 | [PR#4304](https://github.com/bbc/psammead/pull/4304) Talos - Bump Dependencies - @bbc/gel-foundations, @bbc/psammead-assets, @bbc/psammead-styles | +| 3.0.15 | [PR#4303](https://github.com/bbc/psammead/pull/4303) Trigger rebuild following babel config update for emotion 11 | +| 3.0.14 | [PR#4271](https://github.com/bbc/psammead/pull/4271) change react peer dep to >=16.9.0 | +| 3.0.13 | [PR#4266](https://github.com/bbc/psammead/pull/4266) Talos - Bump Dependencies - @bbc/psammead-assets | +| 3.0.12 | [PR#4260](https://github.com/bbc/psammead/pull/4260) Talos - Bump Dependencies - @bbc/gel-foundations | +| 3.0.11 | [PR#4256](https://github.com/bbc/psammead/pull/4256) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.10 | [PR#4193](https://github.com/bbc/psammead/pull/4193) Upgrade Emotion to v11 | +| 3.0.9 | [PR#4226](https://github.com/bbc/psammead/pull/4226) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.8 | [PR#4189](https://github.com/bbc/psammead/pull/4189) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | +| 3.0.7 | [PR#4087](https://github.com/bbc/psammead/pull/4087) Talos - Bump Dependencies - @bbc/psammead-assets | +| 3.0.6 | [PR#4072](https://github.com/bbc/psammead/pull/4072) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.5 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations | +| 3.0.4 | [PR#4029](https://github.com/bbc/psammead/pull/4029) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.3 | [PR#4010](https://github.com/bbc/psammead/pull/4010) Talos - Bump Dependencies - @bbc/psammead-assets | +| 3.0.2 | [PR#3944](https://github.com/bbc/psammead/pull/3944) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.1 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | +| 3.0.0 | [PR#3896](https://github.com/bbc/psammead/pull/3896) Migrate to emotion | +| 2.0.3 | [PR#3883](https://github.com/bbc/psammead/pull/3883) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | +| 2.0.2 | [PR#3855](https://github.com/bbc/psammead/pull/3855) Talos - Bump Dependencies - @bbc/gel-foundations | +| 2.0.1 | [PR#3854](https://github.com/bbc/psammead/pull/3854) Talos - Bump Dependencies - @bbc/psammead-styles | +| 2.0.0-alpha.0 | [PR#3843](https://github.com/bbc/psammead/pull/3843) Bump Dependencies - @bbc/psammead-styles alpha version | +| 1.1.7 | [PR#3836](https://github.com/bbc/psammead/pull/3836) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.6 | [PR#3816](https://github.com/bbc/psammead/pull/3816) Talos - Bump Dependencies | +| 1.1.5 | [PR#3728](https://github.com/bbc/psammead/pull/3728) Tweaks following Storybook v5.3.19 to v6.0.22 update | +| 1.1.4 | [PR#3811](https://github.com/bbc/psammead/pull/3811) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.3 | [PR#3785](https://github.com/bbc/psammead/pull/3785) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.1.2 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.1 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.0 | [PR#3627](https://github.com/bbc/psammead/pull/3627) Add spacing between embed error elements | +| 1.0.1 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.0 | [PR#3615](https://github.com/bbc/psammead/pull/3615) Resolve a11y issues and release of version 1.0. | +| 1.0.0-alpha.21 | [PR#3613](https://github.com/bbc/psammead/pull/3613) Talos - Bump Dependencies - @bbc/psammead-assets | +| 1.0.0-alpha.20 | [PR#3604](https://github.com/bbc/psammead/pull/3604) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.0-alpha.19 | [PR#3573](https://github.com/bbc/psammead/pull/3573) Add option to render a link. | +| 1.0.0-alpha.18 | [PR#3467](https://github.com/bbc/psammead/pull/3467) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.0-alpha.17 | [PR#3397](https://github.com/bbc/psammead/pull/3397) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.0-alpha.16 | [PR#3381](https://github.com/bbc/psammead/pull/3381) Talos - Bump Dependencies - @bbc/psammead-assets | +| 1.0.0-alpha.15 | [PR#3135](https://github.com/bbc/psammead/pull/3135) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.0-alpha.14 | [PR#3129](https://github.com/bbc/psammead/pull/3129) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.0-alpha.13 | [PR#3030](https://github.com/bbc/psammead/pull/3030) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | +| 1.0.0-alpha.12 | [PR#2996](https://github.com/bbc/psammead/pull/2996) Talos - Bump Dependencies - @bbc/psammead-assets | +| 1.0.0-alpha.11 | [PR#2989](https://github.com/bbc/psammead/pull/2989) Talos - Bump Dependencies - @bbc/psammead-assets | +| 1.0.0-alpha.10 | [PR#2978](https://github.com/bbc/psammead/pull/2978) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.0-alpha.9 | [PR#2973](https://github.com/bbc/psammead/pull/2973) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.0-alpha.8 | [PR#2920](https://github.com/bbc/psammead/pull/2920) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.0.0-alpha.7 | [PR#2827](https://github.com/bbc/psammead/pull/2827) Talos - Bump Dependencies - @bbc/psammead-assets | +| 1.0.0-alpha.6 | [PR#2705](https://github.com/bbc/psammead/pull/2705) Talos - Bump Dependencies - @bbc/psammead-assets | +| 1.0.0-alpha.5 | [PR#2701](https://github.com/bbc/psammead/pull/2701) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | +| 1.0.0-alpha.4 | [PR#2697](https://github.com/bbc/psammead/pull/2697) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.0-alpha.3 | [PR#2663](https://github.com/bbc/psammead/pull/2663) Talos - Bump Dependencies - @bbc/psammead-assets | +| 1.0.0-alpha.2 | [PR#2656](https://github.com/bbc/psammead/pull/2656) Talos - Bump Dependencies - @bbc/psammead-assets | +| 1.0.0-alpha.1 | [PR#2625](https://github.com/bbc/psammead/pull/2625) Initial creation of package. | diff --git a/packages/components/psammead-embed-error/package.json b/packages/components/psammead-embed-error/package.json index 491780a297..e6fd92319c 100644 --- a/packages/components/psammead-embed-error/package.json +++ b/packages/components/psammead-embed-error/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-embed-error", - "version": "3.0.22", + "version": "3.0.33", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -25,9 +25,9 @@ "av" ], "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-assets": "3.1.10", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-figure/CHANGELOG.md b/packages/components/psammead-figure/CHANGELOG.md index a583292cc1..f8c2d003f6 100644 --- a/packages/components/psammead-figure/CHANGELOG.md +++ b/packages/components/psammead-figure/CHANGELOG.md @@ -3,6 +3,9 @@ | Version | Description | |---------|-------------| +| 2.0.13 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 2.0.12 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 2.0.11 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | | 2.0.10 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 2.0.8 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | | 2.0.7 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | diff --git a/packages/components/psammead-figure/package.json b/packages/components/psammead-figure/package.json index 98181d4afd..d6c3bdbf5d 100644 --- a/packages/components/psammead-figure/package.json +++ b/packages/components/psammead-figure/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-figure", - "version": "2.0.10", + "version": "2.0.13", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,7 +19,7 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-figure/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3" + "@bbc/gel-foundations": "7.0.0" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-grid/CHANGELOG.md b/packages/components/psammead-grid/CHANGELOG.md index a8b1affd7c..1a1f4e2d83 100644 --- a/packages/components/psammead-grid/CHANGELOG.md +++ b/packages/components/psammead-grid/CHANGELOG.md @@ -3,6 +3,18 @@ | Version | Description | |---------|-------------| +| 3.1.14 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.1.13 | [PR#4608](https://github.com/bbc/psammead/pull/4608) Bump dependencies | +| 3.1.12 | [PR#4606](https://github.com/bbc/psammead/pull/4606) Bump dependencies | +| 3.1.11 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.1.10 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.1.9 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.1.8 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.1.7 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.1.6 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.1.5 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.1.4 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.1.3 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.1.2 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.1.1 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.1.0 | [PR#4484](https://github.com/bbc/psammead/pull/4484) Forwards ref to GridComponent | diff --git a/packages/components/psammead-grid/package.json b/packages/components/psammead-grid/package.json index 813906da28..6ae8053b04 100644 --- a/packages/components/psammead-grid/package.json +++ b/packages/components/psammead-grid/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-grid", - "version": "3.1.2", + "version": "3.1.14", "description": "Grid component", "main": "dist/index.js", "module": "esm/index.js", @@ -23,8 +23,8 @@ "cssgrid" ], "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-grid/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-grid/src/__snapshots__/index.test.jsx.snap index 839c1e57a1..7b6411d37c 100644 --- a/packages/components/psammead-grid/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-grid/src/__snapshots__/index.test.jsx.snap @@ -1730,8 +1730,13 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on visibility: visible; } +.emotion-8 { + display: block; + width: 100%; +} + @media (max-width: 14.9375rem) { - .emotion-8 { + .emotion-10 { padding: 0 0.5rem; width: calc(100%); display: inline-block; @@ -1740,7 +1745,7 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 15rem) and (max-width: 24.9375rem) { - .emotion-8 { + .emotion-10 { padding: 0 0.5rem; width: calc(100%); display: inline-block; @@ -1749,7 +1754,7 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 25rem) and (max-width: 37.4375rem) { - .emotion-8 { + .emotion-10 { padding: 0 1rem; width: calc(100%); display: inline-block; @@ -1758,7 +1763,7 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-8 { + .emotion-10 { padding: 0 1rem; width: calc(100%); display: inline-block; @@ -1767,7 +1772,7 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 63rem) and (max-width: 79.9375rem) { - .emotion-8 { + .emotion-10 { width: calc(75%); display: inline-block; vertical-align: top; @@ -1775,7 +1780,7 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 80rem) { - .emotion-8 { + .emotion-10 { width: calc(75%); display: inline-block; vertical-align: top; @@ -1783,14 +1788,14 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @supports (display: grid) { - .emotion-8 { + .emotion-10 { display: block; width: initial; margin: 0; } @media (max-width: 14.9375rem) { - .emotion-8 { + .emotion-10 { grid-template-columns: repeat(6, 1fr); grid-column-end: span 6; padding: 0 0.5rem; @@ -1798,7 +1803,7 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 15rem) and (max-width: 24.9375rem) { - .emotion-8 { + .emotion-10 { grid-template-columns: repeat(6, 1fr); grid-column-end: span 6; padding: 0 0.5rem; @@ -1806,7 +1811,7 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 25rem) and (max-width: 37.4375rem) { - .emotion-8 { + .emotion-10 { grid-template-columns: repeat(6, 1fr); grid-column-end: span 6; padding: 0 1rem; @@ -1814,7 +1819,7 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 37.5rem) and (max-width: 62.9375rem) { - .emotion-8 { + .emotion-10 { grid-template-columns: repeat(6, 1fr); grid-column-end: span 6; padding: 0 1rem; @@ -1822,14 +1827,14 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on } @media (min-width: 63rem) and (max-width: 79.9375rem) { - .emotion-8 { + .emotion-10 { grid-template-columns: repeat(6, 1fr); grid-column-end: span 6; } } @media (min-width: 80rem) { - .emotion-8 { + .emotion-10 { grid-template-columns: repeat(6, 1fr); grid-column-end: span 6; } @@ -1848,16 +1853,28 @@ exports[`Grid component should render Grid with enableGelGutters & margins on on - + > + + + + diff --git a/packages/components/psammead-grid/src/index.stories.jsx b/packages/components/psammead-grid/src/index.stories.jsx index 2b40eb0cc3..0a5466c70d 100644 --- a/packages/components/psammead-grid/src/index.stories.jsx +++ b/packages/components/psammead-grid/src/index.stories.jsx @@ -5,7 +5,6 @@ import { withServicesKnob, buildRTLSubstories, } from '@bbc/psammead-storybook-helpers'; -import Image from '@bbc/psammead-image'; import StoryPromo, { Headline, Summary, Link } from '@bbc/psammead-story-promo'; import Grid from '.'; import { @@ -1275,17 +1274,9 @@ storiesOf(STORY_KIND, module) > ); - const Img = ( - - ); - return ( } info={Info} promoType={promoType} dir={dir} @@ -1473,11 +1464,7 @@ storiesOf(STORY_KIND, module) group5: 6, }} > - + - + - + - + - + )); diff --git a/packages/components/psammead-grid/src/testHelpers.jsx b/packages/components/psammead-grid/src/testHelpers.jsx index b4e5c283c7..9d2f729aa5 100644 --- a/packages/components/psammead-grid/src/testHelpers.jsx +++ b/packages/components/psammead-grid/src/testHelpers.jsx @@ -29,15 +29,29 @@ const ImageSpacing = styled.div` padding: 0 0 ${GEL_SPACING} 0; `; -export const ExampleImage = () => ( - - - -); +export const ExampleImage = () => { + const imageSizes = [300, 450, 600, 1024]; + const imageSrc = + 'https://ichef.bbci.co.uk/news/[WIDTH]/cpsprodpb/11897/production/_106613817_999_al_.jpg'; + + return ( + + `${imageSrc.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', ')} + fallbackSrcset={imageSizes + .map(size => `${imageSrc.replace('[WIDTH]', size)} ${size}w`) + .join(', ')} + primaryMimeType="image/webp" + fallbackMimeType="image/jpeg" + /> + + ); +}; export const ExampleMediaIndicator = styled(MediaIndicator)``; diff --git a/packages/components/psammead-heading-index/CHANGELOG.md b/packages/components/psammead-heading-index/CHANGELOG.md index 0a383dd39d..e31ffd952f 100644 --- a/packages/components/psammead-heading-index/CHANGELOG.md +++ b/packages/components/psammead-heading-index/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 3.0.28 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.27 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.26 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.25 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.24 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.23 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.22 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.21 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.20 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.19 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.0.18 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.0.17 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.0.15 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-heading-index/package.json b/packages/components/psammead-heading-index/package.json index 5b6e5565d8..0544a5e4a1 100644 --- a/packages/components/psammead-heading-index/package.json +++ b/packages/components/psammead-heading-index/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-heading-index", - "version": "3.0.18", + "version": "3.0.28", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-heading-index/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-headings/CHANGELOG.md b/packages/components/psammead-headings/CHANGELOG.md index 375ee56910..d8f92e886f 100644 --- a/packages/components/psammead-headings/CHANGELOG.md +++ b/packages/components/psammead-headings/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 5.0.28 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 5.0.27 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 5.0.26 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 5.0.25 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 5.0.24 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 5.0.23 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 5.0.22 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 5.0.21 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 5.0.20 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 5.0.19 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 5.0.18 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 5.0.17 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 5.0.15 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-headings/package.json b/packages/components/psammead-headings/package.json index 9ce567dd56..953a95fab0 100644 --- a/packages/components/psammead-headings/package.json +++ b/packages/components/psammead-headings/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-headings", - "version": "5.0.18", + "version": "5.0.28", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-headings/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-image-placeholder/CHANGELOG.md b/packages/components/psammead-image-placeholder/CHANGELOG.md index 0e1dc5d871..7c7cf12c1c 100644 --- a/packages/components/psammead-image-placeholder/CHANGELOG.md +++ b/packages/components/psammead-image-placeholder/CHANGELOG.md @@ -3,6 +3,17 @@ | Version | Description | |---------|-------------| +| 3.4.11 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.4.10 | [PR#4601](https://github.com/bbc/psammead/pull/4601) Bumps dependencies | +| 3.4.9 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.4.8 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.4.7 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.4.6 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.4.5 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.4.4 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.4.3 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.4.2 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.4.1 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.4.0 | [PR#4549](https://github.com/bbc/psammead/pull/4549) Adds forwardStyle prop | | 3.3.0 | [PR#4546](https://github.com/bbc/psammead/pull/4546) Adds padding ratio as inline style | | 3.2.2 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | diff --git a/packages/components/psammead-image-placeholder/package.json b/packages/components/psammead-image-placeholder/package.json index cf3d0e00ca..aa8832e2d2 100644 --- a/packages/components/psammead-image-placeholder/package.json +++ b/packages/components/psammead-image-placeholder/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-image-placeholder", - "version": "3.4.0", + "version": "3.4.11", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-image-placeholder/README.md", "dependencies": { - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-styles": "7.3.0" + "@bbc/psammead-assets": "3.1.10", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-image/CHANGELOG.md b/packages/components/psammead-image/CHANGELOG.md index cff00c0e01..630ee0e1be 100644 --- a/packages/components/psammead-image/CHANGELOG.md +++ b/packages/components/psammead-image/CHANGELOG.md @@ -3,6 +3,9 @@ | Version | Description | |---------|-------------| +| 3.1.0 | [PR#4608](https://github.com/bbc/psammead/pull/4608) Derive mime type from srcset | +| 3.0.1 | [PR#4607](https://github.com/bbc/psammead/pull/4607) Fix amp-img fallback value | +| 3.0.0 | [PR#4606](https://github.com/bbc/psammead/pull/4606) Add support for WebP | | 2.0.8 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 2.0.7 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | | 2.0.6 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | diff --git a/packages/components/psammead-image/README.md b/packages/components/psammead-image/README.md index e095f6048a..a3e54b4a65 100644 --- a/packages/components/psammead-image/README.md +++ b/packages/components/psammead-image/README.md @@ -56,6 +56,7 @@ const WrappingContainer = ({ alt, src, height, width, sizes }) => ( ## Props ### Img + | Prop | Type | Required | Default | Example | |:-----|:-----|:---------|:--------|:--------| @@ -63,7 +64,10 @@ const WrappingContainer = ({ alt, src, height, width, sizes }) => ( | `height` | number/string | No | null | 450 | | `sizes` | string | No | null | "100vw" | | `src` | string | Yes | - | "https://bbc.com/300/cat.jpg" | -| `srcset` | string | No | null | "https://bbc.com/300/cat.jpg 300w, https://bbc.com/450/cat.jpg 450w, https://bbc.com/600/cat.jpg 600w" | +| `srcset` | string | No | null | "https://bbc.com/300/cat.jpg.webp 300w, https://bbc.com/450/cat.jpg.webp 450w, https://bbc.com/600/cat.jpg.webp 600w" | +| `fallbackSrcset` | string | No | null | "https://bbc.com/300/cat.jpg 300w, https://bbc.com/450/cat.jpg 450w, https://bbc.com/600/cat.jpg 600w" | +| `primaryMimeType` | string | No | null | "image/webp" | +| `fallbackMimeType` | string | No | null | "image/jpeg" | | `width` | number/string | No | null | 600 | | `fade` | boolean | No | false | true | @@ -80,6 +84,7 @@ The `sizes` prop is optional since some projects might not want to use the sizes The `fade` prop is optional and set to `false` by default. It's been used to apply a fade-in animation effect on the `Img` component. ### AmpImg + | Prop | Type | Required | Default | Example | |:-----|:-----|:---------|:--------|:--------| @@ -89,7 +94,8 @@ The `fade` prop is optional and set to `false` by default. It's been used to app | `layout` | string | Yes | - | "responsive" | | `sizes` | string | No | null | "100vw" | | `src` | string | Yes | - | "https://bbc.com/300/cat.jpg" | -| `srcset` | string | No | null | "https://bbc.com/300/cat.jpg 300w, https://bbc.com/450/cat.jpg 450w, https://bbc.com/600/cat.jpg 600w" | +| `srcset` | string | No | null | "https://bbc.com/300/cat.jpg.webp 300w, https://bbc.com/450/cat.jpg.webp 450w, https://bbc.com/600/cat.jpg.webp 600w" | +| `fallbackSrcset` | string | No | null | "https://bbc.com/300/cat.jpg 300w, https://bbc.com/450/cat.jpg 450w, https://bbc.com/600/cat.jpg 600w" | | `width` | number/string | Yes | - | 600 | The `attribution` prop is available to pass in strings to include the image source. [For further details, please refer to the `amp-img` attribute docs](https://www.ampproject.org/docs/reference/components/amp-img#attributes). diff --git a/packages/components/psammead-image/package.json b/packages/components/psammead-image/package.json index 7061a46245..d9d901fe3b 100644 --- a/packages/components/psammead-image/package.json +++ b/packages/components/psammead-image/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-image", - "version": "2.0.8", + "version": "3.1.0", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, diff --git a/packages/components/psammead-image/src/__snapshots__/index.amp.test.jsx.snap b/packages/components/psammead-image/src/__snapshots__/index.amp.test.jsx.snap index 8f5738fdfc..5d4973ab2c 100644 --- a/packages/components/psammead-image/src/__snapshots__/index.amp.test.jsx.snap +++ b/packages/components/psammead-image/src/__snapshots__/index.amp.test.jsx.snap @@ -14,7 +14,7 @@ exports[`Image - AmpImg should render image with custom dimensions correctly 1`] `; -exports[`Image - AmpImg should render image with srcset correctly 1`] = ` +exports[`Image - AmpImg should render image with only srcset correctly 1`] = ` `; +exports[`Image - AmpImg should render image with srcset and fallbackSrcset correctly 1`] = ` + + + + + +`; + exports[`Image - AmpImg should render landscape image correctly 1`] = ` - + > + + + + `; @@ -26,35 +42,92 @@ exports[`Image - imported as '{ Img }' should render image with custom dimension visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; -exports[`Image - imported as '{ Img }' should render image with srcset correctly 1`] = ` +exports[`Image - imported as '{ Img }' should render image with only srcset correctly 1`] = ` .emotion-0 { display: block; width: 100%; visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + + + +`; + +exports[`Image - imported as '{ Img }' should render image with srcset and fallbackSrcset correctly 1`] = ` +.emotion-0 { + display: block; + width: 100%; + visibility: visible; +} + +.emotion-2 { + display: block; + width: 100%; +} + + + + + + + `; @@ -65,15 +138,24 @@ exports[`Image - imported as '{ Img }' should render landscape image correctly 1 visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; @@ -84,15 +166,24 @@ exports[`Image - imported as '{ Img }' should render portrait image correctly 1` visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; @@ -103,15 +194,24 @@ exports[`Image - imported as '{ Img }' should render square image correctly 1`] visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; @@ -122,15 +222,31 @@ exports[`Image - imported as default 'Image' should render image correctly witho visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + + + `; @@ -141,35 +257,92 @@ exports[`Image - imported as default 'Image' should render image with custom dim visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + + + + + + +`; + +exports[`Image - imported as default 'Image' should render image with only srcset correctly 1`] = ` +.emotion-0 { + display: block; + width: 100%; + visibility: visible; +} + +.emotion-2 { + display: block; + width: 100%; +} + - + > + + + `; -exports[`Image - imported as default 'Image' should render image with srcset correctly 1`] = ` +exports[`Image - imported as default 'Image' should render image with srcset and fallbackSrcset correctly 1`] = ` .emotion-0 { display: block; width: 100%; visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + + + `; @@ -180,15 +353,24 @@ exports[`Image - imported as default 'Image' should render landscape image corre visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; @@ -199,15 +381,24 @@ exports[`Image - imported as default 'Image' should render portrait image correc visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; @@ -218,87 +409,155 @@ exports[`Image - imported as default 'Image' should render square image correctl visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; exports[`Image - with Fade-in effect' should render image correctly without width 1`] = ` -@keyframes animation-0 { - from { - opacity: 0; - } +.emotion-0 { + display: block; + width: 100%; + visibility: visible; +} - to { - opacity: 1; - } +.emotion-2 { + display: block; + width: 100%; } + + + + + + + +`; + +exports[`Image - with Fade-in effect' should render image with custom dimensions correctly 1`] = ` .emotion-0 { display: block; width: 100%; visibility: visible; - -webkit-animation: animation-0 0.2s linear; - animation: animation-0 0.2s linear; - -webkit-transition: visibility 0.2s linear; - transition: visibility 0.2s linear; +} + +.emotion-2 { + display: block; + width: 100%; } - + > + + `; -exports[`Image - with Fade-in effect' should render image with custom dimensions correctly 1`] = ` +exports[`Image - with Fade-in effect' should render image with only srcset correctly 1`] = ` .emotion-0 { display: block; width: 100%; visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + + `; -exports[`Image - with Fade-in effect' should render image with srcset correctly 1`] = ` +exports[`Image - with Fade-in effect' should render image with srcset and fallbackSrcset correctly 1`] = ` .emotion-0 { display: block; width: 100%; visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + + + `; @@ -309,15 +568,24 @@ exports[`Image - with Fade-in effect' should render landscape image correctly 1` visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; @@ -328,15 +596,24 @@ exports[`Image - with Fade-in effect' should render portrait image correctly 1`] visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; @@ -347,14 +624,23 @@ exports[`Image - with Fade-in effect' should render square image correctly 1`] = visibility: visible; } +.emotion-2 { + display: block; + width: 100%; +} + - + > + + `; diff --git a/packages/components/psammead-image/src/index.amp.jsx b/packages/components/psammead-image/src/index.amp.jsx index 1dae61b55f..c592c997eb 100644 --- a/packages/components/psammead-image/src/index.amp.jsx +++ b/packages/components/psammead-image/src/index.amp.jsx @@ -3,12 +3,26 @@ import omit from 'ramda/src/omit'; import { number, string } from 'prop-types'; // Prevents component outputting invalid HTML when styled with emotion -const omitInvalidProps = omit(['classname']); +const omitInvalidProps = omit([ + 'classname', + 'primaryMimeType', + 'fallbackMimeType', +]); const AmpImg = props => { - const { srcset, ...otherProps } = props; + const { srcset, fallbackSrcset, ...otherProps } = props; - return ; + return ( + + {fallbackSrcset && ( + + )} + + ); }; AmpImg.propTypes = { @@ -19,6 +33,7 @@ AmpImg.propTypes = { sizes: string, src: string.isRequired, srcset: string, + fallbackSrcset: string, width: number.isRequired, }; @@ -26,6 +41,7 @@ AmpImg.defaultProps = { attribution: '', sizes: null, srcset: null, + fallbackSrcset: null, }; export default AmpImg; diff --git a/packages/components/psammead-image/src/index.amp.stories.jsx b/packages/components/psammead-image/src/index.amp.stories.jsx index eddbabae75..f7a56ebd44 100644 --- a/packages/components/psammead-image/src/index.amp.stories.jsx +++ b/packages/components/psammead-image/src/index.amp.stories.jsx @@ -6,10 +6,10 @@ const additionalProps = { layout: 'responsive', }; -stories( - AmpImg, - 'Components/Images/Image - AmpImg', - true, +stories({ + Component: AmpImg, + title: 'Components/Images/Image - AmpImg', + includeHeight: true, additionalProps, - ampDecorator, -); + styleDecorator: ampDecorator, +}); diff --git a/packages/components/psammead-image/src/index.jsx b/packages/components/psammead-image/src/index.jsx index 5e1ec1a74c..a90d0cf3f1 100644 --- a/packages/components/psammead-image/src/index.jsx +++ b/packages/components/psammead-image/src/index.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { number, oneOfType, string, bool } from 'prop-types'; +import { number, oneOfType, string, bool, func } from 'prop-types'; import styled from '@emotion/styled'; import { keyframes, css } from '@emotion/react'; @@ -20,17 +20,38 @@ const fadeIn = css` transition: visibility 0.2s linear; `; -const StyledImg = styled.img` +const StyledPicture = styled.picture` display: block; width: 100%; visibility: visible; ${props => props.fade && fadeIn}; `; +const StyledImg = styled.img` + display: block; + width: 100%; +`; + export const Img = props => { - const { srcset, ...otherProps } = props; + const { + src, + srcset, + fallbackSrcset, + primaryMimeType, + fallbackMimeType, + onLoad, + ...otherProps + } = props; - return ; + return ( + + {srcset && } + {fallbackSrcset && ( + + )} + + + ); }; Img.propTypes = { @@ -40,7 +61,11 @@ Img.propTypes = { sizes: string, src: string.isRequired, srcset: string, + fallbackSrcset: string, + primaryMimeType: string, + fallbackMimeType: string, width: oneOfType([string, number]), + onLoad: func, }; Img.defaultProps = { @@ -48,7 +73,11 @@ Img.defaultProps = { height: null, sizes: null, srcset: null, + fallbackSrcset: null, + primaryMimeType: 'image/jpeg', + fallbackMimeType: 'image/jpeg', width: null, + onLoad: () => {}, }; export default Img; diff --git a/packages/components/psammead-image/src/index.stories.jsx b/packages/components/psammead-image/src/index.stories.jsx index bb45b93b35..c95246ab17 100644 --- a/packages/components/psammead-image/src/index.stories.jsx +++ b/packages/components/psammead-image/src/index.stories.jsx @@ -1,21 +1,15 @@ -import React from 'react'; import { withKnobs } from '@storybook/addon-knobs'; import { Img } from '.'; -import { stories, getProps } from './testHelpers/stories'; -import { landscape } from './testHelpers/fixtureData'; -import notes from '../README.md'; +import { stories } from './testHelpers/stories'; const type = 'Img'; -stories( - Img, - 'Components/Images/Image - Img', - false, - {}, - withKnobs, +stories({ + Component: Img, + title: 'Components/Images/Image - Img', + includeHeight: false, + additionalProps: {}, + styleDecorator: withKnobs, type, -).add( - 'image without width', - () => , - { notes }, -); + isCanonical: true, +}); diff --git a/packages/components/psammead-image/src/index.test.jsx b/packages/components/psammead-image/src/index.test.jsx index 5c99c193de..86f61da5c3 100644 --- a/packages/components/psammead-image/src/index.test.jsx +++ b/packages/components/psammead-image/src/index.test.jsx @@ -1,11 +1,15 @@ import React from 'react'; +import { render } from '@testing-library/react'; import { shouldMatchSnapshot } from '@bbc/psammead-test-helpers'; import snapshotTests from './testHelpers/snapshotTests'; import { landscape } from './testHelpers/fixtureData'; import Image, { Img } from '.'; describe("Image - imported as default 'Image'", () => { - const props = { ...landscape, width: null }; + const props = { + ...landscape, + width: null, + }; shouldMatchSnapshot( 'should render image correctly without width', , @@ -14,7 +18,10 @@ describe("Image - imported as default 'Image'", () => { }); describe("Image - imported as '{ Img }'", () => { - const props = { ...landscape, width: null }; + const props = { + ...landscape, + width: null, + }; shouldMatchSnapshot( 'should render image correctly without width', , @@ -23,10 +30,46 @@ describe("Image - imported as '{ Img }'", () => { }); describe("Image - with Fade-in effect'", () => { - const props = { ...landscape, width: null, fade: true }; + const props = { + ...landscape, + width: null, + fade: true, + }; shouldMatchSnapshot( 'should render image correctly without width', , ); snapshotTests(Image); }); + +describe("Image - should have mime-types set'", () => { + const props = { + ...landscape, + width: null, + }; + + const { container } = render(); + + const sourceTags = container.querySelectorAll('source'); + + expect(sourceTags).toHaveLength(2); + expect(sourceTags[0].type).toEqual('image/webp'); + expect(sourceTags[1].type).toEqual('image/jpeg'); +}); + +describe("Image - should have no mime-types set'", () => { + const props = { + ...landscape, + width: null, + primaryMimeType: null, + fallbackMimeType: null, + }; + + const { container } = render(); + + const sourceTags = container.querySelectorAll('source'); + + expect(sourceTags).toHaveLength(2); + expect(sourceTags[0].type).toEqual(''); + expect(sourceTags[1].type).toEqual(''); +}); diff --git a/packages/components/psammead-image/src/testHelpers/fixtureData.js b/packages/components/psammead-image/src/testHelpers/fixtureData.js index 51e68585c7..ebbd5c560f 100644 --- a/packages/components/psammead-image/src/testHelpers/fixtureData.js +++ b/packages/components/psammead-image/src/testHelpers/fixtureData.js @@ -10,8 +10,13 @@ export const landscape = { sizes: '100vw', src: landscapeImageUrl.replace('[WIDTH]', sizes[0]), srcset: sizes + .map(size => `${landscapeImageUrl.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', '), + fallbackSrcset: sizes .map(size => `${landscapeImageUrl.replace('[WIDTH]', size)} ${size}w`) .join(', '), + primaryMimeType: 'image/webp', + fallbackMimeType: 'image/jpeg', width: 1024, height: 576, }; @@ -23,8 +28,13 @@ export const portrait = { sizes: '100vw', src: portraitImageUrl.replace('[WIDTH]', sizes[0]), srcset: sizes + .map(size => `${portraitImageUrl.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', '), + fallbackSrcset: sizes .map(size => `${portraitImageUrl.replace('[WIDTH]', size)} ${size}w`) .join(', '), + primaryMimeType: 'image/webp', + fallbackMimeType: 'image/jpeg', width: 1024, height: 1280, }; @@ -35,8 +45,13 @@ export const square = { sizes: '100vw', src: squareImageUrl.replace('[WIDTH]', sizes[0]), srcset: sizes + .map(size => `${squareImageUrl.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', '), + fallbackSrcset: sizes .map(size => `${squareImageUrl.replace('[WIDTH]', size)} ${size}w`) .join(', '), + primaryMimeType: 'image/webp', + fallbackMimeType: 'image/jpeg', width: 1024, height: 1024, }; @@ -47,8 +62,26 @@ export const custom = { sizes: '100vw', src: customImageUrl.replace('[WIDTH]', sizes[0]), srcset: sizes + .map(size => `${customImageUrl.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', '), + fallbackSrcset: sizes .map(size => `${customImageUrl.replace('[WIDTH]', size)} ${size}w`) .join(', '), + primaryMimeType: 'image/webp', + fallbackMimeType: 'image/jpeg', width: 445, height: 547, }; + +export const noFallbackSrcset = { + alt: 'Student sitting an exam', + attribution: '', + sizes: '100vw', + src: landscapeImageUrl.replace('[WIDTH]', sizes[0]), + srcset: sizes + .map(size => `${landscapeImageUrl.replace('[WIDTH]', size)} ${size}w`) + .join(', '), + primaryMimeType: 'image/jpeg', + width: 1024, + height: 576, +}; diff --git a/packages/components/psammead-image/src/testHelpers/snapshotTests.jsx b/packages/components/psammead-image/src/testHelpers/snapshotTests.jsx index 92507b5128..c05e3d3d6b 100644 --- a/packages/components/psammead-image/src/testHelpers/snapshotTests.jsx +++ b/packages/components/psammead-image/src/testHelpers/snapshotTests.jsx @@ -52,13 +52,30 @@ const snapshotTests = (Component, additionalProps) => { />, ); shouldMatchSnapshot( - 'should render image with srcset correctly', + 'should render image with srcset and fallbackSrcset correctly', , + ); + shouldMatchSnapshot( + 'should render image with only srcset correctly', + storyFn(), type, -) => + isCanonical = false, +}) => storiesOf(title, module) .addDecorator(styleDecorator) .add( @@ -78,4 +88,20 @@ export const stories = ( /> ), { notes }, + ) + .add( + 'image with no fallbackSrcset', + () => ( + + ), + { notes }, + ) + .add( + isCanonical && 'image without width', + () => , + { notes }, ); diff --git a/packages/components/psammead-inline-link/CHANGELOG.md b/packages/components/psammead-inline-link/CHANGELOG.md index 6087bf371d..c73fc2a872 100644 --- a/packages/components/psammead-inline-link/CHANGELOG.md +++ b/packages/components/psammead-inline-link/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 3.0.26 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.25 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.24 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.23 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.22 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.21 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.20 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.19 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.18 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.17 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.0.16 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.0.15 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.0.13 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-inline-link/package.json b/packages/components/psammead-inline-link/package.json index d4bf2181f5..7af3c5d254 100644 --- a/packages/components/psammead-inline-link/package.json +++ b/packages/components/psammead-inline-link/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-inline-link", - "version": "3.0.16", + "version": "3.0.26", "description": "React component for an Inline Link", "main": "dist/index.js", "module": "esm/index.js", @@ -25,7 +25,7 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-inline-link/README.md", "dependencies": { - "@bbc/psammead-styles": "7.3.0" + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-live-label/CHANGELOG.md b/packages/components/psammead-live-label/CHANGELOG.md index 3eb94c5528..3797a9b2d6 100644 --- a/packages/components/psammead-live-label/CHANGELOG.md +++ b/packages/components/psammead-live-label/CHANGELOG.md @@ -3,6 +3,18 @@ | Version | Description | |---------|-------------| +| 2.0.33 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 2.0.32 | [PR#4597](https://github.com/bbc/psammead/pull/4597) Bump to solve deploying issue| +| 2.0.31 | [PR#4591](https://github.com/bbc/psammead/pull/4591) Fix TalkBack reading nested spans incorrectly | +| 2.0.30 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 2.0.29 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 2.0.28 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 2.0.27 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 2.0.26 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles| +| 2.0.25 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 2.0.24 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 2.0.23 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 2.0.22 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 2.0.21 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 2.0.20 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 2.0.18 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-live-label/package.json b/packages/components/psammead-live-label/package.json index f8822148d3..2d16381bce 100644 --- a/packages/components/psammead-live-label/package.json +++ b/packages/components/psammead-live-label/package.json @@ -1,13 +1,13 @@ { "name": "@bbc/psammead-live-label", - "version": "2.0.21", + "version": "2.0.33", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, "description": "React component for a live label", "repository": { "type": "git", - "url": "https://github.com/BBC-News/psammead/tree/latest/packages/components/psammead-social-embed" + "url": "https://github.com/bbc/psammead/tree/latest/packages/components/psammead-live-label" }, "author": { "name": "Psammead Maintainers", @@ -17,10 +17,10 @@ "bugs": { "url": "https://github.com/bbc/psammead/issues" }, - "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-social-embed/README.md", + "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-live-label/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0", + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2", "@bbc/psammead-visually-hidden-text": "2.0.7" }, "peerDependencies": { diff --git a/packages/components/psammead-live-label/src/index.jsx b/packages/components/psammead-live-label/src/index.jsx index b954b701ef..fb1b67fa77 100644 --- a/packages/components/psammead-live-label/src/index.jsx +++ b/packages/components/psammead-live-label/src/index.jsx @@ -24,9 +24,11 @@ const LiveLabel = ({ offScreenText, lang, children, + id, }) => ( + // lines 27, 56,66, 31 concerning with id are a temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 // eslint-disable-next-line jsx-a11y/aria-role - + | Version | Description | | ------- | ----------- | +| 6.1.13 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 6.1.12 | [PR#4601](https://github.com/bbc/psammead/pull/4601) Bumps dependencies | +| 6.1.12 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 6.1.11 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 6.1.10 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 6.1.9 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 6.1.8 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 6.1.7 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 6.1.6 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 6.1.5 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 6.1.4 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 6.1.2 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 6.1.1 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 6.1.0 | [PR#4436](https://github.com/bbc/psammead/pull/4436) add data-e2e attributes for e2e tests | diff --git a/packages/components/psammead-media-indicator/package.json b/packages/components/psammead-media-indicator/package.json index 75c3af8f24..720af3972c 100644 --- a/packages/components/psammead-media-indicator/package.json +++ b/packages/components/psammead-media-indicator/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-media-indicator", - "version": "6.1.2", + "version": "6.1.14", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,9 +19,9 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-media-indicator/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-assets": "3.1.10", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-media-player/CHANGELOG.md b/packages/components/psammead-media-player/CHANGELOG.md index a8ad608f3a..3087c85943 100644 --- a/packages/components/psammead-media-player/CHANGELOG.md +++ b/packages/components/psammead-media-player/CHANGELOG.md @@ -3,6 +3,21 @@ | Version | Description | | ------------- | ---------------------------------------------------------------------------------------------------------------------------- | +| 6.0.3 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 6.0.2| [PR#4608](https://github.com/bbc/psammead/pull/4608) Bump dependencies| +| 6.0.1| [PR#4607](https://github.com/bbc/psammead/pull/4607) Bump dependencies| +| 6.0.0| [PR#4606](https://github.com/bbc/psammead/pull/4606) Adds support for WebP | +| 5.1.13 | [PR#4601](https://github.com/bbc/psammead/pull/4601) Bumps dependencies | +| 5.1.13 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles transitive packages | +| 5.1.12 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump from psammead-styles | +| 5.1.11 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 5.1.10 |[PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 5.1.9 | [PR#4561](https://github.com/bbc/psammead/pull/4561) bump dependencies | +| 5.1.8 | [PR#4534](https://github.com/bbc/psammead/pull/4534) Fixes prop warnings in storybook | +| 5.1.7 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 5.1.6 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 5.1.5 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 5.1.4 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-image-placeholder | | 5.1.3 | [PR#4549](https://github.com/bbc/psammead/pull/4549) Bump psammead-image-placeholder | | 5.1.2 | [PR#4546](https://github.com/bbc/psammead/pull/4546) Bump psammead-image-placeholder | | 5.1.1 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | diff --git a/packages/components/psammead-media-player/package.json b/packages/components/psammead-media-player/package.json index 1120ea7e0d..3330995cbd 100644 --- a/packages/components/psammead-media-player/package.json +++ b/packages/components/psammead-media-player/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-media-player", - "version": "5.1.3", + "version": "6.0.3", "description": "Provides a media player with optional placeholder", "main": "dist/index.js", "module": "esm/index.js", @@ -29,10 +29,10 @@ "react": ">=16.9.0" }, "dependencies": { - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-image": "2.0.8", - "@bbc/psammead-image-placeholder": "3.4.0", - "@bbc/psammead-play-button": "3.0.22" + "@bbc/psammead-assets": "3.1.10", + "@bbc/psammead-image": "3.1.0", + "@bbc/psammead-image-placeholder": "3.4.11", + "@bbc/psammead-play-button": "3.0.33" }, "devDependencies": { "@emotion/styled": "^11.3.0", diff --git a/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap index d710a3b80b..a3204133f6 100644 --- a/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap @@ -106,6 +106,11 @@ exports[`Media Player: Placeholder should render a video placeholder 1`] = ` visibility: visible; } +.emotion-19 { + display: block; + width: 100%; +} + - + > + + `; @@ -293,6 +302,11 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan visibility: visible; } +.emotion-21 { + display: block; + width: 100%; +} + - + > + + `; @@ -454,6 +472,11 @@ exports[`Media Player: Placeholder should render a video placeholder without dur visibility: visible; } +.emotion-17 { + display: block; + width: 100%; +} + - + > + + `; @@ -608,6 +635,11 @@ exports[`Media Player: Placeholder should render an audio placeholder 1`] = ` visibility: visible; } +.emotion-19 { + display: block; + width: 100%; +} + - + > + + `; @@ -766,6 +802,11 @@ exports[`Media Player: Placeholder should render an audio placeholder without du visibility: visible; } +.emotion-17 { + display: block; + width: 100%; +} + - + > + + `; @@ -966,6 +1011,11 @@ exports[`Media Player: Placeholder should render no-js styles when noJsClassName visibility: visible; } +.emotion-21 { + display: block; + width: 100%; +} + - + > + + `; diff --git a/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap index a93190c360..5c72bc4140 100644 --- a/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap @@ -229,6 +229,11 @@ exports[`Media Player: Canonical Entry renders a landscape container with a plac visibility: visible; } +.emotion-21 { + display: block; + width: 100%; +} + - + > + + @@ -427,6 +436,11 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance visibility: visible; } +.emotion-23 { + display: block; + width: 100%; +} + - + > + + @@ -605,6 +623,11 @@ exports[`Media Player: Canonical Entry renders a portrait container with a place visibility: visible; } +.emotion-21 { + display: block; + width: 100%; +} + - + > + + @@ -896,6 +923,11 @@ exports[`Media Player: Canonical Entry renders with no-js styles when noJsClassN visibility: visible; } +.emotion-23 { + display: block; + width: 100%; +} + - + > + + diff --git a/packages/components/psammead-media-player/src/index.stories.jsx b/packages/components/psammead-media-player/src/index.stories.jsx index 90fdba86fa..688ab099f1 100644 --- a/packages/components/psammead-media-player/src/index.stories.jsx +++ b/packages/components/psammead-media-player/src/index.stories.jsx @@ -32,6 +32,7 @@ storiesOf('Components/Media Player', module) service="news" mediaInfo={{ title: 'Dog chases cat.', type: 'video', ...withDuration }} title="Default Video player" + noJsMessage="Dem no support media player for your device" /> ), { notes, knobs: { escapeHTML: false } }, @@ -73,6 +74,7 @@ storiesOf('Components/Media Player', module) 'Guidance: May contain strong language that may offend', ...withDuration, }} + noJsMessage="Dem no support media player for your device" /> ), { notes, knobs: { escapeHTML: false } }, @@ -90,6 +92,7 @@ storiesOf('Components/Media Player', module) ...withDuration, }} title="Video player" + noJsMessage="Dem no support media player for your device" /> ), { notes, knobs: { escapeHTML: false } }, @@ -105,6 +108,7 @@ storiesOf('Components/Media Player', module) service="news" mediaInfo={{ type: 'audio', title: 'Live show intro.' }} title="Audio player" + noJsMessage="Dem no support media player for your device" /> ), { notes, knobs: { escapeHTML: false } }, @@ -123,6 +127,7 @@ storiesOf('Components/Media Player', module) onMediaInitialised={() => alert('Media Player Initialised')} onMediaPlaying={() => alert('Media Player Playing')} onMediaPause={() => alert('Media Player Paused')} + noJsMessage="Dem no support media player for your device" /> ), { notes, knobs: { escapeHTML: false } }, @@ -153,7 +158,7 @@ storiesOf('Components/Media Player', module) () => ( ), { notes, knobs: { escapeHTML: false } }, @@ -175,6 +181,8 @@ storiesOf('Components/Media Player', module) placeholderSrc="https://news.files.bbci.co.uk/include/articles/public/images/amp_audio_placeholder.png" skin="audio" title="Audio player" + service="news" + noJsMessage="Dem no support media player for your device" /> ), { notes, knobs: { escapeHTML: false } }, diff --git a/packages/components/psammead-navigation/CHANGELOG.md b/packages/components/psammead-navigation/CHANGELOG.md index 43b7858be7..7210d4553d 100644 --- a/packages/components/psammead-navigation/CHANGELOG.md +++ b/packages/components/psammead-navigation/CHANGELOG.md @@ -3,6 +3,21 @@ | Version | Description | |---------|-------------| +| 9.2.17 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 9.2.16 | [PR#4599](https://github.com/bbc/psammead/pull/4599) Fix TalkBack reading nested spans incorrectly, and reading ',' as 'comma' in Dropdown Navigation| +| 9.2.15 | [PR#4601](https://github.com/bbc/psammead/pull/4601) Bumps dependencies | +| 9.2.14 | [PR#4587](https://github.com/bbc/psammead/pull/4587) Fix TalkBack reading nested spans incorrectly | +| 9.2.13 | [PR#4590](https://github.com/bbc/psammead/pull/4590) Fix talkback comma bug | +| 9.2.12 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 9.2.11 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 9.2.10 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 9.2.9 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 9.2.8 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 9.2.7 | [PR#4534](https://github.com/bbc/psammead/pull/4534) Fixes prop warnings in storybook | +| 9.2.6 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 9.2.5 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 9.2.4 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 9.2.3 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 9.2.2 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 9.2.1 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 9.2.0 | [PR#4475](https://github.com/bbc/psammead/pull/4475) Adds bottom nav border in high contrast mode | diff --git a/packages/components/psammead-navigation/package.json b/packages/components/psammead-navigation/package.json index 4b712dbed5..b8196e5265 100644 --- a/packages/components/psammead-navigation/package.json +++ b/packages/components/psammead-navigation/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-navigation", - "version": "9.2.2", + "version": "9.2.17", "description": "A navigation bar to use on index pages", "main": "dist/index.js", "module": "esm/index.js", @@ -19,9 +19,9 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-navigation/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-styles": "7.3.0", + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-assets": "3.1.10", + "@bbc/psammead-styles": "8.0.2", "@bbc/psammead-visually-hidden-text": "2.0.7" }, "peerDependencies": { diff --git a/packages/components/psammead-navigation/src/DropdownNavigation/__snapshots__/index.test.jsx.snap b/packages/components/psammead-navigation/src/DropdownNavigation/__snapshots__/index.test.jsx.snap index d57cac5933..30c070a763 100644 --- a/packages/components/psammead-navigation/src/DropdownNavigation/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-navigation/src/DropdownNavigation/__snapshots__/index.test.jsx.snap @@ -707,10 +707,15 @@ exports[`Dropdown navigation should render correctly when closed 1`] = ` role="listitem" > - Home + + Home + - Nigeria + + Nigeria + - Africa + + Africa + - Current page - , + Current page, World @@ -763,10 +779,15 @@ exports[`Dropdown navigation should render correctly when closed 1`] = ` role="listitem" > - Video + + Video + - Audio + + Audio + - Sport + + Sport + - Entertainment + + Entertainment + - Most popular + + Most popular + @@ -924,10 +965,15 @@ exports[`Dropdown navigation should render correctly when open 1`] = ` role="listitem" > - Home + + Home + - Nigeria + + Nigeria + - Africa + + Africa + - Current page - , + Current page, World @@ -980,10 +1037,15 @@ exports[`Dropdown navigation should render correctly when open 1`] = ` role="listitem" > - Video + + Video + - Audio + + Audio + - Sport + + Sport + - Entertainment + + Entertainment + - Most popular + + Most popular + diff --git a/packages/components/psammead-navigation/src/DropdownNavigation/index.jsx b/packages/components/psammead-navigation/src/DropdownNavigation/index.jsx index 7846ef92ac..64d3849244 100644 --- a/packages/components/psammead-navigation/src/DropdownNavigation/index.jsx +++ b/packages/components/psammead-navigation/src/DropdownNavigation/index.jsx @@ -129,20 +129,33 @@ export const DropdownLi = ({ service, url, dir, -}) => ( - - - {active && currentPageText ? ( - - {currentPageText}, - {children} - - ) : ( - children - )} - - -); +}) => { + const ariaId = `dropdownNavigation-${children + .replace(/\s+/g, '-') + .toLowerCase()}`; + return ( + // aria-labelledby is a temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 + + + {active && currentPageText ? ( + // ID is a temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 + + {`${currentPageText}, `} + {children} + + ) : ( + // ID is a temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 + {children} + )} + + + ); +}; DropdownLi.propTypes = { children: string.isRequired, diff --git a/packages/components/psammead-navigation/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-navigation/src/__snapshots__/index.test.jsx.snap index 22673fc467..53e353a914 100644 --- a/packages/components/psammead-navigation/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-navigation/src/__snapshots__/index.test.jsx.snap @@ -210,19 +210,20 @@ exports[`Navigation should render correctly 1`] = ` role="listitem" > - Current page - , + Current page, Akụkọ @@ -489,19 +490,20 @@ exports[`Navigation should render correctly when ampOpenClass prop is provided 1 role="listitem" > - Current page - , + Current page, Akụkọ @@ -762,19 +764,20 @@ exports[`Navigation should render correctly when isOpen is true 1`] = ` role="listitem" > - Current page - , + Current page, Akụkọ @@ -1079,19 +1082,20 @@ exports[`Scrollable Navigation should render correctly 1`] = ` role="listitem" > - Current page - , + Current page, Akụkọ diff --git a/packages/components/psammead-navigation/src/index.jsx b/packages/components/psammead-navigation/src/index.jsx index ae48848db9..63ebadf10a 100644 --- a/packages/components/psammead-navigation/src/index.jsx +++ b/packages/components/psammead-navigation/src/index.jsx @@ -116,6 +116,7 @@ const StyledSpan = styled.span` `; const CurrentLink = ({ + linkId, children: link, script, currentPageText, @@ -127,14 +128,17 @@ const CurrentLink = ({ role="text" script={script} brandHighlightColour={brandHighlightColour} + // This is a temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 + id={`NavigationLinks-${linkId}`} > - {currentPageText}, + {`${currentPageText}, `} {link} > ); CurrentLink.propTypes = { + linkId: string.isRequired, children: string.isRequired, script: shape(scriptPropType).isRequired, currentPageText: string, @@ -184,9 +188,12 @@ export const NavigationLi = ({ currentLink brandForegroundColour={brandForegroundColour} brandHighlightColour={brandHighlightColour} + // This is a temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652 + aria-labelledby={`NavigationLinks-${link}`} {...props} > { ); }; +const dropdownNavigationStory = ( + currentPageText, + navData, + dir, + isAmp, + script, + service, + brandBackgroundColour, + brandForegroundColour, + brandBorderColour, + brandHighlightColour, +) => ( + <> + + + + {navData.map((item, index) => { + const { title, url } = item; + const active = index === 0; + + return ( + + {title} + + ); + })} + + + + > +); + const navigationStory = ( currentPageText, navData, @@ -303,7 +360,24 @@ canonicalStories.add( canonicalStories.add( 'Dropdown animation', - ({ dir, script, service }) => animationStory(dir, script, service), + ({ + dir, + script, + service, + brandBackgroundColour, + brandForegroundColour, + brandBorderColour, + brandHighlightColour, + }) => + animationStory( + dir, + script, + service, + brandBackgroundColour, + brandForegroundColour, + brandBorderColour, + brandHighlightColour, + ), { notes, }, @@ -338,6 +412,34 @@ canonicalStories.add( }, ); +canonicalStories.add( + 'Dropdown Navigation', + ({ + script, + service, + brandBackgroundColour, + brandForegroundColour, + brandBorderColour, + brandHighlightColour, + }) => + dropdownNavigationStory( + navStoriesData[0].currentPageText, + igboNavData, + navStoriesData[0].dir, + false, + script, + service, + brandBackgroundColour, + brandForegroundColour, + brandBorderColour, + brandHighlightColour, + ), + { + notes, + knobs: { escapeHTML: false }, + }, +); + const ampStories = storiesOf('Components/Navigation/AMP', module) .addDecorator(ampDecorator) .addDecorator(withKnobs) diff --git a/packages/components/psammead-paragraph/CHANGELOG.md b/packages/components/psammead-paragraph/CHANGELOG.md index 2985dda244..e016745299 100644 --- a/packages/components/psammead-paragraph/CHANGELOG.md +++ b/packages/components/psammead-paragraph/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 4.0.28 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 4.0.27 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 4.0.26 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 4.0.25 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 4.0.24 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 4.0.23 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 4.0.22 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 4.0.21 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 4.0.20 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 4.0.19 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 4.0.18 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 4.0.17 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 4.0.15 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-paragraph/package.json b/packages/components/psammead-paragraph/package.json index 25dcddbb8c..d44a28f5a9 100644 --- a/packages/components/psammead-paragraph/package.json +++ b/packages/components/psammead-paragraph/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-paragraph", - "version": "4.0.18", + "version": "4.0.28", "description": "React component for a Paragraph", "main": "dist/index.js", "module": "esm/index.js", @@ -24,8 +24,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-paragraph/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-play-button/CHANGELOG.md b/packages/components/psammead-play-button/CHANGELOG.md index 847e02a675..fdf969285d 100644 --- a/packages/components/psammead-play-button/CHANGELOG.md +++ b/packages/components/psammead-play-button/CHANGELOG.md @@ -3,6 +3,17 @@ | Version | Description | | ------------- | ----------- | +| 3.0.33 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.32| [PR#4601](https://github.com/bbc/psammead/pull/4601) Bumps dependencies | +| 3.0.31 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.30 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.29 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.28 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.27 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.26 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.25 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.24 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.23 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.0.22 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.0.21 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.0.19 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-play-button/package.json b/packages/components/psammead-play-button/package.json index 37cbfff708..3a89c309f9 100644 --- a/packages/components/psammead-play-button/package.json +++ b/packages/components/psammead-play-button/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-play-button", - "version": "3.0.22", + "version": "3.0.33", "description": "Provides a play button, with optional duration, for playable media.", "main": "dist/index.js", "module": "esm/index.js", @@ -18,9 +18,9 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-play-button/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-assets": "3.1.10", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-podcast-promo/CHANGELOG.md b/packages/components/psammead-podcast-promo/CHANGELOG.md deleted file mode 100644 index 6c41b9da15..0000000000 --- a/packages/components/psammead-podcast-promo/CHANGELOG.md +++ /dev/null @@ -1,41 +0,0 @@ -# Podcast Changelog - - -| Version | Description | -|---------|-------------| -| 0.1.0-alpha.37 | [PR#4549](https://github.com/bbc/psammead/pull/4549) Bump psammead-image-placeholder | -| 0.1.0-alpha.36 | [PR#4546](https://github.com/bbc/psammead/pull/4546) Bump psammead-image-placeholder | -| 0.1.0-alpha.35 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | -| 0.1.0-alpha.34 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | -| 0.1.0-alpha.33 | [PR#4436](https://github.com/bbc/psammead/pull/4436) add data-e2e attributes for e2e tests | -| 0.1.0-alpha.31 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | -| 0.1.0-alpha.30 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | -| 0.1.0-alpha.29 | [PR#4377](https://github.com/bbc/psammead/pull/4377) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.28 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | -| 0.1.0-alpha.27 | [PR#4305](https://github.com/bbc/psammead/pull/4305) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.26 | [PR#4304](https://github.com/bbc/psammead/pull/4304) Talos - Bump Dependencies - @bbc/gel-foundations, @bbc/psammead-assets, @bbc/psammead-image-placeholder, @bbc/psammead-styles, @bbc/psammead-visually-hidden-text | -| 0.1.0-alpha.25 | [PR#4303](https://github.com/bbc/psammead/pull/4303) Trigger rebuild following babel config update for emotion 11 | -| 0.1.0-alpha.24 | [PR#4292](https://github.com/bbc/psammead/pull/4292) adds a width to the image for small viewports | -| 0.1.0-alpha.23 | [PR#4289](https://github.com/bbc/psammead/pull/4289) fix broken UI in IE11 | -| 0.1.0-alpha.22 | [PR#4273](https://github.com/bbc/psammead/pull/4273) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.21 | [PR#4271](https://github.com/bbc/psammead/pull/4271) change react peer dep to >=16.9.0 | -| 0.1.0-alpha.20 | [PR#4268](https://github.com/bbc/psammead/pull/4268) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.19 | [PR#4266](https://github.com/bbc/psammead/pull/4266) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-visually-hidden-text | -| 0.1.0-alpha.18 | [PR#4260](https://github.com/bbc/psammead/pull/4260) Talos - Bump Dependencies - @bbc/gel-foundations | -| 0.1.0-alpha.17 | [PR#4258](https://github.com/bbc/psammead/pull/4258) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.16 | [PR#4256](https://github.com/bbc/psammead/pull/4256) Talos - Bump Dependencies - @bbc/psammead-styles | -| 0.1.0-alpha.15 | [PR#4193](https://github.com/bbc/psammead/pull/4193) Upgrade Emotion to v11 | -| 0.1.0-alpha.14 | [PR#4227](https://github.com/bbc/psammead/pull/4227) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.13 | [PR#4226](https://github.com/bbc/psammead/pull/4226) Talos - Bump Dependencies - @bbc/psammead-styles | -| 0.1.0-alpha.12 | [PR#4219](https://github.com/bbc/psammead/pull/#4219) Hide image below 320px| -| 0.1.0-alpha.11 | [PR##4214](https://github.com/bbc/psammead/pull/#4214) Design fixes| -| 0.1.0-alpha.10 | [PR#4197](https://github.com/bbc/psammead/pull/4197) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.9 | [PR#4189](https://github.com/bbc/psammead/pull/4189) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles | -| 0.1.0-alpha.8 | [PR#4168](https://github.com/bbc/psammead/pull/4168) Add English fixture data to story | -| 0.1.0-alpha.7 | [PR#4124](https://github.com/bbc/psammead/pull/4124) Range of a11y improvements for component | -| 0.1.0-alpha.6 | [PR#4088](https://github.com/bbc/psammead/pull/4088) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.5 | [PR#4087](https://github.com/bbc/psammead/pull/4087) Talos - Bump Dependencies - @bbc/psammead-assets | -| 0.1.0-alpha.4 | [PR#4073](https://github.com/bbc/psammead/pull/4073) Talos - Bump Dependencies - @bbc/psammead-image-placeholder | -| 0.1.0-alpha.3 | [PR#4072](https://github.com/bbc/psammead/pull/4072) Talos - Bump Dependencies - @bbc/psammead-styles | -| 0.1.0-alpha.2 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations, @bbc/psammead-image-placeholder, @bbc/psammead-styles, @bbc/psammead-visually-hidden-text | -| 0.1.0-alpha.1 | [PR#4005](https://github.com/bbc/psammead/pull/4005) Initial creation of package. | diff --git a/packages/components/psammead-podcast-promo/README.md b/packages/components/psammead-podcast-promo/README.md deleted file mode 100644 index a7d2a11db5..0000000000 --- a/packages/components/psammead-podcast-promo/README.md +++ /dev/null @@ -1,68 +0,0 @@ -# psammead-podcast-promo - [![Known Vulnerabilities](https://snyk.io/test/github/bbc/psammead/badge.svg?targetFile=packages%2Fcomponents%2Fpsammead-podcast-promo%2Fpackage.json)](https://snyk.io/test/github/bbc/psammead?targetFile=packages%2Fcomponents%2Fpsammead-podcast-promo%2Fpackage.json) [![Dependency Status](https://david-dm.org/bbc/psammead.svg?path=packages/components/psammead-podcast-promo)](https://david-dm.org/bbc/psammead?path=packages/components/psammead-podcast-promo) [![peerDependencies Status](https://david-dm.org/bbc/psammead/peer-status.svg?path=packages/components/psammead-podcast-promo)](https://david-dm.org/bbc/psammead?path=packages/components/psammead-podcast-promo&type=peer) [![Storybook](https://raw.githubusercontent.com/storybooks/brand/master/badge/badge-storybook.svg?sanitize=true)](https://bbc.github.io/psammead/?path=/story/figure--containing-image) [![GitHub license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/bbc/psammead/blob/latest/LICENSE) [![npm version](https://img.shields.io/npm/v/@bbc/psammead-podcast-promo.svg)](https://www.npmjs.com/package/@bbc/psammead-podcast-promo) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/bbc/psammead/blob/latest/CONTRIBUTING.md) - -## Description - -This component is used to implement styling for podcast promos - -## Usage - -See usage examples of how this package can be used in `/src/examples` - -### Components: `PodcastPromo` - -This is the outermost component, responsible for providing the gray background surface that subcomponents are children of. This component requires the psammead `script` and `service` properties to implement locale-specific styling across all of its children. - -Any additional props are passed down to the standard html `section` element that this component uses. You can elect to use a different component via the `as` prop, eg: `` - -### Components: `PodcastPromo.Title` - -This component is responsible for implementing the overall title for the podcast promo section. The title will be placed alongside a podcast icon. Any props to this component are passed along to the underlying html `h2` element. You can elect to use a different component via the `as` prop, eg: `` - -### Components: `PodcastPromo.Card` - -This component is a basic `div` that is styled to be used as the wrapper around any individual episode or series within the podcast promo section. - -Child components can apply the `podcast-promo--hover` class, which will apply a `text-decoration: underline` property when the card is hovered - -### Components: `PodcastPromo.Card.Link` - -This component is a styled `a` that is intended to be the handler for clicks within each individual card. This component implements CSS that will cause it to overlay the entire card, meaning any click within the Card will navigate the user to the destination. Therefore, the placement of this component within the card is only relevant for scenarios where CSS is not being used - -Any props are passed down to the standard html `a` element that this component uses. You can elect to use a different component via the `as` prop, eg: `` - -Child components can apply the `podcast-promo--visited` class, which will reduce the text colour contrast property when the link has been visited by the user -Child components can apply the `podcast-promo--focus` class, which will which will apply a `text-decoration: underline` property when the link is focused - -### Components: `PodcastPromo.Card.ImageWrapper` - -This component is responsible for wrapping the image used within the promo cards. This is a basic styled `div` that is anticipated to be provided with a child `img` component. This `img` can optionally be wrapped with other components to handle, eg, placeholders and lazy-loading - see the basic example in `/src/examples`. - -### Components: `PodcastPromo.Card.Content` - -This component is a basic `div` that is styled to be used as the wrapper around content displayed alongside the image. - -### Components: `PodcastPromo.Card.Title` - -This component is a basic `h3` that is intended to be used as the title within each individual podcast card. - -Any props to this component are passed along to the underlying html `h3` element. You can elect to use a different component via the `as` prop, eg: `` - -### Components: `PodcastPromo.Card.Description` - -This component is a basic `p` that is styled to be used for the synopsis/description of each card. - -### Components: `PodcastPromo.Card.EpisodesText` - -This component intended to be used for the "episodes" text + series stack icon within each card. The child text is positioned alongside an icon. Any props passed to this component are forwarded to the `p` element that wraps the text and icon. - -## Contributing - -Psammead is completely open source. We are grateful for any contributions, whether they be new components, bug fixes or general improvements. Please see our primary contributing guide which can be found at [the root of the Psammead repository](https://github.com/bbc/psammead/blob/latest/CONTRIBUTING.md). - -### [Code of Conduct](https://github.com/bbc/psammead/blob/latest/CODE_OF_CONDUCT.md) - -We welcome feedback and help on this work. By participating in this project, you agree to abide by the [code of conduct](https://github.com/bbc/psammead/blob/latest/CODE_OF_CONDUCT.md). Please take a moment to read it. - -### License - -Psammead is [Apache 2.0 licensed](https://github.com/bbc/psammead/blob/latest/LICENSE). diff --git a/packages/components/psammead-podcast-promo/package.json b/packages/components/psammead-podcast-promo/package.json deleted file mode 100644 index 7c7dceaae8..0000000000 --- a/packages/components/psammead-podcast-promo/package.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "@bbc/psammead-podcast-promo", - "version": "0.1.0-alpha.37", - "main": "dist/index.js", - "module": "esm/index.js", - "sideEffects": false, - "description": "Component package for podcast promos", - "repository": { - "type": "git", - "url": "https://github.com/BBC-News/psammead/tree/latest/packages/components/psammead-podcast-promo" - }, - "author": { - "name": "Psammead Maintainers", - "email": "PsammeadMaintainers@bbc.co.uk" - }, - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/bbc/psammead/issues" - }, - "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-podcast-promo/README.md", - "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-image-placeholder": "3.4.0", - "@bbc/psammead-styles": "7.3.0" - }, - "peerDependencies": { - "@emotion/styled": "^11.0.0", - "prop-types": "^15.7.2", - "react": ">=16.9.0" - }, - "devDependencies": { - "@bbc/psammead-visually-hidden-text": "2.0.7", - "@emotion/styled": "^11.3.0", - "prop-types": "^15.7.2", - "react": "^17.0.2" - }, - "keywords": [ - "bbc", - "podcast" - ] -} diff --git a/packages/components/psammead-podcast-promo/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-podcast-promo/src/__snapshots__/index.test.jsx.snap deleted file mode 100644 index c327722a0a..0000000000 --- a/packages/components/psammead-podcast-promo/src/__snapshots__/index.test.jsx.snap +++ /dev/null @@ -1,1213 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Podcast Promo Card Content should match snapshot 1`] = ` -.emotion-0 { - -webkit-flex: 1; - -ms-flex: 1; - flex: 1; - padding: 0.5rem; -} - -@media (min-width: 25rem) { - .emotion-0 { - padding: 0.5rem 1rem; - } -} - -@media (min-width: 63rem) { - .emotion-0 { - padding: 1rem; - } -} - - - - Content - - -`; - -exports[`Podcast Promo Card Description should match snapshot 1`] = ` -.emotion-0 { - font-size: 0.9375rem; - line-height: 1.125rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - max-width: 30rem; - color: #6E6E73; - margin-top: 0.5rem; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-0 { - font-size: 0.9375rem; - line-height: 1.125rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-0 { - font-size: 0.875rem; - line-height: 1.125rem; - } -} - - - - Content - - -`; - -exports[`Podcast Promo Card Episodes Text should match snapshot 1`] = ` -.emotion-0 { - display: inline; - font-size: 0.9375rem; - line-height: 1.25rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - color: #6E6E73; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-0 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-0 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -.emotion-0>svg { - fill: currentColor; - color: unset; - width: 1rem; - height: 1rem; - position: relative; - bottom: 0.125rem; - right: 0.1875rem; -} - -.emotion-2 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - - - - - - - - - Episodes - - -`; - -exports[`Podcast Promo Card Image should match snapshot 1`] = ` -.emotion-0 { - margin: 0.5rem 0 0 0.5rem; - display: none; -} - -@media (min-width: 20rem) { - .emotion-0 { - display: block; - -webkit-box-flex: 0; - -webkit-flex-grow: 0; - -ms-flex-positive: 0; - flex-grow: 0; - -webkit-flex-shrink: 0; - -ms-flex-negative: 0; - flex-shrink: 0; - -webkit-flex-basis: 6.5rem; - -ms-flex-preferred-size: 6.5rem; - flex-basis: 6.5rem; - } -} - -@media (min-width: 25rem) { - .emotion-0 { - -webkit-flex-basis: 6.8125rem; - -ms-flex-preferred-size: 6.8125rem; - flex-basis: 6.8125rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-0 { - -webkit-flex-basis: 11.125rem; - -ms-flex-preferred-size: 11.125rem; - flex-basis: 11.125rem; - margin: 0; - } -} - -@media (min-width: 63rem) { - .emotion-0 { - margin: 0; - } -} - - - - Content - - -`; - -exports[`Podcast Promo Card Link should match snapshot 1`] = ` -.emotion-0 { - color: #222222; - -webkit-text-decoration: none; - text-decoration: none; -} - -.emotion-0:before { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - content: ''; - overflow: hidden; - z-index: 1; -} - -.emotion-0:visited .podcast-promo--visited { - color: #6E6E73; -} - -.emotion-0:focus .podcast-promo--focus { - -webkit-text-decoration: underline; - text-decoration: underline; -} - - - - Content - - -`; - -exports[`Podcast Promo Card Title should match snapshot 1`] = ` -.emotion-0 { - font-size: 0.9375rem; - line-height: 1.25rem; - font-family: ReithSerif,Helvetica,Arial,sans-serif; - font-weight: 500; - font-style: normal; - margin-top: 0; - margin-bottom: 0.5rem; - color: #222222; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-0 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-0 { - font-size: 1rem; - line-height: 1.25rem; - } -} - - - - Content - - -`; - -exports[`Podcast Promo Card should match snapshot 1`] = ` -.emotion-0 { - position: relative; - background-color: #FDFDFD; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - box-shadow: 0 0 0.3125rem 0.3125rem #22222208; -} - -@media (min-width: 63rem) { - .emotion-0 { - display: block; - } -} - -.emotion-0:hover .podcast-promo--hover { - -webkit-text-decoration: underline; - text-decoration: underline; -} - - - - Content - - -`; - -exports[`Podcast Promo Examples basic example 1`] = ` -.emotion-0 { - background-color: #F2F2F2; - padding: 1rem; -} - -.emotion-2 { - margin: 0 0 1rem; -} - -.emotion-4 { - font-size: 1.125rem; - line-height: 1.375rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - display: inline; - color: #222222; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-4 { - font-size: 1.125rem; - line-height: 1.375rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-4 { - font-size: 1.25rem; - line-height: 1.5rem; - } -} - -.emotion-4>svg { - margin-left: 0; - width: 1.375rem; - height: 1.375rem; - fill: currentColor; - position: relative; - bottom: 0.3125rem; - right: 0.1875rem; -} - -.emotion-6 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - -.emotion-8 { - position: relative; - background-color: #FDFDFD; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - box-shadow: 0 0 0.3125rem 0.3125rem #22222208; -} - -@media (min-width: 63rem) { - .emotion-8 { - display: block; - } -} - -.emotion-8:hover .podcast-promo--hover { - -webkit-text-decoration: underline; - text-decoration: underline; -} - -.emotion-10 { - margin: 0.5rem 0 0 0.5rem; - display: none; -} - -@media (min-width: 20rem) { - .emotion-10 { - display: block; - -webkit-box-flex: 0; - -webkit-flex-grow: 0; - -ms-flex-positive: 0; - flex-grow: 0; - -webkit-flex-shrink: 0; - -ms-flex-negative: 0; - flex-shrink: 0; - -webkit-flex-basis: 6.5rem; - -ms-flex-preferred-size: 6.5rem; - flex-basis: 6.5rem; - } -} - -@media (min-width: 25rem) { - .emotion-10 { - -webkit-flex-basis: 6.8125rem; - -ms-flex-preferred-size: 6.8125rem; - flex-basis: 6.8125rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-10 { - -webkit-flex-basis: 11.125rem; - -ms-flex-preferred-size: 11.125rem; - flex-basis: 11.125rem; - margin: 0; - } -} - -@media (min-width: 63rem) { - .emotion-10 { - margin: 0; - } -} - -.emotion-12 { - position: relative; - height: 0; - overflow: hidden; - background-color: #F2F2F2; - -webkit-background-position: center center; - background-position: center center; - background-repeat: no-repeat; - -webkit-background-size: 60px 17px; - background-size: 60px 17px; - width: 100%; - background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI0NzkiIGhlaWdodD0iMTM2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PGcgZmlsbD0iI0Q1RDBDRCI+PGc+PHBhdGggZD0iTTQ0OS41NTYgOTEuNTUzbC0yLjMxIDEuNDFjLTExLjE2NyA2LjgxOC0yMy4zMTMgMTAuNDc0LTM0LjM0NiAxMC40Ny0yMy42MS0uMDktMzkuMTYzLTE0LjA4My0zOS4yMjctMzQuNDUzLjAzLTE5LjkxOCAxNi4yNy0zNC42NjMgMzguNjMzLTM0LjcxOCAxMS4zODcuMDEgMjEuNzAzIDIuOTU0IDMzLjk2MiA5LjY3MmwyLjI1MSAxLjI0di0xOC4xOWwtLjk2Mi0uMzc3Yy0xMy44MjQtNS40NTgtMjQuNTMtNy44OS0zNS4xMDMtNy44ODQtMTYuMzQ2LS4wMDYtMzAuNTMzIDUuMzk0LTQwLjYzNyAxNC41NTctMTAuMTA1IDkuMTYzLTE2LjEwNiAyMi4xMDItMTYuMDk5IDM2Ljk1My4wMDggMTAuMzQ4IDQuMjc5IDIyLjQ4IDEzLjQyIDMyLjEwNSA5LjEyMSA5LjYyOCAyMy4xNjUgMTYuNjQ4IDQyLjQzIDE2LjYzOWguMDYzYzE1Ljk4IDAgMjcuMDYyLTMuNTYzIDM3LjA3NC04LjQ5MmwuODUxLS40MTRWOTEuNTUzek0zMzQgMTM1LjY5N2gxNDQuMTk1VjBIMzM0djEzNS42OTd6Ii8+PHBhdGggZD0iTTI3Ni45MzcgODkuOTY4Yy4wNDEtMTIuMzMtOC4xNzEtMjEuNjk2LTIxLjMwOC0yNS4zIDMuNTQ0LTEuODA5IDYuMzUtNC4wMjMgOC40MDQtNi43MjcgMi43NS0zLjYyMiA0LjA2MS04LjA2NCA0LjA0Ni0xMy4yMzUuMDE1LTYuMzU5LTIuNDg2LTEyLjgzOS03Ljg1OC0xNy42ODctNS4zNzItNC44NDctMTMuNTI2LTcuOTk3LTI0LjY1NC03Ljk5MUgyMDQuODN2OTcuNzI4aDM2LjA3M2MxMi44NyAwIDIxLjkwNi0zLjQ4MiAyNy43MjItOC42NSA1LjgxOC01LjE1NSA4LjMyLTExLjkxIDguMzEyLTE4LjEzOHpNMTY3IDEzNS42OThoMTQ0LjE5N1YwSDE2N3YxMzUuNjk3eiIvPjxwYXRoIGQ9Ik0xMDkuOTM3IDg5Ljk2OGMuMDQxLTEyLjMzLTguMTcxLTIxLjY5Ni0yMS4zMDgtMjUuMyAzLjU0NC0xLjgwOSA2LjM1LTQuMDIzIDguNDA0LTYuNzI3IDIuNzUtMy42MjIgNC4wNjEtOC4wNjQgNC4wNDYtMTMuMjM1LjAxNS02LjM1OS0yLjQ4Ni0xMi44MzktNy44NTgtMTcuNjg3LTUuMzcyLTQuODQ3LTEzLjUyNi03Ljk5Ny0yNC42NTQtNy45OTFIMzcuODN2OTcuNzI4aDM2LjA3M2MxMi44NyAwIDIxLjkwNi0zLjQ4MiAyNy43MjItOC42NSA1LjgxOC01LjE1NSA4LjMyLTExLjkxIDguMzEyLTE4LjEzOHpNMCAxMzUuNjk4aDE0NC4xOTdWMEgwdjEzNS42OTd6Ii8+PHBhdGggZD0iTTI1OC42NjIgODguMTk4Yy0uMDEzIDMuMjI5LTEuMDA3IDYuNDc1LTMuODk2IDkuMDExLTIuODg0IDIuNTM3LTcuODczIDQuNDYzLTE2LjEzMyA0LjQ2M0gyMjJWNzVoMTUuODkzYzcuNDExIDAgMTIuNjcgMS41MDIgMTUuOTY1IDMuODUgMy4yODkgMi4zNjIgNC43NzYgNS40NjMgNC44MDQgOS4zNDgiLz48cGF0aCBkPSJNOTEuNjYyIDg4LjE5OGMtLjAxMyAzLjIyOS0xLjAwNyA2LjQ3NS0zLjg5NiA5LjAxMS0yLjg4NCAyLjUzNy03Ljg3NCA0LjQ2My0xNi4xMzMgNC40NjNINTVWNzVoMTUuODkyYzcuNDEyIDAgMTIuNjcyIDEuNTAyIDE1Ljk2NiAzLjg1IDMuMjg5IDIuMzYyIDQuNzc2IDUuNDYzIDQuODA0IDkuMzQ4Ii8+PHBhdGggZD0iTTI0NS4xODYgNTUuNzljMy4wOTYtMi4yMzcgNC41OS01LjM4NiA0LjYxMy0xMC4xMjQtLjAxNS0zLjI1LS45NDMtNi4wMzMtMy4yODEtOC4xMTEtMi4zNDYtMi4wNzgtNi4zMy0zLjU1NS0xMi43NTQtMy41NTVIMjIydjI1LjI3NWg4LjA3NmM2Ljk4OC4wMDQgMTEuOTk4LTEuMjQzIDE1LjExLTMuNDg2Ii8+PHBhdGggZD0iTTc4LjE4NiA1NS43OWMzLjA5Ni0yLjIzNyA0LjU5LTUuMzg2IDQuNjEzLTEwLjEyNC0uMDE1LTMuMjUtLjk0My02LjAzMy0zLjI4Mi04LjExMUM3Ny4xNzIgMzUuNDc3IDczLjE4OCAzNCA2Ni43NjQgMzRINTV2MjUuMjc1aDguMDc2YzYuOTg4LjAwNCAxMS45OTgtMS4yNDMgMTUuMTEtMy40ODYiLz48L2c+PC9nPjwvZz48L3N2Zz4K); -} - -@media (min-width: 25rem) { - .emotion-12 { - -webkit-background-size: 77px 22px; - background-size: 77px 22px; - } -} - -@media (min-width: 63rem) { - .emotion-12 { - -webkit-background-size: 93px 27px; - background-size: 93px 27px; - } -} - -.emotion-14 { - -webkit-flex: 1; - -ms-flex: 1; - flex: 1; - padding: 0.5rem; -} - -@media (min-width: 25rem) { - .emotion-14 { - padding: 0.5rem 1rem; - } -} - -@media (min-width: 63rem) { - .emotion-14 { - padding: 1rem; - } -} - -.emotion-16 { - font-size: 0.9375rem; - line-height: 1.25rem; - font-family: ReithSerif,Helvetica,Arial,sans-serif; - font-weight: 500; - font-style: normal; - margin-top: 0; - margin-bottom: 0.5rem; - color: #222222; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-16 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-16 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -.emotion-18 { - color: #222222; - -webkit-text-decoration: none; - text-decoration: none; -} - -.emotion-18:before { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - content: ''; - overflow: hidden; - z-index: 1; -} - -.emotion-18:visited .podcast-promo--visited { - color: #6E6E73; -} - -.emotion-18:focus .podcast-promo--focus { - -webkit-text-decoration: underline; - text-decoration: underline; -} - -.emotion-20 { - font-size: 0.9375rem; - line-height: 1.125rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - max-width: 30rem; - color: #6E6E73; - margin-top: 0.5rem; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-20 { - font-size: 0.9375rem; - line-height: 1.125rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-20 { - font-size: 0.875rem; - line-height: 1.125rem; - } -} - -.emotion-22 { - display: inline; - font-size: 0.9375rem; - line-height: 1.25rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - color: #6E6E73; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-22 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-22 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -.emotion-22>svg { - fill: currentColor; - color: unset; - width: 1rem; - height: 1rem; - position: relative; - bottom: 0.125rem; - right: 0.1875rem; -} - -.emotion-24 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - - - - - - - - - Подкаст - - - - - - - - - - - - - Что это было? - - - - - Мы быстро, просто и понятно объясняем, что случилось, почему это важно и что будет дальше. Никаких ненужных подробностей и передергиваний - только факты и взвешенная аналитика. - - - - - - - - эпизоды - - - - - -`; - -exports[`Podcast Promo Examples on-page example 1`] = ` -.emotion-0 { - margin: 10px auto; - max-width: 1008px; -} - -.emotion-2 { - vertical-align: top; - display: inline-block; - max-width: 1000px; - padding: 0 10px; - width: 100%; -} - -@media (min-width: 63rem) { - .emotion-2 { - width: 66%; - } -} - -.emotion-4 { - height: 1000px; - margin: 20px 0; - background-color: #404040; - font-family: sans-serif; - color: #757575; - font-size: 20px; - line-height: 1; - text-align: center; - padding-top: 490px; -} - -.emotion-6 { - display: inline-block; - padding: 0 10px; - width: 100%; -} - -@media (min-width: 63rem) { - .emotion-6 { - width: 33%; - } -} - -.emotion-8 { - height: 200px; - margin: 20px 0; - background-color: #404040; - font-family: sans-serif; - color: #757575; - font-size: 20px; - line-height: 1; - text-align: center; - padding-top: 90px; -} - -.emotion-10 { - background-color: #F2F2F2; - padding: 1rem; -} - -.emotion-12 { - margin: 0 0 1rem; -} - -.emotion-14 { - font-size: 1.125rem; - line-height: 1.375rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - display: inline; - color: #222222; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-14 { - font-size: 1.125rem; - line-height: 1.375rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-14 { - font-size: 1.25rem; - line-height: 1.5rem; - } -} - -.emotion-14>svg { - margin-left: 0; - width: 1.375rem; - height: 1.375rem; - fill: currentColor; - position: relative; - bottom: 0.3125rem; - right: 0.1875rem; -} - -.emotion-16 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - -.emotion-18 { - position: relative; - background-color: #FDFDFD; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - box-shadow: 0 0 0.3125rem 0.3125rem #22222208; -} - -@media (min-width: 63rem) { - .emotion-18 { - display: block; - } -} - -.emotion-18:hover .podcast-promo--hover { - -webkit-text-decoration: underline; - text-decoration: underline; -} - -.emotion-20 { - margin: 0.5rem 0 0 0.5rem; - display: none; -} - -@media (min-width: 20rem) { - .emotion-20 { - display: block; - -webkit-box-flex: 0; - -webkit-flex-grow: 0; - -ms-flex-positive: 0; - flex-grow: 0; - -webkit-flex-shrink: 0; - -ms-flex-negative: 0; - flex-shrink: 0; - -webkit-flex-basis: 6.5rem; - -ms-flex-preferred-size: 6.5rem; - flex-basis: 6.5rem; - } -} - -@media (min-width: 25rem) { - .emotion-20 { - -webkit-flex-basis: 6.8125rem; - -ms-flex-preferred-size: 6.8125rem; - flex-basis: 6.8125rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-20 { - -webkit-flex-basis: 11.125rem; - -ms-flex-preferred-size: 11.125rem; - flex-basis: 11.125rem; - margin: 0; - } -} - -@media (min-width: 63rem) { - .emotion-20 { - margin: 0; - } -} - -.emotion-22 { - position: relative; - height: 0; - overflow: hidden; - background-color: #F2F2F2; - -webkit-background-position: center center; - background-position: center center; - background-repeat: no-repeat; - -webkit-background-size: 60px 17px; - background-size: 60px 17px; - width: 100%; - background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI0NzkiIGhlaWdodD0iMTM2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PGcgZmlsbD0iI0Q1RDBDRCI+PGc+PHBhdGggZD0iTTQ0OS41NTYgOTEuNTUzbC0yLjMxIDEuNDFjLTExLjE2NyA2LjgxOC0yMy4zMTMgMTAuNDc0LTM0LjM0NiAxMC40Ny0yMy42MS0uMDktMzkuMTYzLTE0LjA4My0zOS4yMjctMzQuNDUzLjAzLTE5LjkxOCAxNi4yNy0zNC42NjMgMzguNjMzLTM0LjcxOCAxMS4zODcuMDEgMjEuNzAzIDIuOTU0IDMzLjk2MiA5LjY3MmwyLjI1MSAxLjI0di0xOC4xOWwtLjk2Mi0uMzc3Yy0xMy44MjQtNS40NTgtMjQuNTMtNy44OS0zNS4xMDMtNy44ODQtMTYuMzQ2LS4wMDYtMzAuNTMzIDUuMzk0LTQwLjYzNyAxNC41NTctMTAuMTA1IDkuMTYzLTE2LjEwNiAyMi4xMDItMTYuMDk5IDM2Ljk1My4wMDggMTAuMzQ4IDQuMjc5IDIyLjQ4IDEzLjQyIDMyLjEwNSA5LjEyMSA5LjYyOCAyMy4xNjUgMTYuNjQ4IDQyLjQzIDE2LjYzOWguMDYzYzE1Ljk4IDAgMjcuMDYyLTMuNTYzIDM3LjA3NC04LjQ5MmwuODUxLS40MTRWOTEuNTUzek0zMzQgMTM1LjY5N2gxNDQuMTk1VjBIMzM0djEzNS42OTd6Ii8+PHBhdGggZD0iTTI3Ni45MzcgODkuOTY4Yy4wNDEtMTIuMzMtOC4xNzEtMjEuNjk2LTIxLjMwOC0yNS4zIDMuNTQ0LTEuODA5IDYuMzUtNC4wMjMgOC40MDQtNi43MjcgMi43NS0zLjYyMiA0LjA2MS04LjA2NCA0LjA0Ni0xMy4yMzUuMDE1LTYuMzU5LTIuNDg2LTEyLjgzOS03Ljg1OC0xNy42ODctNS4zNzItNC44NDctMTMuNTI2LTcuOTk3LTI0LjY1NC03Ljk5MUgyMDQuODN2OTcuNzI4aDM2LjA3M2MxMi44NyAwIDIxLjkwNi0zLjQ4MiAyNy43MjItOC42NSA1LjgxOC01LjE1NSA4LjMyLTExLjkxIDguMzEyLTE4LjEzOHpNMTY3IDEzNS42OThoMTQ0LjE5N1YwSDE2N3YxMzUuNjk3eiIvPjxwYXRoIGQ9Ik0xMDkuOTM3IDg5Ljk2OGMuMDQxLTEyLjMzLTguMTcxLTIxLjY5Ni0yMS4zMDgtMjUuMyAzLjU0NC0xLjgwOSA2LjM1LTQuMDIzIDguNDA0LTYuNzI3IDIuNzUtMy42MjIgNC4wNjEtOC4wNjQgNC4wNDYtMTMuMjM1LjAxNS02LjM1OS0yLjQ4Ni0xMi44MzktNy44NTgtMTcuNjg3LTUuMzcyLTQuODQ3LTEzLjUyNi03Ljk5Ny0yNC42NTQtNy45OTFIMzcuODN2OTcuNzI4aDM2LjA3M2MxMi44NyAwIDIxLjkwNi0zLjQ4MiAyNy43MjItOC42NSA1LjgxOC01LjE1NSA4LjMyLTExLjkxIDguMzEyLTE4LjEzOHpNMCAxMzUuNjk4aDE0NC4xOTdWMEgwdjEzNS42OTd6Ii8+PHBhdGggZD0iTTI1OC42NjIgODguMTk4Yy0uMDEzIDMuMjI5LTEuMDA3IDYuNDc1LTMuODk2IDkuMDExLTIuODg0IDIuNTM3LTcuODczIDQuNDYzLTE2LjEzMyA0LjQ2M0gyMjJWNzVoMTUuODkzYzcuNDExIDAgMTIuNjcgMS41MDIgMTUuOTY1IDMuODUgMy4yODkgMi4zNjIgNC43NzYgNS40NjMgNC44MDQgOS4zNDgiLz48cGF0aCBkPSJNOTEuNjYyIDg4LjE5OGMtLjAxMyAzLjIyOS0xLjAwNyA2LjQ3NS0zLjg5NiA5LjAxMS0yLjg4NCAyLjUzNy03Ljg3NCA0LjQ2My0xNi4xMzMgNC40NjNINTVWNzVoMTUuODkyYzcuNDEyIDAgMTIuNjcyIDEuNTAyIDE1Ljk2NiAzLjg1IDMuMjg5IDIuMzYyIDQuNzc2IDUuNDYzIDQuODA0IDkuMzQ4Ii8+PHBhdGggZD0iTTI0NS4xODYgNTUuNzljMy4wOTYtMi4yMzcgNC41OS01LjM4NiA0LjYxMy0xMC4xMjQtLjAxNS0zLjI1LS45NDMtNi4wMzMtMy4yODEtOC4xMTEtMi4zNDYtMi4wNzgtNi4zMy0zLjU1NS0xMi43NTQtMy41NTVIMjIydjI1LjI3NWg4LjA3NmM2Ljk4OC4wMDQgMTEuOTk4LTEuMjQzIDE1LjExLTMuNDg2Ii8+PHBhdGggZD0iTTc4LjE4NiA1NS43OWMzLjA5Ni0yLjIzNyA0LjU5LTUuMzg2IDQuNjEzLTEwLjEyNC0uMDE1LTMuMjUtLjk0My02LjAzMy0zLjI4Mi04LjExMUM3Ny4xNzIgMzUuNDc3IDczLjE4OCAzNCA2Ni43NjQgMzRINTV2MjUuMjc1aDguMDc2YzYuOTg4LjAwNCAxMS45OTgtMS4yNDMgMTUuMTEtMy40ODYiLz48L2c+PC9nPjwvZz48L3N2Zz4K); -} - -@media (min-width: 25rem) { - .emotion-22 { - -webkit-background-size: 77px 22px; - background-size: 77px 22px; - } -} - -@media (min-width: 63rem) { - .emotion-22 { - -webkit-background-size: 93px 27px; - background-size: 93px 27px; - } -} - -.emotion-24 { - -webkit-flex: 1; - -ms-flex: 1; - flex: 1; - padding: 0.5rem; -} - -@media (min-width: 25rem) { - .emotion-24 { - padding: 0.5rem 1rem; - } -} - -@media (min-width: 63rem) { - .emotion-24 { - padding: 1rem; - } -} - -.emotion-26 { - font-size: 0.9375rem; - line-height: 1.25rem; - font-family: ReithSerif,Helvetica,Arial,sans-serif; - font-weight: 500; - font-style: normal; - margin-top: 0; - margin-bottom: 0.5rem; - color: #222222; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-26 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-26 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -.emotion-28 { - color: #222222; - -webkit-text-decoration: none; - text-decoration: none; -} - -.emotion-28:before { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - content: ''; - overflow: hidden; - z-index: 1; -} - -.emotion-28:visited .podcast-promo--visited { - color: #6E6E73; -} - -.emotion-28:focus .podcast-promo--focus { - -webkit-text-decoration: underline; - text-decoration: underline; -} - -.emotion-30 { - font-size: 0.9375rem; - line-height: 1.125rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - max-width: 30rem; - color: #6E6E73; - margin-top: 0.5rem; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-30 { - font-size: 0.9375rem; - line-height: 1.125rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-30 { - font-size: 0.875rem; - line-height: 1.125rem; - } -} - -.emotion-32 { - display: inline; - font-size: 0.9375rem; - line-height: 1.25rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - color: #6E6E73; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-32 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-32 { - font-size: 1rem; - line-height: 1.25rem; - } -} - -.emotion-32>svg { - fill: currentColor; - color: unset; - width: 1rem; - height: 1rem; - position: relative; - bottom: 0.125rem; - right: 0.1875rem; -} - -.emotion-34 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - - - - - - Main Content - - - - - Content Above - - - - - - - - Подкаст - - - - - - - - - - - - - Что это было? - - - - - Мы быстро, просто и понятно объясняем, что случилось, почему это важно и что будет дальше. Никаких ненужных подробностей и передергиваний - только факты и взвешенная аналитика. - - - - - - - - эпизоды - - - - - - Content Below - - - - -`; - -exports[`Podcast Promo Title should match snapshot 1`] = ` -.emotion-0 { - margin: 0 0 1rem; -} - -.emotion-2 { - font-size: 1.125rem; - line-height: 1.375rem; - font-family: ReithSans,Helvetica,Arial,sans-serif; - font-weight: 400; - font-style: normal; - display: inline; - color: #222222; -} - -@media (min-width: 20rem) and (max-width: 37.4375rem) { - .emotion-2 { - font-size: 1.125rem; - line-height: 1.375rem; - } -} - -@media (min-width: 37.5rem) { - .emotion-2 { - font-size: 1.25rem; - line-height: 1.5rem; - } -} - -.emotion-2>svg { - margin-left: 0; - width: 1.375rem; - height: 1.375rem; - fill: currentColor; - position: relative; - bottom: 0.3125rem; - right: 0.1875rem; -} - -.emotion-4 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - - - - - - - - Content - - - -`; diff --git a/packages/components/psammead-podcast-promo/src/components/card-content.jsx b/packages/components/psammead-podcast-promo/src/components/card-content.jsx deleted file mode 100644 index 263d331251..0000000000 --- a/packages/components/psammead-podcast-promo/src/components/card-content.jsx +++ /dev/null @@ -1,22 +0,0 @@ -import styled from '@emotion/styled'; - -import { GEL_SPACING, GEL_SPACING_DBL } from '@bbc/gel-foundations/spacings'; -import { - GEL_GROUP_2_SCREEN_WIDTH_MIN, - GEL_GROUP_4_SCREEN_WIDTH_MIN, -} from '@bbc/gel-foundations/breakpoints'; - -const CardContent = styled.div` - flex: 1; - padding: ${GEL_SPACING}; - - @media (min-width: ${GEL_GROUP_2_SCREEN_WIDTH_MIN}) { - padding: ${GEL_SPACING} ${GEL_SPACING_DBL}; - } - - @media (min-width: ${GEL_GROUP_4_SCREEN_WIDTH_MIN}) { - padding: ${GEL_SPACING_DBL}; - } -`; - -export default CardContent; diff --git a/packages/components/psammead-podcast-promo/src/components/card-description.jsx b/packages/components/psammead-podcast-promo/src/components/card-description.jsx deleted file mode 100644 index bd99c76164..0000000000 --- a/packages/components/psammead-podcast-promo/src/components/card-description.jsx +++ /dev/null @@ -1,15 +0,0 @@ -import styled from '@emotion/styled'; -import { getLongPrimer } from '@bbc/gel-foundations/typography'; -import { getSansRegular } from '@bbc/psammead-styles/font-styles'; -import { C_METAL } from '@bbc/psammead-styles/colours'; -import { GEL_SPACING } from '@bbc/gel-foundations/spacings'; - -const CardDescription = styled.p` - ${({ script }) => getLongPrimer(script)}; - ${({ service }) => getSansRegular(service)}; - max-width: 30rem; - color: ${C_METAL}; - margin-top: ${GEL_SPACING}; -`; - -export default CardDescription; diff --git a/packages/components/psammead-podcast-promo/src/components/card-episodes-text.jsx b/packages/components/psammead-podcast-promo/src/components/card-episodes-text.jsx deleted file mode 100644 index 210d0c65e3..0000000000 --- a/packages/components/psammead-podcast-promo/src/components/card-episodes-text.jsx +++ /dev/null @@ -1,39 +0,0 @@ -import React from 'react'; -import { node } from 'prop-types'; -import styled from '@emotion/styled'; -import { mediaIcons } from '@bbc/psammead-assets/svgs'; -import { getPica } from '@bbc/gel-foundations/typography'; -import { getSansRegular } from '@bbc/psammead-styles/font-styles'; -import { GEL_SPACING_DBL } from '@bbc/gel-foundations/spacings'; -import { C_METAL } from '@bbc/psammead-styles/colours'; - -const EpisodesText = styled.p` - display: inline; - ${({ script }) => getPica(script)}; - ${({ service }) => getSansRegular(service)}; - color: ${C_METAL}; - > svg { - fill: currentColor; - color: unset; - width: ${GEL_SPACING_DBL}; - height: ${GEL_SPACING_DBL}; - position: relative; - bottom: 0.125rem; - right: 0.1875rem; - } -`; - -const CardEpisodesText = ({ children, ...props }) => ( - <> - - {mediaIcons.seriesstack} - {children} - - > -); - -CardEpisodesText.propTypes = { - children: node.isRequired, -}; - -export default CardEpisodesText; diff --git a/packages/components/psammead-podcast-promo/src/components/card-image-wrapper.jsx b/packages/components/psammead-podcast-promo/src/components/card-image-wrapper.jsx deleted file mode 100644 index 89b9ec02b4..0000000000 --- a/packages/components/psammead-podcast-promo/src/components/card-image-wrapper.jsx +++ /dev/null @@ -1,31 +0,0 @@ -import styled from '@emotion/styled'; -import { GEL_SPACING } from '@bbc/gel-foundations/spacings'; -import { - GEL_GROUP_2_SCREEN_WIDTH_MIN, - GEL_GROUP_3_SCREEN_WIDTH_MIN, - GEL_GROUP_4_SCREEN_WIDTH_MIN, - GEL_GROUP_B_MIN_WIDTH, -} from '@bbc/gel-foundations/breakpoints'; - -const CardImageWrapper = styled.div` - margin: ${GEL_SPACING} 0 0 ${GEL_SPACING}; - display: none; - @media (min-width: ${GEL_GROUP_B_MIN_WIDTH}rem) { - display: block; - flex-grow: 0; - flex-shrink: 0; - flex-basis: 6.5rem; - } - @media (min-width: ${GEL_GROUP_2_SCREEN_WIDTH_MIN}) { - flex-basis: 6.8125rem; - } - @media (min-width: ${GEL_GROUP_3_SCREEN_WIDTH_MIN}) { - flex-basis: 11.125rem; - margin: 0; - } - @media (min-width: ${GEL_GROUP_4_SCREEN_WIDTH_MIN}) { - margin: 0; - } -`; - -export default CardImageWrapper; diff --git a/packages/components/psammead-podcast-promo/src/components/card-link.jsx b/packages/components/psammead-podcast-promo/src/components/card-link.jsx deleted file mode 100644 index d7345aa668..0000000000 --- a/packages/components/psammead-podcast-promo/src/components/card-link.jsx +++ /dev/null @@ -1,29 +0,0 @@ -import styled from '@emotion/styled'; -import { C_METAL, C_EBON } from '@bbc/psammead-styles/colours'; - -const CardLink = styled.a` - color: ${C_EBON}; - text-decoration: none; - :before { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - content: ''; - overflow: hidden; - z-index: 1; - } - &:visited { - .podcast-promo--visited { - color: ${C_METAL}; - } - } - &:focus { - .podcast-promo--focus { - text-decoration: underline; - } - } -`; - -export default CardLink; diff --git a/packages/components/psammead-podcast-promo/src/components/card-title.jsx b/packages/components/psammead-podcast-promo/src/components/card-title.jsx deleted file mode 100644 index 697acc9c4a..0000000000 --- a/packages/components/psammead-podcast-promo/src/components/card-title.jsx +++ /dev/null @@ -1,15 +0,0 @@ -import styled from '@emotion/styled'; -import { GEL_SPACING } from '@bbc/gel-foundations/spacings'; -import { getPica } from '@bbc/gel-foundations/typography'; -import { getSerifMedium } from '@bbc/psammead-styles/font-styles'; -import { C_EBON } from '@bbc/psammead-styles/colours'; - -const CardTitle = styled.h3` - ${({ script }) => getPica(script)}; - ${({ service }) => getSerifMedium(service)} - margin-top: 0; - margin-bottom: ${GEL_SPACING}; - color: ${C_EBON}; -`; - -export default CardTitle; diff --git a/packages/components/psammead-podcast-promo/src/components/card.jsx b/packages/components/psammead-podcast-promo/src/components/card.jsx deleted file mode 100644 index 100b484885..0000000000 --- a/packages/components/psammead-podcast-promo/src/components/card.jsx +++ /dev/null @@ -1,21 +0,0 @@ -import styled from '@emotion/styled'; -import { C_GHOST, C_EBON } from '@bbc/psammead-styles/colours'; -import { GEL_GROUP_4_SCREEN_WIDTH_MIN } from '@bbc/gel-foundations/breakpoints'; - -const Card = styled.div` - position: relative; - background-color: ${C_GHOST}; - display: flex; - box-shadow: 0 0 0.3125rem 0.3125rem ${C_EBON}08; - - @media (min-width: ${GEL_GROUP_4_SCREEN_WIDTH_MIN}) { - display: block; - } - &:hover { - .podcast-promo--hover { - text-decoration: underline; - } - } -`; - -export default Card; diff --git a/packages/components/psammead-podcast-promo/src/components/title.jsx b/packages/components/psammead-podcast-promo/src/components/title.jsx deleted file mode 100644 index 2a0fd0cd78..0000000000 --- a/packages/components/psammead-podcast-promo/src/components/title.jsx +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; -import styled from '@emotion/styled'; -import { node } from 'prop-types'; -import { mediaIcons } from '@bbc/psammead-assets/svgs'; -import { GEL_SPACING_DBL } from '@bbc/gel-foundations/spacings'; -import { getGreatPrimer } from '@bbc/gel-foundations/typography'; -import { getSansRegular } from '@bbc/psammead-styles/font-styles'; -import { C_EBON } from '@bbc/psammead-styles/colours'; - -const Heading = styled.h2` - ${({ script }) => getGreatPrimer(script)}; - ${({ service }) => getSansRegular(service)}; - display: inline; - color: ${C_EBON}; - - > svg { - margin-left: 0; - width: 1.375rem; - height: 1.375rem; - fill: currentColor; - position: relative; - bottom: 0.3125rem; - right: 0.1875rem; - } -`; - -const Wrapper = styled.div` - margin: 0 0 ${GEL_SPACING_DBL}; -`; - -const Title = ({ children, ...props }) => ( - - - {mediaIcons.podcast} - {children} - - -); - -Title.propTypes = { - children: node.isRequired, -}; - -export default Title; diff --git a/packages/components/psammead-podcast-promo/src/examples/basic.jsx b/packages/components/psammead-podcast-promo/src/examples/basic.jsx deleted file mode 100644 index 742d2f33f9..0000000000 --- a/packages/components/psammead-podcast-promo/src/examples/basic.jsx +++ /dev/null @@ -1,53 +0,0 @@ -import React from 'react'; -import { string } from 'prop-types'; -import ImagePlaceholder from '@bbc/psammead-image-placeholder'; -import serviceData from './fixtureData'; - -import PodcastPromo from '..'; - -const BasicExample = props => { - let { service } = props; - if (service !== 'russian' && service !== 'news') { - service = 'news'; - } - - return ( - - - {serviceData[service].podcastPromoTitle} - - - - - - - - - - - - {serviceData[service].brandTitle} - - - - - {serviceData[service].brandDescription} - - - {serviceData[service].linkLabel.text} - - - - - ); -}; - -BasicExample.propTypes = { - service: string.isRequired, -}; - -export default BasicExample; diff --git a/packages/components/psammead-podcast-promo/src/examples/fixtureData.js b/packages/components/psammead-podcast-promo/src/examples/fixtureData.js deleted file mode 100644 index 7689ba48fa..0000000000 --- a/packages/components/psammead-podcast-promo/src/examples/fixtureData.js +++ /dev/null @@ -1,30 +0,0 @@ -export default { - russian: { - podcastPromoTitle: 'Подкаст', - brandTitle: 'Что это было?', - brandDescription: - 'Мы быстро, просто и понятно объясняем, что случилось, почему это важно и что будет дальше. Никаких ненужных подробностей и передергиваний - только факты и взвешенная аналитика.', - image: { - src: 'http://ichef.bbci.co.uk/images/ic/3000x3000/p0776f5z.jpg', - alt: 'Что это было?', - }, - linkLabel: { - text: 'эпизоды', - href: 'https://www.bbc.com/russian/media-47937790', - }, - }, - news: { - podcastPromoTitle: 'Podcasts', - brandTitle: 'What was it all about?', - brandDescription: - 'Each episode, we explain what happened in a clear and simple manner. Skipping unnecessary details, we discuss what makes the event important, and what may happen moving forwards. Listen for facts and considered analysis.', - image: { - src: 'http://ichef.bbci.co.uk/images/ic/3000x3000/p0776f5z.jpg', - alt: 'What was it all about?', - }, - linkLabel: { - text: 'Episodes', - href: 'https://www.bbc.com/russian/media-47937790', - }, - }, -}; diff --git a/packages/components/psammead-podcast-promo/src/examples/on-page.jsx b/packages/components/psammead-podcast-promo/src/examples/on-page.jsx deleted file mode 100644 index 5a8cecf515..0000000000 --- a/packages/components/psammead-podcast-promo/src/examples/on-page.jsx +++ /dev/null @@ -1,60 +0,0 @@ -import React from 'react'; -import styled from '@emotion/styled'; - -import { GEL_GROUP_4_SCREEN_WIDTH_MIN } from '@bbc/gel-foundations/breakpoints'; - -import { C_STORM, C_CLOUD_DARK } from '@bbc/psammead-styles/colours'; - -import BasicExample from './basic'; - -const Wrapper = styled.div` - margin: 10px auto; - max-width: 1008px; -`; - -const Left = styled.div` - vertical-align: top; - display: inline-block; - max-width: 1000px; - padding: 0 10px; - width: 100%; - @media (min-width: ${GEL_GROUP_4_SCREEN_WIDTH_MIN}) { - width: 66%; - } -`; - -const Right = styled.div` - display: inline-block; - padding: 0 10px; - width: 100%; - @media (min-width: ${GEL_GROUP_4_SCREEN_WIDTH_MIN}) { - width: 33%; - } -`; - -const ContentArea = styled.div` - height: ${({ height }) => height}px; - margin: 20px 0; - background-color: ${C_STORM}; - font-family: sans-serif; - color: ${C_CLOUD_DARK}; - font-size: 20px; - line-height: 1; - text-align: center; - padding-top: ${({ height }) => height / 2 - 10}px; -`; - -const OnPageExample = props => ( - - - Main Content - - - Content Above - - Content Below - - -); - -export default OnPageExample; diff --git a/packages/components/psammead-podcast-promo/src/index.jsx b/packages/components/psammead-podcast-promo/src/index.jsx deleted file mode 100644 index 06eafcb409..0000000000 --- a/packages/components/psammead-podcast-promo/src/index.jsx +++ /dev/null @@ -1,52 +0,0 @@ -import React from 'react'; -import styled from '@emotion/styled'; -import { string, shape, arrayOf, element } from 'prop-types'; -import { scriptPropType } from '@bbc/gel-foundations/prop-types'; -import { C_LUNAR } from '@bbc/psammead-styles/colours'; -import { GEL_SPACING_DBL } from '@bbc/gel-foundations/spacings'; - -import Title from './components/title'; -import Card from './components/card'; -import CardContent from './components/card-content'; -import CardLink from './components/card-link'; -import CardImageWrapper from './components/card-image-wrapper'; -import CardTitle from './components/card-title'; -import CardDescription from './components/card-description'; -import CardEpisodesText from './components/card-episodes-text'; - -const PodcastContext = React.createContext({}); -const withPodcastContext = Component => props => ( - - {context => } - -); - -const Wrapper = styled.section` - background-color: ${C_LUNAR}; - padding: ${GEL_SPACING_DBL}; -`; - -const PodcastPromo = ({ script, service, children, ...props }) => ( - - {children} - -); - -PodcastPromo.Title = withPodcastContext(Title); -PodcastPromo.Card = Card; -PodcastPromo.Card.Link = CardLink; -PodcastPromo.Card.ImageWrapper = CardImageWrapper; -PodcastPromo.Card.Content = CardContent; -PodcastPromo.Card.Title = withPodcastContext(CardTitle); -PodcastPromo.Card.Description = withPodcastContext(CardDescription); -PodcastPromo.Card.EpisodesText = withPodcastContext(CardEpisodesText); - -PodcastPromo.propTypes = { - children: arrayOf(element).isRequired, - script: shape(scriptPropType).isRequired, - service: string.isRequired, -}; - -PodcastPromo.defaultProps = {}; - -export default PodcastPromo; diff --git a/packages/components/psammead-podcast-promo/src/index.stories.jsx b/packages/components/psammead-podcast-promo/src/index.stories.jsx deleted file mode 100644 index 79b04a5d3e..0000000000 --- a/packages/components/psammead-podcast-promo/src/index.stories.jsx +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; -import { storiesOf } from '@storybook/react'; -import { withKnobs } from '@storybook/addon-knobs'; -import { withServicesKnob } from '@bbc/psammead-storybook-helpers'; - -import BasicExample from './examples/basic'; -import OnPageExample from './examples/on-page'; - -storiesOf('Components/PodcastPromo', module) - .addDecorator(withKnobs) - .addDecorator(withServicesKnob({ defaultService: 'russian' })) - .add('default', props => ) - .add('on page', props => ); diff --git a/packages/components/psammead-podcast-promo/src/index.test.jsx b/packages/components/psammead-podcast-promo/src/index.test.jsx deleted file mode 100644 index 4e6920f703..0000000000 --- a/packages/components/psammead-podcast-promo/src/index.test.jsx +++ /dev/null @@ -1,107 +0,0 @@ -import React from 'react'; -import { render } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; -import { shouldMatchSnapshot } from '@bbc/psammead-test-helpers'; -import * as scripts from '@bbc/gel-foundations/scripts'; - -import PodcastPromo from '.'; -import BasicExample from './examples/basic'; -import OnPageExample from './examples/on-page'; - -const assertTypeOfElement = (Component, type) => { - const { container } = render( - - Content - , - ); - - expect(container.querySelector(type)).toBeInTheDocument(); - expect(container.querySelector(type).textContent).toBe('Content'); -}; - -describe('Podcast Promo', () => { - describe('Title', () => { - assertTypeOfElement(PodcastPromo.Title, 'h2'); - shouldMatchSnapshot( - 'should match snapshot', - - Content - , - ); - }); - - describe('Card', () => { - assertTypeOfElement(PodcastPromo.Title, 'div'); - shouldMatchSnapshot( - 'should match snapshot', - Content, - ); - }); - - describe('Card Content', () => { - assertTypeOfElement(PodcastPromo.Card.Content, 'div'); - shouldMatchSnapshot( - 'should match snapshot', - Content, - ); - }); - - describe('Card Title', () => { - assertTypeOfElement(PodcastPromo.Card.Title, 'h3'); - shouldMatchSnapshot( - 'should match snapshot', - - Content - , - ); - }); - - describe('Card Description', () => { - assertTypeOfElement(PodcastPromo.Card.Description, 'p'); - shouldMatchSnapshot( - 'should match snapshot', - - Content - , - ); - }); - - describe('Card Image', () => { - assertTypeOfElement(PodcastPromo.Card.ImageWrapper, 'div'); - shouldMatchSnapshot( - 'should match snapshot', - Content, - ); - }); - - describe('Card Link', () => { - assertTypeOfElement(PodcastPromo.Card.Link, 'a'); - shouldMatchSnapshot( - 'should match snapshot', - - Content - , - ); - }); - - describe('Card Episodes Text', () => { - assertTypeOfElement(PodcastPromo.Card.EpisodesText, 'p'); - shouldMatchSnapshot( - 'should match snapshot', - - Episodes - , - ); - }); - - describe('Examples', () => { - shouldMatchSnapshot( - 'basic example', - , - ); - shouldMatchSnapshot( - 'on-page example', - , - ); - }); -}); diff --git a/packages/components/psammead-script-link/CHANGELOG.md b/packages/components/psammead-script-link/CHANGELOG.md index 78f6fab3c7..6909e418bd 100644 --- a/packages/components/psammead-script-link/CHANGELOG.md +++ b/packages/components/psammead-script-link/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 3.0.30 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.29 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.28 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.27 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.26 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.25 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.24 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.23 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.22 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.21 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.0.20 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.0.19 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.0.17 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-script-link/package.json b/packages/components/psammead-script-link/package.json index e883ac87d6..96dc743ca7 100644 --- a/packages/components/psammead-script-link/package.json +++ b/packages/components/psammead-script-link/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-script-link", - "version": "3.0.20", + "version": "3.0.30", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -24,8 +24,8 @@ }, "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-script-link/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-section-label/CHANGELOG.md b/packages/components/psammead-section-label/CHANGELOG.md index d91f1d496c..5f1ed1e326 100644 --- a/packages/components/psammead-section-label/CHANGELOG.md +++ b/packages/components/psammead-section-label/CHANGELOG.md @@ -3,6 +3,17 @@ | Version | Description | |---------|-------------| +| 7.1.11 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 7.1.10 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 7.1.9 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 7.1.8 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 7.1.7 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 7.1.6 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 7.1.5 | [PR#4558](https://github.com/bbc/psammead/pull/4558) remove aria-labelledby attribute | +| 7.1.4 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 7.1.3 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 7.1.2 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 7.1.1 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 7.1.0 | [PR#4528](https://github.com/bbc/psammead/pull/4528) Allows the mobile divider to be toggled off | | 7.0.20 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 7.0.19 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | diff --git a/packages/components/psammead-section-label/README.md b/packages/components/psammead-section-label/README.md index df884683b0..a20d922a3c 100644 --- a/packages/components/psammead-section-label/README.md +++ b/packages/components/psammead-section-label/README.md @@ -23,7 +23,8 @@ The only provided child should be the title for the section, provided as a _stri | children | string | yes | N/A | `'Most Read'` | | dir | string | no | `'ltr'` | `'rtl'` | | href | string | no | `null` | `'https://www.bbc/com/igbo/egwuregwu'` | -| labelId | string | yes | N/A | `top-stories-label` | +| id | string | no | N/A | `top-stories-id` | +| labelId | string | no | N/A | `top-stories-label` | | linkText | string | no | `null` | `'See More'` | | script | object | yes | N/A | { canon: { groupA: { fontSize: '28', lineHeight: '32',}, groupB: { fontSize: '32', lineHeight: '36' }, groupD: { fontSize: '44', lineHeight: '48' } }, trafalgar: { groupA: { fontSize: '20', lineHeight: '24' }, groupB: { fontSize: '24', lineHeight: '28' }, groupD: { fontSize: '32', lineHeight: '36' } } } | | service | string | yes | N/A | `'news'` | @@ -126,7 +127,7 @@ const WrappingComponent = () => ( script={latin} dir="ltr" href="https://www.bbc.com/news/index" - labelId="example-section-label" + id="example-section-label" linkText="See More" service="news" > diff --git a/packages/components/psammead-section-label/package.json b/packages/components/psammead-section-label/package.json index 85ad75d46d..7c9f6a2dcf 100644 --- a/packages/components/psammead-section-label/package.json +++ b/packages/components/psammead-section-label/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-section-label", - "version": "7.1.0", + "version": "7.1.11", "description": "React styled component for a section label", "main": "dist/index.js", "module": "esm/index.js", @@ -24,8 +24,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-section-label/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-section-label/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-section-label/src/__snapshots__/index.test.jsx.snap index 97c1522ee2..a5f3d1de45 100644 --- a/packages/components/psammead-section-label/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-section-label/src/__snapshots__/index.test.jsx.snap @@ -376,7 +376,6 @@ exports[`SectionLabel With bar With linking title should render correctly 1`] = class="emotion-6 emotion-7" > @@ -623,7 +622,6 @@ exports[`SectionLabel With bar With linking title should render correctly with a class="emotion-6 emotion-7" > @@ -870,7 +868,6 @@ exports[`SectionLabel With bar With linking title should render correctly with e class="emotion-6 emotion-7" > @@ -1117,7 +1114,6 @@ exports[`SectionLabel With bar With linking title should render correctly with e class="emotion-6 emotion-7" > @@ -2374,7 +2370,6 @@ exports[`SectionLabel Without bar With linking title should render correctly 1`] class="emotion-4 emotion-5" > @@ -2596,7 +2591,6 @@ exports[`SectionLabel Without bar With linking title should render correctly wit class="emotion-4 emotion-5" > @@ -2818,7 +2812,6 @@ exports[`SectionLabel Without bar With linking title should render correctly wit class="emotion-4 emotion-5" > diff --git a/packages/components/psammead-section-label/src/titles.jsx b/packages/components/psammead-section-label/src/titles.jsx index 4389759cfa..de3cfe2afd 100644 --- a/packages/components/psammead-section-label/src/titles.jsx +++ b/packages/components/psammead-section-label/src/titles.jsx @@ -152,7 +152,7 @@ export const LinkTitle = ({ service, backgroundColor, }) => ( - + =16.9.0 | -| 3.1.7 | [PR#4260](https://github.com/bbc/psammead/pull/4260) Talos - Bump Dependencies - @bbc/gel-foundations | -| 3.1.6 | [PR#4256](https://github.com/bbc/psammead/pull/4256) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.1.5 | [PR#4193](https://github.com/bbc/psammead/pull/4193) Upgrade Emotion to v11 | -| 3.1.4 | [PR#4226](https://github.com/bbc/psammead/pull/4226) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.1.3 | [PR#4189](https://github.com/bbc/psammead/pull/4189) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.1.2 | [PR#4072](https://github.com/bbc/psammead/pull/4072) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.1.1 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations | -| 3.1.0 | [PR#4040](https://github.com/bbc/psammead/pull/4040) Add support for lazy loading of social embeds | -| 3.0.3 | [PR#4029](https://github.com/bbc/psammead/pull/4029) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.2 | [PR#3944](https://github.com/bbc/psammead/pull/3944) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.1 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-styles | -| 3.0.0 | [PR#3890](https://github.com/bbc/psammead/pull/3890) Migrate to Emotion | -| 2.0.3 | [PR#3883](https://github.com/bbc/psammead/pull/3883) Talos - Bump Dependencies - @bbc/psammead-styles | -| 2.0.2 | [PR#3855](https://github.com/bbc/psammead/pull/3855) Talos - Bump Dependencies - @bbc/gel-foundations | -| 2.0.1 | [PR#3854](https://github.com/bbc/psammead/pull/3854) Talos - Bump Dependencies - @bbc/psammead-styles | -| 2.0.0-alpha.0 | [PR#3843](https://github.com/bbc/psammead/pull/3843) Bump Dependencies - @bbc/psammead-styles alpha version | -| 1.1.12 | [PR#3836](https://github.com/bbc/psammead/pull/3836) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.11 | [PR#3816](https://github.com/bbc/psammead/pull/3816) Talos - Bump Dependencies | -| 1.1.10 | [PR#3728](https://github.com/bbc/psammead/pull/3728) Tweaks following Storybook v5.3.19 to v6.0.22 update | -| 1.1.9 | [PR#3811](https://github.com/bbc/psammead/pull/3811) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.8 | [PR#3785](https://github.com/bbc/psammead/pull/3785) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.1.7 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.6 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.5 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.1.4 | [PR#3604](https://github.com/bbc/psammead/pull/3604) Talos - Bump Dependencies - @bbc/gel-foundations | -| 1.1.3 | [PR#3513](https://github.com/bbc/psammead/pull/3513) Update fallback text colour in Social Embed. | -| 1.1.2 | [PR#3476](https://github.com/bbc/psammead/pull/3476) Resolve provider script bugs. | -| 1.1.1 | [PR#3467](https://github.com/bbc/psammead/pull/3467) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.1.0 | [PR#3450](https://github.com/bbc/psammead/pull/3450) Update Canonical provider styles | -| 1.0.2 | [PR#3397](https://github.com/bbc/psammead/pull/3397) Talos - Bump Dependencies - @bbc/psammead-styles | -| 1.0.1 | [PR#3388](https://github.com/bbc/psammead/pull/3388) Update react-helmet to 6.0.0 | -| 1.0.0 | [PR#3349](https://github.com/bbc/psammead/pull/3349) Resolve a11y issues and release version one. | -| 0.1.0-alpha.4 | [PR#3319](https://github.com/bbc/psammead/pull/3319) Remove dependency on @bbc/psammead-oembed. | -| 0.1.0-alpha.3 | [PR#3311](https://github.com/bbc/psammead/pull/3311) Transpile with @loadable/babel-plugin. | -| 0.1.0-alpha.2 | [PR#3298](https://github.com/bbc/psammead/pull/3298) Add webpackChunkName to dynamic import. | -| 0.1.0-alpha.1 | [PR#3217](https://github.com/bbc/psammead/pull/3217) Initial creation of package. | +| Version | Description | +| ------------- | --------------------------------------------------------------------------------------------------------------------------- | +| 3.3.11 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.3.10 | [PR#4605](https://github.com/bbc/psammead/pull/4605) render null when no social embed id is provided | +| 3.3.9 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.3.8 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.3.7 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.3.6 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.3.5 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.3.4 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.3.3 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.3.2 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.3.1 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | +| 3.3.0 | [PR#4539](https://github.com/bbc/psammead/pull/4539) Use twitter-tweet-rendered class | +| 3.2.1 | [PR#4536](https://github.com/bbc/psammead/pull/4536) Remove use of fixtures for provider name | +| 3.2.0 | [PR#4535](https://github.com/bbc/psammead/pull/4535) Add onRender prop | +| 3.1.16 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | +| 3.1.15 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | +| 3.1.13 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | +| 3.1.12 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | +| 3.1.11 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | +| 3.1.10 | [PR#4304](https://github.com/bbc/psammead/pull/4304) Talos - Bump Dependencies - @bbc/gel-foundations, @bbc/psammead-styles | +| 3.1.9 | [PR#4303](https://github.com/bbc/psammead/pull/4303) Trigger rebuild following babel config update for emotion 11 | +| 3.1.8 | [PR#4271](https://github.com/bbc/psammead/pull/4271) change react peer dep to >=16.9.0 | +| 3.1.7 | [PR#4260](https://github.com/bbc/psammead/pull/4260) Talos - Bump Dependencies - @bbc/gel-foundations | +| 3.1.6 | [PR#4256](https://github.com/bbc/psammead/pull/4256) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.1.5 | [PR#4193](https://github.com/bbc/psammead/pull/4193) Upgrade Emotion to v11 | +| 3.1.4 | [PR#4226](https://github.com/bbc/psammead/pull/4226) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.1.3 | [PR#4189](https://github.com/bbc/psammead/pull/4189) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.1.2 | [PR#4072](https://github.com/bbc/psammead/pull/4072) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.1.1 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations | +| 3.1.0 | [PR#4040](https://github.com/bbc/psammead/pull/4040) Add support for lazy loading of social embeds | +| 3.0.3 | [PR#4029](https://github.com/bbc/psammead/pull/4029) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.2 | [PR#3944](https://github.com/bbc/psammead/pull/3944) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.1 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-styles | +| 3.0.0 | [PR#3890](https://github.com/bbc/psammead/pull/3890) Migrate to Emotion | +| 2.0.3 | [PR#3883](https://github.com/bbc/psammead/pull/3883) Talos - Bump Dependencies - @bbc/psammead-styles | +| 2.0.2 | [PR#3855](https://github.com/bbc/psammead/pull/3855) Talos - Bump Dependencies - @bbc/gel-foundations | +| 2.0.1 | [PR#3854](https://github.com/bbc/psammead/pull/3854) Talos - Bump Dependencies - @bbc/psammead-styles | +| 2.0.0-alpha.0 | [PR#3843](https://github.com/bbc/psammead/pull/3843) Bump Dependencies - @bbc/psammead-styles alpha version | +| 1.1.12 | [PR#3836](https://github.com/bbc/psammead/pull/3836) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.11 | [PR#3816](https://github.com/bbc/psammead/pull/3816) Talos - Bump Dependencies | +| 1.1.10 | [PR#3728](https://github.com/bbc/psammead/pull/3728) Tweaks following Storybook v5.3.19 to v6.0.22 update | +| 1.1.9 | [PR#3811](https://github.com/bbc/psammead/pull/3811) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.8 | [PR#3785](https://github.com/bbc/psammead/pull/3785) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.1.7 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.6 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.5 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.1.4 | [PR#3604](https://github.com/bbc/psammead/pull/3604) Talos - Bump Dependencies - @bbc/gel-foundations | +| 1.1.3 | [PR#3513](https://github.com/bbc/psammead/pull/3513) Update fallback text colour in Social Embed. | +| 1.1.2 | [PR#3476](https://github.com/bbc/psammead/pull/3476) Resolve provider script bugs. | +| 1.1.1 | [PR#3467](https://github.com/bbc/psammead/pull/3467) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.1.0 | [PR#3450](https://github.com/bbc/psammead/pull/3450) Update Canonical provider styles | +| 1.0.2 | [PR#3397](https://github.com/bbc/psammead/pull/3397) Talos - Bump Dependencies - @bbc/psammead-styles | +| 1.0.1 | [PR#3388](https://github.com/bbc/psammead/pull/3388) Update react-helmet to 6.0.0 | +| 1.0.0 | [PR#3349](https://github.com/bbc/psammead/pull/3349) Resolve a11y issues and release version one. | +| 0.1.0-alpha.4 | [PR#3319](https://github.com/bbc/psammead/pull/3319) Remove dependency on @bbc/psammead-oembed. | +| 0.1.0-alpha.3 | [PR#3311](https://github.com/bbc/psammead/pull/3311) Transpile with @loadable/babel-plugin. | +| 0.1.0-alpha.2 | [PR#3298](https://github.com/bbc/psammead/pull/3298) Add webpackChunkName to dynamic import. | +| 0.1.0-alpha.1 | [PR#3217](https://github.com/bbc/psammead/pull/3217) Initial creation of package. | diff --git a/packages/components/psammead-social-embed/package.json b/packages/components/psammead-social-embed/package.json index 03d31b27a6..a316d0e12e 100644 --- a/packages/components/psammead-social-embed/package.json +++ b/packages/components/psammead-social-embed/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-social-embed", - "version": "3.3.0", + "version": "3.3.11", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-social-embed/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-social-embed/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-social-embed/src/__snapshots__/index.test.jsx.snap index c5229e2618..715d52b8a0 100644 --- a/packages/components/psammead-social-embed/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-social-embed/src/__snapshots__/index.test.jsx.snap @@ -455,6 +455,8 @@ exports[`AmpSocialEmbed should render correctly for YouTube 1`] = ` `; +exports[`AmpSocialEmbed should render null when no social embed ID is provided 1`] = ``; + exports[`CanonicalSocialEmbed Instagram should render correctly for Instagram 1`] = ` .emotion-0 { position: relative; diff --git a/packages/components/psammead-social-embed/src/index.jsx b/packages/components/psammead-social-embed/src/index.jsx index 1fce174db6..20c49ea253 100644 --- a/packages/components/psammead-social-embed/src/index.jsx +++ b/packages/components/psammead-social-embed/src/index.jsx @@ -64,6 +64,10 @@ export const AmpSocialEmbed = ({ caption, fallback, }) => { + if (!id) { + return null; + } + const AmpElement = AmpElements[provider]; const hasCaption = caption && caption.text; diff --git a/packages/components/psammead-social-embed/src/index.test.jsx b/packages/components/psammead-social-embed/src/index.test.jsx index b096a179ba..64a6ab7aa0 100644 --- a/packages/components/psammead-social-embed/src/index.test.jsx +++ b/packages/components/psammead-social-embed/src/index.test.jsx @@ -301,4 +301,24 @@ describe('AmpSocialEmbed', () => { service="news" />, ); + + shouldMatchSnapshot( + 'should render null when no social embed ID is provided', + , + ); }); diff --git a/packages/components/psammead-story-promo-list/CHANGELOG.md b/packages/components/psammead-story-promo-list/CHANGELOG.md index 576b5daa93..b182406a22 100644 --- a/packages/components/psammead-story-promo-list/CHANGELOG.md +++ b/packages/components/psammead-story-promo-list/CHANGELOG.md @@ -3,6 +3,18 @@ | Version | Description | | ------- | ----------- | +| 6.0.31 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 6.0.30 | [PR#4608](https://github.com/bbc/psammead/pull/4608) Bumps psammead-styles | +| 6.0.29 | [PR#4606](https://github.com/bbc/psammead/pull/4606) Bumps psammead-styles | +| 6.0.28 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 6.0.27 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 6.0.26 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 6.0.25 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 6.0.24 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 6.0.23 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 6.0.22 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 6.0.21 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 6.0.20 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 6.0.19 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 6.0.18 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 6.0.16 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-story-promo-list/package.json b/packages/components/psammead-story-promo-list/package.json index 9844a479d7..e07325417d 100644 --- a/packages/components/psammead-story-promo-list/package.json +++ b/packages/components/psammead-story-promo-list/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-story-promo-list", - "version": "6.0.19", + "version": "6.0.31", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-story-promo-list/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-story-promo-list/src/index.stories.jsx b/packages/components/psammead-story-promo-list/src/index.stories.jsx index 3debfd5361..71a804c78f 100644 --- a/packages/components/psammead-story-promo-list/src/index.stories.jsx +++ b/packages/components/psammead-story-promo-list/src/index.stories.jsx @@ -12,7 +12,15 @@ import notes from '../README.md'; // eslint-disable-next-line react/prop-types const ImageComponent = ({ alt, src }) => ( - + ); // eslint-disable-next-line react/prop-types diff --git a/packages/components/psammead-story-promo/CHANGELOG.md b/packages/components/psammead-story-promo/CHANGELOG.md index b2436d8d11..13a6d6a7e5 100644 --- a/packages/components/psammead-story-promo/CHANGELOG.md +++ b/packages/components/psammead-story-promo/CHANGELOG.md @@ -3,6 +3,22 @@ | Version | Description | | ------- | ----------- | +| 8.0.37 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 8.0.36 | [PR#4608](https://github.com/bbc/psammead/pull/4608) Bump dependencies | +| 8.0.35 | [PR#4606](https://github.com/bbc/psammead/pull/4606) Bump dependencies | +| 8.0.34 | [PR#4603](https://github.com/bbc/psammead/pull/4603) Conditionally add aria-labelledby attribute | +| 8.0.33 | [PR#4602](https://github.com/bbc/psammead/pull/4602) Use 'children' value instead of 'URL' for aria-labelledby | +| 8.0.32 | [PR#4588](https://github.com/bbc/psammead/pull/4588) Fix TalkBack reading nested spans incorrectly | +| 8.0.31 | [PR#4578](https://github.com/bbc/psammead/pull/4578) Fix Firefox underline rendering bug | +| 8.0.30 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 8.0.29 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 8.0.28 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 8.0.27 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 8.0.26 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 8.0.25 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 8.0.24 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 8.0.23 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 8.0.22 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 8.0.21 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 8.0.20 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 8.0.18 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-story-promo/package.json b/packages/components/psammead-story-promo/package.json index 6197e2e3ab..13a40bd1cf 100644 --- a/packages/components/psammead-story-promo/package.json +++ b/packages/components/psammead-story-promo/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-story-promo", - "version": "8.0.21", + "version": "8.0.37", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-story-promo/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/react": "^11.1.4", diff --git a/packages/components/psammead-story-promo/src/IndexAlsos/__snapshots__/index.test.jsx.snap b/packages/components/psammead-story-promo/src/IndexAlsos/__snapshots__/index.test.jsx.snap index c0bb5b775e..1b8fae558d 100644 --- a/packages/components/psammead-story-promo/src/IndexAlsos/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-story-promo/src/IndexAlsos/__snapshots__/index.test.jsx.snap @@ -116,11 +116,6 @@ exports[`Index Alsos should render multiple correctly 1`] = ` height: 0.75rem; } -.emotion-18 { - display: inline; - vertical-align: middle; -} - @@ -167,6 +163,7 @@ exports[`Index Alsos should render multiple correctly 1`] = ` video, - + APC ba ta isa ta kore ni ba – Buba Galadima @@ -190,9 +185,7 @@ exports[`Index Alsos should render multiple correctly 1`] = ` class="emotion-8 emotion-9" href="/hausa/labarai-42837051" > - + Yaushe Obasanjo ya fara yi wa shugabannin kasa baki? @@ -312,11 +305,6 @@ exports[`Index Alsos should render one correctly 1`] = ` height: 0.75rem; } -.emotion-16 { - display: inline; - vertical-align: middle; -} - @@ -358,6 +347,7 @@ exports[`Index Alsos should render one correctly 1`] = ` video, - + APC ba ta isa ta kore ni ba – Buba Galadima diff --git a/packages/components/psammead-story-promo/src/IndexAlsos/index.jsx b/packages/components/psammead-story-promo/src/IndexAlsos/index.jsx index d9da0b759d..6036dea377 100644 --- a/packages/components/psammead-story-promo/src/IndexAlsos/index.jsx +++ b/packages/components/psammead-story-promo/src/IndexAlsos/index.jsx @@ -26,11 +26,6 @@ const StyledIndexAlsosUl = styled.ul` margin: 0; `; -const IndexAlsosText = styled.span` - display: inline; - vertical-align: middle; -`; - const StyledIndexAlsosLink = styled.a` ${({ script }) => script && getBrevier(script)}; ${({ service }) => getSerifMedium(service)} @@ -59,18 +54,28 @@ const IndexAlsosLink = ({ mediaIndicator, mediaType, }) => { + const sanitisedUrl = url.replace(/\W/g, ''); + return ( - + {mediaIndicator ? ( <> {mediaIndicator} - + {`${mediaType}, `} - {children} + {children} > ) : ( - {children} + {children} )} ); diff --git a/packages/components/psammead-story-promo/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-story-promo/src/__snapshots__/index.test.jsx.snap index 67bb6f3e66..d1363075a5 100644 --- a/packages/components/psammead-story-promo/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-story-promo/src/__snapshots__/index.test.jsx.snap @@ -1464,11 +1464,6 @@ exports[`StoryPromo - Top Story should render with multiple Index Alsos correctl height: 0.75rem; } -.emotion-32 { - display: inline; - vertical-align: middle; -} - @@ -1553,6 +1549,7 @@ exports[`StoryPromo - Top Story should render with multiple Index Alsos correctl video, - + APC ba ta isa ta kore ni ba – Buba Galadima @@ -1576,9 +1571,7 @@ exports[`StoryPromo - Top Story should render with multiple Index Alsos correctl class="emotion-22 emotion-23" href="/hausa/labarai-42837051" > - + Yaushe Obasanjo ya fara yi wa shugabannin kasa baki? @@ -1888,11 +1881,6 @@ exports[`StoryPromo - Top Story should render with one Index Also correctly 1`] height: 0.75rem; } -.emotion-30 { - display: inline; - vertical-align: middle; -} - @@ -1972,6 +1961,7 @@ exports[`StoryPromo - Top Story should render with one Index Also correctly 1`] video, - + APC ba ta isa ta kore ni ba – Buba Galadima diff --git a/packages/components/psammead-story-promo/src/index.stories.jsx b/packages/components/psammead-story-promo/src/index.stories.jsx index b454800b89..87d7b7f196 100644 --- a/packages/components/psammead-story-promo/src/index.stories.jsx +++ b/packages/components/psammead-story-promo/src/index.stories.jsx @@ -14,16 +14,27 @@ import relatedItems from '../testHelpers/relatedItems'; import IndexAlsosContainer from '../testHelpers/IndexAlsosContainer'; import notes from '../README.md'; -const buildImg = () => ( - -); +const buildImg = () => { + const imageSizes = [300, 450, 600, 1024]; + const imageSrc = + 'https://ichef.bbci.co.uk/news/[WIDTH]/cpsprodpb/11897/production/_106613817_999_al_.jpg'; + + return ( + `${imageSrc.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', ')} + fallbackSrcset={imageSizes + .map(size => `${imageSrc.replace('[WIDTH]', size)} ${size}w`) + .join(', ')} + primaryMimeType="image/webp" + fallbackMimeType="image/jpeg" + /> + ); +}; const StyledTime = styled.time` padding: 0 ${GEL_SPACING_HLF}; diff --git a/packages/components/psammead-timestamp/CHANGELOG.md b/packages/components/psammead-timestamp/CHANGELOG.md index 026fcf920a..96188a82df 100644 --- a/packages/components/psammead-timestamp/CHANGELOG.md +++ b/packages/components/psammead-timestamp/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 4.0.29 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 4.0.28 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 4.0.27 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 4.0.26 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 4.0.25 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 4.0.24 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 4.0.23 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 4.0.22 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 4.0.21 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 4.0.20 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 4.0.19 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 4.0.18 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 4.0.16 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-timestamp/package.json b/packages/components/psammead-timestamp/package.json index a03352c95f..e4399326ac 100644 --- a/packages/components/psammead-timestamp/package.json +++ b/packages/components/psammead-timestamp/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-timestamp", - "version": "4.0.19", + "version": "4.0.29", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-timestamp/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-topic-tags/CHANGELOG.md b/packages/components/psammead-topic-tags/CHANGELOG.md index 68c4987c11..0902fbfcd9 100644 --- a/packages/components/psammead-topic-tags/CHANGELOG.md +++ b/packages/components/psammead-topic-tags/CHANGELOG.md @@ -1,16 +1,27 @@ # Topic Tags Changelog -| Version | Description | -|---------|-------------| -| 1.0.0 | [PR#4522](https://github.com/bbc/psammead/pull/4522) Remove alpha versioning and halve row spacing | -| 0.1.0-alpha.11 | [PR#4521](https://github.com/bbc/psammead/pull/4521) Tweak dimensions of tags | -| 0.1.0-alpha.10 | [PR#4512](https://github.com/bbc/psammead/pull/4512) Fix line spacing on text wrap | -| 0.1.0-alpha.9 | [PR#4500](https://github.com/bbc/psammead/pull/4500) Forward onClick to anchor on TopicTag | -| 0.1.0-alpha.8 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | -| 0.1.0-alpha.7 | [PR#4496](https://github.com/bbc/psammead/pull/4496) Forward ref in TopicTag and check single child type | -| 0.1.0-alpha.6 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | -| 0.1.0-alpha.5 | [PR#4419](https://github.com/bbc/psammead/pull/4419) Remove clickable whitespace | -| 0.1.0-alpha.4 | [PR#4419](https://github.com/bbc/psammead/pull/4419) Update designs | -| 0.1.0-alpha.3 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | -| 0.1.0-alpha.2 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | -| 0.1.0-alpha.1 | [PR#4248](https://github.com/BBC-News/psammead/pull/4248) Initial creation of package. | +| Version | Description | +| -------------- | -------------------------------------------------------------------------------------------------------- | +| 1.1.1 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 1.1.0 | [PR#4574](https://github.com/bbc/psammead/pull/4576) Allow tag background colour to be customised | +| 1.0.9 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 1.0.8 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 1.0.7 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 1.0.6 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 1.0.5 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 1.0.4 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 1.0.3 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 1.0.2 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 1.0.1 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | +| 1.0.0 | [PR#4522](https://github.com/bbc/psammead/pull/4522) Remove alpha versioning and halve row spacing | +| 0.1.0-alpha.11 | [PR#4521](https://github.com/bbc/psammead/pull/4521) Tweak dimensions of tags | +| 0.1.0-alpha.10 | [PR#4512](https://github.com/bbc/psammead/pull/4512) Fix line spacing on text wrap | +| 0.1.0-alpha.9 | [PR#4500](https://github.com/bbc/psammead/pull/4500) Forward onClick to anchor on TopicTag | +| 0.1.0-alpha.8 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | +| 0.1.0-alpha.7 | [PR#4496](https://github.com/bbc/psammead/pull/4496) Forward ref in TopicTag and check single child type | +| 0.1.0-alpha.6 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | +| 0.1.0-alpha.5 | [PR#4419](https://github.com/bbc/psammead/pull/4419) Remove clickable whitespace | +| 0.1.0-alpha.4 | [PR#4419](https://github.com/bbc/psammead/pull/4419) Update designs | +| 0.1.0-alpha.3 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | +| 0.1.0-alpha.2 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | +| 0.1.0-alpha.1 | [PR#4248](https://github.com/BBC-News/psammead/pull/4248) Initial creation of package. | diff --git a/packages/components/psammead-topic-tags/README.md b/packages/components/psammead-topic-tags/README.md index 3014dfebe4..b347baec25 100644 --- a/packages/components/psammead-topic-tags/README.md +++ b/packages/components/psammead-topic-tags/README.md @@ -12,26 +12,27 @@ npm install @bbc/psammead-topic-tags --save ## Props -| Argument | Type | Required | Default | Example | -| --------- | ---- | -------- | ------- | ------- | -| script | string | Yes | N/A | `'news'` | -| service | object | Yes | N/A | `{ canon: { groupA: { fontSize: '28', lineHeight: '32',}, groupB: { fontSize: '32', lineHeight: '36', }, groupD: { fontSize: '44', lineHeight: '48', }, }, trafalgar: { groupA: { fontSize: '20', lineHeight: '24', }, groupB: { fontSize: '24', lineHeight: '28', }, groupD: { fontSize: '32', lineHeight: '36', }, }, }` | -| dir | string | No | `'ltr'` | One of `'ltr'` or `'rtl'` | +| Argument | Type | Required | Default | Example | +| ------------------- | ------ | -------- | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| script | string | Yes | N/A | `'news'` | +| service | object | Yes | N/A | `{ canon: { groupA: { fontSize: '28', lineHeight: '32',}, groupB: { fontSize: '32', lineHeight: '36', }, groupD: { fontSize: '44', lineHeight: '48', }, }, trafalgar: { groupA: { fontSize: '20', lineHeight: '24', }, groupB: { fontSize: '24', lineHeight: '28', }, groupD: { fontSize: '32', lineHeight: '36', }, }, }` | +| dir | string | No | `'ltr'` | One of `'ltr'` or `'rtl'` | +| tagBackgroundColour | string | No | The GEL variable `C_LUNAR` | Any valid CSS `color` | ## Usage ```jsx -import { TopicTags, TopicTag } from "@bbc/psammead-topic-tags" +import { TopicTags, TopicTag } from '@bbc/psammead-topic-tags'; import { latin } from '@bbc/gel-foundations/scripts'; const Wrapper = () => ( - - - - - + + + + + ); ``` diff --git a/packages/components/psammead-topic-tags/package.json b/packages/components/psammead-topic-tags/package.json index 82aa1ac429..7cd31b2006 100644 --- a/packages/components/psammead-topic-tags/package.json +++ b/packages/components/psammead-topic-tags/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-topic-tags", - "version": "1.0.0", + "version": "1.1.1", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-topic-tags/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.1.5", diff --git a/packages/components/psammead-topic-tags/src/index.jsx b/packages/components/psammead-topic-tags/src/index.jsx index 087fdfe63c..a7c38d9d26 100644 --- a/packages/components/psammead-topic-tags/src/index.jsx +++ b/packages/components/psammead-topic-tags/src/index.jsx @@ -45,7 +45,7 @@ const SingleTopicTagItem = styled.div` min-height: ${MIN_TAG_HEIGHT}; padding: ${GEL_SPACING} ${GEL_SPACING_DBL}; align-items: center; - background-color: ${C_LUNAR}; + background-color: ${({ backgroundColour }) => backgroundColour}; text-decoration: none; color: ${C_EBON}; @@ -65,7 +65,12 @@ export const TopicTag = forwardRef(({ name, link, onClick }, ref) => ( )); -export const TopicTags = ({ children, script, service }) => { +export const TopicTags = ({ + children, + script, + service, + tagBackgroundColour, +}) => { const hasMultipleChildren = children.length > 1; return ( @@ -78,6 +83,7 @@ export const TopicTags = ({ children, script, service }) => { return ( { ) : ( - + {children.type === TopicTag && children} @@ -111,8 +121,10 @@ TopicTags.propTypes = { children: node, script: shape(scriptPropType).isRequired, service: string.isRequired, + tagBackgroundColour: string, }; TopicTags.defaultProps = { children: [], + tagBackgroundColour: C_LUNAR, }; diff --git a/packages/components/psammead-useful-links/CHANGELOG.md b/packages/components/psammead-useful-links/CHANGELOG.md index 7f1b52a881..0549d333a2 100644 --- a/packages/components/psammead-useful-links/CHANGELOG.md +++ b/packages/components/psammead-useful-links/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 3.0.30 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.29 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.28 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.27 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.26 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.25 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.24 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.23 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.22 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.21 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.0.20 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.0.19 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.0.17 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-useful-links/package.json b/packages/components/psammead-useful-links/package.json index 1e45a32602..283c80eb2f 100644 --- a/packages/components/psammead-useful-links/package.json +++ b/packages/components/psammead-useful-links/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-useful-links", - "version": "3.0.20", + "version": "3.0.30", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -26,8 +26,8 @@ }, "homepage": "https://github.com/BBC-News/psammead/blob/latest/packages/components/psammead-useful-links/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/containers/psammead-timestamp-container/CHANGELOG.md b/packages/containers/psammead-timestamp-container/CHANGELOG.md index c85807db84..647d1cc06c 100644 --- a/packages/containers/psammead-timestamp-container/CHANGELOG.md +++ b/packages/containers/psammead-timestamp-container/CHANGELOG.md @@ -3,8 +3,18 @@ | Version | Description | |---------|-------------| +| 5.0.40 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 5.0.39 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles transitive packages | +| 5.0.38 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 5.0.37 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 5.0.36 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 5.0.35 | [PR#4561](https://github.com/bbc/psammead/pull/4561) bump dependencies | +| 5.0.34 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 5.0.33 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 5.0.32 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 5.0.31 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 5.0.30 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | -| 5.0.30 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | +| 5.0.29 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 5.0.28 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | | 5.0.27 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | | 5.0.26 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | diff --git a/packages/containers/psammead-timestamp-container/package.json b/packages/containers/psammead-timestamp-container/package.json index 880f6f4b95..b9605ffc2a 100644 --- a/packages/containers/psammead-timestamp-container/package.json +++ b/packages/containers/psammead-timestamp-container/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-timestamp-container", - "version": "5.0.30", + "version": "5.0.40", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -25,8 +25,8 @@ "moment-timezone" ], "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-timestamp": "4.0.19", + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-timestamp": "4.0.29", "moment-timezone": "^0.5.26" }, "devDependencies": { diff --git a/packages/utilities/gel-foundations/CHANGELOG.md b/packages/utilities/gel-foundations/CHANGELOG.md index 5b05f6e9da..26eccb8003 100644 --- a/packages/utilities/gel-foundations/CHANGELOG.md +++ b/packages/utilities/gel-foundations/CHANGELOG.md @@ -3,6 +3,9 @@ | Version | Description | |---------|-------------| +| 7.0.0 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Removes scripts for old Sinhala, Burmese and Tamil fonts | +| 6.3.0 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Adds new sinhala script for new font | +| 6.2.0 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Added Noto Serif Bengali font sizes and line heights | | 6.1.3 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | | 6.1.2 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | | 6.1.1 | [PR#4303](https://github.com/bbc/psammead/pull/4303) Trigger rebuild following babel config update for emotion 11 | diff --git a/packages/utilities/gel-foundations/package.json b/packages/utilities/gel-foundations/package.json index 8a5514e035..49c3ada970 100644 --- a/packages/utilities/gel-foundations/package.json +++ b/packages/utilities/gel-foundations/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/gel-foundations", - "version": "6.1.3", + "version": "7.0.0", "sideEffects": false, "description": "A range of string constants for use in CSS, intended to help implement BBC GEL-compliant webpages and components.", "repository": { diff --git a/packages/utilities/gel-foundations/src/scripts.js b/packages/utilities/gel-foundations/src/scripts.js index ebae087999..7d50630c84 100644 --- a/packages/utilities/gel-foundations/src/scripts.js +++ b/packages/utilities/gel-foundations/src/scripts.js @@ -1,29 +1,20 @@ /* eslint-disable import/no-duplicates */ import arabic from './scripts/arabic'; - import bengali from './scripts/bengali'; - import burmese from './scripts/burmese'; - import devanagariAndGurmukhi from './scripts/devanagari-and-gurmukhi'; import hindi from './scripts/devanagari-and-gurmukhi'; import nepali from './scripts/devanagari-and-gurmukhi'; - import cyrillic from './scripts/latin-and-cyrillic'; import cyrillicAndLatin from './scripts/latin-and-cyrillic'; import latin from './scripts/latin-and-cyrillic'; - import latinDiacritics from './scripts/latin-with-diacritics'; - import chinese from './scripts/no-ascenders-or-descenders'; import ethiopic from './scripts/no-ascenders-or-descenders'; import korean from './scripts/no-ascenders-or-descenders'; import noAscendersOrDescenders from './scripts/no-ascenders-or-descenders'; - import sinhalese from './scripts/sinhalese'; - import tamil from './scripts/tamil'; - import thai from './scripts/thai'; export { diff --git a/packages/utilities/gel-foundations/src/scripts/bengali.js b/packages/utilities/gel-foundations/src/scripts/bengali.js index 584b2bd6dc..10add73b01 100644 --- a/packages/utilities/gel-foundations/src/scripts/bengali.js +++ b/packages/utilities/gel-foundations/src/scripts/bengali.js @@ -33,11 +33,11 @@ const bengaliTypography = { lineHeight: '54', }, groupB: { - fontSize: '64', + fontSize: '58', lineHeight: '72', }, groupD: { - fontSize: '96', + fontSize: '86', lineHeight: '104', }, }, @@ -47,11 +47,11 @@ const bengaliTypography = { lineHeight: '44', }, groupB: { - fontSize: '52', + fontSize: '47', lineHeight: '60', }, groupD: { - fontSize: '76', + fontSize: '68', lineHeight: '84', }, }, @@ -61,151 +61,151 @@ const bengaliTypography = { lineHeight: '36', }, groupB: { - fontSize: '40', + fontSize: '36', lineHeight: '44', }, groupD: { - fontSize: '56', + fontSize: '51', lineHeight: '60', }, }, canon: { groupA: { - fontSize: '30', + fontSize: '27', lineHeight: '40', }, groupB: { - fontSize: '36', + fontSize: '32', lineHeight: '46', }, groupD: { - fontSize: '44', + fontSize: '40', lineHeight: '56', }, }, trafalgar: { groupA: { - fontSize: '28', + fontSize: '25', lineHeight: '32', }, groupB: { - fontSize: '32', + fontSize: '29', lineHeight: '36', }, groupD: { - fontSize: '38', + fontSize: '33', lineHeight: '48', }, }, paragon: { groupA: { - fontSize: '26', + fontSize: '24', lineHeight: '30', }, groupB: { - fontSize: '28', + fontSize: '24', lineHeight: '32', }, groupD: { - fontSize: '32', + fontSize: '28', lineHeight: '40', }, }, doublePica: { groupA: { - fontSize: '26', + fontSize: '22', lineHeight: '30', }, groupB: { - fontSize: '26', + fontSize: '22', lineHeight: '30', }, groupD: { - fontSize: '28', + fontSize: '23', lineHeight: '32', }, }, greatPrimer: { groupA: { - fontSize: '22', + fontSize: '19', lineHeight: '28', }, groupB: { - fontSize: '24', + fontSize: '20', lineHeight: '30', }, groupD: { - fontSize: '26', + fontSize: '21', lineHeight: '30', }, }, bodyCopy: { groupA: { - fontSize: '17', + fontSize: '14', lineHeight: '28', }, groupB: { - fontSize: '20', + fontSize: '17', lineHeight: '32', }, groupD: { - fontSize: '22', + fontSize: '18', lineHeight: '34', }, }, pica: { groupA: { - fontSize: '17', + fontSize: '15', lineHeight: '23', }, groupB: { - fontSize: '17', + fontSize: '15', lineHeight: '23', }, groupD: { - fontSize: '20', + fontSize: '17', lineHeight: '24', }, }, longPrimer: { groupA: { - fontSize: '16', + fontSize: '13', lineHeight: '26', }, groupB: { - fontSize: '16', + fontSize: '13', lineHeight: '26', }, groupD: { - fontSize: '20', + fontSize: '17', lineHeight: '30', }, }, brevier: { groupA: { - fontSize: '15', + fontSize: '12', lineHeight: '20', }, groupB: { - fontSize: '15', + fontSize: '12', lineHeight: '20', }, groupD: { - fontSize: '19', + fontSize: '16', lineHeight: '22', }, }, minion: { groupA: { - fontSize: '12', + fontSize: '10', lineHeight: '16', }, groupB: { - fontSize: '14', + fontSize: '12', lineHeight: '18', }, groupD: { - fontSize: '15', + fontSize: '12', lineHeight: '18', }, }, diff --git a/packages/utilities/gel-foundations/src/scripts/sinhalese.js b/packages/utilities/gel-foundations/src/scripts/sinhalese.js index 88897faa2a..5a42b6e357 100644 --- a/packages/utilities/gel-foundations/src/scripts/sinhalese.js +++ b/packages/utilities/gel-foundations/src/scripts/sinhalese.js @@ -33,11 +33,11 @@ const sinhaleseTypography = { lineHeight: '54', }, groupB: { - fontSize: '64', + fontSize: '53', lineHeight: '72', }, groupD: { - fontSize: '96', + fontSize: '77', lineHeight: '104', }, }, @@ -47,11 +47,11 @@ const sinhaleseTypography = { lineHeight: '44', }, groupB: { - fontSize: '52', + fontSize: '42', lineHeight: '60', }, groupD: { - fontSize: '76', + fontSize: '61', lineHeight: '84', }, }, @@ -61,151 +61,151 @@ const sinhaleseTypography = { lineHeight: '36', }, groupB: { - fontSize: '40', + fontSize: '32', lineHeight: '44', }, groupD: { - fontSize: '56', + fontSize: '45', lineHeight: '60', }, }, canon: { groupA: { - fontSize: '30', + fontSize: '25', lineHeight: '32', }, groupB: { - fontSize: '38', + fontSize: '31', lineHeight: '40', }, groupD: { - fontSize: '52', + fontSize: '42', lineHeight: '58', }, }, trafalgar: { groupA: { - fontSize: '24', + fontSize: '20', lineHeight: '24', }, groupB: { - fontSize: '32', + fontSize: '27', lineHeight: '36', }, groupD: { - fontSize: '40', + fontSize: '32', lineHeight: '44', }, }, paragon: { groupA: { - fontSize: '24', + fontSize: '19', lineHeight: '24', }, groupB: { - fontSize: '28', + fontSize: '23', lineHeight: '32', }, groupD: { - fontSize: '34', + fontSize: '28', lineHeight: '38', }, }, doublePica: { groupA: { - fontSize: '22', + fontSize: '18', lineHeight: '22', }, groupB: { - fontSize: '26', + fontSize: '21', lineHeight: '30', }, groupD: { - fontSize: '30', + fontSize: '24', lineHeight: '34', }, }, greatPrimer: { groupA: { - fontSize: '22', + fontSize: '18', lineHeight: '22', }, groupB: { - fontSize: '24', + fontSize: '19', lineHeight: '24', }, groupD: { - fontSize: '24', + fontSize: '19', lineHeight: '24', }, }, bodyCopy: { groupA: { - fontSize: '22', + fontSize: '18', lineHeight: '28', }, groupB: { - fontSize: '22', + fontSize: '18', lineHeight: '28', }, groupD: { - fontSize: '22', + fontSize: '18', lineHeight: '28', }, }, pica: { groupA: { - fontSize: '22', + fontSize: '17', lineHeight: '28', }, groupB: { - fontSize: '22', + fontSize: '17', lineHeight: '24', }, groupD: { - fontSize: '22', + fontSize: '17', lineHeight: '24', }, }, longPrimer: { groupA: { - fontSize: '18', + fontSize: '15', lineHeight: '22', }, groupB: { - fontSize: '18', + fontSize: '15', lineHeight: '22', }, groupD: { - fontSize: '18', + fontSize: '15', lineHeight: '22', }, }, brevier: { groupA: { - fontSize: '17', + fontSize: '14', lineHeight: '22', }, groupB: { - fontSize: '17', + fontSize: '14', lineHeight: '22', }, groupD: { - fontSize: '17', + fontSize: '14', lineHeight: '22', }, }, minion: { groupA: { - fontSize: '16', + fontSize: '13', lineHeight: '22', }, groupB: { - fontSize: '16', + fontSize: '13', lineHeight: '22', }, groupD: { - fontSize: '16', + fontSize: '13', lineHeight: '22', }, }, diff --git a/packages/utilities/gel-foundations/tests/__snapshots__/getTypeSizes.test.js.snap b/packages/utilities/gel-foundations/tests/__snapshots__/getTypeSizes.test.js.snap index 1572c54c6b..1d7f8d4d70 100644 --- a/packages/utilities/gel-foundations/tests/__snapshots__/getTypeSizes.test.js.snap +++ b/packages/utilities/gel-foundations/tests/__snapshots__/getTypeSizes.test.js.snap @@ -308,16 +308,16 @@ exports[`getTypeSizes should match bodyCopy for arabic 1`] = ` exports[`getTypeSizes should match bodyCopy for bengali 1`] = ` " - font-size: 1.0625rem; + font-size: 0.875rem; line-height: 1.75rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.25rem; + font-size: 1.0625rem; line-height: 2rem; } @media (min-width: 37.5rem) { - font-size: 1.375rem; + font-size: 1.125rem; line-height: 2.125rem; } " @@ -529,16 +529,16 @@ exports[`getTypeSizes should match bodyCopy for noAscendersOrDescenders 1`] = ` exports[`getTypeSizes should match bodyCopy for sinhalese 1`] = ` " - font-size: 1.375rem; + font-size: 1.125rem; line-height: 1.75rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.375rem; + font-size: 1.125rem; line-height: 1.75rem; } @media (min-width: 37.5rem) { - font-size: 1.375rem; + font-size: 1.125rem; line-height: 1.75rem; } " @@ -597,16 +597,16 @@ exports[`getTypeSizes should match brevier for arabic 1`] = ` exports[`getTypeSizes should match brevier for bengali 1`] = ` " - font-size: 0.9375rem; + font-size: 0.75rem; line-height: 1.25rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 0.9375rem; + font-size: 0.75rem; line-height: 1.25rem; } @media (min-width: 37.5rem) { - font-size: 1.1875rem; + font-size: 1rem; line-height: 1.375rem; } " @@ -818,16 +818,16 @@ exports[`getTypeSizes should match brevier for noAscendersOrDescenders 1`] = ` exports[`getTypeSizes should match brevier for sinhalese 1`] = ` " - font-size: 1.0625rem; + font-size: 0.875rem; line-height: 1.375rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.0625rem; + font-size: 0.875rem; line-height: 1.375rem; } @media (min-width: 37.5rem) { - font-size: 1.0625rem; + font-size: 0.875rem; line-height: 1.375rem; } " @@ -886,16 +886,16 @@ exports[`getTypeSizes should match canon for arabic 1`] = ` exports[`getTypeSizes should match canon for bengali 1`] = ` " - font-size: 1.875rem; + font-size: 1.6875rem; line-height: 2.5rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 2.25rem; + font-size: 2rem; line-height: 2.875rem; } @media (min-width: 37.5rem) { - font-size: 2.75rem; + font-size: 2.5rem; line-height: 3.5rem; } " @@ -1107,16 +1107,16 @@ exports[`getTypeSizes should match canon for noAscendersOrDescenders 1`] = ` exports[`getTypeSizes should match canon for sinhalese 1`] = ` " - font-size: 1.875rem; + font-size: 1.5625rem; line-height: 2rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 2.375rem; + font-size: 1.9375rem; line-height: 2.5rem; } @media (min-width: 37.5rem) { - font-size: 3.25rem; + font-size: 2.625rem; line-height: 3.625rem; } " @@ -1175,16 +1175,16 @@ exports[`getTypeSizes should match doublePica for arabic 1`] = ` exports[`getTypeSizes should match doublePica for bengali 1`] = ` " - font-size: 1.625rem; + font-size: 1.375rem; line-height: 1.875rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.625rem; + font-size: 1.375rem; line-height: 1.875rem; } @media (min-width: 37.5rem) { - font-size: 1.75rem; + font-size: 1.4375rem; line-height: 2rem; } " @@ -1396,16 +1396,16 @@ exports[`getTypeSizes should match doublePica for noAscendersOrDescenders 1`] = exports[`getTypeSizes should match doublePica for sinhalese 1`] = ` " - font-size: 1.375rem; + font-size: 1.125rem; line-height: 1.375rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.625rem; + font-size: 1.3125rem; line-height: 1.875rem; } @media (min-width: 37.5rem) { - font-size: 1.875rem; + font-size: 1.5rem; line-height: 2.125rem; } " @@ -1757,12 +1757,12 @@ exports[`getTypeSizes should match foolscap for bengali 1`] = ` line-height: 2.25rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 2.5rem; + font-size: 2.25rem; line-height: 2.75rem; } @media (min-width: 37.5rem) { - font-size: 3.5rem; + font-size: 3.1875rem; line-height: 3.75rem; } " @@ -1978,12 +1978,12 @@ exports[`getTypeSizes should match foolscap for sinhalese 1`] = ` line-height: 2.25rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 2.5rem; + font-size: 2rem; line-height: 2.75rem; } @media (min-width: 37.5rem) { - font-size: 3.5rem; + font-size: 2.8125rem; line-height: 3.75rem; } " @@ -2042,16 +2042,16 @@ exports[`getTypeSizes should match greatPrimer for arabic 1`] = ` exports[`getTypeSizes should match greatPrimer for bengali 1`] = ` " - font-size: 1.375rem; + font-size: 1.1875rem; line-height: 1.75rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.5rem; + font-size: 1.25rem; line-height: 1.875rem; } @media (min-width: 37.5rem) { - font-size: 1.625rem; + font-size: 1.3125rem; line-height: 1.875rem; } " @@ -2263,16 +2263,16 @@ exports[`getTypeSizes should match greatPrimer for noAscendersOrDescenders 1`] = exports[`getTypeSizes should match greatPrimer for sinhalese 1`] = ` " - font-size: 1.375rem; + font-size: 1.125rem; line-height: 1.375rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.5rem; + font-size: 1.1875rem; line-height: 1.5rem; } @media (min-width: 37.5rem) { - font-size: 1.5rem; + font-size: 1.1875rem; line-height: 1.5rem; } " @@ -2335,12 +2335,12 @@ exports[`getTypeSizes should match imperial for bengali 1`] = ` line-height: 3.375rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 4rem; + font-size: 3.625rem; line-height: 4.5rem; } @media (min-width: 37.5rem) { - font-size: 6rem; + font-size: 5.375rem; line-height: 6.5rem; } " @@ -2556,12 +2556,12 @@ exports[`getTypeSizes should match imperial for sinhalese 1`] = ` line-height: 3.375rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 4rem; + font-size: 3.3125rem; line-height: 4.5rem; } @media (min-width: 37.5rem) { - font-size: 6rem; + font-size: 4.8125rem; line-height: 6.5rem; } " @@ -2620,16 +2620,16 @@ exports[`getTypeSizes should match longPrimer for arabic 1`] = ` exports[`getTypeSizes should match longPrimer for bengali 1`] = ` " - font-size: 1rem; + font-size: 0.8125rem; line-height: 1.625rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1rem; + font-size: 0.8125rem; line-height: 1.625rem; } @media (min-width: 37.5rem) { - font-size: 1.25rem; + font-size: 1.0625rem; line-height: 1.875rem; } " @@ -2841,16 +2841,16 @@ exports[`getTypeSizes should match longPrimer for noAscendersOrDescenders 1`] = exports[`getTypeSizes should match longPrimer for sinhalese 1`] = ` " - font-size: 1.125rem; + font-size: 0.9375rem; line-height: 1.375rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.125rem; + font-size: 0.9375rem; line-height: 1.375rem; } @media (min-width: 37.5rem) { - font-size: 1.125rem; + font-size: 0.9375rem; line-height: 1.375rem; } " @@ -2909,16 +2909,16 @@ exports[`getTypeSizes should match minion for arabic 1`] = ` exports[`getTypeSizes should match minion for bengali 1`] = ` " - font-size: 0.75rem; + font-size: 0.625rem; line-height: 1rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 0.875rem; + font-size: 0.75rem; line-height: 1.125rem; } @media (min-width: 37.5rem) { - font-size: 0.9375rem; + font-size: 0.75rem; line-height: 1.125rem; } " @@ -3130,16 +3130,16 @@ exports[`getTypeSizes should match minion for noAscendersOrDescenders 1`] = ` exports[`getTypeSizes should match minion for sinhalese 1`] = ` " - font-size: 1rem; + font-size: 0.8125rem; line-height: 1.375rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1rem; + font-size: 0.8125rem; line-height: 1.375rem; } @media (min-width: 37.5rem) { - font-size: 1rem; + font-size: 0.8125rem; line-height: 1.375rem; } " @@ -3198,16 +3198,16 @@ exports[`getTypeSizes should match paragon for arabic 1`] = ` exports[`getTypeSizes should match paragon for bengali 1`] = ` " - font-size: 1.625rem; + font-size: 1.5rem; line-height: 1.875rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.75rem; + font-size: 1.5rem; line-height: 2rem; } @media (min-width: 37.5rem) { - font-size: 2rem; + font-size: 1.75rem; line-height: 2.5rem; } " @@ -3419,16 +3419,16 @@ exports[`getTypeSizes should match paragon for noAscendersOrDescenders 1`] = ` exports[`getTypeSizes should match paragon for sinhalese 1`] = ` " - font-size: 1.5rem; + font-size: 1.1875rem; line-height: 1.5rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.75rem; + font-size: 1.4375rem; line-height: 2rem; } @media (min-width: 37.5rem) { - font-size: 2.125rem; + font-size: 1.75rem; line-height: 2.375rem; } " @@ -3487,16 +3487,16 @@ exports[`getTypeSizes should match pica for arabic 1`] = ` exports[`getTypeSizes should match pica for bengali 1`] = ` " - font-size: 1.0625rem; + font-size: 0.9375rem; line-height: 1.4375rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.0625rem; + font-size: 0.9375rem; line-height: 1.4375rem; } @media (min-width: 37.5rem) { - font-size: 1.25rem; + font-size: 1.0625rem; line-height: 1.5rem; } " @@ -3708,16 +3708,16 @@ exports[`getTypeSizes should match pica for noAscendersOrDescenders 1`] = ` exports[`getTypeSizes should match pica for sinhalese 1`] = ` " - font-size: 1.375rem; + font-size: 1.0625rem; line-height: 1.75rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 1.375rem; + font-size: 1.0625rem; line-height: 1.5rem; } @media (min-width: 37.5rem) { - font-size: 1.375rem; + font-size: 1.0625rem; line-height: 1.5rem; } " @@ -3780,12 +3780,12 @@ exports[`getTypeSizes should match royal for bengali 1`] = ` line-height: 2.75rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 3.25rem; + font-size: 2.9375rem; line-height: 3.75rem; } @media (min-width: 37.5rem) { - font-size: 4.75rem; + font-size: 4.25rem; line-height: 5.25rem; } " @@ -4001,12 +4001,12 @@ exports[`getTypeSizes should match royal for sinhalese 1`] = ` line-height: 2.75rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 3.25rem; + font-size: 2.625rem; line-height: 3.75rem; } @media (min-width: 37.5rem) { - font-size: 4.75rem; + font-size: 3.8125rem; line-height: 5.25rem; } " @@ -4065,16 +4065,16 @@ exports[`getTypeSizes should match trafalgar for arabic 1`] = ` exports[`getTypeSizes should match trafalgar for bengali 1`] = ` " - font-size: 1.75rem; + font-size: 1.5625rem; line-height: 2rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 2rem; + font-size: 1.8125rem; line-height: 2.25rem; } @media (min-width: 37.5rem) { - font-size: 2.375rem; + font-size: 2.0625rem; line-height: 3rem; } " @@ -4286,16 +4286,16 @@ exports[`getTypeSizes should match trafalgar for noAscendersOrDescenders 1`] = ` exports[`getTypeSizes should match trafalgar for sinhalese 1`] = ` " - font-size: 1.5rem; + font-size: 1.25rem; line-height: 1.5rem; @media (min-width: 20rem) and (max-width: 37.4375rem) { - font-size: 2rem; + font-size: 1.6875rem; line-height: 2.25rem; } @media (min-width: 37.5rem) { - font-size: 2.5rem; + font-size: 2rem; line-height: 2.75rem; } " diff --git a/packages/utilities/psammead-assets/CHANGELOG.md b/packages/utilities/psammead-assets/CHANGELOG.md index e8c70a3575..7542de966d 100644 --- a/packages/utilities/psammead-assets/CHANGELOG.md +++ b/packages/utilities/psammead-assets/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 3.1.10 | [PR#4601](https://github.com/bbc/psammead/pull/4601) SVG size adjustments | | 3.1.9 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.1.8 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | | 3.1.7 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | diff --git a/packages/utilities/psammead-assets/package.json b/packages/utilities/psammead-assets/package.json index e650cc8a1a..a0f2e7811c 100644 --- a/packages/utilities/psammead-assets/package.json +++ b/packages/utilities/psammead-assets/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-assets", - "version": "3.1.9", + "version": "3.1.10", "sideEffects": false, "description": "A collection of common assets that are likely to be required by many Psammead components or users, such as SVGs or small scripts.", "repository": { diff --git a/packages/utilities/psammead-assets/src/__snapshots__/svgs.test.jsx.snap b/packages/utilities/psammead-assets/src/__snapshots__/svgs.test.jsx.snap index 12c3d94159..57ec221c0b 100644 --- a/packages/utilities/psammead-assets/src/__snapshots__/svgs.test.jsx.snap +++ b/packages/utilities/psammead-assets/src/__snapshots__/svgs.test.jsx.snap @@ -7,7 +7,7 @@ exports[`BBC_BLOCKS_DARK_MODE SVG should render correctly 1`] = `"PHN2ZyB4bWxucz exports[`afaanoromoo SVG should render correctly 1`] = ` ), - ratio: 13.2688, + ratio: width / height, viewbox: { - height: 24, - width: 318.45, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/afrique.jsx b/packages/utilities/psammead-assets/src/svgs/afrique.jsx index b96498231e..d93362c2e6 100644 --- a/packages/utilities/psammead-assets/src/svgs/afrique.jsx +++ b/packages/utilities/psammead-assets/src/svgs/afrique.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 251.0404; const afrique = { group: ( ), - ratio: 10.4458, + ratio: width / height, viewbox: { - height: 24, - width: 250.7, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/amharic.jsx b/packages/utilities/psammead-assets/src/svgs/amharic.jsx index 9104a9f0f6..04aa7287f5 100644 --- a/packages/utilities/psammead-assets/src/svgs/amharic.jsx +++ b/packages/utilities/psammead-assets/src/svgs/amharic.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 223.6254; const amharic = { group: ( ), - ratio: 9.30375, + ratio: width / height, viewbox: { - height: 24, - width: 223.29, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/arabic.jsx b/packages/utilities/psammead-assets/src/svgs/arabic.jsx index 8909632430..4410c2450c 100644 --- a/packages/utilities/psammead-assets/src/svgs/arabic.jsx +++ b/packages/utilities/psammead-assets/src/svgs/arabic.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 222.3514; const arabic = { group: ( ), - ratio: 9.2917, + ratio: width / height, viewbox: { - height: 24, - width: 223, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/archive.jsx b/packages/utilities/psammead-assets/src/svgs/archive.jsx index 0949541c6b..3125aa6ab2 100644 --- a/packages/utilities/psammead-assets/src/svgs/archive.jsx +++ b/packages/utilities/psammead-assets/src/svgs/archive.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.34; +const width = 206.487; const archive = { group: ( ), - ratio: 8.625, + ratio: width / height, viewbox: { - height: 24, - width: 207, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/azeri.jsx b/packages/utilities/psammead-assets/src/svgs/azeri.jsx index 90a50b81b8..68ab28508f 100644 --- a/packages/utilities/psammead-assets/src/svgs/azeri.jsx +++ b/packages/utilities/psammead-assets/src/svgs/azeri.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 315.6754; const azeri = { group: ( ), - ratio: 13.1388, + ratio: width / height, viewbox: { - height: 24, - width: 315.33, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/bengali.jsx b/packages/utilities/psammead-assets/src/svgs/bengali.jsx index 25c26f3655..7e97bb5b87 100644 --- a/packages/utilities/psammead-assets/src/svgs/bengali.jsx +++ b/packages/utilities/psammead-assets/src/svgs/bengali.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 228.3554; const bengali = { group: ( ), - ratio: 9.4975, + ratio: width / height, viewbox: { - height: 24, - width: 227.94, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/burmese.jsx b/packages/utilities/psammead-assets/src/svgs/burmese.jsx index 1bc3548314..7d7d6ff6aa 100644 --- a/packages/utilities/psammead-assets/src/svgs/burmese.jsx +++ b/packages/utilities/psammead-assets/src/svgs/burmese.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 213.6056; const burmese = { group: ( ), - ratio: 8.895, + ratio: width / height, viewbox: { - height: 24, - width: 213.48, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/cymrufyw.jsx b/packages/utilities/psammead-assets/src/svgs/cymrufyw.jsx index 1480fbec28..f002b80fe0 100644 --- a/packages/utilities/psammead-assets/src/svgs/cymrufyw.jsx +++ b/packages/utilities/psammead-assets/src/svgs/cymrufyw.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.018; +const width = 198.515; const cymrufyw = { group: ( ), - ratio: 8.2916, + ratio: width / height, viewbox: { - height: 24, - width: 199, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/gahuza.jsx b/packages/utilities/psammead-assets/src/svgs/gahuza.jsx index e2d850730c..77fb7f1b18 100644 --- a/packages/utilities/psammead-assets/src/svgs/gahuza.jsx +++ b/packages/utilities/psammead-assets/src/svgs/gahuza.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 252.7962; const gahuza = { group: ( ), - ratio: 10.5192, + ratio: width / height, viewbox: { - height: 24, - width: 252.46, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/gujarati.jsx b/packages/utilities/psammead-assets/src/svgs/gujarati.jsx index ca6d9027c2..34e2cf7d97 100644 --- a/packages/utilities/psammead-assets/src/svgs/gujarati.jsx +++ b/packages/utilities/psammead-assets/src/svgs/gujarati.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 235.1706; const gujarati = { group: ( ), - ratio: 9.785, + ratio: width / height, viewbox: { - height: 24, - width: 234.84, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/hausa.jsx b/packages/utilities/psammead-assets/src/svgs/hausa.jsx index f5770322a0..ae6c77bf54 100644 --- a/packages/utilities/psammead-assets/src/svgs/hausa.jsx +++ b/packages/utilities/psammead-assets/src/svgs/hausa.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 237.6454; const hausa = { group: ( ), - ratio: 9.8879, + ratio: width / height, viewbox: { - height: 24, - width: 237.31, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/hindi.jsx b/packages/utilities/psammead-assets/src/svgs/hindi.jsx index 9aa6bd7542..6eb3996cc5 100644 --- a/packages/utilities/psammead-assets/src/svgs/hindi.jsx +++ b/packages/utilities/psammead-assets/src/svgs/hindi.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 216.3304; const hindi = { group: ( ), - ratio: 8.9983, + ratio: width / height, viewbox: { - height: 24, - width: 215.96, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/igbo.jsx b/packages/utilities/psammead-assets/src/svgs/igbo.jsx index 5d90358aba..8928a22828 100644 --- a/packages/utilities/psammead-assets/src/svgs/igbo.jsx +++ b/packages/utilities/psammead-assets/src/svgs/igbo.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 222.0764; const igbo = { group: ( ), - ratio: 9.25, + ratio: width / height, viewbox: { - height: 24, - width: 222, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/indonesia.jsx b/packages/utilities/psammead-assets/src/svgs/indonesia.jsx index 2daddd1953..9735eed309 100644 --- a/packages/utilities/psammead-assets/src/svgs/indonesia.jsx +++ b/packages/utilities/psammead-assets/src/svgs/indonesia.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 272.3404; const indonesia = { group: ( ), - ratio: 11.3346, + ratio: width / height, viewbox: { - height: 24, - width: 272.03, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/japanese.jsx b/packages/utilities/psammead-assets/src/svgs/japanese.jsx index b3d404956c..ec15288c33 100644 --- a/packages/utilities/psammead-assets/src/svgs/japanese.jsx +++ b/packages/utilities/psammead-assets/src/svgs/japanese.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 229.8304; const japanese = { group: ( ), - ratio: 9.5621, + ratio: width / height, viewbox: { - height: 24, - width: 229.49, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/korean.jsx b/packages/utilities/psammead-assets/src/svgs/korean.jsx index 634cdc0462..40e4406064 100644 --- a/packages/utilities/psammead-assets/src/svgs/korean.jsx +++ b/packages/utilities/psammead-assets/src/svgs/korean.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 233.3404; const korean = { group: ( ), - ratio: 9.7088, + ratio: width / height, viewbox: { - height: 24, - width: 233.01, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/kyrgyz.jsx b/packages/utilities/psammead-assets/src/svgs/kyrgyz.jsx index b7b507d25a..713362efa3 100644 --- a/packages/utilities/psammead-assets/src/svgs/kyrgyz.jsx +++ b/packages/utilities/psammead-assets/src/svgs/kyrgyz.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 326.9954; const kyrgyz = { group: ( ), - ratio: 13.6108, + ratio: width / height, viewbox: { - height: 24, - width: 326.66, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/learningenglish.jsx b/packages/utilities/psammead-assets/src/svgs/learningenglish.jsx index 3d16a0d549..210f9a4fa3 100644 --- a/packages/utilities/psammead-assets/src/svgs/learningenglish.jsx +++ b/packages/utilities/psammead-assets/src/svgs/learningenglish.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24; +const width = 314.223; const learningenglish = { group: ( ), - ratio: 13.0833, + ratio: width / height, viewbox: { - height: 24, - width: 314, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/marathi.jsx b/packages/utilities/psammead-assets/src/svgs/marathi.jsx index fa8b3d85a2..b8f9ed094d 100644 --- a/packages/utilities/psammead-assets/src/svgs/marathi.jsx +++ b/packages/utilities/psammead-assets/src/svgs/marathi.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 224.1057; const marathi = { group: ( ), - ratio: 9.3238, + ratio: width / height, viewbox: { - height: 24, - width: 223.77, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/mundo.jsx b/packages/utilities/psammead-assets/src/svgs/mundo.jsx index d20bc3a284..0cbd68fc32 100644 --- a/packages/utilities/psammead-assets/src/svgs/mundo.jsx +++ b/packages/utilities/psammead-assets/src/svgs/mundo.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 246.2812; const mundo = { group: ( ), - ratio: 10.2475, + ratio: width / height, viewbox: { - height: 24, - width: 245.94, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/naidheachdan.jsx b/packages/utilities/psammead-assets/src/svgs/naidheachdan.jsx index 6e2e4bd728..c472edb4eb 100644 --- a/packages/utilities/psammead-assets/src/svgs/naidheachdan.jsx +++ b/packages/utilities/psammead-assets/src/svgs/naidheachdan.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 22.465; +const width = 269.0145; const naidheachdan = { group: ( ), - ratio: 11.25, + ratio: width / height, viewbox: { - height: 24, - width: 270, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/nepali.jsx b/packages/utilities/psammead-assets/src/svgs/nepali.jsx index 2176aee72e..a3e1f33fb7 100644 --- a/packages/utilities/psammead-assets/src/svgs/nepali.jsx +++ b/packages/utilities/psammead-assets/src/svgs/nepali.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 227.9254; const nepali = { group: ( ), - ratio: 9.4846, + ratio: width / height, viewbox: { - height: 24, - width: 227.63, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/news.jsx b/packages/utilities/psammead-assets/src/svgs/news.jsx index 22bdba627f..269d2d6346 100644 --- a/packages/utilities/psammead-assets/src/svgs/news.jsx +++ b/packages/utilities/psammead-assets/src/svgs/news.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 22.19; +const width = 153.2569; const news = { group: ( ), - ratio: 6.9979, + ratio: width / height, viewbox: { - height: 24, - width: 167.95, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/newsround.jsx b/packages/utilities/psammead-assets/src/svgs/newsround.jsx index 99dcfafcfc..0ec29d8e27 100644 --- a/packages/utilities/psammead-assets/src/svgs/newsround.jsx +++ b/packages/utilities/psammead-assets/src/svgs/newsround.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.34; +const width = 133.34; const newsround = { group: ( @@ -42,10 +44,10 @@ const newsround = { /> ), - ratio: 5.54, + ratio: width / height, viewbox: { - height: 24, - width: 133, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/pashto.jsx b/packages/utilities/psammead-assets/src/svgs/pashto.jsx index d35e75af1e..24323b230b 100644 --- a/packages/utilities/psammead-assets/src/svgs/pashto.jsx +++ b/packages/utilities/psammead-assets/src/svgs/pashto.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 221.1554; const pashto = { group: ( ), - ratio: 9.25, + ratio: width / height, viewbox: { - height: 24, - width: 222, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/persian.jsx b/packages/utilities/psammead-assets/src/svgs/persian.jsx index 03db30bd76..a40265a007 100644 --- a/packages/utilities/psammead-assets/src/svgs/persian.jsx +++ b/packages/utilities/psammead-assets/src/svgs/persian.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 228.5081; const persian = { group: ( ), - ratio: 9.542, + ratio: width / height, viewbox: { - width: 229, - height: 24, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/pidgin.jsx b/packages/utilities/psammead-assets/src/svgs/pidgin.jsx index 7017971272..b5cdfcec40 100644 --- a/packages/utilities/psammead-assets/src/svgs/pidgin.jsx +++ b/packages/utilities/psammead-assets/src/svgs/pidgin.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 238.4254; const pidgin = { group: ( ), - ratio: 9.9204, + ratio: width / height, viewbox: { - height: 24, - width: 238, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/portuguese.jsx b/packages/utilities/psammead-assets/src/svgs/portuguese.jsx index 14d1fef63f..464856a0dc 100644 --- a/packages/utilities/psammead-assets/src/svgs/portuguese.jsx +++ b/packages/utilities/psammead-assets/src/svgs/portuguese.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 235.8454; const portuguese = { group: ( ), - ratio: 9.8133, + ratio: width / height, viewbox: { - height: 24, - width: 235.52, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/punjabi.jsx b/packages/utilities/psammead-assets/src/svgs/punjabi.jsx index b6c1c25d24..cfd37d7cbc 100644 --- a/packages/utilities/psammead-assets/src/svgs/punjabi.jsx +++ b/packages/utilities/psammead-assets/src/svgs/punjabi.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 227.8954; const punjabi = { group: ( ), - ratio: 9.48125, + ratio: width / height, viewbox: { - height: 24, - width: 227.55, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/russian.jsx b/packages/utilities/psammead-assets/src/svgs/russian.jsx index 1c35db9130..92445ffb16 100644 --- a/packages/utilities/psammead-assets/src/svgs/russian.jsx +++ b/packages/utilities/psammead-assets/src/svgs/russian.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 327.5254; const russian = { group: ( ), - ratio: 13.6329, + ratio: width / height, viewbox: { - height: 24, - width: 327.19, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/scotland.jsx b/packages/utilities/psammead-assets/src/svgs/scotland.jsx index 7a15bb90df..d08ceaf86f 100644 --- a/packages/utilities/psammead-assets/src/svgs/scotland.jsx +++ b/packages/utilities/psammead-assets/src/svgs/scotland.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.34; +const width = 176.5008; const scotland = { group: ( ), - ratio: 7.3396, + ratio: width / height, viewbox: { - height: 24, - width: 176.15, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/serbian.jsx b/packages/utilities/psammead-assets/src/svgs/serbian.jsx index 8c1a8a30ad..6923d16b00 100644 --- a/packages/utilities/psammead-assets/src/svgs/serbian.jsx +++ b/packages/utilities/psammead-assets/src/svgs/serbian.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 282.9704; const serbian = { group: ( ), - ratio: 11.77625, + ratio: width / height, viewbox: { - height: 24, - width: 282.63, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/sinhala.jsx b/packages/utilities/psammead-assets/src/svgs/sinhala.jsx index e4055a1d4e..a4b6a2d351 100644 --- a/packages/utilities/psammead-assets/src/svgs/sinhala.jsx +++ b/packages/utilities/psammead-assets/src/svgs/sinhala.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 241.5665; const sinhala = { group: ( ), - ratio: 10.0513, + ratio: width / height, viewbox: { - height: 24, - width: 241.23, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/somali.jsx b/packages/utilities/psammead-assets/src/svgs/somali.jsx index 0f0b07ae68..9bdca7019c 100644 --- a/packages/utilities/psammead-assets/src/svgs/somali.jsx +++ b/packages/utilities/psammead-assets/src/svgs/somali.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 240.0157; const somali = { group: ( ), - ratio: 9.9871, + ratio: width / height, viewbox: { - height: 24, - width: 239.69, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/sport.jsx b/packages/utilities/psammead-assets/src/svgs/sport.jsx index 9e2d403503..af5de74aaf 100644 --- a/packages/utilities/psammead-assets/src/svgs/sport.jsx +++ b/packages/utilities/psammead-assets/src/svgs/sport.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24; +const width = 189.442; const sport = { group: ( ), - ratio: 7.92, + ratio: width / height, viewbox: { - height: 24, - width: 190, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/swahili.jsx b/packages/utilities/psammead-assets/src/svgs/swahili.jsx index 79b3a3a034..d9d8f82107 100644 --- a/packages/utilities/psammead-assets/src/svgs/swahili.jsx +++ b/packages/utilities/psammead-assets/src/svgs/swahili.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 246.6157; const swahili = { group: ( ), - ratio: 10.2617, + ratio: width / height, viewbox: { - height: 24, - width: 246.28, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/tamil.jsx b/packages/utilities/psammead-assets/src/svgs/tamil.jsx index f2b32733f4..6569a49e17 100644 --- a/packages/utilities/psammead-assets/src/svgs/tamil.jsx +++ b/packages/utilities/psammead-assets/src/svgs/tamil.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 229.5557; const tamil = { group: ( ), - ratio: 9.55041666666667, + ratio: width / height, viewbox: { - height: 24, - width: 229.21, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/telugu.jsx b/packages/utilities/psammead-assets/src/svgs/telugu.jsx index 8d30cc5889..6ce014a879 100644 --- a/packages/utilities/psammead-assets/src/svgs/telugu.jsx +++ b/packages/utilities/psammead-assets/src/svgs/telugu.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 240.6965; const telugu = { group: ( ), - ratio: 10.0142, + ratio: width / height, viewbox: { - height: 24, - width: 240.34, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/thai.jsx b/packages/utilities/psammead-assets/src/svgs/thai.jsx index 8dd448d8fa..4ad9e119ea 100644 --- a/packages/utilities/psammead-assets/src/svgs/thai.jsx +++ b/packages/utilities/psammead-assets/src/svgs/thai.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 208.9008; const thai = { group: ( ), - ratio: 8.75, + ratio: width / height, viewbox: { - height: 24, - width: 210, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/tigrinya.jsx b/packages/utilities/psammead-assets/src/svgs/tigrinya.jsx index c176bf7cc7..4e1b94b156 100644 --- a/packages/utilities/psammead-assets/src/svgs/tigrinya.jsx +++ b/packages/utilities/psammead-assets/src/svgs/tigrinya.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 223.6004; const tigrinya = { group: ( ), - ratio: 9.3021, + ratio: width / height, viewbox: { - height: 24, - width: 223.25, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/turkce.jsx b/packages/utilities/psammead-assets/src/svgs/turkce.jsx index e968899dd9..0958b1315f 100644 --- a/packages/utilities/psammead-assets/src/svgs/turkce.jsx +++ b/packages/utilities/psammead-assets/src/svgs/turkce.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 244.6554; const turkce = { group: ( ), - ratio: 10.18, + ratio: width / height, viewbox: { - height: 24, - width: 244.32, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/ukchina.jsx b/packages/utilities/psammead-assets/src/svgs/ukchina.jsx index 7a8932f14f..381f7027d7 100644 --- a/packages/utilities/psammead-assets/src/svgs/ukchina.jsx +++ b/packages/utilities/psammead-assets/src/svgs/ukchina.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 162.6154; const ukchina = { group: ( ), - ratio: 6.7613, + ratio: width / height, viewbox: { - height: 24, - width: 162.27, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/ukrainian.jsx b/packages/utilities/psammead-assets/src/svgs/ukrainian.jsx index aab865f6ee..0871551b50 100644 --- a/packages/utilities/psammead-assets/src/svgs/ukrainian.jsx +++ b/packages/utilities/psammead-assets/src/svgs/ukrainian.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 251.7004; const ukrainian = { group: ( ), - ratio: 10.4733, + ratio: width / height, viewbox: { - height: 24, - width: 251.36, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/urdu.jsx b/packages/utilities/psammead-assets/src/svgs/urdu.jsx index 343d7f7072..74ff8be8bf 100644 --- a/packages/utilities/psammead-assets/src/svgs/urdu.jsx +++ b/packages/utilities/psammead-assets/src/svgs/urdu.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 209.7654; const urdu = { group: ( ), - ratio: 8.7917, + ratio: width / height, viewbox: { - height: 24, - width: 211, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/uzbek.jsx b/packages/utilities/psammead-assets/src/svgs/uzbek.jsx index db6f796a6c..191bc4d078 100644 --- a/packages/utilities/psammead-assets/src/svgs/uzbek.jsx +++ b/packages/utilities/psammead-assets/src/svgs/uzbek.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 239.3365; const uzbek = { group: ( ), - ratio: 9.9579, + ratio: width / height, viewbox: { - height: 24, - width: 238.99, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/vietnamese.jsx b/packages/utilities/psammead-assets/src/svgs/vietnamese.jsx index 99e95c2f52..996c50bf05 100644 --- a/packages/utilities/psammead-assets/src/svgs/vietnamese.jsx +++ b/packages/utilities/psammead-assets/src/svgs/vietnamese.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 268.7954; const vietnamese = { group: ( ), - ratio: 11.1858, + ratio: width / height, viewbox: { - height: 24, - width: 268.46, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/weather.jsx b/packages/utilities/psammead-assets/src/svgs/weather.jsx index 4190ee6fd0..5081c0be6c 100644 --- a/packages/utilities/psammead-assets/src/svgs/weather.jsx +++ b/packages/utilities/psammead-assets/src/svgs/weather.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.188; +const width = 214.889; const weather = { group: ( ), - ratio: 8.9583, + ratio: width / height, viewbox: { - height: 24, - width: 215, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/yoruba.jsx b/packages/utilities/psammead-assets/src/svgs/yoruba.jsx index 2dcc592142..4e724b9b59 100644 --- a/packages/utilities/psammead-assets/src/svgs/yoruba.jsx +++ b/packages/utilities/psammead-assets/src/svgs/yoruba.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 249.0804; const yoruba = { group: ( ), - ratio: 10.4167, + ratio: width / height, viewbox: { - width: 250, - height: 24, + height, + width, }, }; diff --git a/packages/utilities/psammead-assets/src/svgs/zhongwen.jsx b/packages/utilities/psammead-assets/src/svgs/zhongwen.jsx index f86b90f632..afb8022535 100644 --- a/packages/utilities/psammead-assets/src/svgs/zhongwen.jsx +++ b/packages/utilities/psammead-assets/src/svgs/zhongwen.jsx @@ -1,5 +1,7 @@ import React from 'react'; +const height = 24.59; +const width = 217.6354; const zhongwen = { group: ( ), - ratio: 9.0542, + ratio: width / height, viewbox: { - height: 24, - width: 217.3, + height, + width, }, }; diff --git a/packages/utilities/psammead-storybook-helpers/CHANGELOG.md b/packages/utilities/psammead-storybook-helpers/CHANGELOG.md index 7831d46ad4..5828260238 100644 --- a/packages/utilities/psammead-storybook-helpers/CHANGELOG.md +++ b/packages/utilities/psammead-storybook-helpers/CHANGELOG.md @@ -3,6 +3,9 @@ | Version | Description | |---------|-------------| +| 9.0.17 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bumps dependencies | +| 9.0.16 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 9.0.15 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | | 9.0.13 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | | 9.0.12 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | | 9.0.11 | [PR#4335](https://github.com/bbc/psammead/pull/4335) switch to yarn for package management | diff --git a/packages/utilities/psammead-storybook-helpers/package.json b/packages/utilities/psammead-storybook-helpers/package.json index 3462e69f71..b8104c4bf4 100644 --- a/packages/utilities/psammead-storybook-helpers/package.json +++ b/packages/utilities/psammead-storybook-helpers/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-storybook-helpers", - "version": "9.0.14", + "version": "9.0.17", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -26,7 +26,7 @@ "knobs" ], "dependencies": { - "@bbc/gel-foundations": "6.1.3", + "@bbc/gel-foundations": "7.0.0", "react-helmet": "^6.1.0" } } diff --git a/packages/utilities/psammead-styles/CHANGELOG.md b/packages/utilities/psammead-styles/CHANGELOG.md index 05d01436f1..fa68e3828d 100644 --- a/packages/utilities/psammead-styles/CHANGELOG.md +++ b/packages/utilities/psammead-styles/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 8.0.2 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Added Grey 8 colour | +| 8.0.1 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Fixes Tamil font base URL | +| 8.0.0 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Removes Iskoola Pota, Latha and Shonar Bangla Fonts | +| 7.6.3 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Fixes bold font URL for Noto Serif Sinhala | +| 7.6.2 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Added Grey 6 colour | +| 7.6.1 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Correct Tamil font name to Noto Sans Tamil | +| 7.6.0 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Adds Noto Serif Sinhala font | +| 7.5.0 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Added Noto Serif Bengali font | +| 7.4.0 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Added NotoSansTamil font for Tamil service | +| 7.3.1 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Added Grey 2 colour | | 7.3.0 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Added Silver and Mist colours for BBC Sport | | 7.2.6 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 7.2.5 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/utilities/psammead-styles/index.test.jsx b/packages/utilities/psammead-styles/index.test.jsx index f34c7610ac..4545b3d6e4 100644 --- a/packages/utilities/psammead-styles/index.test.jsx +++ b/packages/utilities/psammead-styles/index.test.jsx @@ -25,17 +25,17 @@ const fontsExpectedExports = { F_REITH_SANS_CONDENSED_BOLD: 'function', F_REITH_QALAM_REGULAR: 'function', F_REITH_QALAM_BOLD: 'function', - F_ISKOOLA_POTA_BBC_REGULAR: 'function', - F_ISKOOLA_POTA_BBC_BOLD: 'function', - F_LATHA_REGULAR: 'function', - F_LATHA_BOLD: 'function', + F_NOTO_SERIF_SINHALA_REGULAR: 'function', + F_NOTO_SERIF_SINHALA_BOLD: 'function', + F_NOTO_SANS_TAMIL_REGULAR: 'function', + F_NOTO_SANS_TAMIL_BOLD: 'function', F_MALLANNA_REGULAR: 'function', F_NOTO_SANS_ETHIOPIC_REGULAR: 'function', F_NOTO_SANS_ETHIOPIC_BOLD: 'function', F_PADAUK_REGULAR: 'function', F_PADAUK_BOLD: 'function', - F_SHONAR_BANGLA_REGULAR: 'function', - F_SHONAR_BANGLA_BOLD: 'function', + F_NOTO_SERIF_BENGALI_REGULAR: 'function', + F_NOTO_SERIF_BENGALI_BOLD: 'function', }; const detectionExpectedExports = { @@ -80,6 +80,9 @@ const coloursExpectedExports = { C_SPORT_MIST: 'string', C_BLACK: 'string', C_POSTBOX_30: 'string', + C_GREY_2: 'string', + C_GREY_6: 'string', + C_GREY_8: 'string', }; const expectedExports = { diff --git a/packages/utilities/psammead-styles/package.json b/packages/utilities/psammead-styles/package.json index 4fcf78dc5d..ae6a04877b 100644 --- a/packages/utilities/psammead-styles/package.json +++ b/packages/utilities/psammead-styles/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-styles", - "version": "7.3.0", + "version": "8.0.2", "description": "A collection of string constants for use in CSS, containing non-GEL styling details that are bespoke to specific BBC services and products.", "repository": { "type": "git", diff --git a/packages/utilities/psammead-styles/src/__snapshots__/colours.test.js.snap b/packages/utilities/psammead-styles/src/__snapshots__/colours.test.js.snap index 12ab36983a..11c56ec295 100644 --- a/packages/utilities/psammead-styles/src/__snapshots__/colours.test.js.snap +++ b/packages/utilities/psammead-styles/src/__snapshots__/colours.test.js.snap @@ -30,12 +30,16 @@ exports[`Psammead Styles - Colours should match #23104C for C_DARK_SALTIRE 1`] = exports[`Psammead Styles - Colours should match #121212 for C_MIDNIGHT_BLACK 1`] = `"C_MIDNIGHT_BLACK"`; +exports[`Psammead Styles - Colours should match #202224 for C_GREY_8 1`] = `"C_GREY_8"`; + exports[`Psammead Styles - Colours should match #222222 for C_EBON 1`] = `"C_EBON"`; exports[`Psammead Styles - Colours should match #323232 for C_CONSENT_BACKGROUND 1`] = `"C_CONSENT_BACKGROUND"`; exports[`Psammead Styles - Colours should match #404040 for C_STORM 1`] = `"C_STORM"`; +exports[`Psammead Styles - Colours should match #545658 for C_GREY_6 1`] = `"C_GREY_6"`; + exports[`Psammead Styles - Colours should match #757575 for C_CLOUD_DARK 1`] = `"C_CLOUD_DARK"`; exports[`Psammead Styles - Colours should match #AEAEB5 for C_PEBBLE 1`] = `"C_PEBBLE"`; @@ -64,6 +68,8 @@ exports[`Psammead Styles - Colours should match #F5F3F1 for C_OAT_LHT 1`] = `"C_ exports[`Psammead Styles - Colours should match #F6A21D for C_CONSENT_ACTION 1`] = `"C_CONSENT_ACTION"`; +exports[`Psammead Styles - Colours should match #F6F6F6 for C_GREY_2 1`] = `"C_GREY_2"`; + exports[`Psammead Styles - Colours should match #F7F7F5 for C_SPORT_MIST 1`] = `"C_SPORT_MIST"`; exports[`Psammead Styles - Colours should match #F8F8F8 for C_LUNAR_LIGHT 1`] = `"C_LUNAR_LIGHT"`; diff --git a/packages/utilities/psammead-styles/src/__snapshots__/font-families.test.js.snap b/packages/utilities/psammead-styles/src/__snapshots__/font-families.test.js.snap index 46a003cf54..4cec0e2962 100644 --- a/packages/utilities/psammead-styles/src/__snapshots__/font-families.test.js.snap +++ b/packages/utilities/psammead-styles/src/__snapshots__/font-families.test.js.snap @@ -163,12 +163,12 @@ Object { exports[`Psammead Styles - Font Families should match bengali 1`] = ` Object { "sansBold": " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; ", "sansRegular": " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; ", @@ -1028,12 +1028,12 @@ Object { exports[`Psammead Styles - Font Families should match sinhala 1`] = ` Object { "sansBold": " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; ", "sansRegular": " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; ", @@ -1148,12 +1148,12 @@ Object { exports[`Psammead Styles - Font Families should match tamil 1`] = ` Object { "sansBold": " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; ", "sansRegular": " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; ", diff --git a/packages/utilities/psammead-styles/src/__snapshots__/font-styles.test.js.snap b/packages/utilities/psammead-styles/src/__snapshots__/font-styles.test.js.snap index 530ba564fc..840190537b 100644 --- a/packages/utilities/psammead-styles/src/__snapshots__/font-styles.test.js.snap +++ b/packages/utilities/psammead-styles/src/__snapshots__/font-styles.test.js.snap @@ -50,7 +50,7 @@ exports[`should render SansBold correctly for azeri 1`] = ` exports[`should render SansBold correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -274,7 +274,7 @@ exports[`should render SansBold correctly for serbian 1`] = ` exports[`should render SansBold correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -306,7 +306,7 @@ exports[`should render SansBold correctly for swahili 1`] = ` exports[`should render SansBold correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -458,7 +458,7 @@ exports[`should render SansBoldItalic correctly for azeri 1`] = ` exports[`should render SansBoldItalic correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -682,7 +682,7 @@ exports[`should render SansBoldItalic correctly for serbian 1`] = ` exports[`should render SansBoldItalic correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -714,7 +714,7 @@ exports[`should render SansBoldItalic correctly for swahili 1`] = ` exports[`should render SansBoldItalic correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -866,7 +866,7 @@ exports[`should render SansLight correctly for azeri 1`] = ` exports[`should render SansLight correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -1090,7 +1090,7 @@ exports[`should render SansLight correctly for serbian 1`] = ` exports[`should render SansLight correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1122,7 +1122,7 @@ exports[`should render SansLight correctly for swahili 1`] = ` exports[`should render SansLight correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -1274,7 +1274,7 @@ exports[`should render SansRegular correctly for azeri 1`] = ` exports[`should render SansRegular correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -1498,7 +1498,7 @@ exports[`should render SansRegular correctly for serbian 1`] = ` exports[`should render SansRegular correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1530,7 +1530,7 @@ exports[`should render SansRegular correctly for swahili 1`] = ` exports[`should render SansRegular correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -1682,7 +1682,7 @@ exports[`should render SansRegularItalic correctly for azeri 1`] = ` exports[`should render SansRegularItalic correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -1906,7 +1906,7 @@ exports[`should render SansRegularItalic correctly for serbian 1`] = ` exports[`should render SansRegularItalic correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1938,7 +1938,7 @@ exports[`should render SansRegularItalic correctly for swahili 1`] = ` exports[`should render SansRegularItalic correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -2090,7 +2090,7 @@ exports[`should render SerifBold correctly for azeri 1`] = ` exports[`should render SerifBold correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -2314,7 +2314,7 @@ exports[`should render SerifBold correctly for serbian 1`] = ` exports[`should render SerifBold correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -2346,7 +2346,7 @@ exports[`should render SerifBold correctly for swahili 1`] = ` exports[`should render SerifBold correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -2498,7 +2498,7 @@ exports[`should render SerifLight correctly for azeri 1`] = ` exports[`should render SerifLight correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -2722,7 +2722,7 @@ exports[`should render SerifLight correctly for serbian 1`] = ` exports[`should render SerifLight correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -2754,7 +2754,7 @@ exports[`should render SerifLight correctly for swahili 1`] = ` exports[`should render SerifLight correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -2906,7 +2906,7 @@ exports[`should render SerifMedium correctly for azeri 1`] = ` exports[`should render SerifMedium correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -3130,7 +3130,7 @@ exports[`should render SerifMedium correctly for serbian 1`] = ` exports[`should render SerifMedium correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -3162,7 +3162,7 @@ exports[`should render SerifMedium correctly for swahili 1`] = ` exports[`should render SerifMedium correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -3314,7 +3314,7 @@ exports[`should render SerifMediumItalic correctly for azeri 1`] = ` exports[`should render SerifMediumItalic correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -3538,7 +3538,7 @@ exports[`should render SerifMediumItalic correctly for serbian 1`] = ` exports[`should render SerifMediumItalic correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -3570,7 +3570,7 @@ exports[`should render SerifMediumItalic correctly for swahili 1`] = ` exports[`should render SerifMediumItalic correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 700; font-style: normal; " @@ -3722,7 +3722,7 @@ exports[`should render SerifRegular correctly for azeri 1`] = ` exports[`should render SerifRegular correctly for bengali 1`] = ` " - font-family: \\"Shonar Bangla\\", Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Serif Bengali\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " @@ -3946,7 +3946,7 @@ exports[`should render SerifRegular correctly for serbian 1`] = ` exports[`should render SerifRegular correctly for sinhala 1`] = ` " - font-family: \\"Iskoola Pota BBC\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"Noto Serif Sinhala\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -3978,7 +3978,7 @@ exports[`should render SerifRegular correctly for swahili 1`] = ` exports[`should render SerifRegular correctly for tamil 1`] = ` " - font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif; + font-family: \\"Noto Sans Tamil\\", Helmet, Freesans, Helvetica, Arial, sans-serif; font-weight: 400; font-style: normal; " diff --git a/packages/utilities/psammead-styles/src/__snapshots__/fonts.test.js.snap b/packages/utilities/psammead-styles/src/__snapshots__/fonts.test.js.snap index e02b8cb640..d4018f23b1 100644 --- a/packages/utilities/psammead-styles/src/__snapshots__/fonts.test.js.snap +++ b/packages/utilities/psammead-styles/src/__snapshots__/fonts.test.js.snap @@ -1,21 +1,45 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Psammead Styles - Fonts should match ISKOOLA POTA BBC BOLD base font url 1`] = ` +exports[`Psammead Styles - Fonts should match MALLANNA REGULAR base font url 1`] = ` +" + @font-face { + font-family: \\"Mallanna\\"; + font-weight: 400; + font-style: normal; + src: url('https://ws-downloads.files.bbci.co.uk/fonts/Mallanna/v1.0.4/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/Mallanna/v1.0.4/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/Mallanna/v1.0.4/normal.ttf') format('ttf'); + font-display: swap; + } +" +`; + +exports[`Psammead Styles - Fonts should match MALLANNA REGULAR with overridden url 1`] = ` +" + @font-face { + font-family: \\"Mallanna\\"; + font-weight: 400; + font-style: normal; + src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); + font-display: swap; + } +" +`; + +exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC BOLD base font url 1`] = ` " @font-face { - font-family: \\"Iskoola Pota BBC\\"; + font-family: \\"Noto Sans Ethiopic\\"; font-weight: 700; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/IskoolaPota/v5.91/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/IskoolaPota/v5.91/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/IskoolaPota/v5.91/bold.ttf') format('ttf'); + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.ttf') format('ttf'); font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match ISKOOLA POTA BBC BOLD with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC BOLD with overridden url 1`] = ` " @font-face { - font-family: \\"Iskoola Pota BBC\\"; + font-family: \\"Noto Sans Ethiopic\\"; font-weight: 700; font-style: normal; src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); @@ -24,144 +48,166 @@ exports[`Psammead Styles - Fonts should match ISKOOLA POTA BBC BOLD with overrid " `; -exports[`Psammead Styles - Fonts should match ISKOOLA POTA BBC REGULAR base font url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC REGULAR base font url 1`] = ` " @font-face { - font-family: \\"Iskoola Pota BBC\\"; + font-family: \\"Noto Sans Ethiopic\\"; font-weight: 400; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/IskoolaPota/v5.91/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/IskoolaPota/v5.91/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/IskoolaPota/v5.91/normal.ttf') format('ttf'); + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.ttf') format('ttf'); font-display: swap; - }" + } + " `; -exports[`Psammead Styles - Fonts should match ISKOOLA POTA BBC REGULAR with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC REGULAR with overridden url 1`] = ` " @font-face { - font-family: \\"Iskoola Pota BBC\\"; + font-family: \\"Noto Sans Ethiopic\\"; font-weight: 400; font-style: normal; src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); font-display: swap; - }" + } + " `; -exports[`Psammead Styles - Fonts should match LATHA BOLD base font url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS TAMIL BOLD base font url 1`] = ` " @font-face { - font-family: \\"Latha\\"; + font-family: \\"Noto Sans Tamil\\"; font-weight: 700; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/Latha/v5.90/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/Latha/v5.90/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/Latha/v5.90/bold.ttf') format('ttf'); + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/bold.woff2') format('woff2'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/bold.ttf') format('ttf'); font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match LATHA BOLD with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS TAMIL BOLD with overridden url 1`] = ` " @font-face { - font-family: \\"Latha\\"; + font-family: \\"Noto Sans Tamil\\"; font-weight: 700; font-style: normal; - src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); + src: url('https://example.com/bold.woff2') format('woff2'), url('https://example.com/bold.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match LATHA REGULAR base font url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS TAMIL REGULAR base font url 1`] = ` " @font-face { - font-family: \\"Latha\\"; + font-family: \\"Noto Sans Tamil\\"; font-weight: 400; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/Latha/v5.90/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/Latha/v5.90/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/Latha/v5.90/normal.ttf') format('ttf'); + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/normal.woff2') format('woff2'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/normal.ttf') format('ttf'); font-display: swap; }" `; -exports[`Psammead Styles - Fonts should match LATHA REGULAR with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS TAMIL REGULAR with overridden url 1`] = ` " @font-face { - font-family: \\"Latha\\"; + font-family: \\"Noto Sans Tamil\\"; font-weight: 400; font-style: normal; - src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); + src: url('https://example.com/normal.woff2') format('woff2'), url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); font-display: swap; }" `; -exports[`Psammead Styles - Fonts should match MALLANNA REGULAR base font url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SERIF BENGALI BOLD base font url 1`] = ` " @font-face { - font-family: \\"Mallanna\\"; - font-weight: 400; + font-family: \\"Noto Serif Bengali\\"; + font-weight: 700; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/Mallanna/v1.0.4/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/Mallanna/v1.0.4/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/Mallanna/v1.0.4/normal.ttf') format('ttf'); - font-display: swap; + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/bold.woff2') format('woff2'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/bold.ttf') format('ttf'); + font-display: optional; } " `; -exports[`Psammead Styles - Fonts should match MALLANNA REGULAR with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SERIF BENGALI BOLD with overridden url 1`] = ` " @font-face { - font-family: \\"Mallanna\\"; - font-weight: 400; + font-family: \\"Noto Serif Bengali\\"; + font-weight: 700; font-style: normal; - src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); - font-display: swap; + src: url('https://example.com/bold.woff2') format('woff2'), url('https://example.com/bold.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); + font-display: optional; } " `; -exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC BOLD base font url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SERIF BENGALI REGULAR base font url 1`] = ` " @font-face { - font-family: \\"Noto Sans Ethiopic\\"; + font-family: \\"Noto Serif Bengali\\"; + font-weight: 400; + font-style: normal; + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/normal.woff2') format('woff2'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/normal.ttf') format('ttf'); + font-display: optional; + }" +`; + +exports[`Psammead Styles - Fonts should match NOTO SERIF BENGALI REGULAR with overridden url 1`] = ` +" + @font-face { + font-family: \\"Noto Serif Bengali\\"; + font-weight: 400; + font-style: normal; + src: url('https://example.com/normal.woff2') format('woff2'), url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); + font-display: optional; + }" +`; + +exports[`Psammead Styles - Fonts should match NOTO SERIF SINHALA BOLD base font url 1`] = ` +" + @font-face { + font-family: \\"Noto Serif Sinhala\\"; font-weight: 700; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.ttf') format('ttf'); + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/bold.woff2') format('woff2'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/bold.ttf') format('ttf'); font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC BOLD with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SERIF SINHALA BOLD with overridden url 1`] = ` " @font-face { - font-family: \\"Noto Sans Ethiopic\\"; + font-family: \\"Noto Serif Sinhala\\"; font-weight: 700; font-style: normal; - src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); + src: url('https://example.com/bold.woff2') format('woff2'), url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC REGULAR base font url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SERIF SINHALA REGULAR base font url 1`] = ` " @font-face { - font-family: \\"Noto Sans Ethiopic\\"; + font-family: \\"Noto Serif Sinhala\\"; font-weight: 400; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.ttf') format('ttf'); + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/normal.woff2') format('woff2'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/normal.ttf') format('ttf'); font-display: swap; - } - " + }" `; -exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC REGULAR with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SERIF SINHALA REGULAR with overridden url 1`] = ` " @font-face { - font-family: \\"Noto Sans Ethiopic\\"; + font-family: \\"Noto Serif Sinhala\\"; font-weight: 400; font-style: normal; - src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); + src: url('https://example.com/normal.woff2') format('woff2'), url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); font-display: swap; - } - " + }" `; exports[`Psammead Styles - Fonts should match PADAUK BOLD base font url 1`] = ` @@ -707,49 +753,3 @@ exports[`Psammead Styles - Fonts should match REITH SERIF REGULAR with overridde font-display: optional; }" `; - -exports[`Psammead Styles - Fonts should match SHONAR BANGLA BOLD base font url 1`] = ` -" - @font-face { - font-family: \\"Shonar Bangla\\"; - font-weight: 700; - font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/ShonarBangla/v5.91/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/ShonarBangla/v5.91/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/ShonarBangla/v5.91/bold.ttf') format('ttf'); - font-display: optional; - } -" -`; - -exports[`Psammead Styles - Fonts should match SHONAR BANGLA BOLD with overridden url 1`] = ` -" - @font-face { - font-family: \\"Shonar Bangla\\"; - font-weight: 700; - font-style: normal; - src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); - font-display: optional; - } -" -`; - -exports[`Psammead Styles - Fonts should match SHONAR BANGLA REGULAR base font url 1`] = ` -" - @font-face { - font-family: \\"Shonar Bangla\\"; - font-weight: 400; - font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/ShonarBangla/v5.91/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/ShonarBangla/v5.91/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/ShonarBangla/v5.91/normal.ttf') format('ttf'); - font-display: optional; - }" -`; - -exports[`Psammead Styles - Fonts should match SHONAR BANGLA REGULAR with overridden url 1`] = ` -" - @font-face { - font-family: \\"Shonar Bangla\\"; - font-weight: 400; - font-style: normal; - src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); - font-display: optional; - }" -`; diff --git a/packages/utilities/psammead-styles/src/colours.js b/packages/utilities/psammead-styles/src/colours.js index ef68aeb1b7..e0f71f3894 100644 --- a/packages/utilities/psammead-styles/src/colours.js +++ b/packages/utilities/psammead-styles/src/colours.js @@ -20,6 +20,7 @@ export const C_METAL = '#6E6E73'; export const C_KINGFISHER = '#11708C'; export const C_MIDNIGHT_BLACK = '#121212'; export const C_POSTBOX_30 = '#EAB3B3'; +export const C_GREY_2 = '#F6F6F6'; // Colours from other BBC services export const C_CONSENT_BACKGROUND = '#323232'; @@ -38,3 +39,5 @@ export const C_SPORT_YELLOW_30 = '#BB9A31'; export const C_SPORT_SILVER = '#DBDBDB'; export const C_SPORT_MIST = '#F7F7F5'; export const C_BLACK = '#000000'; +export const C_GREY_6 = '#545658'; +export const C_GREY_8 = '#202224'; diff --git a/packages/utilities/psammead-styles/src/font-families.js b/packages/utilities/psammead-styles/src/font-families.js index aceadb6646..5429b7dc29 100644 --- a/packages/utilities/psammead-styles/src/font-families.js +++ b/packages/utilities/psammead-styles/src/font-families.js @@ -112,7 +112,7 @@ const amharicStyles = { /* * BENGALI */ -const bengaliFontFamily = `font-family: "Shonar Bangla", Helmet, Freesans, Helvetica, Arial, sans-serif;`; +const bengaliFontFamily = `font-family: "Noto Serif Bengali", Helmet, Freesans, Helvetica, Arial, sans-serif;`; const bengaliStyles = { sansRegular: ` @@ -273,7 +273,7 @@ const punjabiStyles = { /* * SINHALA */ -const sinhalaFontFamily = `font-family: "Iskoola Pota BBC", Arial, Verdana, Geneva, Helvetica, sans-serif;`; +const sinhalaFontFamily = `font-family: "Noto Serif Sinhala", Arial, Verdana, Geneva, Helvetica, sans-serif;`; const sinhalaStyles = { sansRegular: ` @@ -289,7 +289,7 @@ const sinhalaStyles = { /* * TAMIL */ -const tamilFontFamily = `font-family: Latha, Helmet, Freesans, Helvetica, Arial, sans-serif;`; +const tamilFontFamily = `font-family: "Noto Sans Tamil", Helmet, Freesans, Helvetica, Arial, sans-serif;`; const tamilStyles = { sansRegular: ` diff --git a/packages/utilities/psammead-styles/src/fonts.js b/packages/utilities/psammead-styles/src/fonts.js index 9072c24484..2e477b2eca 100644 --- a/packages/utilities/psammead-styles/src/fonts.js +++ b/packages/utilities/psammead-styles/src/fonts.js @@ -1,9 +1,10 @@ const baseFontUrl = 'https://gel.files.bbci.co.uk/r2.511/'; -const baseUrlIskoolaPotaBBC = - 'https://ws-downloads.files.bbci.co.uk/fonts/IskoolaPota/v5.91/'; +const baseUrlNotoSerifSinhala = + 'https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifSinhala/v1.00/'; -const baseUrlLatha = 'https://ws-downloads.files.bbci.co.uk/fonts/Latha/v5.90/'; +const baseUrlTamil = + 'https://ws-downloads.files.bbci.co.uk/fonts/NotoSansTamil/v1.00/'; const baseUrlMallanna = 'https://ws-downloads.files.bbci.co.uk/fonts/Mallanna/v1.0.4/'; @@ -14,8 +15,8 @@ const baseUrlNotoSansEthiopic = const baseUrlPadauk = 'https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/'; -const baseUrlShonarBangla = - 'https://ws-downloads.files.bbci.co.uk/fonts/ShonarBangla/v5.91/'; +const baseUrlNotoSerifBengali = + 'https://ws-downloads.files.bbci.co.uk/fonts/NotoSerifBengali/v1.00/'; const baseUrlBBCReithQalam = 'https://ws-downloads.files.bbci.co.uk/fonts/ReithQalam/v1.100/'; @@ -292,65 +293,73 @@ export const F_REITH_SANS_CONDENSED_BOLD = baseUrlOverride => ` font-display: optional; }`; -// Iskoola Pota BBC -export const F_ISKOOLA_POTA_BBC_REGULAR = baseUrlOverride => ` +// Noto Serif Sinhala +export const F_NOTO_SERIF_SINHALA_REGULAR = baseUrlOverride => ` @font-face { - font-family: "Iskoola Pota BBC"; + font-family: "Noto Serif Sinhala"; font-weight: 400; font-style: normal; src: url('${ - baseUrlOverride || baseUrlIskoolaPotaBBC - }normal.woff') format('woff'), url('${ - baseUrlOverride || baseUrlIskoolaPotaBBC + baseUrlOverride || baseUrlNotoSerifSinhala + }normal.woff2') format('woff2'), url('${ + baseUrlOverride || baseUrlNotoSerifSinhala +}normal.woff') format('woff'), url('${ + baseUrlOverride || baseUrlNotoSerifSinhala }normal.eot') format('eot'), url('${ - baseUrlOverride || baseUrlIskoolaPotaBBC + baseUrlOverride || baseUrlNotoSerifSinhala }normal.ttf') format('ttf'); font-display: swap; }`; -export const F_ISKOOLA_POTA_BBC_BOLD = baseUrlOverride => ` +export const F_NOTO_SERIF_SINHALA_BOLD = baseUrlOverride => ` @font-face { - font-family: "Iskoola Pota BBC"; + font-family: "Noto Serif Sinhala"; font-weight: 700; font-style: normal; src: url('${ - baseUrlOverride || baseUrlIskoolaPotaBBC - }bold.woff') format('woff'), url('${ - baseUrlOverride || baseUrlIskoolaPotaBBC + baseUrlOverride || baseUrlNotoSerifSinhala + }bold.woff2') format('woff2'), url('${ + baseUrlOverride || baseUrlNotoSerifSinhala +}bold.woff') format('woff'), url('${ + baseUrlOverride || baseUrlNotoSerifSinhala }bold.eot') format('eot'), url('${ - baseUrlOverride || baseUrlIskoolaPotaBBC + baseUrlOverride || baseUrlNotoSerifSinhala }bold.ttf') format('ttf'); font-display: swap; } `; -// Latha -export const F_LATHA_REGULAR = baseUrlOverride => ` +// Tamil +export const F_NOTO_SANS_TAMIL_REGULAR = baseUrlOverride => ` @font-face { - font-family: "Latha"; + font-family: "Noto Sans Tamil"; font-weight: 400; font-style: normal; src: url('${ - baseUrlOverride || baseUrlLatha - }normal.woff') format('woff'), url('${ - baseUrlOverride || baseUrlLatha + baseUrlOverride || baseUrlTamil + }normal.woff2') format('woff2'), url('${ + baseUrlOverride || baseUrlTamil +}normal.woff') format('woff'), url('${ + baseUrlOverride || baseUrlTamil }normal.eot') format('eot'), url('${ - baseUrlOverride || baseUrlLatha + baseUrlOverride || baseUrlTamil }normal.ttf') format('ttf'); font-display: swap; }`; -export const F_LATHA_BOLD = baseUrlOverride => ` +export const F_NOTO_SANS_TAMIL_BOLD = baseUrlOverride => ` @font-face { - font-family: "Latha"; + font-family: "Noto Sans Tamil"; font-weight: 700; font-style: normal; src: url('${ - baseUrlOverride || baseUrlLatha - }bold.woff') format('woff'), url('${ - baseUrlOverride || baseUrlLatha -}bold.eot') format('eot'), url('${ - baseUrlOverride || baseUrlLatha + baseUrlOverride || baseUrlTamil + }bold.woff2') format('woff2'), url('${ + baseUrlOverride || baseUrlTamil +}bold.woff') format('woff'), url('${ + baseUrlOverride || baseUrlTamil +}normal.eot') format('eot'), url('${ + baseUrlOverride || baseUrlTamil }bold.ttf') format('ttf'); font-display: swap; } @@ -438,33 +447,37 @@ export const F_PADAUK_BOLD = baseUrlOverride => ` } `; -// Shonar Bangla -export const F_SHONAR_BANGLA_REGULAR = baseUrlOverride => ` +// Bengali +export const F_NOTO_SERIF_BENGALI_REGULAR = baseUrlOverride => ` @font-face { - font-family: "Shonar Bangla"; + font-family: "Noto Serif Bengali"; font-weight: 400; font-style: normal; src: url('${ - baseUrlOverride || baseUrlShonarBangla - }normal.woff') format('woff'), url('${ - baseUrlOverride || baseUrlShonarBangla + baseUrlOverride || baseUrlNotoSerifBengali + }normal.woff2') format('woff2'), url('${ + baseUrlOverride || baseUrlNotoSerifBengali +}normal.woff') format('woff'), url('${ + baseUrlOverride || baseUrlNotoSerifBengali }normal.eot') format('eot'), url('${ - baseUrlOverride || baseUrlShonarBangla + baseUrlOverride || baseUrlNotoSerifBengali }normal.ttf') format('ttf'); font-display: optional; }`; -export const F_SHONAR_BANGLA_BOLD = baseUrlOverride => ` +export const F_NOTO_SERIF_BENGALI_BOLD = baseUrlOverride => ` @font-face { - font-family: "Shonar Bangla"; + font-family: "Noto Serif Bengali"; font-weight: 700; font-style: normal; src: url('${ - baseUrlOverride || baseUrlShonarBangla - }bold.woff') format('woff'), url('${ - baseUrlOverride || baseUrlShonarBangla -}bold.eot') format('eot'), url('${ - baseUrlOverride || baseUrlShonarBangla + baseUrlOverride || baseUrlNotoSerifBengali + }bold.woff2') format('woff2'), url('${ + baseUrlOverride || baseUrlNotoSerifBengali +}bold.woff') format('woff'), url('${ + baseUrlOverride || baseUrlNotoSerifBengali +}normal.eot') format('eot'), url('${ + baseUrlOverride || baseUrlNotoSerifBengali }bold.ttf') format('ttf'); font-display: optional; } diff --git a/packages/utilities/psammead-styles/src/index.stories.jsx b/packages/utilities/psammead-styles/src/index.stories.jsx index d248751bb1..44e1588b1e 100644 --- a/packages/utilities/psammead-styles/src/index.stories.jsx +++ b/packages/utilities/psammead-styles/src/index.stories.jsx @@ -114,6 +114,27 @@ storiesOf('Utilities/Psammead Styles', module) نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومغلف بجلد أزرق + + + ஒரு கட்டத்தில் தங்களை பெற்றோர் கவனிக்காமல் இருப்பதற்காக அவர்கள் + இருவருக்குள்ளும் இந்த பிள்ளைகள் சண்டை மூட்டி தங்கள் பக்கம் + திரும்பாமல் பார்த்துக் கொண்டுள்ளனர். + + + + তাইওয়ানের প্রতিরক্ষা মন্ত্রণালয় জানিয়েছে, রোববার তাদের বিমান + প্রতিরক্ষা সীমানা লঙ্ঘন করেছে ১৯টি চীনা যুদ্ধবিমানের একটি বহর, যার + ভেতর পারমানবিক বোমা হামলায় সক্ষম এমন অন্তত চারটি এইচ-৬ যুদ্ধবিমান + ছিল। + + + + 2001 වසරේ සැප්තැම්බරයේ 11 වැනිදා, අඟහරුවාදාවකි. මරාගෙන මැරෙන + ප්රහාරකයෝ එක්සත් ජනපදයේ මගී ප්රවාහන ජෙට් යානා තම ග්රහණයට ගෙන + නිව්යෝර්ක් නුවර උසැති ගොඩනැගිලි දෙකක ගැටෙන්නට සැලැස්වූහ. දහස් ගණනකට + ජීවිත අහිමි විය. ඇමරිකාවේ පමණක් නොව මුළු ලොවටම බලපෑ, ශතවර්ෂය තුළ + සිදුවූ දරුණුතම සිද්ධියක් ලෙස එය තවමත් වර්තාගතය. + ); }, diff --git a/packages/utilities/web-vitals/CHANGELOG.md b/packages/utilities/web-vitals/CHANGELOG.md index f187fd6bfe..6b2478641a 100644 --- a/packages/utilities/web-vitals/CHANGELOG.md +++ b/packages/utilities/web-vitals/CHANGELOG.md @@ -2,6 +2,7 @@ | Version | Description | |---------|-------------| +| 1.1.0 | [PR#4573](https://github.com/bbc/psammead/pull/4573) adds error handling to performance metrics collection | | 1.0.9 | [PR#4492](https://github.com/bbc/psammead/pull/4492) upgrades google web-vitals package from ^1.1.1 to ^2.0.1 | | 1.0.8 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 1.0.7 | [PR#4467](https://github.com/bbc/psammead/pull/4467) bumps 3rd-party dependencies | diff --git a/packages/utilities/web-vitals/package.json b/packages/utilities/web-vitals/package.json index d70596e49a..52444efad9 100644 --- a/packages/utilities/web-vitals/package.json +++ b/packages/utilities/web-vitals/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/web-vitals", - "version": "1.0.9", + "version": "1.1.0", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, diff --git a/packages/utilities/web-vitals/src/index.js b/packages/utilities/web-vitals/src/index.js index 48370154c0..1392ae47df 100644 --- a/packages/utilities/web-vitals/src/index.js +++ b/packages/utilities/web-vitals/src/index.js @@ -1,5 +1,5 @@ import fetch from 'cross-fetch'; -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; import { getCLS, getFID, getLCP, getFCP, getTTFB } from 'web-vitals'; import { useNetworkStatus, @@ -90,6 +90,7 @@ const useWebVitals = ({ reportParams, }) => { let pageLoadTime; + const [status, setStatus] = useState({ error: false }); const shouldSendVitals = enabled && shouldSample(sampleRate); const { effectiveConnectionType } = useNetworkStatus(); @@ -113,21 +114,25 @@ const useWebVitals = ({ useEvent('pagehide', shouldSendVitals ? sendVitals : noOp); useEffect(() => { - pageLoadTime = Date.now(); - setCurrentUrl(); - updateDeviceMetrics({ - effectiveConnectionType, - numberOfLogicalProcessors, - deviceMemory, - }); - getCLS(updateWebVitals, true); // Setting 'true' will report all CLS changes - getFID(updateWebVitals); - getLCP(updateWebVitals, true); // Setting 'true' will report all LCP changes - getFCP(updateWebVitals); - getTTFB(updateWebVitals); + try { + pageLoadTime = Date.now(); + setCurrentUrl(); + updateDeviceMetrics({ + effectiveConnectionType, + numberOfLogicalProcessors, + deviceMemory, + }); + getCLS(updateWebVitals, true); // Setting 'true' will report all CLS changes + getFID(updateWebVitals); + getLCP(updateWebVitals, true); // Setting 'true' will report all LCP changes + getFCP(updateWebVitals); + getTTFB(updateWebVitals); + } catch ({ message }) { + setStatus({ error: true, message }); + } }, []); - return null; + return status; }; export default useWebVitals; diff --git a/packages/utilities/web-vitals/src/index.test.js b/packages/utilities/web-vitals/src/index.test.js index 53d5d9b921..73a5550882 100644 --- a/packages/utilities/web-vitals/src/index.test.js +++ b/packages/utilities/web-vitals/src/index.test.js @@ -6,6 +6,8 @@ import useWebVitals from './index'; jest.mock('cross-fetch'); jest.mock('web-vitals'); +beforeEach(jest.clearAllMocks); + const mockVitalsGet = (name, value) => reportHandler => { reportHandler({ name, value }); }; @@ -88,6 +90,7 @@ describe('useWebVitals', () => { describe('when enabled is set to true', () => { const enabled = true; const reportingEndpoint = 'https://endpoint.to.report.to'; + it('sends a beacon via navigator.sendBeacon when enabled', async () => { mockSendBeacon(); renderHook(() => useWebVitals({ enabled, reportingEndpoint })); @@ -100,6 +103,18 @@ describe('useWebVitals', () => { ); }); + it('should not return an error when reporting is successful', async () => { + mockSendBeacon(); + const { result } = renderHook(() => + useWebVitals({ enabled, reportingEndpoint }), + ); + const { error } = result.current; + + await eventListeners.pagehide(); + + expect(error).toEqual(false); + }); + it('falls back to use fetch when sendBeacon is unavailable', async () => { fetch.mockImplementation(() => Promise.resolve()); renderHook(() => useWebVitals({ enabled, reportingEndpoint })); @@ -318,5 +333,16 @@ describe('useWebVitals', () => { expect(navigator.sendBeacon).not.toHaveBeenCalled(); }); }); + + it('should handle errors during the performance metrics collection phase', () => { + webVitals.getCLS.mockImplementation(() => { + throw new Error('Some error'); + }); + const { result } = renderHook(() => + useWebVitals({ enabled, reportingEndpoint }), + ); + + expect(result.current).toEqual({ error: true, message: 'Some error' }); + }); }); }); diff --git a/scripts/bumpPackages/cli.js b/scripts/bumpPackages/cli.js index faf0333ca2..79f2c8abdd 100644 --- a/scripts/bumpPackages/cli.js +++ b/scripts/bumpPackages/cli.js @@ -5,13 +5,13 @@ const initialPrompt = require('../utilities/initialPrompt'); const promptVersion = async ({ packageNames }) => { if (!packageNames.length) throw new Error('No packages selected'); - const { version } = await prompt({ + const { strategy } = await prompt({ type: 'select', - name: 'version', + name: 'strategy', choices: ['major', 'minor', 'patch'], - message: 'Select the version', + message: 'Select the versioning strategy', }); - return { packageNames, version }; + return { packageNames, strategy }; }; initialPrompt('Please choose which packages to version:') diff --git a/scripts/bumpPackages/index.js b/scripts/bumpPackages/index.js index 63bc554db8..396d127131 100644 --- a/scripts/bumpPackages/index.js +++ b/scripts/bumpPackages/index.js @@ -1,56 +1,49 @@ -const { exec } = require('child_process'); +const { execSync } = require('child_process'); +const { readFileSync } = require('fs'); const getPackagePath = require('../utilities/getPackagePath'); const getPackages = require('../utilities/getPackages'); -const isAlpha = packageDir => - new Promise((resolve, reject) => { - exec( - 'npm version', - { - cwd: packageDir, - }, - (error, stdout) => { - if (error) { - reject(error); - } else { - const alphaRegex = new RegExp(/@bbc.*-alpha/); - resolve(alphaRegex.test(stdout)); - } - }, - ); - }); +const getVersion = packageDir => { + const { version } = JSON.parse(readFileSync(`${packageDir}/package.json`)); -const runExec = async (version, packageDir) => { - if (!packageDir) { - return Promise.resolve(); - } - const isAlphaVersion = await isAlpha(packageDir); - const versionTag = isAlphaVersion ? 'prerelease' : version; + return version; +}; - return new Promise((resolve, reject) => { - exec( +const runExec = (strategy, packageName) => { + const packageDir = getPackagePath(packageName); + + if (packageDir) { + const version = getVersion(packageDir); + const isAlphaVersion = version.includes('-alpha'); + const versionTag = isAlphaVersion ? 'prerelease' : strategy; + + execSync( `yarn version ${versionTag}`, { cwd: packageDir, }, error => { if (error) { - reject(error); - } else { - resolve(); + console.log(error); } }, ); - }); + + const newVersion = getVersion(packageDir); + + console.log( + '✔', + packageName, + `version has been bumped: ${version} -> ${newVersion}`, + ); + } }; -module.exports = ({ packageNames, version }) => { +module.exports = ({ packageNames, strategy }) => { const packagePaths = getPackages().map(({ location }) => location); - const bumpVersion = packageName => - runExec(version, getPackagePath(packageName)); - return Promise.all([ - packageNames, - packagePaths, - ...packageNames.map(bumpVersion), - ]); + const bumpVersion = packageName => runExec(strategy, packageName); + + packageNames.map(bumpVersion); + + return [packageNames, packagePaths]; }; diff --git a/scripts/bumpPackages/index.test.js b/scripts/bumpPackages/index.test.js index b39b3bca2d..6991294814 100644 --- a/scripts/bumpPackages/index.test.js +++ b/scripts/bumpPackages/index.test.js @@ -1,28 +1,124 @@ -const { exec } = require('child_process'); +/* eslint-disable no-console */ +const { execSync } = require('child_process'); +const { readFileSync } = require('fs'); const bumpPackages = require('.'); -const packageVersionStub = `{ '@bbc/psammead-test-package': '1.0.1-alpha.4' }`; - jest.mock('../utilities/getPackages', () => () => [ - { name: '@bbc/psammead-test-package', location: '/psammead-test-package' }, + { + name: '@bbc/psammead-test-package-1', + location: '/psammead-test-package-1', + }, + { + name: '@bbc/psammead-test-package-2', + location: '/psammead-test-package-2', + }, + { + name: '@bbc/psammead-test-package-3', + location: '/psammead-test-package-3', + }, ]); jest.mock('child_process', () => ({ - exec: jest.fn(), + execSync: jest.fn(), +})); + +jest.mock('fs', () => ({ + readFileSync: jest.fn(), })); -exec.mockImplementation((command, options, cb) => cb(null, packageVersionStub)); +const { log } = console; + +beforeEach(() => { + jest.clearAllMocks(); + console.log = jest.fn(); + + readFileSync.mockImplementation(() => + JSON.stringify({ + version: '1.0.0', + }), + ); +}); + +afterEach(() => { + console.log = log; +}); describe('bumpPackages', () => { - it('should bump alpha versions correctly', async () => { - await bumpPackages({ - packageNames: ['@bbc/psammead-test-package'], - version: 'minor', + it('should bump alpha versions correctly', () => { + readFileSync.mockImplementation(() => + JSON.stringify({ + version: '1.0.1-alpha.4', + }), + ); + bumpPackages({ + packageNames: ['@bbc/psammead-test-package-1'], + strategy: 'minor', }); - const command = exec.mock.calls[1][0]; + const [[command, options]] = execSync.mock.calls; - expect(exec).toHaveBeenCalledTimes(2); + expect(execSync).toHaveBeenCalledTimes(1); + expect(options).toEqual({ cwd: '/psammead-test-package-1' }); expect(command).toBe('yarn version prerelease'); }); + + it('should bump patch versions correctly', () => { + bumpPackages({ + packageNames: ['@bbc/psammead-test-package-1'], + strategy: 'patch', + }); + + const [[command, options]] = execSync.mock.calls; + + expect(execSync).toHaveBeenCalledTimes(1); + expect(options).toEqual({ cwd: '/psammead-test-package-1' }); + expect(command).toBe('yarn version patch'); + }); + + it('should bump minor versions correctly', () => { + bumpPackages({ + packageNames: ['@bbc/psammead-test-package-1'], + strategy: 'minor', + }); + + const [[command, options]] = execSync.mock.calls; + + expect(execSync).toHaveBeenCalledTimes(1); + expect(options).toEqual({ cwd: '/psammead-test-package-1' }); + expect(command).toBe('yarn version minor'); + }); + + it('should bump major versions correctly', () => { + bumpPackages({ + packageNames: ['@bbc/psammead-test-package-1'], + strategy: 'major', + }); + + const [[command, options]] = execSync.mock.calls; + + expect(execSync).toHaveBeenCalledTimes(1); + expect(options).toEqual({ cwd: '/psammead-test-package-1' }); + expect(command).toBe('yarn version major'); + }); + + it('should bump mulitple packages correctly', () => { + bumpPackages({ + packageNames: [ + '@bbc/psammead-test-package-1', + '@bbc/psammead-test-package-2', + '@bbc/psammead-test-package-3', + ], + strategy: 'major', + }); + + const { calls } = execSync.mock; + + expect(execSync).toHaveBeenCalledTimes(3); + expect(calls[0][1]).toEqual({ cwd: '/psammead-test-package-1' }); + expect(calls[0][0]).toBe('yarn version major'); + expect(calls[1][1]).toEqual({ cwd: '/psammead-test-package-2' }); + expect(calls[1][0]).toBe('yarn version major'); + expect(calls[2][1]).toEqual({ cwd: '/psammead-test-package-3' }); + expect(calls[2][0]).toBe('yarn version major'); + }); }); diff --git a/scripts/utilities/getPackages/index.js b/scripts/utilities/getPackages/index.js index ff342405f1..612a300b07 100644 --- a/scripts/utilities/getPackages/index.js +++ b/scripts/utilities/getPackages/index.js @@ -1,8 +1,13 @@ const { exec } = require('shelljs'); +const isNotRootPackage = ({ name }) => name !== '@bbc/psammead'; + module.exports = () => { const output = exec('yarn workspaces list --json', { silent: true }); const outputStringArray = output.stdout.split('\n'); - return outputStringArray.filter(Boolean).map(JSON.parse); + return outputStringArray + .filter(Boolean) + .map(JSON.parse) + .filter(isNotRootPackage); }; diff --git a/yarn.lock b/yarn.lock index ed338a8e90..bbb0652dd7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,34 +5,6 @@ __metadata: version: 4 cacheKey: 8 -"@actions/core@npm:^1.2.4": - version: 1.4.0 - resolution: "@actions/core@npm:1.4.0" - checksum: bdad9fedeb184b59bb0d3b81ea8e486367b2cda4185e037cc9068204ed2aece79cc0889cdc96eb9752507dbd702bbf49c2ec1ffded4c26e9c1c6825fe124dfc6 - languageName: node - linkType: hard - -"@actions/github@npm:^4.0.0": - version: 4.0.0 - resolution: "@actions/github@npm:4.0.0" - dependencies: - "@actions/http-client": ^1.0.8 - "@octokit/core": ^3.0.0 - "@octokit/plugin-paginate-rest": ^2.2.3 - "@octokit/plugin-rest-endpoint-methods": ^4.0.0 - checksum: 0a1dd8e11bdeb746ca750e70daa4468202db32dbd7d09843e1cec202287ed836816d055f96ce44a0782117b84a04dd9037d9e038fe505b715f3f28fa231e041e - languageName: node - linkType: hard - -"@actions/http-client@npm:^1.0.8": - version: 1.0.11 - resolution: "@actions/http-client@npm:1.0.11" - dependencies: - tunnel: 0.0.6 - checksum: 2c72834ec36a121ae95d2cb61fd28234eae2ab265a2aefe857a9eeb788ea77b284ad727ecd3c67fefd1920d5f2800b6c1ba6916b39d44f81f293b4b0020d367c - languageName: node - linkType: hard - "@babel/cli@npm:7.14.5": version: 7.14.5 resolution: "@babel/cli@npm:7.14.5" @@ -1572,7 +1544,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.7.7, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.7.7, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.14.6 resolution: "@babel/runtime@npm:7.14.6" dependencies: @@ -1652,7 +1624,7 @@ __metadata: languageName: unknown linkType: soft -"@bbc/gel-foundations@6.1.3, @bbc/gel-foundations@workspace:packages/utilities/gel-foundations": +"@bbc/gel-foundations@7.0.0, @bbc/gel-foundations@workspace:packages/utilities/gel-foundations": version: 0.0.0-use.local resolution: "@bbc/gel-foundations@workspace:packages/utilities/gel-foundations" languageName: unknown @@ -1672,7 +1644,7 @@ __metadata: languageName: unknown linkType: soft -"@bbc/psammead-assets@3.1.9, @bbc/psammead-assets@workspace:packages/utilities/psammead-assets": +"@bbc/psammead-assets@3.1.10, @bbc/psammead-assets@workspace:packages/utilities/psammead-assets": version: 0.0.0-use.local resolution: "@bbc/psammead-assets@workspace:packages/utilities/psammead-assets" dependencies: @@ -1688,9 +1660,9 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-brand@workspace:packages/components/psammead-brand" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-script-link": 3.0.20 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-script-link": 3.0.30 + "@bbc/psammead-styles": 8.0.2 "@bbc/psammead-visually-hidden-text": 2.0.7 "@emotion/styled": ^11.3.0 react: ^17.0.2 @@ -1704,8 +1676,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-bulleted-list@workspace:packages/components/psammead-bulleted-list" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 react-dom: ^17.0.2 peerDependencies: @@ -1718,11 +1690,11 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-bulletin@workspace:packages/components/psammead-bulletin" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-assets": 3.1.9 - "@bbc/psammead-live-label": 2.0.21 - "@bbc/psammead-story-promo": 8.0.21 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-assets": 3.1.10 + "@bbc/psammead-live-label": 2.0.33 + "@bbc/psammead-story-promo": 8.0.37 + "@bbc/psammead-styles": 8.0.2 "@bbc/psammead-visually-hidden-text": 2.0.7 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 @@ -1738,8 +1710,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-byline@workspace:packages/components/psammead-byline" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 react: ^17.0.2 peerDependencies: @@ -1765,8 +1737,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-caption@workspace:packages/components/psammead-caption" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 @@ -1777,8 +1749,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-consent-banner@workspace:packages/components/psammead-consent-banner" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 react: ^17.0.2 @@ -1793,7 +1765,7 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-content-anchor@workspace:packages/components/psammead-content-anchor" dependencies: - "@bbc/psammead-headings": 5.0.18 + "@bbc/psammead-headings": 5.0.28 "@emotion/react": ^11.4.0 "@emotion/styled": ^11.3.0 "@juggle/resize-observer": ^2.4.0 @@ -1810,8 +1782,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-copyright@workspace:packages/components/psammead-copyright" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 @@ -1832,9 +1804,9 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-embed-error@workspace:packages/components/psammead-embed-error" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-assets": 3.1.9 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-assets": 3.1.10 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 react: ^17.0.2 peerDependencies: @@ -1847,7 +1819,7 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-figure@workspace:packages/components/psammead-figure" dependencies: - "@bbc/gel-foundations": 6.1.3 + "@bbc/gel-foundations": 7.0.0 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 @@ -1858,8 +1830,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-grid@workspace:packages/components/psammead-grid" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 @@ -1870,32 +1842,32 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-heading-index@workspace:packages/components/psammead-heading-index" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 languageName: unknown linkType: soft -"@bbc/psammead-headings@5.0.18, @bbc/psammead-headings@workspace:packages/components/psammead-headings": +"@bbc/psammead-headings@5.0.28, @bbc/psammead-headings@workspace:packages/components/psammead-headings": version: 0.0.0-use.local resolution: "@bbc/psammead-headings@workspace:packages/components/psammead-headings" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 languageName: unknown linkType: soft -"@bbc/psammead-image-placeholder@3.4.0, @bbc/psammead-image-placeholder@workspace:packages/components/psammead-image-placeholder": +"@bbc/psammead-image-placeholder@3.4.11, @bbc/psammead-image-placeholder@workspace:packages/components/psammead-image-placeholder": version: 0.0.0-use.local resolution: "@bbc/psammead-image-placeholder@workspace:packages/components/psammead-image-placeholder" dependencies: - "@bbc/psammead-assets": 3.1.9 - "@bbc/psammead-styles": 7.3.0 + "@bbc/psammead-assets": 3.1.10 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 react: ^17.0.2 peerDependencies: @@ -1904,7 +1876,7 @@ __metadata: languageName: unknown linkType: soft -"@bbc/psammead-image@2.0.8, @bbc/psammead-image@workspace:packages/components/psammead-image": +"@bbc/psammead-image@3.1.0, @bbc/psammead-image@workspace:packages/components/psammead-image": version: 0.0.0-use.local resolution: "@bbc/psammead-image@workspace:packages/components/psammead-image" dependencies: @@ -1925,19 +1897,19 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-inline-link@workspace:packages/components/psammead-inline-link" dependencies: - "@bbc/psammead-styles": 7.3.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 languageName: unknown linkType: soft -"@bbc/psammead-live-label@2.0.21, @bbc/psammead-live-label@workspace:packages/components/psammead-live-label": +"@bbc/psammead-live-label@2.0.33, @bbc/psammead-live-label@workspace:packages/components/psammead-live-label": version: 0.0.0-use.local resolution: "@bbc/psammead-live-label@workspace:packages/components/psammead-live-label" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@bbc/psammead-visually-hidden-text": 2.0.7 "@emotion/styled": ^11.3.0 react: ^17.0.2 @@ -1965,9 +1937,9 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-media-indicator@workspace:packages/components/psammead-media-indicator" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-assets": 3.1.9 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-assets": 3.1.10 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 react: ^17.0.2 peerDependencies: @@ -1980,10 +1952,10 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-media-player@workspace:packages/components/psammead-media-player" dependencies: - "@bbc/psammead-assets": 3.1.9 - "@bbc/psammead-image": 2.0.8 - "@bbc/psammead-image-placeholder": 3.4.0 - "@bbc/psammead-play-button": 3.0.22 + "@bbc/psammead-assets": 3.1.10 + "@bbc/psammead-image": 3.1.0 + "@bbc/psammead-image-placeholder": 3.4.11 + "@bbc/psammead-play-button": 3.0.33 "@emotion/styled": ^11.3.0 react: ^17.0.2 peerDependencies: @@ -1996,9 +1968,9 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-navigation@workspace:packages/components/psammead-navigation" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-assets": 3.1.9 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-assets": 3.1.10 + "@bbc/psammead-styles": 8.0.2 "@bbc/psammead-visually-hidden-text": 2.0.7 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 @@ -2025,21 +1997,21 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-paragraph@workspace:packages/components/psammead-paragraph" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 languageName: unknown linkType: soft -"@bbc/psammead-play-button@3.0.22, @bbc/psammead-play-button@workspace:packages/components/psammead-play-button": +"@bbc/psammead-play-button@3.0.33, @bbc/psammead-play-button@workspace:packages/components/psammead-play-button": version: 0.0.0-use.local resolution: "@bbc/psammead-play-button@workspace:packages/components/psammead-play-button" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-assets": 3.1.9 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-assets": 3.1.10 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 react: ^17.0.2 peerDependencies: @@ -2048,25 +2020,6 @@ __metadata: languageName: unknown linkType: soft -"@bbc/psammead-podcast-promo@workspace:packages/components/psammead-podcast-promo": - version: 0.0.0-use.local - resolution: "@bbc/psammead-podcast-promo@workspace:packages/components/psammead-podcast-promo" - dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-assets": 3.1.9 - "@bbc/psammead-image-placeholder": 3.4.0 - "@bbc/psammead-styles": 7.3.0 - "@bbc/psammead-visually-hidden-text": 2.0.7 - "@emotion/styled": ^11.3.0 - prop-types: ^15.7.2 - react: ^17.0.2 - peerDependencies: - "@emotion/styled": ^11.0.0 - prop-types: ^15.7.2 - react: ">=16.9.0" - languageName: unknown - linkType: soft - "@bbc/psammead-rich-text-transforms@workspace:packages/utilities/psammead-rich-text-transforms": version: 0.0.0-use.local resolution: "@bbc/psammead-rich-text-transforms@workspace:packages/utilities/psammead-rich-text-transforms" @@ -2077,12 +2030,12 @@ __metadata: languageName: unknown linkType: soft -"@bbc/psammead-script-link@3.0.20, @bbc/psammead-script-link@workspace:packages/components/psammead-script-link": +"@bbc/psammead-script-link@3.0.30, @bbc/psammead-script-link@workspace:packages/components/psammead-script-link": version: 0.0.0-use.local resolution: "@bbc/psammead-script-link@workspace:packages/components/psammead-script-link" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 react: ^17.0.2 @@ -2097,8 +2050,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-section-label@workspace:packages/components/psammead-section-label" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 react: ^17.0.2 @@ -2113,8 +2066,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-social-embed@workspace:packages/components/psammead-social-embed" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 react: ^17.0.2 peerDependencies: @@ -2127,8 +2080,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-story-promo-list@workspace:packages/components/psammead-story-promo-list" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 react: ^17.0.2 @@ -2139,12 +2092,12 @@ __metadata: languageName: unknown linkType: soft -"@bbc/psammead-story-promo@8.0.21, @bbc/psammead-story-promo@workspace:packages/components/psammead-story-promo": +"@bbc/psammead-story-promo@8.0.37, @bbc/psammead-story-promo@workspace:packages/components/psammead-story-promo": version: 0.0.0-use.local resolution: "@bbc/psammead-story-promo@workspace:packages/components/psammead-story-promo" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/react": ^11.4.0 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 @@ -2161,12 +2114,12 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-storybook-helpers@workspace:packages/utilities/psammead-storybook-helpers" dependencies: - "@bbc/gel-foundations": 6.1.3 + "@bbc/gel-foundations": 7.0.0 react-helmet: ^6.1.0 languageName: unknown linkType: soft -"@bbc/psammead-styles@7.3.0, @bbc/psammead-styles@workspace:packages/utilities/psammead-styles": +"@bbc/psammead-styles@8.0.2, @bbc/psammead-styles@workspace:packages/utilities/psammead-styles": version: 0.0.0-use.local resolution: "@bbc/psammead-styles@workspace:packages/utilities/psammead-styles" dependencies: @@ -2190,9 +2143,9 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-timestamp-container@workspace:packages/containers/psammead-timestamp-container" dependencies: - "@bbc/gel-foundations": 6.1.3 + "@bbc/gel-foundations": 7.0.0 "@bbc/psammead-locales": 5.0.7 - "@bbc/psammead-timestamp": 4.0.19 + "@bbc/psammead-timestamp": 4.0.29 moment: 2.24.0 moment-timezone: ^0.5.26 react: ^17.0.2 @@ -2202,12 +2155,12 @@ __metadata: languageName: unknown linkType: soft -"@bbc/psammead-timestamp@4.0.19, @bbc/psammead-timestamp@workspace:packages/components/psammead-timestamp": +"@bbc/psammead-timestamp@4.0.29, @bbc/psammead-timestamp@workspace:packages/components/psammead-timestamp": version: 0.0.0-use.local resolution: "@bbc/psammead-timestamp@workspace:packages/components/psammead-timestamp" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 peerDependencies: "@emotion/styled": ^11.0.0 @@ -2218,8 +2171,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-topic-tags@workspace:packages/components/psammead-topic-tags" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 react: ^17.0.2 @@ -2234,8 +2187,8 @@ __metadata: version: 0.0.0-use.local resolution: "@bbc/psammead-useful-links@workspace:packages/components/psammead-useful-links" dependencies: - "@bbc/gel-foundations": 6.1.3 - "@bbc/psammead-styles": 7.3.0 + "@bbc/gel-foundations": 7.0.0 + "@bbc/psammead-styles": 8.0.2 "@emotion/styled": ^11.3.0 prop-types: ^15.7.2 react: ^17.0.2 @@ -2293,14 +2246,14 @@ __metadata: babel-plugin-dynamic-import-node: ^2.3.3 browserslist: ^4.16.5 chalk: ^4.1.0 - chromatic: ^5.2.0 + chromatic: 6.0.4 enquirer: ^2.3.6 eslint: ^7.10.0 eslint-config-airbnb: ^18.2.0 eslint-config-prettier: ^8.0.0 eslint-plugin-es5: ^1.5.0 eslint-plugin-import: ^2.22.1 - eslint-plugin-json: ^2.1.2 + eslint-plugin-json: 3.1.0 eslint-plugin-jsx-a11y: ^6.3.1 eslint-plugin-prettier: 4.0.0 eslint-plugin-react: 7.22.0 @@ -2310,7 +2263,7 @@ __metadata: husky: 7.0.2 jest: 26.6.3 json5: ^2.1.3 - lint-staged: 11.1.2 + lint-staged: 12.0.3 postcss: ^8.3.5 prettier: 2.2.1 prop-types: ^15.7.2 @@ -2324,8 +2277,8 @@ __metadata: shelljs: ^0.8.4 strip-ansi: ^6.0.0 stylelint: ^13.7.2 - stylelint-config-recommended: ^3.0.0 - yargs-parser: ^20.2.1 + stylelint-config-recommended: 5.0.0 + yargs-parser: 21.0.0 languageName: unknown linkType: soft @@ -2356,20 +2309,6 @@ __metadata: languageName: node linkType: hard -"@chromaui/localtunnel@npm:^2.0.2": - version: 2.0.3 - resolution: "@chromaui/localtunnel@npm:2.0.3" - dependencies: - axios: 0.21.1 - debug: 4.3.1 - openurl: 1.1.1 - yargs: 16.2.0 - bin: - lt: bin/lt.js - checksum: ca568183b1a2de9db3ef25e503a23bf99335f28ad8967560eaa8baebbd1cf1a6af41416d73b683c33747e3d6df127580537ed50c1782fd9f52cfd9ad934d72b4 - languageName: node - linkType: hard - "@cnakazawa/watch@npm:^1.0.3": version: 1.0.4 resolution: "@cnakazawa/watch@npm:1.0.4" @@ -3211,17 +3150,6 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-paginate-rest@npm:^2.2.3": - version: 2.13.5 - resolution: "@octokit/plugin-paginate-rest@npm:2.13.5" - dependencies: - "@octokit/types": ^6.13.0 - peerDependencies: - "@octokit/core": ">=2" - checksum: 7dc7b625c122d362de05ff36fbc07298ae01c75b3f200ba22b04735d948c7cfd16fd4d9e44704798526d56e1b3d946064a5ac3763f6a831928f930776999f3c6 - languageName: node - linkType: hard - "@octokit/plugin-paginate-rest@npm:^2.2.4, @octokit/plugin-paginate-rest@npm:^2.6.2": version: 2.15.1 resolution: "@octokit/plugin-paginate-rest@npm:2.15.1" @@ -3254,18 +3182,6 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-rest-endpoint-methods@npm:^4.0.0": - version: 4.15.1 - resolution: "@octokit/plugin-rest-endpoint-methods@npm:4.15.1" - dependencies: - "@octokit/types": ^6.13.0 - deprecation: ^2.3.1 - peerDependencies: - "@octokit/core": ">=3" - checksum: 6913c54997e90a7aa5edd43c696e592b55bf2956c22313d8fb2d32a65ee81702d5441aa52967f0e8b466214fa9a9735e72ad59817b620b33ce871dec05258e55 - languageName: node - linkType: hard - "@octokit/request-error@npm:^2.0.5, @octokit/request-error@npm:^2.1.0": version: 2.1.0 resolution: "@octokit/request-error@npm:2.1.0" @@ -3303,7 +3219,7 @@ __metadata: languageName: node linkType: hard -"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.13.0, @octokit/types@npm:^6.16.1": +"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1": version: 6.16.4 resolution: "@octokit/types@npm:6.16.4" dependencies: @@ -3379,20 +3295,6 @@ __metadata: languageName: node linkType: hard -"@samverschueren/stream-to-observable@npm:^0.3.0": - version: 0.3.1 - resolution: "@samverschueren/stream-to-observable@npm:0.3.1" - dependencies: - any-observable: ^0.3.0 - peerDependenciesMeta: - rxjs: - optional: true - zen-observable: - optional: true - checksum: 8ec6d43370f419975295f306699f87989dd64a099a29cf62ddacbbbe32df634f87451504d340e15321e74b0a3ca8a9b447736472f792102e234faa207395e6c9 - languageName: node - linkType: hard - "@sindresorhus/is@npm:^0.14.0": version: 0.14.0 resolution: "@sindresorhus/is@npm:0.14.0" @@ -5563,13 +5465,6 @@ __metadata: languageName: node linkType: hard -"ansi-escapes@npm:^3.0.0": - version: 3.2.0 - resolution: "ansi-escapes@npm:3.2.0" - checksum: 0f94695b677ea742f7f1eed961f7fd8d05670f744c6ad1f8f635362f6681dcfbc1575cb05b43abc7bb6d67e25a75fb8c7ea8f2a57330eb2c76b33f18cb2cef0a - languageName: node - linkType: hard - "ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" @@ -5616,10 +5511,10 @@ __metadata: languageName: node linkType: hard -"ansi-styles@npm:^2.2.1": - version: 2.2.1 - resolution: "ansi-styles@npm:2.2.1" - checksum: ebc0e00381f2a29000d1dac8466a640ce11943cef3bda3cd0020dc042e31e1058ab59bf6169cd794a54c3a7338a61ebc404b7c91e004092dd20e028c432c9c2c +"ansi-regex@npm:^6.0.1": + version: 6.0.1 + resolution: "ansi-regex@npm:6.0.1" + checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169 languageName: node linkType: hard @@ -5648,6 +5543,13 @@ __metadata: languageName: node linkType: hard +"ansi-styles@npm:^6.0.0": + version: 6.1.0 + resolution: "ansi-styles@npm:6.1.0" + checksum: 7a7f8528c07a9d20c3a92bccd2b6bc3bb4d26e5cb775c02826921477377bd495d615d61f710d56216344b6238d1d11ef2b0348e146c5b128715578bfb3217229 + languageName: node + linkType: hard + "ansi-to-html@npm:^0.6.11": version: 0.6.15 resolution: "ansi-to-html@npm:0.6.15" @@ -5659,13 +5561,6 @@ __metadata: languageName: node linkType: hard -"any-observable@npm:^0.3.0": - version: 0.3.0 - resolution: "any-observable@npm:0.3.0" - checksum: e715563ebb520ef4b2688c69512bc17e73dc8d5fb9fd29f50dea417cd4e5c8d05d27205461fa22bfd07b9a32134fc8fa88059a16adf52bb5968ccbf338ec4c7f - languageName: node - linkType: hard - "anymatch@npm:^2.0.0": version: 2.0.0 resolution: "anymatch@npm:2.0.0" @@ -5925,15 +5820,6 @@ __metadata: languageName: node linkType: hard -"async-retry@npm:^1.3.1": - version: 1.3.1 - resolution: "async-retry@npm:1.3.1" - dependencies: - retry: 0.12.0 - checksum: 42b518505c0cf56179d49d0cc373e50656a1edf913842c045e84a9f7191ade10b73edf583915b05617296ed3d8c2f1f151e47fcb10eb47681a935db3b407787f - languageName: node - linkType: hard - "async@npm:^2.6.1": version: 2.6.3 resolution: "async@npm:2.6.3" @@ -6888,19 +6774,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^1.0.0, chalk@npm:^1.1.3": - version: 1.1.3 - resolution: "chalk@npm:1.1.3" - dependencies: - ansi-styles: ^2.2.1 - escape-string-regexp: ^1.0.2 - has-ansi: ^2.0.0 - strip-ansi: ^3.0.0 - supports-color: ^2.0.0 - checksum: 9d2ea6b98fc2b7878829eec223abcf404622db6c48396a9b9257f6d0ead2acf18231ae368d6a664a83f272b0679158da12e97b5229f794939e555cc574478acd - languageName: node - linkType: hard - "chalk@npm:^3.0.0": version: 3.0.0 resolution: "chalk@npm:3.0.0" @@ -7005,52 +6878,14 @@ __metadata: languageName: node linkType: hard -"chromatic@npm:^5.2.0": - version: 5.9.2 - resolution: "chromatic@npm:5.9.2" - dependencies: - "@actions/core": ^1.2.4 - "@actions/github": ^4.0.0 - "@babel/runtime": ^7.12.13 - "@chromaui/localtunnel": ^2.0.2 - async-retry: ^1.3.1 - chalk: ^4.0.0 - cross-spawn: ^7.0.2 - debug: ^4.3.1 - dotenv: ^8.2.0 - env-ci: ^5.0.2 - esm: ^3.2.25 - execa: ^5.0.0 - fake-tag: ^2.0.0 - fs-extra: ^9.1.0 - https-proxy-agent: ^5.0.0 - jsonfile: ^6.0.1 - junit-report-builder: 2.1.0 - listr: 0.14.3 - meow: ^8.0.0 - node-ask: ^1.0.1 - node-fetch: ^2.6.0 - node-loggly-bulk: ^2.2.4 - p-limit: 3.1.0 - picomatch: 2.2.2 - pkg-up: ^3.1.0 - pluralize: ^8.0.0 - progress-stream: ^2.0.0 - semver: ^7.3.4 - slash: ^3.0.0 - string-argv: ^0.3.1 - strip-ansi: 6.0.0 - tmp-promise: 3.0.2 - tree-kill: ^1.2.2 - ts-dedent: ^1.0.0 - util-deprecate: ^1.0.2 - uuid: ^8.3.2 - yarn-or-npm: ^3.0.1 +"chromatic@npm:6.0.4": + version: 6.0.4 + resolution: "chromatic@npm:6.0.4" bin: - chroma: bin/register.js - chromatic: bin/register.js - chromatic-cli: bin/register.js - checksum: 395b78f107dd508371c6e7ac9f44ec5bce9e05d517c05d94a20137cde07d316d9dedfa32d1d8a646f657e384f68daf4ffd93700e31e769da6e6a854b6dbd67c3 + chroma: bin/main.cjs + chromatic: bin/main.cjs + chromatic-cli: bin/main.cjs + checksum: 5f59af090834c2bcf3853a0b9dc18300331bc571a6fc87b393141e1c4626acf5b8aa1d9ce8fe72f9c3e92d10dcbe111ef274136fc960e12bf157942033e40410 languageName: node linkType: hard @@ -7127,15 +6962,6 @@ __metadata: languageName: node linkType: hard -"cli-cursor@npm:^2.0.0, cli-cursor@npm:^2.1.0": - version: 2.1.0 - resolution: "cli-cursor@npm:2.1.0" - dependencies: - restore-cursor: ^2.0.0 - checksum: d88e97bfdac01046a3ffe7d49f06757b3126559d7e44aa2122637eb179284dc6cd49fca2fac4f67c19faaf7e6dab716b6fe1dfcd309977407d8c7578ec2d044d - languageName: node - linkType: hard - "cli-cursor@npm:^3.1.0": version: 3.1.0 resolution: "cli-cursor@npm:3.1.0" @@ -7159,16 +6985,6 @@ __metadata: languageName: node linkType: hard -"cli-truncate@npm:^0.2.1": - version: 0.2.1 - resolution: "cli-truncate@npm:0.2.1" - dependencies: - slice-ansi: 0.0.4 - string-width: ^1.0.1 - checksum: c2e4b8d95275d8c772ced60977341e87530b81a1160b0e26a252a6c39b794fdf7a1236bf5bc7150558f759deb960cbabc0f993964327bde80790bcd330b698a0 - languageName: node - linkType: hard - "cli-truncate@npm:^2.1.0": version: 2.1.0 resolution: "cli-truncate@npm:2.1.0" @@ -7179,6 +6995,16 @@ __metadata: languageName: node linkType: hard +"cli-truncate@npm:^3.1.0": + version: 3.1.0 + resolution: "cli-truncate@npm:3.1.0" + dependencies: + slice-ansi: ^5.0.0 + string-width: ^5.0.0 + checksum: c3243e41974445691c63f8b405df1d5a24049dc33d324fe448dc572e561a7b772ae982692900b1a5960901cc4fc7def25a629b9c69a4208ee89d12ab3332617a + languageName: node + linkType: hard + "cliui@npm:^6.0.0": version: 6.0.0 resolution: "cliui@npm:6.0.0" @@ -7230,6 +7056,13 @@ __metadata: languageName: node linkType: hard +"clone@npm:^2.1.2": + version: 2.1.2 + resolution: "clone@npm:2.1.2" + checksum: aaf106e9bc025b21333e2f4c12da539b568db4925c0501a1bf4070836c9e848c892fa22c35548ce0d1132b08bbbfa17a00144fe58fccdab6fa900fec4250f67d + languageName: node + linkType: hard + "co@npm:^4.6.0": version: 4.6.0 resolution: "co@npm:4.6.0" @@ -7307,6 +7140,13 @@ __metadata: languageName: node linkType: hard +"colorette@npm:^2.0.16": + version: 2.0.16 + resolution: "colorette@npm:2.0.16" + checksum: cd55596a3a2d1071c1a28eee7fd8a5387593ff1bd10a3e8d0a6221499311fe34a9f2b9272d77c391e0e003dcdc8934fb2f8d106e7ef1f7516f8060c901d41a27 + languageName: node + linkType: hard + "colors@npm:^1.1.2": version: 1.4.0 resolution: "colors@npm:1.4.0" @@ -7351,10 +7191,10 @@ __metadata: languageName: node linkType: hard -"commander@npm:^7.2.0": - version: 7.2.0 - resolution: "commander@npm:7.2.0" - checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc +"commander@npm:^8.3.0": + version: 8.3.0 + resolution: "commander@npm:8.3.0" + checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0 languageName: node linkType: hard @@ -7576,6 +7416,19 @@ __metadata: languageName: node linkType: hard +"cosmiconfig@npm:^7.0.1": + version: 7.0.1 + resolution: "cosmiconfig@npm:7.0.1" + dependencies: + "@types/parse-json": ^4.0.0 + import-fresh: ^3.2.1 + parse-json: ^5.0.0 + path-type: ^4.0.0 + yaml: ^1.10.0 + checksum: 4be63e7117955fd88333d7460e4c466a90f556df6ef34efd59034d2463484e339666c41f02b523d574a797ec61f4a91918c5b89a316db2ea2f834e0d2d09465b + languageName: node + linkType: hard + "cp-file@npm:^7.0.0": version: 7.0.0 resolution: "cp-file@npm:7.0.0" @@ -7686,7 +7539,7 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^6.0.0, cross-spawn@npm:^6.0.5": +"cross-spawn@npm:^6.0.0": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" dependencies: @@ -7859,20 +7712,6 @@ __metadata: languageName: node linkType: hard -"date-fns@npm:^1.27.2": - version: 1.30.1 - resolution: "date-fns@npm:1.30.1" - checksum: 86b1f3269cbb1f3ee5ac9959775ea6600436f4ee2b78430cd427b41a0c9fabf740b1a5d401c085f3003539a6f4755c7c56c19fbd70ce11f6f673f6bc8075b710 - languageName: node - linkType: hard - -"date-format@npm:0.0.2": - version: 0.0.2 - resolution: "date-format@npm:0.0.2" - checksum: 01a95d6b5522a4af928462ff4e9f3ee787c20059029afe5a72ff0296459082842c33ff7e8de6d54e9b8e8632408c6ef621b336095678f43b959d2cf11b466f4d - languageName: node - linkType: hard - "debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.0, debug@npm:^2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9" @@ -7882,7 +7721,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:4.3.1, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1": +"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1": version: 4.3.1 resolution: "debug@npm:4.3.1" dependencies: @@ -7903,6 +7742,18 @@ __metadata: languageName: node linkType: hard +"debug@npm:^4.3.2": + version: 4.3.2 + resolution: "debug@npm:4.3.2" + dependencies: + ms: 2.1.2 + peerDependenciesMeta: + supports-color: + optional: true + checksum: 820ea160e267e23c953c9ed87e7ad93494d8cda2f7349af5e7e3bb236d23707ee3022f477d5a7d2ee86ef2bf7d60aa9ab22d1f58080d7deb9dccd073585e1e43 + languageName: node + linkType: hard + "decamelize-keys@npm:^1.1.0": version: 1.1.0 resolution: "decamelize-keys@npm:1.1.0" @@ -8344,7 +8195,7 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:^8.0.0, dotenv@npm:^8.2.0": +"dotenv@npm:^8.0.0": version: 8.6.0 resolution: "dotenv@npm:8.6.0" checksum: 38e902c80b0666ab59e9310a3d24ed237029a7ce34d976796349765ac96b8d769f6df19090f1f471b77a25ca391971efde8a1ea63bb83111bd8bec8e5cc9b2cd @@ -8415,13 +8266,6 @@ __metadata: languageName: node linkType: hard -"elegant-spinner@npm:^1.0.1": - version: 1.0.1 - resolution: "elegant-spinner@npm:1.0.1" - checksum: d6a773d950c5d403b5f0fa402787e37dde99989ab6c943558fe8491cf7cd0df0e2747a9ff4d391d5a5f20a447cc9e9a63bdc956354ba47bea462f1603a5b04fe - languageName: node - linkType: hard - "element-resize-detector@npm:^1.2.2": version: 1.2.2 resolution: "element-resize-detector@npm:1.2.2" @@ -8481,7 +8325,7 @@ __metadata: languageName: node linkType: hard -"emoji-regex@npm:^9.0.0": +"emoji-regex@npm:^9.0.0, emoji-regex@npm:^9.2.2": version: 9.2.2 resolution: "emoji-regex@npm:9.2.2" checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601 @@ -8579,16 +8423,6 @@ __metadata: languageName: node linkType: hard -"env-ci@npm:^5.0.2": - version: 5.0.2 - resolution: "env-ci@npm:5.0.2" - dependencies: - execa: ^4.0.0 - java-properties: ^1.0.0 - checksum: d3c9d5466378c6d14d28c9bde2acede2ec44456fc21589d677e3f39c9ca016fcd4ca7371051b35dec5cba1a17a36289368a771e9a141feb828937898681ee8bc - languageName: node - linkType: hard - "env-paths@npm:^2.2.0": version: 2.2.1 resolution: "env-paths@npm:2.2.1" @@ -8854,13 +8688,13 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-json@npm:^2.1.2": - version: 2.1.2 - resolution: "eslint-plugin-json@npm:2.1.2" +"eslint-plugin-json@npm:3.1.0": + version: 3.1.0 + resolution: "eslint-plugin-json@npm:3.1.0" dependencies: - lodash: ^4.17.19 - vscode-json-languageservice: ^3.7.0 - checksum: c3da24699dd8cc90f63b49c9658de6264a499065d48c5d6962a9fb8f9e93736224560442b7e8ca32622b98a3b82fadb6e552ab01b676a05fd67b70d5d01bfdf1 + lodash: ^4.17.21 + vscode-json-languageservice: ^4.1.6 + checksum: bc7fa4c2e1fdac4365e499bd24ecdf6cddeb6bb647ea9543f214fd811559345a3c1a944b78ff1d3e4b6a49980bcea592f0d58b26a41e05e451e222bb43322cac languageName: node linkType: hard @@ -9013,13 +8847,6 @@ __metadata: languageName: node linkType: hard -"esm@npm:^3.2.25": - version: 3.2.25 - resolution: "esm@npm:3.2.25" - checksum: 978aabe2de83541c105605a6d60a26ed8e627ef6bb0a7605fe15a95bbdea6b8348bd045255cb22219c054dd09a81a94823df00843d9e97f42419c92015ce3a64 - languageName: node - linkType: hard - "espree@npm:^7.3.0, espree@npm:^7.3.1": version: 7.3.1 resolution: "espree@npm:7.3.1" @@ -9155,7 +8982,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:^5.0.0": +"execa@npm:^5.1.1": version: 5.1.1 resolution: "execa@npm:5.1.1" dependencies: @@ -9311,13 +9138,6 @@ __metadata: languageName: node linkType: hard -"fake-tag@npm:^2.0.0": - version: 2.0.0 - resolution: "fake-tag@npm:2.0.0" - checksum: 019f402a867add44688ddc22e10f426e23cc30c8b71414a019b79296a54eceb4ed16eb5322f15b5d8b6ced4cef663e717d284165c6ce970d554780d6a72fe541 - languageName: node - linkType: hard - "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" @@ -9422,25 +9242,6 @@ __metadata: languageName: node linkType: hard -"figures@npm:^1.7.0": - version: 1.7.0 - resolution: "figures@npm:1.7.0" - dependencies: - escape-string-regexp: ^1.0.5 - object-assign: ^4.1.0 - checksum: d77206deba991a7977f864b8c8edf9b8b43b441be005482db04b0526e36263adbdb22c1c6d2df15a1ad78d12029bd1aa41ccebcb5d425e1f2cf629c6daaa8e10 - languageName: node - linkType: hard - -"figures@npm:^2.0.0": - version: 2.0.0 - resolution: "figures@npm:2.0.0" - dependencies: - escape-string-regexp: ^1.0.5 - checksum: 081beb16ea57d1716f8447c694f637668322398b57017b20929376aaf5def9823b35245b734cdd87e4832dc96e9c6f46274833cada77bfe15e5f980fea1fd21f - languageName: node - linkType: hard - "file-entry-cache@npm:^6.0.1": version: 6.0.1 resolution: "file-entry-cache@npm:6.0.1" @@ -9819,7 +9620,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^9.0.0, fs-extra@npm:^9.0.1, fs-extra@npm:^9.1.0": +"fs-extra@npm:^9.0.0, fs-extra@npm:^9.0.1": version: 9.1.0 resolution: "fs-extra@npm:9.1.0" dependencies: @@ -9992,13 +9793,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"get-own-enumerable-property-symbols@npm:^3.0.0": - version: 3.0.2 - resolution: "get-own-enumerable-property-symbols@npm:3.0.2" - checksum: 8f0331f14159f939830884799f937343c8c0a2c330506094bc12cbee3665d88337fe97a4ea35c002cc2bdba0f5d9975ad7ec3abb925015cdf2a93e76d4759ede - languageName: node - linkType: hard - "get-package-type@npm:^0.1.0": version: 0.1.0 resolution: "get-package-type@npm:0.1.0" @@ -10124,12 +9918,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"glob-parent@npm:5.1.2": - version: 5.1.2 - resolution: "glob-parent@npm:5.1.2" +"glob-parent@npm:6.0.1": + version: 6.0.1 + resolution: "glob-parent@npm:6.0.1" dependencies: is-glob: ^4.0.1 - checksum: f4f2bfe2425296e8a47e36864e4f42be38a996db40420fe434565e4480e3322f18eb37589617a98640c5dc8fdec1a387007ee18dbb1f3f5553409c34d17f425e + checksum: 0468cf300b8c7a483dbd8c031704fa1003331cbc65ded095f768328ed35eec78dd199c224c7436db997569863c0cbc0b7fd7c3cb45508e6134c502be9e691dc5 languageName: node linkType: hard @@ -10369,15 +10163,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"has-ansi@npm:^2.0.0": - version: 2.0.0 - resolution: "has-ansi@npm:2.0.0" - dependencies: - ansi-regex: ^2.0.0 - checksum: 1b51daa0214440db171ff359d0a2d17bc20061164c57e76234f614c91dbd2a79ddd68dfc8ee73629366f7be45a6df5f2ea9de83f52e1ca24433f2cc78c35d8ec - languageName: node - linkType: hard - "has-bigints@npm:^1.0.1": version: 1.0.1 resolution: "has-bigints@npm:1.0.1" @@ -10934,13 +10719,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"indent-string@npm:^3.0.0": - version: 3.2.0 - resolution: "indent-string@npm:3.2.0" - checksum: a0b72603bba6c985d367fda3a25aad16423d2056b22a7e83ee2dd9ce0ce3d03d1e078644b679087aa7edf1cfb457f0d96d9eeadc0b12f38582088cc00e995d2f - languageName: node - linkType: hard - "indent-string@npm:^4.0.0": version: 4.0.0 resolution: "indent-string@npm:4.0.0" @@ -11314,6 +11092,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"is-fullwidth-code-point@npm:^4.0.0": + version: 4.0.0 + resolution: "is-fullwidth-code-point@npm:4.0.0" + checksum: 8ae89bf5057bdf4f57b346fb6c55e9c3dd2549983d54191d722d5c739397a903012cc41a04ee3403fd872e811243ef91a7c5196da7b5841dc6b6aae31a264a8d + languageName: node + linkType: hard + "is-function@npm:^1.0.2": version: 1.0.2 resolution: "is-function@npm:1.0.2" @@ -11406,13 +11191,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-obj@npm:^1.0.1": - version: 1.0.1 - resolution: "is-obj@npm:1.0.1" - checksum: 3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c - languageName: node - linkType: hard - "is-object@npm:^1.0.1": version: 1.0.2 resolution: "is-object@npm:1.0.2" @@ -11420,15 +11198,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-observable@npm:^1.1.0": - version: 1.1.0 - resolution: "is-observable@npm:1.1.0" - dependencies: - symbol-observable: ^1.1.0 - checksum: ab3d7e740915e6b53a81d96ce7d581f4dd26dacceb95278b74e7bf3123221073ea02cde810f864cff94ed5c394f18248deefd6a8f2d40137d868130eb5be6f85 - languageName: node - linkType: hard - "is-plain-obj@npm:^1.0.0, is-plain-obj@npm:^1.1.0": version: 1.1.0 resolution: "is-plain-obj@npm:1.1.0" @@ -11473,13 +11242,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-promise@npm:^2.1.0": - version: 2.2.2 - resolution: "is-promise@npm:2.2.2" - checksum: 18bf7d1c59953e0ad82a1ed963fb3dc0d135c8f299a14f89a17af312fc918373136e56028e8831700e1933519630cc2fd4179a777030330fde20d34e96f40c78 - languageName: node - linkType: hard - "is-regex@npm:^1.1.2, is-regex@npm:^1.1.3": version: 1.1.3 resolution: "is-regex@npm:1.1.3" @@ -11490,13 +11252,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-regexp@npm:^1.0.0": - version: 1.0.0 - resolution: "is-regexp@npm:1.0.0" - checksum: be692828e24cba479ec33644326fa98959ec68ba77965e0291088c1a741feaea4919d79f8031708f85fd25e39de002b4520622b55460660b9c369e6f7187faef - languageName: node - linkType: hard - "is-regexp@npm:^2.0.0": version: 2.1.0 resolution: "is-regexp@npm:2.1.0" @@ -11732,13 +11487,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"java-properties@npm:^1.0.0": - version: 1.0.2 - resolution: "java-properties@npm:1.0.2" - checksum: 9a086778346e3adbe2395e370f5c779033ed60360055a15e2cead49e3d676d2c73786cf2f6563a1860277dea3dd0a859432e546ed89c03ee08c1f53e31a5d420 - languageName: node - linkType: hard - "jest-changed-files@npm:^26.6.2": version: 26.6.2 resolution: "jest-changed-files@npm:26.6.2" @@ -12333,7 +12081,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"json-stringify-safe@npm:5.0.x, json-stringify-safe@npm:~5.0.1": +"json-stringify-safe@npm:~5.0.1": version: 5.0.1 resolution: "json-stringify-safe@npm:5.0.1" checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee @@ -12428,18 +12176,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"junit-report-builder@npm:2.1.0": - version: 2.1.0 - resolution: "junit-report-builder@npm:2.1.0" - dependencies: - date-format: 0.0.2 - lodash: ^4.17.15 - make-dir: ^1.3.0 - xmlbuilder: ^10.0.0 - checksum: f781a0c641c021686d76b8bbff6f986c6fd3fb0e6751db0a6232166777991d14fac8daddcb6edd06b15394d8d287e0513bcacba1889f17c32fe53f89fbbe7e64 - languageName: node - linkType: hard - "junk@npm:^3.1.0": version: 3.1.0 resolution: "junk@npm:3.1.0" @@ -12584,98 +12320,47 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lint-staged@npm:11.1.2": - version: 11.1.2 - resolution: "lint-staged@npm:11.1.2" +"lint-staged@npm:12.0.3": + version: 12.0.3 + resolution: "lint-staged@npm:12.0.3" dependencies: - chalk: ^4.1.1 - cli-truncate: ^2.1.0 - commander: ^7.2.0 - cosmiconfig: ^7.0.0 - debug: ^4.3.1 + cli-truncate: ^3.1.0 + colorette: ^2.0.16 + commander: ^8.3.0 + cosmiconfig: ^7.0.1 + debug: ^4.3.2 enquirer: ^2.3.6 - execa: ^5.0.0 - listr2: ^3.8.2 - log-symbols: ^4.1.0 + execa: ^5.1.1 + listr2: ^3.13.3 micromatch: ^4.0.4 normalize-path: ^3.0.0 - please-upgrade-node: ^3.2.0 - string-argv: 0.3.1 - stringify-object: ^3.3.0 + object-inspect: ^1.11.0 + string-argv: ^0.3.1 + supports-color: ^9.0.2 bin: lint-staged: bin/lint-staged.js - checksum: 0050d1836dda879c58561fa4efd100f5cd14fcbf8ee3fdeab7e89ec4219c019543bb5bf2442f760557ebe4bb8b7bfc56a9c98b9384acecfe0f8553f091723e36 - languageName: node - linkType: hard - -"listr-silent-renderer@npm:^1.1.1": - version: 1.1.1 - resolution: "listr-silent-renderer@npm:1.1.1" - checksum: 81982612e4d207be2e69c4dcf2a6e0aaa6080e41bfe0b73e8d0b040dcdb79874248b1040558793a2f0fcc9c2252ec8af47379650f59bf2a7656c11cd5a48c948 - languageName: node - linkType: hard - -"listr-update-renderer@npm:^0.5.0": - version: 0.5.0 - resolution: "listr-update-renderer@npm:0.5.0" - dependencies: - chalk: ^1.1.3 - cli-truncate: ^0.2.1 - elegant-spinner: ^1.0.1 - figures: ^1.7.0 - indent-string: ^3.0.0 - log-symbols: ^1.0.2 - log-update: ^2.3.0 - strip-ansi: ^3.0.1 - peerDependencies: - listr: ^0.14.2 - checksum: 2dddc763837a9086a684545ee9049fcb102d423b0c840ad929471ab461075ed78d5c79f1e8334cd7a76aa9076e7631c04a38733bb4d88c23ca6082c087335864 + checksum: 08a20d9c93bab3e26baf6f92a9f39d114636eba4f3cf6b6c3893cac8db612963563a9ba6cd477f4fd5af265e04976b049e70647ff8732e7469a5d989840f9148 languageName: node linkType: hard -"listr-verbose-renderer@npm:^0.5.0": - version: 0.5.0 - resolution: "listr-verbose-renderer@npm:0.5.0" - dependencies: - chalk: ^2.4.1 - cli-cursor: ^2.1.0 - date-fns: ^1.27.2 - figures: ^2.0.0 - checksum: 3e504be729f9dd15b40db743e403673b76331774411dbc29d6f48136f6ba8bc1dee645a4e621c1cb781e6e69a58b78cb9aa8c153c7ceccfe4e4ea74d563bca3a - languageName: node - linkType: hard - -"listr2@npm:^3.8.2": - version: 3.11.1 - resolution: "listr2@npm:3.11.1" +"listr2@npm:^3.13.3": + version: 3.13.4 + resolution: "listr2@npm:3.13.4" dependencies: cli-truncate: ^2.1.0 - colorette: ^1.2.2 + clone: ^2.1.2 + colorette: ^2.0.16 log-update: ^4.0.0 p-map: ^4.0.0 - rxjs: ^6.6.7 + rxjs: ^7.4.0 through: ^2.3.8 wrap-ansi: ^7.0.0 peerDependencies: enquirer: ">= 2.3.0 < 3" - checksum: 758b9d463d663d14f69f0a1d8dac7fb1236d5b7abb90dd1fcb168d5fd9cb146bec1024e7c364b1806b5622ab2f856ea4d86eacbb7971d20af4c608f598d188fd - languageName: node - linkType: hard - -"listr@npm:0.14.3": - version: 0.14.3 - resolution: "listr@npm:0.14.3" - dependencies: - "@samverschueren/stream-to-observable": ^0.3.0 - is-observable: ^1.1.0 - is-promise: ^2.1.0 - is-stream: ^1.1.0 - listr-silent-renderer: ^1.1.1 - listr-update-renderer: ^0.5.0 - listr-verbose-renderer: ^0.5.0 - p-map: ^2.0.0 - rxjs: ^6.3.3 - checksum: 932d69430c2bed2f987c53b2ea2070786187de29bc4a9fa8e93fdfdf2390d7c0ff9415eb1b31136f76b134cbb930fb18af039fc341263a02b107abc6d2c31a00 + peerDependenciesMeta: + enquirer: + optional: true + checksum: 67801b3373fba1e225c6003a4cdf487646a9ef936b08774028264b02092c4eab7ecebc8438a93b63776b81f7a7e642216da50c92cfd8e0c5bb5ea4c4e6559132 languageName: node linkType: hard @@ -12800,15 +12485,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"log-symbols@npm:^1.0.2": - version: 1.0.2 - resolution: "log-symbols@npm:1.0.2" - dependencies: - chalk: ^1.0.0 - checksum: 5214ade9381db5d40528c171fdfd459b75cad7040eb6a347294ae47fa80cfebba4adbc3aa73a1c9da744cbfa240dd93b38f80df8615717affeea6c4bb6b8dfe7 - languageName: node - linkType: hard - "log-symbols@npm:^4.1.0": version: 4.1.0 resolution: "log-symbols@npm:4.1.0" @@ -12819,17 +12495,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"log-update@npm:^2.3.0": - version: 2.3.0 - resolution: "log-update@npm:2.3.0" - dependencies: - ansi-escapes: ^3.0.0 - cli-cursor: ^2.0.0 - wrap-ansi: ^3.0.1 - checksum: 84fd8e93bfc316eb6ca479a37743f2edcb7563fe5b9161205ce2980f0b3c822717b8f8f1871369697fcb0208521d7b8d00750c594edc3f8a8273dd8b48dd14a3 - languageName: node - linkType: hard - "log-update@npm:^4.0.0": version: 4.0.0 resolution: "log-update@npm:4.0.0" @@ -12930,15 +12595,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"make-dir@npm:^1.3.0": - version: 1.3.0 - resolution: "make-dir@npm:1.3.0" - dependencies: - pify: ^3.0.0 - checksum: c564f6e7bb5ace1c02ad56b3a5f5e07d074af0c0b693c55c7b2c2b148882827c8c2afc7b57e43338a9f90c125b58d604e8cf3e6990a48bf949dfea8c79668c0b - languageName: node - linkType: hard - "make-dir@npm:^2.0.0, make-dir@npm:^2.1.0": version: 2.1.0 resolution: "make-dir@npm:2.1.0" @@ -13207,25 +12863,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"meow@npm:^8.0.0": - version: 8.1.2 - resolution: "meow@npm:8.1.2" - dependencies: - "@types/minimist": ^1.2.0 - camelcase-keys: ^6.2.2 - decamelize-keys: ^1.1.0 - hard-rejection: ^2.1.0 - minimist-options: 4.1.0 - normalize-package-data: ^3.0.0 - read-pkg-up: ^7.0.1 - redent: ^3.0.0 - trim-newlines: ^3.0.0 - type-fest: ^0.18.0 - yargs-parser: ^20.2.3 - checksum: bc23bf1b4423ef6a821dff9734406bce4b91ea257e7f10a8b7f896f45b59649f07adc0926e2917eacd8cf1df9e4cd89c77623cf63dfd0f8bf54de07a32ee5a85 - languageName: node - linkType: hard - "meow@npm:^9.0.0": version: 9.0.0 resolution: "meow@npm:9.0.0" @@ -13368,13 +13005,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"mimic-fn@npm:^1.0.0": - version: 1.2.0 - resolution: "mimic-fn@npm:1.2.0" - checksum: 69c08205156a1f4906d9c46f9b4dc08d18a50176352e77fdeb645cedfe9f20c0b19865d465bd2dec27a5c432347f24dc07fc3695e11159d193f892834233e939 - languageName: node - linkType: hard - "mimic-fn@npm:^2.1.0": version: 2.1.0 resolution: "mimic-fn@npm:2.1.0" @@ -13713,13 +13343,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"node-ask@npm:^1.0.1": - version: 1.0.1 - resolution: "node-ask@npm:1.0.1" - checksum: e5f064e86d5917266163dd4b029bd86edc306185100ea60d10c38a9232cc701fa3241c935428c7a54e8797fc1f1924259361c30d80b4cf65d2981c163ad52cc2 - languageName: node - linkType: hard - "node-dir@npm:^0.1.10": version: 0.1.17 resolution: "node-dir@npm:0.1.17" @@ -13729,7 +13352,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"node-fetch@npm:2.6.1, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1": +"node-fetch@npm:2.6.1, node-fetch@npm:^2.6.1": version: 2.6.1 resolution: "node-fetch@npm:2.6.1" checksum: 91075bedd57879117e310fbcc36983ad5d699e522edb1ebcdc4ee5294c982843982652925c3532729fdc86b2d64a8a827797a745f332040d91823c8752ee4d7c @@ -13794,17 +13417,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"node-loggly-bulk@npm:^2.2.4": - version: 2.2.5 - resolution: "node-loggly-bulk@npm:2.2.5" - dependencies: - json-stringify-safe: 5.0.x - moment: ^2.18.1 - request: ">=2.76.0 <3.0.0" - checksum: 7071604755a35fb4def96dad5f72374fb48cee72044f618baf878ba29736f4d514df151ffb3d32b253b1f4b162316568ae52b68f263c58eeeb4964cd432027e1 - languageName: node - linkType: hard - "node-modules-regexp@npm:^1.0.0": version: 1.0.0 resolution: "node-modules-regexp@npm:1.0.0" @@ -14009,6 +13621,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"object-inspect@npm:^1.11.0": + version: 1.11.0 + resolution: "object-inspect@npm:1.11.0" + checksum: 8c64f89ce3a7b96b6925879ad5f6af71d498abc217e136660efecd97452991216f375a7eb47cb1cb50643df939bf0c7cc391567b7abc6a924d04679705e58e27 + languageName: node + linkType: hard + "object-keys@npm:^1.0.12, object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" @@ -14123,15 +13742,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"onetime@npm:^2.0.0": - version: 2.0.1 - resolution: "onetime@npm:2.0.1" - dependencies: - mimic-fn: ^1.0.0 - checksum: bb44015ac7a525d0fb43b029a583d4ad359834632b4424ca209b438aacf6d669dda81b5edfbdb42c22636e607b276ba5589f46694a729e3bc27948ce26f4cc1a - languageName: node - linkType: hard - "onetime@npm:^5.1.0, onetime@npm:^5.1.2": version: 5.1.2 resolution: "onetime@npm:5.1.2" @@ -14151,13 +13761,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"openurl@npm:1.1.1": - version: 1.1.1 - resolution: "openurl@npm:1.1.1" - checksum: c90f2f065bc5950f1402aff67a3ce4b5fb0e4475cb07b5ff84247686f7436fbc5bc2d0e38bda4ebc9cf8aea866788424e07f25a68f7e97502d412527964351a9 - languageName: node - linkType: hard - "optionator@npm:^0.8.1": version: 0.8.3 resolution: "optionator@npm:0.8.3" @@ -14248,15 +13851,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"p-limit@npm:3.1.0, p-limit@npm:^3.0.2, p-limit@npm:^3.1.0": - version: 3.1.0 - resolution: "p-limit@npm:3.1.0" - dependencies: - yocto-queue: ^0.1.0 - checksum: 7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360 - languageName: node - linkType: hard - "p-limit@npm:^1.1.0": version: 1.3.0 resolution: "p-limit@npm:1.3.0" @@ -14275,6 +13869,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0": + version: 3.1.0 + resolution: "p-limit@npm:3.1.0" + dependencies: + yocto-queue: ^0.1.0 + checksum: 7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360 + languageName: node + linkType: hard + "p-locate@npm:^2.0.0": version: 2.0.0 resolution: "p-locate@npm:2.0.0" @@ -14589,13 +14192,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"picomatch@npm:2.2.2": - version: 2.2.2 - resolution: "picomatch@npm:2.2.2" - checksum: 897a589f94665b4fd93e075fa94893936afe3f7bbef44250f0e878a8d9d001972a79589cac2856c24f6f5aa3b0abc9c8ba00c98fae4dc22bc0117188864d4181 - languageName: node - linkType: hard - "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3": version: 2.3.0 resolution: "picomatch@npm:2.3.0" @@ -14685,7 +14281,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pkg-up@npm:3.1.0, pkg-up@npm:^3.1.0": +"pkg-up@npm:3.1.0": version: 3.1.0 resolution: "pkg-up@npm:3.1.0" dependencies: @@ -14703,22 +14299,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"please-upgrade-node@npm:^3.2.0": - version: 3.2.0 - resolution: "please-upgrade-node@npm:3.2.0" - dependencies: - semver-compare: ^1.0.0 - checksum: d87c41581a2a022fbe25965a97006238cd9b8cbbf49b39f78d262548149a9d30bd2bdf35fec3d810e0001e630cd46ef13c7e19c389dea8de7e64db271a2381bb - languageName: node - linkType: hard - -"pluralize@npm:^8.0.0": - version: 8.0.0 - resolution: "pluralize@npm:8.0.0" - checksum: 08931d4a6a4a5561a7f94f67a31c17e6632cb21e459ab3ff4f6f629d9a822984cf8afef2311d2005fbea5d7ef26016ebb090db008e2d8bce39d0a9a9d218736e - languageName: node - linkType: hard - "pnp-webpack-plugin@npm:1.6.4": version: 1.6.4 resolution: "pnp-webpack-plugin@npm:1.6.4" @@ -15018,16 +14598,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"progress-stream@npm:^2.0.0": - version: 2.0.0 - resolution: "progress-stream@npm:2.0.0" - dependencies: - speedometer: ~1.0.0 - through2: ~2.0.3 - checksum: 6aab6a9cf2c8bf0ea222e925d13e31dbf0f74c33a6fec773824995382e299417bcb77aec762a9d240cca3c9d31983bd3d5c195aa97608e39dc40083a8a02c393 - languageName: node - linkType: hard - "progress@npm:^2.0.0": version: 2.0.3 resolution: "progress@npm:2.0.3" @@ -16142,7 +15712,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"request@npm:>=2.76.0 <3.0.0, request@npm:^2.88.2": +"request@npm:^2.88.2": version: 2.88.2 resolution: "request@npm:2.88.2" dependencies: @@ -16250,16 +15820,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"restore-cursor@npm:^2.0.0": - version: 2.0.0 - resolution: "restore-cursor@npm:2.0.0" - dependencies: - onetime: ^2.0.0 - signal-exit: ^3.0.2 - checksum: 482e13d02d834b6e5e3aa90304a8b5e840775d6f06916cc92a50038adf9f098dcc72405b567da8a37e137ae40ad3e31896fa3136ae62f7a426c2fbf53d036536 - languageName: node - linkType: hard - "restore-cursor@npm:^3.1.0": version: 3.1.0 resolution: "restore-cursor@npm:3.1.0" @@ -16277,7 +15837,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"retry@npm:0.12.0, retry@npm:^0.12.0": +"retry@npm:^0.12.0": version: 0.12.0 resolution: "retry@npm:0.12.0" checksum: 623bd7d2e5119467ba66202d733ec3c2e2e26568074923bc0585b6b99db14f357e79bdedb63cab56cec47491c4a0da7e6021a7465ca6dc4f481d3898fdd3158c @@ -16348,12 +15908,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rxjs@npm:^6.3.3, rxjs@npm:^6.6.7": - version: 6.6.7 - resolution: "rxjs@npm:6.6.7" +"rxjs@npm:^7.4.0": + version: 7.4.0 + resolution: "rxjs@npm:7.4.0" dependencies: - tslib: ^1.9.0 - checksum: bc334edef1bb8bbf56590b0b25734ba0deaf8825b703256a93714308ea36dff8a11d25533671adf8e104e5e8f256aa6fdfe39b2e248cdbd7a5f90c260acbbd1b + tslib: ~2.1.0 + checksum: 6b33172a760dcad6882fdc836ee8cf1ebe160dd7eaad95c45a12338ffdaa96eb41e48e6c25bbd3d1fdf45075949ff447954bc17a9d01c688558a67967d09c114 languageName: node linkType: hard @@ -16493,13 +16053,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"semver-compare@npm:^1.0.0": - version: 1.0.0 - resolution: "semver-compare@npm:1.0.0" - checksum: dd1d7e2909744cf2cf71864ac718efc990297f9de2913b68e41a214319e70174b1d1793ac16e31183b128c2b9812541300cb324db8168e6cf6b570703b171c68 - languageName: node - linkType: hard - "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.1 resolution: "semver@npm:5.7.1" @@ -16761,13 +16314,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"slice-ansi@npm:0.0.4": - version: 0.0.4 - resolution: "slice-ansi@npm:0.0.4" - checksum: 481d969c6aa771b27d7baacd6fe321751a0b9eb410274bda10ca81ea641bbfe747e428025d6d8f15bd635fdcfd57e8b2d54681ee6b0ce0c40f78644b144759e3 - languageName: node - linkType: hard - "slice-ansi@npm:^3.0.0": version: 3.0.0 resolution: "slice-ansi@npm:3.0.0" @@ -16790,6 +16336,16 @@ fsevents@^1.2.7: languageName: node linkType: hard +"slice-ansi@npm:^5.0.0": + version: 5.0.0 + resolution: "slice-ansi@npm:5.0.0" + dependencies: + ansi-styles: ^6.0.0 + is-fullwidth-code-point: ^4.0.0 + checksum: 7e600a2a55e333a21ef5214b987c8358fe28bfb03c2867ff2cbf919d62143d1812ac27b4297a077fdaf27a03da3678e49551c93e35f9498a3d90221908a1180e + languageName: node + linkType: hard + "smart-buffer@npm:^4.1.0": version: 4.1.0 resolution: "smart-buffer@npm:4.1.0" @@ -16998,13 +16554,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"speedometer@npm:~1.0.0": - version: 1.0.0 - resolution: "speedometer@npm:1.0.0" - checksum: 6b322bbb0607c9994fba2a6ac189cf6caea4ce9f5067c1ccfc2848b55883f65d48292bfed4244ce855573ed7cdf0f69943ae6e507f7ec90eef232b64cdba6237 - languageName: node - linkType: hard - "split-string@npm:^3.0.1, split-string@npm:^3.0.2": version: 3.1.0 resolution: "split-string@npm:3.1.0" @@ -17161,7 +16710,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"string-argv@npm:0.3.1, string-argv@npm:^0.3.1": +"string-argv@npm:^0.3.1": version: 0.3.1 resolution: "string-argv@npm:0.3.1" checksum: efbd0289b599bee808ce80820dfe49c9635610715429c6b7cc50750f0437e3c2f697c81e5c390208c13b5d5d12d904a1546172a88579f6ee5cbaaaa4dc9ec5cf @@ -17189,7 +16738,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2, string-width@npm:^2.1.1": +"string-width@npm:^1.0.2 || 2": version: 2.1.1 resolution: "string-width@npm:2.1.1" dependencies: @@ -17221,6 +16770,17 @@ fsevents@^1.2.7: languageName: node linkType: hard +"string-width@npm:^5.0.0": + version: 5.0.1 + resolution: "string-width@npm:5.0.1" + dependencies: + emoji-regex: ^9.2.2 + is-fullwidth-code-point: ^4.0.0 + strip-ansi: ^7.0.1 + checksum: 2a7cbd6a4180f8215553fc0dfe8fe62d2ba76d141b0a6fca44df7b81f0089613d0b115bd67bb293ea7e8c5f8295525014a3562cce28d0e06caa6f626980e9c7e + languageName: node + linkType: hard + "string.prototype.matchall@npm:^4.0.0 || ^3.0.1, string.prototype.matchall@npm:^4.0.2": version: 4.0.5 resolution: "string.prototype.matchall@npm:4.0.5" @@ -17297,17 +16857,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"stringify-object@npm:^3.3.0": - version: 3.3.0 - resolution: "stringify-object@npm:3.3.0" - dependencies: - get-own-enumerable-property-symbols: ^3.0.0 - is-obj: ^1.0.1 - is-regexp: ^1.0.0 - checksum: 6827a3f35975cfa8572e8cd3ed4f7b262def260af18655c6fde549334acdac49ddba69f3c861ea5a6e9c5a4990fe4ae870b9c0e6c31019430504c94a83b7a154 - languageName: node - linkType: hard - "strip-ansi@npm:6.0.0, strip-ansi@npm:^6.0.0": version: 6.0.0 resolution: "strip-ansi@npm:6.0.0" @@ -17344,6 +16893,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"strip-ansi@npm:^7.0.1": + version: 7.0.1 + resolution: "strip-ansi@npm:7.0.1" + dependencies: + ansi-regex: ^6.0.1 + checksum: 257f78fa433520e7f9897722731d78599cb3fce29ff26a20a5e12ba4957463b50a01136f37c43707f4951817a75e90820174853d6ccc240997adc5df8f966039 + languageName: node + linkType: hard + "strip-bom@npm:^3.0.0": version: 3.0.0 resolution: "strip-bom@npm:3.0.0" @@ -17439,12 +16997,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"stylelint-config-recommended@npm:^3.0.0": - version: 3.0.0 - resolution: "stylelint-config-recommended@npm:3.0.0" +"stylelint-config-recommended@npm:5.0.0": + version: 5.0.0 + resolution: "stylelint-config-recommended@npm:5.0.0" peerDependencies: - stylelint: ">=10.1.0" - checksum: 8f02b2cd20269eca1aedb78b66b2085c16568463f225c5b5c80df61288b5b96a0ded2eeb8fa226eec442ef00ceac15a48cd499a3e5a4575a33215dedec298767 + stylelint: ^13.13.0 + checksum: 574468542e9f143838feff91771a5901454d6ed89c671bc561373e0509d1414d4a856e5e251c22630c18eb02819c94137eb7a091959dc225f0d91a3eb49538c4 languageName: node linkType: hard @@ -17522,13 +17080,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"supports-color@npm:^2.0.0": - version: 2.0.0 - resolution: "supports-color@npm:2.0.0" - checksum: 602538c5812b9006404370b5a4b885d3e2a1f6567d314f8b4a41974ffe7d08e525bf92ae0f9c7030e3b4c78e4e34ace55d6a67a74f1571bc205959f5972f88f0 - languageName: node - linkType: hard - "supports-color@npm:^5.3.0": version: 5.5.0 resolution: "supports-color@npm:5.5.0" @@ -17547,6 +17098,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"supports-color@npm:^9.0.2": + version: 9.1.0 + resolution: "supports-color@npm:9.1.0" + checksum: 90794e2a31c03fd84bd3eee83a1310d4d4d415624d4747d6bdc847f7ae786b0ebf7c03b9e7ba7be1cd0733d9456be998ff5fb32410d787ee4fb145f5ad104c99 + languageName: node + linkType: hard + "supports-hyperlinks@npm:^2.0.0": version: 2.2.0 resolution: "supports-hyperlinks@npm:2.2.0" @@ -17564,13 +17122,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"symbol-observable@npm:^1.1.0": - version: 1.2.0 - resolution: "symbol-observable@npm:1.2.0" - checksum: 48ffbc22e3d75f9853b3ff2ae94a44d84f386415110aea5effc24d84c502e03a4a6b7a8f75ebaf7b585780bda34eb5d6da3121f826a6f93398429d30032971b6 - languageName: node - linkType: hard - "symbol-tree@npm:^3.2.4": version: 3.2.4 resolution: "symbol-tree@npm:3.2.4" @@ -17754,7 +17305,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"through2@npm:^2.0.0, through2@npm:~2.0.3": +"through2@npm:^2.0.0": version: 2.0.5 resolution: "through2@npm:2.0.5" dependencies: @@ -17780,24 +17331,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"tmp-promise@npm:3.0.2": - version: 3.0.2 - resolution: "tmp-promise@npm:3.0.2" - dependencies: - tmp: ^0.2.0 - checksum: 2d8457c9512e896633f64fab33e5e3fd273c4d8fca33cfc74a04a104a0b921d15ed3e832c4f2a50108635ac88264afef85abddbe5ad8480e15f55fc7f8e76969 - languageName: node - linkType: hard - -"tmp@npm:^0.2.0": - version: 0.2.1 - resolution: "tmp@npm:0.2.1" - dependencies: - rimraf: ^3.0.0 - checksum: 8b1214654182575124498c87ca986ac53dc76ff36e8f0e0b67139a8d221eaecfdec108c0e6ec54d76f49f1f72ab9325500b246f562b926f85bcdfca8bf35df9e - languageName: node - linkType: hard - "tmpl@npm:1.0.x": version: 1.0.4 resolution: "tmpl@npm:1.0.4" @@ -17910,15 +17443,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"tree-kill@npm:^1.2.2": - version: 1.2.2 - resolution: "tree-kill@npm:1.2.2" - bin: - tree-kill: cli.js - checksum: 49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7 - languageName: node - linkType: hard - "trim-newlines@npm:^3.0.0": version: 3.0.1 resolution: "trim-newlines@npm:3.0.1" @@ -17956,13 +17480,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"ts-dedent@npm:^1.0.0": - version: 1.2.0 - resolution: "ts-dedent@npm:1.2.0" - checksum: 69f654beb381a32732d3652e4b705322b7b94061e19e9b26824fe796ce8ede1e9ad29fd5e9dad2d200a92804063bf1beb5e256d304e729bfcf99d12e91b8926d - languageName: node - linkType: hard - "ts-dedent@npm:^2.0.0": version: 2.1.1 resolution: "ts-dedent@npm:2.1.1" @@ -17999,13 +17516,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"tslib@npm:^1.9.0": - version: 1.14.1 - resolution: "tslib@npm:1.14.1" - checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd - languageName: node - linkType: hard - "tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3": version: 2.3.0 resolution: "tslib@npm:2.3.0" @@ -18013,6 +17523,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"tslib@npm:~2.1.0": + version: 2.1.0 + resolution: "tslib@npm:2.1.0" + checksum: aa189c8179de0427b0906da30926fd53c59d96ec239dff87d6e6bc831f608df0cbd6f77c61dabc074408bd0aa0b9ae4ec35cb2c15f729e32f37274db5730cb78 + languageName: node + linkType: hard + "tty-browserify@npm:0.0.0": version: 0.0.0 resolution: "tty-browserify@npm:0.0.0" @@ -18029,13 +17546,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"tunnel@npm:0.0.6": - version: 0.0.6 - resolution: "tunnel@npm:0.0.6" - checksum: c362948df9ad34b649b5585e54ce2838fa583aa3037091aaed66793c65b423a264e5229f0d7e9a95513a795ac2bd4cb72cda7e89a74313f182c1e9ae0b0994fa - languageName: node - linkType: hard - "tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0": version: 0.14.5 resolution: "tweetnacl@npm:0.14.5" @@ -18663,16 +18173,16 @@ fsevents@^1.2.7: languageName: node linkType: hard -"vscode-json-languageservice@npm:^3.7.0": - version: 3.11.0 - resolution: "vscode-json-languageservice@npm:3.11.0" +"vscode-json-languageservice@npm:^4.1.6": + version: 4.1.7 + resolution: "vscode-json-languageservice@npm:4.1.7" dependencies: jsonc-parser: ^3.0.0 vscode-languageserver-textdocument: ^1.0.1 - vscode-languageserver-types: 3.16.0-next.2 + vscode-languageserver-types: ^3.16.0 vscode-nls: ^5.0.0 - vscode-uri: ^2.1.2 - checksum: 3bd64f9180ac13b6a384eb8148add08aafd123b779594c2104435ceea3fafcf5bca5176fb8fc7da37d63fd16a20e51086a74f403a2fabcbc6265a3014324b194 + vscode-uri: ^3.0.2 + checksum: 5d9f82f3abef4ce74e48d5413d1f4054348391e6ebccfda84b6fadb1e34afa8f2b4df04b1c57427b3128dad076d885c4c98b4a538d446ee528e989917eb5ee99 languageName: node linkType: hard @@ -18683,10 +18193,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"vscode-languageserver-types@npm:3.16.0-next.2": - version: 3.16.0-next.2 - resolution: "vscode-languageserver-types@npm:3.16.0-next.2" - checksum: e7c30204082cd41847b7487b61f3c7375a1ab824cd5c74dfd511a3d68171128c88074071c7cc439faa949352b4dd5524b82a824d49a6af02b4e5c127f60f9712 +"vscode-languageserver-types@npm:^3.16.0": + version: 3.16.0 + resolution: "vscode-languageserver-types@npm:3.16.0" + checksum: 7a44fb10b9fbeb9529f832337b7f0430fc6275d62945b86851d425a950e22da3917ef5f6c552688191769dd1eae047c6ee9ec3d9f2280498353007c2dfe0725c languageName: node linkType: hard @@ -18697,10 +18207,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"vscode-uri@npm:^2.1.2": - version: 2.1.2 - resolution: "vscode-uri@npm:2.1.2" - checksum: 58c2d21018b86825b5a7f65f8879f837828a367bbf31d07ed59268fb2b56c9621a6996547d5e8f966d6ac05f0f921a7005f4541927007f788c2e4c6e5d6735e0 +"vscode-uri@npm:^3.0.2": + version: 3.0.2 + resolution: "vscode-uri@npm:3.0.2" + checksum: 5ed2c95a483a43398df40c31d23e44f138e9c8bed384fa4edf0fd97396ce18ae8dae173c5d55e69b47205e2108e165cb165b12843a74e8b35c066d9f3810fb6c languageName: node linkType: hard @@ -19009,16 +18519,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"wrap-ansi@npm:^3.0.1": - version: 3.0.1 - resolution: "wrap-ansi@npm:3.0.1" - dependencies: - string-width: ^2.1.1 - strip-ansi: ^4.0.0 - checksum: 1ceed09986d58cf6e0b88ea29084e70ef3463b3b891a04a8dbf245abb1fb678358986bdc43e12bcc92a696ced17327d079bc796f4d709d15aad7b8c1a7e7c83a - languageName: node - linkType: hard - "wrap-ansi@npm:^6.2.0": version: 6.2.0 resolution: "wrap-ansi@npm:6.2.0" @@ -19082,13 +18582,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"xmlbuilder@npm:^10.0.0": - version: 10.1.1 - resolution: "xmlbuilder@npm:10.1.1" - checksum: 1543fdf1489ccaf168d8f39978ea5c59ee438bc869f90365cd455f1729759fbfb92bb8e976b990a2c07ce4d4b2c7530ece4a7235b6d6705bdfc8d1f41ec4aa11 - languageName: node - linkType: hard - "xmlchars@npm:^2.2.0": version: 2.2.0 resolution: "xmlchars@npm:2.2.0" @@ -19154,6 +18647,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"yargs-parser@npm:21.0.0": + version: 21.0.0 + resolution: "yargs-parser@npm:21.0.0" + checksum: 1e205fca1cb7a36a1585e2b94a64e641c12741b53627d338e12747f4dca3c3610cdd9bb235040621120548dd74c3ef03a8168d52a1eabfedccbe4a62462b6731 + languageName: node + linkType: hard + "yargs-parser@npm:^18.1.2": version: 18.1.3 resolution: "yargs-parser@npm:18.1.3" @@ -19164,28 +18664,13 @@ fsevents@^1.2.7: languageName: node linkType: hard -"yargs-parser@npm:^20.2.1, yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3, yargs-parser@npm:^20.2.7": +"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3, yargs-parser@npm:^20.2.7": version: 20.2.9 resolution: "yargs-parser@npm:20.2.9" checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3 languageName: node linkType: hard -"yargs@npm:16.2.0, yargs@npm:^16.2.0": - version: 16.2.0 - resolution: "yargs@npm:16.2.0" - dependencies: - cliui: ^7.0.2 - escalade: ^3.1.1 - get-caller-file: ^2.0.5 - require-directory: ^2.1.1 - string-width: ^4.2.0 - y18n: ^5.0.5 - yargs-parser: ^20.2.2 - checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59 - languageName: node - linkType: hard - "yargs@npm:^15.4.1": version: 15.4.1 resolution: "yargs@npm:15.4.1" @@ -19205,16 +18690,18 @@ fsevents@^1.2.7: languageName: node linkType: hard -"yarn-or-npm@npm:^3.0.1": - version: 3.0.1 - resolution: "yarn-or-npm@npm:3.0.1" +"yargs@npm:^16.2.0": + version: 16.2.0 + resolution: "yargs@npm:16.2.0" dependencies: - cross-spawn: ^6.0.5 - pkg-dir: ^4.2.0 - bin: - yarn-or-npm: bin/index.js - yon: bin/index.js - checksum: 94421b4315520075b4db6c09b6284064c047058d8bbe2663cdd4269491e5f7ea5d2e68eeaa0182a760a8757479cef665b7040a8c9ddb48a3da52587a8b712b27 + cliui: ^7.0.2 + escalade: ^3.1.1 + get-caller-file: ^2.0.5 + require-directory: ^2.1.1 + string-width: ^4.2.0 + y18n: ^5.0.5 + yargs-parser: ^20.2.2 + checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59 languageName: node linkType: hard
This is the summary text
+ This is the summary text +
diff --git a/packages/components/psammead-grid/src/index.stories.jsx b/packages/components/psammead-grid/src/index.stories.jsx index 2b40eb0cc3..0a5466c70d 100644 --- a/packages/components/psammead-grid/src/index.stories.jsx +++ b/packages/components/psammead-grid/src/index.stories.jsx @@ -5,7 +5,6 @@ import { withServicesKnob, buildRTLSubstories, } from '@bbc/psammead-storybook-helpers'; -import Image from '@bbc/psammead-image'; import StoryPromo, { Headline, Summary, Link } from '@bbc/psammead-story-promo'; import Grid from '.'; import { @@ -1275,17 +1274,9 @@ storiesOf(STORY_KIND, module) > ); - const Img = ( - - ); - return ( } info={Info} promoType={promoType} dir={dir} @@ -1473,11 +1464,7 @@ storiesOf(STORY_KIND, module) group5: 6, }} > - + - + - + - + - + )); diff --git a/packages/components/psammead-grid/src/testHelpers.jsx b/packages/components/psammead-grid/src/testHelpers.jsx index b4e5c283c7..9d2f729aa5 100644 --- a/packages/components/psammead-grid/src/testHelpers.jsx +++ b/packages/components/psammead-grid/src/testHelpers.jsx @@ -29,15 +29,29 @@ const ImageSpacing = styled.div` padding: 0 0 ${GEL_SPACING} 0; `; -export const ExampleImage = () => ( - - - -); +export const ExampleImage = () => { + const imageSizes = [300, 450, 600, 1024]; + const imageSrc = + 'https://ichef.bbci.co.uk/news/[WIDTH]/cpsprodpb/11897/production/_106613817_999_al_.jpg'; + + return ( + + `${imageSrc.replace('[WIDTH]', size)}.webp ${size}w`) + .join(', ')} + fallbackSrcset={imageSizes + .map(size => `${imageSrc.replace('[WIDTH]', size)} ${size}w`) + .join(', ')} + primaryMimeType="image/webp" + fallbackMimeType="image/jpeg" + /> + + ); +}; export const ExampleMediaIndicator = styled(MediaIndicator)``; diff --git a/packages/components/psammead-heading-index/CHANGELOG.md b/packages/components/psammead-heading-index/CHANGELOG.md index 0a383dd39d..e31ffd952f 100644 --- a/packages/components/psammead-heading-index/CHANGELOG.md +++ b/packages/components/psammead-heading-index/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 3.0.28 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.0.27 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.0.26 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.0.25 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.0.24 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.0.23 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.0.22 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.0.21 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.0.20 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.0.19 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.0.18 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 3.0.17 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 3.0.15 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-heading-index/package.json b/packages/components/psammead-heading-index/package.json index 5b6e5565d8..0544a5e4a1 100644 --- a/packages/components/psammead-heading-index/package.json +++ b/packages/components/psammead-heading-index/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-heading-index", - "version": "3.0.18", + "version": "3.0.28", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-heading-index/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-headings/CHANGELOG.md b/packages/components/psammead-headings/CHANGELOG.md index 375ee56910..d8f92e886f 100644 --- a/packages/components/psammead-headings/CHANGELOG.md +++ b/packages/components/psammead-headings/CHANGELOG.md @@ -3,6 +3,16 @@ | Version | Description | |---------|-------------| +| 5.0.28 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 5.0.27 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 5.0.26 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 5.0.25 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 5.0.24 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 5.0.23 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 5.0.22 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 5.0.21 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 5.0.20 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 5.0.19 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 5.0.18 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | | 5.0.17 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 5.0.15 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | diff --git a/packages/components/psammead-headings/package.json b/packages/components/psammead-headings/package.json index 9ce567dd56..953a95fab0 100644 --- a/packages/components/psammead-headings/package.json +++ b/packages/components/psammead-headings/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-headings", - "version": "5.0.18", + "version": "5.0.28", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-headings/README.md", "dependencies": { - "@bbc/gel-foundations": "6.1.3", - "@bbc/psammead-styles": "7.3.0" + "@bbc/gel-foundations": "7.0.0", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0" diff --git a/packages/components/psammead-image-placeholder/CHANGELOG.md b/packages/components/psammead-image-placeholder/CHANGELOG.md index 0e1dc5d871..7c7cf12c1c 100644 --- a/packages/components/psammead-image-placeholder/CHANGELOG.md +++ b/packages/components/psammead-image-placeholder/CHANGELOG.md @@ -3,6 +3,17 @@ | Version | Description | |---------|-------------| +| 3.4.11 | [PR#4609](https://github.com/bbc/psammead/pull/4609) Bump from psammead-styles | +| 3.4.10 | [PR#4601](https://github.com/bbc/psammead/pull/4601) Bumps dependencies | +| 3.4.9 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | +| 3.4.8 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | +| 3.4.7 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | +| 3.4.6 | [PR#4562](https://github.com/bbc/psammead/pull/4562) Bump psammead-styles | +| 3.4.5 | [PR#4561](https://github.com/bbc/psammead/pull/4561) Bump dependencies for @bbc/psammead-styles | +| 3.4.4 | [PR#4548](https://github.com/bbc/psammead/pull/4548) Bumps dependencies | +| 3.4.3 | [PR#4547](https://github.com/bbc/psammead/pull/4547) Bumps packages | +| 3.4.2 | [PR#4545](https://github.com/bbc/psammead/pull/4545) Bump dependencies for @bbc/psammead-styles | +| 3.4.1 | [PR#4552](https://github.com/bbc/psammead/pull/4552) Bump psammead-styles | | 3.4.0 | [PR#4549](https://github.com/bbc/psammead/pull/4549) Adds forwardStyle prop | | 3.3.0 | [PR#4546](https://github.com/bbc/psammead/pull/4546) Adds padding ratio as inline style | | 3.2.2 | [PR#4497](https://github.com/bbc/psammead/pull/4497) Bump psammead-styles | diff --git a/packages/components/psammead-image-placeholder/package.json b/packages/components/psammead-image-placeholder/package.json index cf3d0e00ca..aa8832e2d2 100644 --- a/packages/components/psammead-image-placeholder/package.json +++ b/packages/components/psammead-image-placeholder/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-image-placeholder", - "version": "3.4.0", + "version": "3.4.11", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-image-placeholder/README.md", "dependencies": { - "@bbc/psammead-assets": "3.1.9", - "@bbc/psammead-styles": "7.3.0" + "@bbc/psammead-assets": "3.1.10", + "@bbc/psammead-styles": "8.0.2" }, "peerDependencies": { "@emotion/styled": "^11.0.0", diff --git a/packages/components/psammead-image/CHANGELOG.md b/packages/components/psammead-image/CHANGELOG.md index cff00c0e01..630ee0e1be 100644 --- a/packages/components/psammead-image/CHANGELOG.md +++ b/packages/components/psammead-image/CHANGELOG.md @@ -3,6 +3,9 @@ | Version | Description | |---------|-------------| +| 3.1.0 | [PR#4608](https://github.com/bbc/psammead/pull/4608) Derive mime type from srcset | +| 3.0.1 | [PR#4607](https://github.com/bbc/psammead/pull/4607) Fix amp-img fallback value | +| 3.0.0 | [PR#4606](https://github.com/bbc/psammead/pull/4606) Add support for WebP | | 2.0.8 | [PR#4486](https://github.com/bbc/psammead/pull/4486) upgrade minor/patch dependencies | | 2.0.7 | [PR#4420](https://github.com/bbc/psammead/pull/4420) bumps 3rd-party dependencies | | 2.0.6 | [PR#4368](https://github.com/bbc/psammead/pull/4368) use Yarn Workspaces | diff --git a/packages/components/psammead-image/README.md b/packages/components/psammead-image/README.md index e095f6048a..a3e54b4a65 100644 --- a/packages/components/psammead-image/README.md +++ b/packages/components/psammead-image/README.md @@ -56,6 +56,7 @@ const WrappingContainer = ({ alt, src, height, width, sizes }) => ( ## Props ### Img + | Prop | Type | Required | Default | Example | |:-----|:-----|:---------|:--------|:--------| @@ -63,7 +64,10 @@ const WrappingContainer = ({ alt, src, height, width, sizes }) => ( | `height` | number/string | No | null | 450 | | `sizes` | string | No | null | "100vw" | | `src` | string | Yes | - | "https://bbc.com/300/cat.jpg" | -| `srcset` | string | No | null | "https://bbc.com/300/cat.jpg 300w, https://bbc.com/450/cat.jpg 450w, https://bbc.com/600/cat.jpg 600w" | +| `srcset` | string | No | null | "https://bbc.com/300/cat.jpg.webp 300w, https://bbc.com/450/cat.jpg.webp 450w, https://bbc.com/600/cat.jpg.webp 600w" | +| `fallbackSrcset` | string | No | null | "https://bbc.com/300/cat.jpg 300w, https://bbc.com/450/cat.jpg 450w, https://bbc.com/600/cat.jpg 600w" | +| `primaryMimeType` | string | No | null | "image/webp" | +| `fallbackMimeType` | string | No | null | "image/jpeg" | | `width` | number/string | No | null | 600 | | `fade` | boolean | No | false | true | @@ -80,6 +84,7 @@ The `sizes` prop is optional since some projects might not want to use the sizes The `fade` prop is optional and set to `false` by default. It's been used to apply a fade-in animation effect on the `Img` component. ### AmpImg + | Prop | Type | Required | Default | Example | |:-----|:-----|:---------|:--------|:--------| @@ -89,7 +94,8 @@ The `fade` prop is optional and set to `false` by default. It's been used to app | `layout` | string | Yes | - | "responsive" | | `sizes` | string | No | null | "100vw" | | `src` | string | Yes | - | "https://bbc.com/300/cat.jpg" | -| `srcset` | string | No | null | "https://bbc.com/300/cat.jpg 300w, https://bbc.com/450/cat.jpg 450w, https://bbc.com/600/cat.jpg 600w" | +| `srcset` | string | No | null | "https://bbc.com/300/cat.jpg.webp 300w, https://bbc.com/450/cat.jpg.webp 450w, https://bbc.com/600/cat.jpg.webp 600w" | +| `fallbackSrcset` | string | No | null | "https://bbc.com/300/cat.jpg 300w, https://bbc.com/450/cat.jpg 450w, https://bbc.com/600/cat.jpg 600w" | | `width` | number/string | Yes | - | 600 | The `attribution` prop is available to pass in strings to include the image source. [For further details, please refer to the `amp-img` attribute docs](https://www.ampproject.org/docs/reference/components/amp-img#attributes). diff --git a/packages/components/psammead-image/package.json b/packages/components/psammead-image/package.json index 7061a46245..d9d901fe3b 100644 --- a/packages/components/psammead-image/package.json +++ b/packages/components/psammead-image/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-image", - "version": "2.0.8", + "version": "3.1.0", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, diff --git a/packages/components/psammead-image/src/__snapshots__/index.amp.test.jsx.snap b/packages/components/psammead-image/src/__snapshots__/index.amp.test.jsx.snap index 8f5738fdfc..5d4973ab2c 100644 --- a/packages/components/psammead-image/src/__snapshots__/index.amp.test.jsx.snap +++ b/packages/components/psammead-image/src/__snapshots__/index.amp.test.jsx.snap @@ -14,7 +14,7 @@ exports[`Image - AmpImg should render image with custom dimensions correctly 1`]
- Content -
- - - - - - Episodes -
- Мы быстро, просто и понятно объясняем, что случилось, почему это важно и что будет дальше. Никаких ненужных подробностей и передергиваний - только факты и взвешенная аналитика. -
- - - - - - эпизоды -