Skip to content
This repository has been archived by the owner on Aug 13, 2023. It is now read-only.

Commit

Permalink
Merge branch 'latest' into renovate/jest-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
pvaliani committed Jan 13, 2022
2 parents 5b2288f + beaaf67 commit 24385e0
Show file tree
Hide file tree
Showing 359 changed files with 3,878 additions and 4,313 deletions.
32 changes: 0 additions & 32 deletions .github/workflows/psammead-deploy-storybook.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .prettierrc
@@ -1,5 +1,5 @@
{
"singleQuote": true,
"trailingComma": "all",
"arrowParens": "avoid"
"singleQuote": true,
"trailingComma": "all",
"arrowParens": "avoid"
}
6 changes: 3 additions & 3 deletions .storybook/preview.js
Expand Up @@ -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 => (
Expand Down
Binary file removed .storybook/static/fonts/IskoolaPota/bold.eot
Binary file not shown.
Binary file removed .storybook/static/fonts/IskoolaPota/bold.ttf
Binary file not shown.
Binary file removed .storybook/static/fonts/IskoolaPota/bold.woff
Binary file not shown.
Binary file removed .storybook/static/fonts/IskoolaPota/normal.eot
Binary file not shown.
Binary file removed .storybook/static/fonts/IskoolaPota/normal.ttf
Binary file not shown.
Binary file removed .storybook/static/fonts/IskoolaPota/normal.woff
Binary file not shown.
Binary file removed .storybook/static/fonts/Latha/bold.eot
Binary file not shown.
Binary file removed .storybook/static/fonts/Latha/bold.ttf
Binary file not shown.
Binary file removed .storybook/static/fonts/Latha/bold.woff
Binary file not shown.
Binary file removed .storybook/static/fonts/Latha/normal.eot
Binary file not shown.
Binary file removed .storybook/static/fonts/Latha/normal.ttf
Binary file not shown.
Binary file removed .storybook/static/fonts/Latha/normal.woff
Binary file not shown.
Binary file added .storybook/static/fonts/NotoSansTamil/bold.eot
Binary file not shown.
Binary file added .storybook/static/fonts/NotoSansTamil/bold.ttf
Binary file not shown.
Binary file added .storybook/static/fonts/NotoSansTamil/bold.woff
Binary file not shown.
Binary file added .storybook/static/fonts/NotoSansTamil/bold.woff2
Binary file not shown.
Binary file added .storybook/static/fonts/NotoSansTamil/normal.eot
Binary file not shown.
Binary file added .storybook/static/fonts/NotoSansTamil/normal.ttf
Binary file not shown.
Binary file added .storybook/static/fonts/NotoSansTamil/normal.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .storybook/static/fonts/ShonarBangla/bold.eot
Binary file not shown.
Binary file removed .storybook/static/fonts/ShonarBangla/bold.ttf
Binary file not shown.
Binary file removed .storybook/static/fonts/ShonarBangla/bold.woff
Binary file not shown.
Binary file removed .storybook/static/fonts/ShonarBangla/normal.eot
Binary file not shown.
Binary file removed .storybook/static/fonts/ShonarBangla/normal.ttf
Binary file not shown.
Binary file removed .storybook/static/fonts/ShonarBangla/normal.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/meow-npm-8.1.2-bcfe48d4f3-bc23bf1b44.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/rxjs-npm-6.6.7-055046ea3c-bc334edef1.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file added .yarn/versions/115ae74b.yml
Empty file.
Empty file added .yarn/versions/bc6a1846.yml
Empty file.
Empty file added .yarn/versions/d20b2bc1.yml
Empty file.
Empty file added .yarn/versions/e4d654fd.yml
Empty file.
12 changes: 6 additions & 6 deletions package.json
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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'"
Expand Down
13 changes: 13 additions & 0 deletions packages/components/psammead-brand/CHANGELOG.md
Expand Up @@ -3,6 +3,19 @@
<!-- prettier-ignore -->
| 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 |
Expand Down
8 changes: 4 additions & 4 deletions 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,
Expand All @@ -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"
},
Expand Down
Expand Up @@ -122,15 +122,17 @@ exports[`Brand should render correctly with link not provided 1`] = `
</svg>
<span
class="emotion-6 emotion-7"
id="BrandLink-null"
role="text"
>
<span
lang="en-GB"
>
Default Brand Name
Default Brand Name,
</span>
<span>
Service
</span>
,
Service
</span>
</div>
</div>
Expand Down Expand Up @@ -259,6 +261,7 @@ exports[`Brand should render correctly with link provided 1`] = `
class="emotion-2 emotion-3"
>
<a
aria-labelledby="BrandLink-null"
class="emotion-4 emotion-5"
href="https://www.bbc.co.uk/news"
>
Expand All @@ -280,15 +283,17 @@ exports[`Brand should render correctly with link provided 1`] = `
</svg>
<span
class="emotion-8 emotion-9"
id="BrandLink-null"
role="text"
>
<span
lang="en-GB"
>
Default Brand Name
Default Brand Name,
</span>
<span>
Service
</span>
,
Service
</span>
</a>
</div>
Expand Down Expand Up @@ -418,6 +423,7 @@ exports[`Brand should render correctly with no service Localised Name 1`] = `
</svg>
<span
class="emotion-6 emotion-7"
id="BrandLink-null"
>
BBC News
</span>
Expand Down Expand Up @@ -550,6 +556,7 @@ exports[`Brand should render correctly with transparent borders 1`] = `
</svg>
<span
class="emotion-6 emotion-7"
id="BrandLink-null"
>
BBC News
</span>
Expand Down
20 changes: 15 additions & 5 deletions packages/components/psammead-brand/src/index.jsx
Expand Up @@ -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
<VisuallyHiddenText role="text">
<span lang="en-GB">{product}</span>, {serviceLocalisedName}
<VisuallyHiddenText role="text" id={brandId}>
<span lang="en-GB">{`${product}, `}</span>
<span>{serviceLocalisedName}</span>
</VisuallyHiddenText>
) : (
<VisuallyHiddenText>{product}</VisuallyHiddenText>
<VisuallyHiddenText id={brandId}>{product}</VisuallyHiddenText>
);
};

LocalisedBrandName.propTypes = {
linkId: string.isRequired,
product: string.isRequired,
serviceLocalisedName: string,
};
Expand All @@ -142,6 +147,7 @@ LocalisedBrandName.defaultProps = {
};

const StyledBrand = ({
linkId,
product,
serviceLocalisedName,
svgHeight,
Expand Down Expand Up @@ -169,6 +175,7 @@ const StyledBrand = ({
{svg.group}
</BrandSvg>
<LocalisedBrandName
linkId={linkId}
product={product}
serviceLocalisedName={serviceLocalisedName}
/>
Expand All @@ -178,6 +185,7 @@ const StyledBrand = ({
);

const brandProps = {
linkId: string.isRequired,
product: string.isRequired,
serviceLocalisedName: string,
maxWidth: number.isRequired,
Expand Down Expand Up @@ -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}`}
>
<StyledBrand {...props} />
</StyledLink>
Expand Down
10 changes: 10 additions & 0 deletions packages/components/psammead-bulleted-list/CHANGELOG.md
Expand Up @@ -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 |
Expand Down
6 changes: 3 additions & 3 deletions 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,
Expand All @@ -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",
Expand Down
20 changes: 20 additions & 0 deletions packages/components/psammead-bulletin/CHANGELOG.md
Expand Up @@ -3,6 +3,26 @@
<!-- prettier-ignore -->
| 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 |
Expand Down
12 changes: 6 additions & 6 deletions 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,
Expand All @@ -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": {
Expand Down

0 comments on commit 24385e0

Please sign in to comment.