From e9cf1c70718758ab5fcc562c08c29f53e9eaca28 Mon Sep 17 00:00:00 2001 From: Sareh Heidari Date: Mon, 10 Feb 2020 16:39:27 +0000 Subject: [PATCH 01/15] Use @bbc/psammead-story-promo@4.0.0-alpha.8 & psammead-grid@1.1.7 --- CHANGELOG.md | 1 + package-lock.json | 18 +++++++++--------- package.json | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f61d09985..8d4080ac76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 2.0.77 | [PR#x](https://github.com/bbc/psammead/pull/x) Update packages. | | 2.0.76 | [PR#3073](https://github.com/bbc/psammead/pull/3073) Update `@bbc/psammead-media-indicator` to major version 4 & update relevant usage in packages. | | 2.0.75 | [PR#3105](https://github.com/bbc/psammead/pull/3105) Use Node Image with version v12.15.0 & npm version 6.13.7 | | 2.0.74 | [PR#3104](https://github.com/bbc/psammead/pull/3104) Bumping dependencies | diff --git a/package-lock.json b/package-lock.json index 8d46420495..cbdbcd0cb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead", - "version": "2.0.76", + "version": "2.0.77", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2875,9 +2875,9 @@ } }, "@bbc/psammead-grid": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@bbc/psammead-grid/-/psammead-grid-1.1.6.tgz", - "integrity": "sha512-cco/zg4H448wc5Bwsv+uhAahvzfIDrKIba2veaAKYpoW1b5td2nhgej9h3nbnLWqSE87+OF75YZ0eKMtYJe5uQ==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@bbc/psammead-grid/-/psammead-grid-1.1.7.tgz", + "integrity": "sha512-XAxnoFvFuR28gEMcBe4tC+TZtdGL79nPfF7T+Pp1tLsrb0d7W+moRHIUH522BNGUXZ/yOfoY6bdN44iMMegqQw==", "dev": true, "requires": { "@bbc/gel-foundations": "^3.4.3", @@ -2941,13 +2941,13 @@ } }, "@bbc/psammead-story-promo": { - "version": "2.8.0-alpha.1", - "resolved": "https://registry.npmjs.org/@bbc/psammead-story-promo/-/psammead-story-promo-2.8.0-alpha.1.tgz", - "integrity": "sha512-CrsOR2RPIttDdiOKsbEl9C6fGnOuNAqJIr3418SF1O0EuR0COimkxddwEX3LrK7cejnVwzc2RacaNuZv2KEtYw==", + "version": "4.0.0-alpha.8", + "resolved": "https://registry.npmjs.org/@bbc/psammead-story-promo/-/psammead-story-promo-4.0.0-alpha.8.tgz", + "integrity": "sha512-oF+Q9KrSU3eDI7Q45FLTItdfH6Uj0geOYwPXKLKdN7oYZcC10DKQFeTgPR5CT/D+3YNMDcWGgYrrQpxzkF/fBA==", "dev": true, "requires": { - "@bbc/gel-foundations": "^3.4.0", - "@bbc/psammead-styles": "^4.0.1" + "@bbc/gel-foundations": "^3.4.3", + "@bbc/psammead-styles": "^4.3.0" } }, "@bbc/psammead-storybook-helpers": { diff --git a/package.json b/package.json index 2e7d89df70..8fc401486a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead", - "version": "2.0.76", + "version": "2.0.77", "description": "Core Components Library Developed & Maintained By The Articles and Reach & Languages Team", "main": "index.js", "private": true, @@ -54,14 +54,14 @@ "@bbc/psammead-calendars": "^2.0.5", "@bbc/psammead-caption": "^2.2.24", "@bbc/psammead-copyright": "^1.2.22", - "@bbc/psammead-grid": "^1.1.6", + "@bbc/psammead-grid": "^1.1.7", "@bbc/psammead-image": "^1.2.4", "@bbc/psammead-image-placeholder": "^1.2.33", "@bbc/psammead-inline-link": "^1.3.20", "@bbc/psammead-locales": "^4.1.2", "@bbc/psammead-media-indicator": "^4.0.1", "@bbc/psammead-paragraph": "^2.2.24", - "@bbc/psammead-story-promo": "2.8.0-alpha.1", + "@bbc/psammead-story-promo": "^4.0.0-alpha.8", "@bbc/psammead-storybook-helpers": "^8.2.3", "@bbc/psammead-styles": "^4.3.0", "@bbc/psammead-test-helpers": "^3.1.2", From 398b095a29c5c59d68e1766d099c317e2fd3522c Mon Sep 17 00:00:00 2001 From: Sareh Date: Mon, 10 Feb 2020 16:44:01 +0000 Subject: [PATCH 02/15] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d4080ac76..c10b05c3f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | |---------|-------------| -| 2.0.77 | [PR#x](https://github.com/bbc/psammead/pull/x) Update packages. | +| 2.0.77 | [PR#3107](https://github.com/bbc/psammead/pull/3107) Update packages. | | 2.0.76 | [PR#3073](https://github.com/bbc/psammead/pull/3073) Update `@bbc/psammead-media-indicator` to major version 4 & update relevant usage in packages. | | 2.0.75 | [PR#3105](https://github.com/bbc/psammead/pull/3105) Use Node Image with version v12.15.0 & npm version 6.13.7 | | 2.0.74 | [PR#3104](https://github.com/bbc/psammead/pull/3104) Bumping dependencies | From 3ce69f0e0b678c7b2f0774acf0e156da1b9035a9 Mon Sep 17 00:00:00 2001 From: Sareh Heidari Date: Mon, 10 Feb 2020 16:58:25 +0000 Subject: [PATCH 03/15] Update snapshots --- .../src/__snapshots__/index.test.jsx.snap | 50 ++++++++----------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/packages/components/psammead-story-promo-list/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-story-promo-list/src/__snapshots__/index.test.jsx.snap index 8e6dc7caac..3e897b9faf 100644 --- a/packages/components/psammead-story-promo-list/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-story-promo-list/src/__snapshots__/index.test.jsx.snap @@ -1,10 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`StoryPromo list should render correctly 1`] = ` -.c2 { - position: relative; -} - .c3 { display: inline-block; vertical-align: top; @@ -12,10 +8,6 @@ exports[`StoryPromo list should render correctly 1`] = ` width: 33.33%; } -.c4 { - position: relative; -} - .c5 { display: inline-block; vertical-align: top; @@ -23,15 +15,23 @@ exports[`StoryPromo list should render correctly 1`] = ` padding: 0 0.5rem; } +.c2 { + position: relative; +} + +.c4 { + position: relative; +} + .c6 { - font-size: 0.9375rem; - line-height: 1.25rem; - font-family: ReithSerif,Helvetica,Arial,sans-serif; - font-weight: 500; - font-style: normal; color: #222222; margin: 0; padding-bottom: 0.5rem; + font-family: ReithSerif,Helvetica,Arial,sans-serif; + font-weight: 500; + font-style: normal; + font-size: 0.9375rem; + line-height: 1.25rem; } .c7 { @@ -64,14 +64,6 @@ exports[`StoryPromo list should render correctly 1`] = ` padding: 0; } -@supports (grid-template-columns:fit-content(200px)) { - .c2 { - display: grid; - grid-template-columns: repeat(6,1fr); - grid-column-gap: 0.5rem; - } -} - @media (min-width:63rem) { .c3 { display: block; @@ -81,7 +73,6 @@ exports[`StoryPromo list should render correctly 1`] = ` @supports (grid-template-columns:fit-content(200px)) { .c3 { - display: block; width: initial; grid-column: 1 / span 2; } @@ -110,14 +101,15 @@ exports[`StoryPromo list should render correctly 1`] = ` } } -@media (min-width:20rem) and (max-width:37.4375rem) { - .c6 { - font-size: 1rem; - line-height: 1.25rem; +@supports (grid-template-columns:fit-content(200px)) { + .c2 { + display: grid; + grid-template-columns: repeat(6,1fr); + grid-column-gap: 0.5rem; } } -@media (min-width:37.5rem) { +@media (min-width:20rem) and (max-width:37.4375rem) { .c6 { font-size: 1rem; line-height: 1.25rem; @@ -126,8 +118,8 @@ exports[`StoryPromo list should render correctly 1`] = ` @media (min-width:37.5rem) { .c6 { - font-size: 1.25rem; - line-height: 1.5rem; + font-size: 1rem; + line-height: 1.25rem; } } From b3c53a1c8a07de3fb787d0b342b198ce52ec30d7 Mon Sep 17 00:00:00 2001 From: Sareh Heidari Date: Mon, 10 Feb 2020 18:06:05 +0000 Subject: [PATCH 04/15] Bump bbc/psammead-story-promo-list version since snapshots have been updated --- packages/components/psammead-story-promo-list/CHANGELOG.md | 1 + packages/components/psammead-story-promo-list/package-lock.json | 2 +- packages/components/psammead-story-promo-list/package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/components/psammead-story-promo-list/CHANGELOG.md b/packages/components/psammead-story-promo-list/CHANGELOG.md index 208891f5fa..64e6429aa7 100644 --- a/packages/components/psammead-story-promo-list/CHANGELOG.md +++ b/packages/components/psammead-story-promo-list/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | | ------- | ----------- | +| 4.0.2 | [PR#3107](https://github.com/bbc/psammead/pull/3107) Update snapshots using new version of story-promo at top level. | | 4.0.1 | [PR#3070](https://github.com/bbc/psammead/pull/3070) Padding fix - update padding-top to not be applied on first li at 1008px+. | | 4.0.0 | [PR#3058](https://github.com/bbc/psammead/pull/3058) Update `StoryPromoLi` padding top above 1008px | | 3.0.1 | [PR#3030](https://github.com/bbc/psammead/pull/3030) Talos - Bump Dependencies - @bbc/psammead-styles | diff --git a/packages/components/psammead-story-promo-list/package-lock.json b/packages/components/psammead-story-promo-list/package-lock.json index f4d7ce6842..c473e37d6f 100644 --- a/packages/components/psammead-story-promo-list/package-lock.json +++ b/packages/components/psammead-story-promo-list/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-story-promo-list", - "version": "4.0.1", + "version": "4.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/components/psammead-story-promo-list/package.json b/packages/components/psammead-story-promo-list/package.json index c92113174c..0b9d578f5c 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": "4.0.1", + "version": "4.0.2", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, From ff1d3ff427888807c21293eec4914f6778e7ce0a Mon Sep 17 00:00:00 2001 From: sareh Date: Tue, 11 Feb 2020 10:51:43 +0000 Subject: [PATCH 05/15] Use MediaIndicator update & pass in dir attribute --- package-lock.json | 6 +++--- package.json | 2 +- packages/components/psammead-grid/src/index.stories.jsx | 1 + packages/components/psammead-story-promo/CHANGELOG.md | 1 + packages/components/psammead-story-promo/package-lock.json | 2 +- packages/components/psammead-story-promo/package.json | 2 +- .../src/IndexAlsos/__snapshots__/index.test.jsx.snap | 2 ++ .../components/psammead-story-promo/src/index.stories.jsx | 1 + packages/components/psammead-story-promo/src/index.test.jsx | 2 +- .../testHelpers/IndexAlsosContainer.jsx | 3 +++ 10 files changed, 15 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index cbdbcd0cb6..e7af726999 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2920,9 +2920,9 @@ } }, "@bbc/psammead-media-indicator": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@bbc/psammead-media-indicator/-/psammead-media-indicator-4.0.1.tgz", - "integrity": "sha512-/2a1x4OE+JajNx3VvTymTUXfoFXNTQuf53aM1zdQO1qTMr2F5tiOvwid//Pd8DSj++5uYPWW+JlUSrVtaqxI7g==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@bbc/psammead-media-indicator/-/psammead-media-indicator-4.0.2.tgz", + "integrity": "sha512-kyQB/65F5/F63FzpfQZluf4HgQOgeKlUFPQ33No5ZJr5sQqYbpQGZZIZP4DAQ1dg1jtVVh65gi/+6koNlZtpcA==", "dev": true, "requires": { "@bbc/gel-foundations": "^3.4.3", diff --git a/package.json b/package.json index 8fc401486a..6652cfc5ba 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "@bbc/psammead-image-placeholder": "^1.2.33", "@bbc/psammead-inline-link": "^1.3.20", "@bbc/psammead-locales": "^4.1.2", - "@bbc/psammead-media-indicator": "^4.0.1", + "@bbc/psammead-media-indicator": "^4.0.2", "@bbc/psammead-paragraph": "^2.2.24", "@bbc/psammead-story-promo": "^4.0.0-alpha.8", "@bbc/psammead-storybook-helpers": "^8.2.3", diff --git a/packages/components/psammead-grid/src/index.stories.jsx b/packages/components/psammead-grid/src/index.stories.jsx index b426aa1f23..8088581ee4 100644 --- a/packages/components/psammead-grid/src/index.stories.jsx +++ b/packages/components/psammead-grid/src/index.stories.jsx @@ -1173,6 +1173,7 @@ storiesOf(STORY_KIND, module) const generateStory = ({ topStory, alsoItems = null, mediaType }) => { const MediaIndicatorComponent = () => ( | Version | Description | | ------- | ----------- | +| 4.0.0-alpha.9 | [PR#3107](https://github.com/bbc/psammead/pull/3107) Pass in dir prop to MediaIndicator in IndexAlsosContainer. | | 4.0.0-alpha.8 | [PR#3073](https://github.com/bbc/psammead/pull/3073) Use new major version of MediaIndicator. StoryPromo has updated styling around the MediaIndicator. Index Alsos test helper now using prop `isInline` for the MediaIndicator. | | 4.0.0-alpha.7 | [PR#3027](https://github.com/bbc/psammead/pull/3027) Use mobile and tablet stylings | | 4.0.0-alpha.6 | [PR#3030](https://github.com/bbc/psammead/pull/3030) Talos - Bump Dependencies - @bbc/psammead-styles | diff --git a/packages/components/psammead-story-promo/package-lock.json b/packages/components/psammead-story-promo/package-lock.json index 39e4f44508..a16cf38e0c 100644 --- a/packages/components/psammead-story-promo/package-lock.json +++ b/packages/components/psammead-story-promo/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-story-promo", - "version": "4.0.0-alpha.8", + "version": "4.0.0-alpha.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/components/psammead-story-promo/package.json b/packages/components/psammead-story-promo/package.json index b360c4878c..1146e06057 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": "4.0.0-alpha.8", + "version": "4.0.0-alpha.9", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, 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 302c826b96..4792d77c07 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 @@ -146,6 +146,7 @@ exports[`Index Alsos should render multiple correctly 1`] = `