From a19f49298b77daf3cc0da4e55f608e1b8064ae7b Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 13 May 2019 10:08:41 +0300 Subject: [PATCH 1/7] remove rtl addon --- .storybook/addons.js | 1 - .storybook/config.js | 2 -- package-lock.json | 10 ---------- package.json | 1 - 4 files changed, 14 deletions(-) diff --git a/.storybook/addons.js b/.storybook/addons.js index a3cbbe22cd..95f470eb7b 100644 --- a/.storybook/addons.js +++ b/.storybook/addons.js @@ -1,3 +1,2 @@ import '@storybook/addon-notes/register'; import '@storybook/addon-knobs/register'; -import 'storybook-addon-rtl/register'; diff --git a/.storybook/config.js b/.storybook/config.js index e080612998..147f516e63 100644 --- a/.storybook/config.js +++ b/.storybook/config.js @@ -16,7 +16,6 @@ import { F_REITH_SANS_BOLD_ITALIC, } from '@bbc/psammead-styles/fonts'; import Helmet from 'react-helmet'; -import { initializeRTL } from 'storybook-addon-rtl'; const theme = create({ base: 'light', @@ -77,7 +76,6 @@ export const ampDecorator = story => ( function loadAllStories() { require('glob-loader!./stories.pattern'); - initializeRTL(); } configure(loadAllStories, module); diff --git a/package-lock.json b/package-lock.json index 06ae38c8f1..4f770ecbf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16262,16 +16262,6 @@ "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", "dev": true }, - "storybook-addon-rtl": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/storybook-addon-rtl/-/storybook-addon-rtl-0.2.2.tgz", - "integrity": "sha512-vTXX2qKyIzH6amknJHPQFQf6LDPUEu8UwYqQVU0JlYrfjgrsMb/KKhk47iTjrR6eHCtDBOmJJt9lPWr1uTqmuA==", - "dev": true, - "requires": { - "prop-types": "^15.7.2", - "styled-components": "^4.1.3" - } - }, "storybook-readme": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/storybook-readme/-/storybook-readme-5.0.1.tgz", diff --git a/package.json b/package.json index 7370e5a5cf..b94b129348 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,6 @@ "request": "^2.88.0", "semver": "^5.6.0", "shelljs": "^0.8.3", - "storybook-addon-rtl": "^0.2.2", "storybook-readme": "^5.0.1", "strip-ansi": "^5.0.0", "stylelint": "^9.8.0", From 91260f43e5cac80a3ff2a73fd5583bb7d5a62571 Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 13 May 2019 10:21:15 +0300 Subject: [PATCH 2/7] use dirDecorator in storybook --- .../components/psammead-brand/CHANGELOG.md | 1 + .../psammead-brand/package-lock.json | 60 ++++++++++++++++++- .../components/psammead-brand/package.json | 3 +- .../psammead-brand/src/index.stories.jsx | 2 + 4 files changed, 64 insertions(+), 2 deletions(-) diff --git a/packages/components/psammead-brand/CHANGELOG.md b/packages/components/psammead-brand/CHANGELOG.md index be6a54ab76..9c0ff82fbf 100644 --- a/packages/components/psammead-brand/CHANGELOG.md +++ b/packages/components/psammead-brand/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | | ------- | ----------- | +| 1.0.2 | [PR#???](https://github.com/bbc/psammead/pull/???) Update story to use dirDecorator | | 1.0.1 | [PR#476](https://github.com/bbc/psammead/pull/476) Fail gracefully if brand svg is not provided | | 1.0.0 | [PR#457](https://github.com/bbc/psammead/pull/457) Enable passing of different svgs | | 0.3.4 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | diff --git a/packages/components/psammead-brand/package-lock.json b/packages/components/psammead-brand/package-lock.json index e0bb624d99..77b9114207 100644 --- a/packages/components/psammead-brand/package-lock.json +++ b/packages/components/psammead-brand/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-brand", - "version": "1.0.1", + "version": "1.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -41,6 +41,24 @@ "integrity": "sha512-oEGKvOYy3M+ceZVgkdnTxkn35xhLCAvhZN179NSMeChUhPKT8u8ZGertRjFcffasFlm8i+vdstJgAClVO7aNCg==", "dev": true }, + "@bbc/psammead-storybook-helpers": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@bbc/psammead-storybook-helpers/-/psammead-storybook-helpers-2.1.1.tgz", + "integrity": "sha512-kKpeH97+PY439LoUkTceNtgJynjRbwU9AbmNjsZ18h+alVR2PbZ2j2uYXTo6ux1DiCN3L15aLZmu4K3VordLmw==", + "dev": true, + "requires": { + "@bbc/gel-foundations": "^1.2.0", + "react-helmet": "^5.2.0" + }, + "dependencies": { + "@bbc/gel-foundations": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@bbc/gel-foundations/-/gel-foundations-1.2.0.tgz", + "integrity": "sha512-OpEJf42FSgyZRN0e9pJFm9eYmzbhfB7W7EWlrjh46fWlozyVwKA4uaTPUoGHLbXJkMOhPdpfM3gOAxbuM0FnrQ==", + "dev": true + } + } + }, "@bbc/psammead-styles": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@bbc/psammead-styles/-/psammead-styles-0.3.2.tgz", @@ -147,6 +165,12 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" }, + "exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -222,11 +246,39 @@ "scheduler": "^0.13.3" } }, + "react-fast-compare": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", + "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==", + "dev": true + }, + "react-helmet": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", + "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", + "dev": true, + "requires": { + "object-assign": "^4.1.1", + "prop-types": "^15.5.4", + "react-fast-compare": "^2.0.2", + "react-side-effect": "^1.1.0" + } + }, "react-is": { "version": "16.8.3", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.3.tgz", "integrity": "sha512-Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA==" }, + "react-side-effect": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz", + "integrity": "sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw==", + "dev": true, + "requires": { + "exenv": "^1.2.1", + "shallowequal": "^1.0.1" + } + }, "react-test-renderer": { "version": "16.8.5", "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.8.5.tgz", @@ -273,6 +325,12 @@ "object-assign": "^4.1.1" } }, + "shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", diff --git a/packages/components/psammead-brand/package.json b/packages/components/psammead-brand/package.json index 63d428f4af..2310a66dd3 100644 --- a/packages/components/psammead-brand/package.json +++ b/packages/components/psammead-brand/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-brand", - "version": "1.0.1", + "version": "1.0.2", "main": "dist/index.js", "description": "Provides the BBC News logo (as SVG), nested a hardcoded link to https://www.bbc.co.uk/news", "repository": { @@ -23,6 +23,7 @@ }, "devDependencies": { "@bbc/psammead-assets": "^0.1.8", + "@bbc/psammead-storybook-helpers": "^2.1.1", "@bbc/psammead-test-helpers": "^0.3.3", "react": "^16.6.3", "styled-components": "^4.1.3" diff --git a/packages/components/psammead-brand/src/index.stories.jsx b/packages/components/psammead-brand/src/index.stories.jsx index 5d4c044714..ca1e326b06 100644 --- a/packages/components/psammead-brand/src/index.stories.jsx +++ b/packages/components/psammead-brand/src/index.stories.jsx @@ -2,11 +2,13 @@ import React from 'react'; import { select, withKnobs } from '@storybook/addon-knobs'; import { storiesOf } from '@storybook/react'; import * as svgs from '@bbc/psammead-assets/svgs'; +import { dirDecorator } from '@bbc/psammead-storybook-helpers'; import notes from '../README.md'; import Brand from './index'; storiesOf('Brand', module) .addDecorator(withKnobs) + .addDecorator(dirDecorator) .add( 'default', () => { From 9c35ff191cb2760aa1ba6d572bf0ce844daff686 Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 13 May 2019 10:23:36 +0300 Subject: [PATCH 3/7] Remove dirDecorator from withoutSVG story --- .../components/psammead-brand/src/index.stories.jsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/components/psammead-brand/src/index.stories.jsx b/packages/components/psammead-brand/src/index.stories.jsx index ca1e326b06..47ea4848d3 100644 --- a/packages/components/psammead-brand/src/index.stories.jsx +++ b/packages/components/psammead-brand/src/index.stories.jsx @@ -21,7 +21,12 @@ storiesOf('Brand', module) return ; }, { notes }, - ) - .add('without brand svg', () => , { + ); + +storiesOf('Brand', module).add( + 'without brand svg', + () => , + { notes, - }); + }, +); From 9e9206d2abf0406f20f2504578c03ff312158dcb Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 13 May 2019 10:38:29 +0300 Subject: [PATCH 4/7] Update Caption story to use dirDecorator --- packages/components/psammead-caption/CHANGELOG.md | 1 + packages/components/psammead-caption/package-lock.json | 9 +++++---- packages/components/psammead-caption/package.json | 6 +++--- .../components/psammead-caption/src/index.stories.jsx | 8 ++++++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/components/psammead-caption/CHANGELOG.md b/packages/components/psammead-caption/CHANGELOG.md index abb403c436..b22dd3796f 100644 --- a/packages/components/psammead-caption/CHANGELOG.md +++ b/packages/components/psammead-caption/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 1.1.4 | [PR#???](https://github.com/bbc/psammead/pull/???) Update story to use dirDecorator | | 1.1.3 | [PR#491](https://github.com/bbc/psammead/pull/491) Remove bottom padding from paragraphs within Caption | | 1.1.2 | [PR#498](https://github.com/bbc/psammead/pull/498) Update stories to use new input provider | | 1.1.1 | [PR#459](https://github.com/bbc/psammead/pull/459) Add custom propTypes shape | diff --git a/packages/components/psammead-caption/package-lock.json b/packages/components/psammead-caption/package-lock.json index 6f387d8ef7..31f0c8bc72 100644 --- a/packages/components/psammead-caption/package-lock.json +++ b/packages/components/psammead-caption/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-caption", - "version": "1.1.3", + "version": "1.1.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -60,15 +60,16 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/@bbc/psammead-paragraph/-/psammead-paragraph-1.0.3.tgz", "integrity": "sha512-OwKR8rl5Cy5BO/lU4agAYM3BndQksRpojkV/OHpTEBOfC6WA+ZdICYuC0YhrT2DfjdOfjpKCNbT3Dy1mU8HhwQ==", + "dev": true, "requires": { "@bbc/gel-foundations": "^1.2.0", "@bbc/psammead-styles": "^0.3.2" } }, "@bbc/psammead-storybook-helpers": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@bbc/psammead-storybook-helpers/-/psammead-storybook-helpers-2.0.0.tgz", - "integrity": "sha512-mWSd6TCld6mfTQF+YWzKEaPzICr7nTzuruhezeG/xF1T34++XBjw5Ika2BP2+uYKEmN7AxOq25OmNdmcjn4zhQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@bbc/psammead-storybook-helpers/-/psammead-storybook-helpers-2.1.1.tgz", + "integrity": "sha512-kKpeH97+PY439LoUkTceNtgJynjRbwU9AbmNjsZ18h+alVR2PbZ2j2uYXTo6ux1DiCN3L15aLZmu4K3VordLmw==", "dev": true, "requires": { "@bbc/gel-foundations": "^1.2.0", diff --git a/packages/components/psammead-caption/package.json b/packages/components/psammead-caption/package.json index 8de323af74..ef1b28003c 100644 --- a/packages/components/psammead-caption/package.json +++ b/packages/components/psammead-caption/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-caption", - "version": "1.1.3", + "version": "1.1.4", "main": "dist/index.js", "description": "React styled components for a Caption", "repository": { @@ -21,9 +21,9 @@ "@bbc/psammead-styles": "^0.3.2" }, "devDependencies": { - "@bbc/psammead-paragraph": "^1.0.3", "@bbc/psammead-inline-link": "^0.3.4", - "@bbc/psammead-storybook-helpers": "^2.0.0", + "@bbc/psammead-paragraph": "^1.0.3", + "@bbc/psammead-storybook-helpers": "^2.1.1", "@bbc/psammead-test-helpers": "^0.3.3", "@bbc/psammead-visually-hidden-text": "^0.1.10", "react": "^16.6.3", diff --git a/packages/components/psammead-caption/src/index.stories.jsx b/packages/components/psammead-caption/src/index.stories.jsx index a75ceaba7d..7fcf60eeed 100644 --- a/packages/components/psammead-caption/src/index.stories.jsx +++ b/packages/components/psammead-caption/src/index.stories.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; import { withKnobs } from '@storybook/addon-knobs'; -import { inputProvider } from '@bbc/psammead-storybook-helpers'; +import { inputProvider, dirDecorator } from '@bbc/psammead-storybook-helpers'; import InlineLink from '@bbc/psammead-inline-link'; import Paragraph from '@bbc/psammead-paragraph'; import VisuallyHiddenText from '@bbc/psammead-visually-hidden-text'; @@ -48,7 +48,11 @@ storiesOf('Caption', module) ), ), { notes, knobs: { escapeHTML: false } }, - ) + ); + +storiesOf('Caption', module) + .addDecorator(withKnobs) + .addDecorator(dirDecorator) .add( 'containing italicisation', inputProvider([], (inputs, script) => ( From 35822893eb51c8e6cbc158ce37ebf6a9bd308de1 Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 13 May 2019 10:47:11 +0300 Subject: [PATCH 5/7] Update MediaIndicator story to use dirDecorator --- .../psammead-media-indicator/CHANGELOG.md | 1 + .../package-lock.json | 52 ++++++++++++++++++- .../psammead-media-indicator/package.json | 3 +- .../src/index.stories.jsx | 2 + 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/packages/components/psammead-media-indicator/CHANGELOG.md b/packages/components/psammead-media-indicator/CHANGELOG.md index cfb63c80cd..c89bc6bf8f 100644 --- a/packages/components/psammead-media-indicator/CHANGELOG.md +++ b/packages/components/psammead-media-indicator/CHANGELOG.md @@ -3,4 +3,5 @@ | Version | Description | | ------- | ----------- | +| 0.1.1 | [PR#???](https://github.com/BBC-News/psammead/pull/???) Update story to use dirDecorator | | 0.1.0 | [PR#448](https://github.com/BBC-News/psammead/pull/448) Create initial package. | diff --git a/packages/components/psammead-media-indicator/package-lock.json b/packages/components/psammead-media-indicator/package-lock.json index 05eeeaa03e..55ab2d86e7 100644 --- a/packages/components/psammead-media-indicator/package-lock.json +++ b/packages/components/psammead-media-indicator/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-media-indicator", - "version": "0.1.0", + "version": "0.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -38,6 +38,16 @@ "resolved": "https://registry.npmjs.org/@bbc/gel-foundations/-/gel-foundations-1.2.0.tgz", "integrity": "sha512-OpEJf42FSgyZRN0e9pJFm9eYmzbhfB7W7EWlrjh46fWlozyVwKA4uaTPUoGHLbXJkMOhPdpfM3gOAxbuM0FnrQ==" }, + "@bbc/psammead-storybook-helpers": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@bbc/psammead-storybook-helpers/-/psammead-storybook-helpers-2.1.1.tgz", + "integrity": "sha512-kKpeH97+PY439LoUkTceNtgJynjRbwU9AbmNjsZ18h+alVR2PbZ2j2uYXTo6ux1DiCN3L15aLZmu4K3VordLmw==", + "dev": true, + "requires": { + "@bbc/gel-foundations": "^1.2.0", + "react-helmet": "^5.2.0" + } + }, "@bbc/psammead-styles": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@bbc/psammead-styles/-/psammead-styles-0.3.3.tgz", @@ -150,6 +160,12 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, + "exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -233,12 +249,40 @@ "scheduler": "^0.13.3" } }, + "react-fast-compare": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", + "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==", + "dev": true + }, + "react-helmet": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", + "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", + "dev": true, + "requires": { + "object-assign": "^4.1.1", + "prop-types": "^15.5.4", + "react-fast-compare": "^2.0.2", + "react-side-effect": "^1.1.0" + } + }, "react-is": { "version": "16.8.3", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.3.tgz", "integrity": "sha512-Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA==", "dev": true }, + "react-side-effect": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz", + "integrity": "sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw==", + "dev": true, + "requires": { + "exenv": "^1.2.1", + "shallowequal": "^1.0.1" + } + }, "react-test-renderer": { "version": "16.8.5", "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.8.5.tgz", @@ -285,6 +329,12 @@ "object-assign": "^4.1.1" } }, + "shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", diff --git a/packages/components/psammead-media-indicator/package.json b/packages/components/psammead-media-indicator/package.json index a0784fe875..c2f94ad15e 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": "0.1.0", + "version": "0.1.1", "main": "dist/index.js", "description": "Provides a play icon and media duration for media page promos", "repository": { @@ -22,6 +22,7 @@ "@bbc/psammead-visually-hidden-text": "^0.1.12" }, "devDependencies": { + "@bbc/psammead-storybook-helpers": "^2.1.1", "@bbc/psammead-test-helpers": "^0.3.3", "react": "^16.6.3", "styled-components": "^4.1.3" diff --git a/packages/components/psammead-media-indicator/src/index.stories.jsx b/packages/components/psammead-media-indicator/src/index.stories.jsx index 2f3a3de8e9..08729198f1 100644 --- a/packages/components/psammead-media-indicator/src/index.stories.jsx +++ b/packages/components/psammead-media-indicator/src/index.stories.jsx @@ -2,6 +2,7 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; import styled from 'styled-components'; import { withKnobs, text } from '@storybook/addon-knobs'; +import { dirDecorator } from '@bbc/psammead-storybook-helpers'; import notes from '../README.md'; import MediaIndicator from './index'; @@ -16,6 +17,7 @@ const PageDecorator = storyFn => {storyFn()}; storiesOf('MediaIndicator', module) .addDecorator(PageDecorator) .addDecorator(withKnobs) + .addDecorator(dirDecorator) .add( 'default', () => ( From 89874f4854787c634f591750416babd19a71a0ca Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 13 May 2019 10:54:59 +0300 Subject: [PATCH 6/7] Update Timestamp story to use dirDecorator --- .../psammead-timestamp/CHANGELOG.md | 1 + .../psammead-timestamp/package-lock.json | 52 ++++++++++++++++++- .../psammead-timestamp/package.json | 3 +- .../psammead-timestamp/src/index.stories.jsx | 2 + 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/packages/components/psammead-timestamp/CHANGELOG.md b/packages/components/psammead-timestamp/CHANGELOG.md index c0e1caa457..d95ef2b508 100644 --- a/packages/components/psammead-timestamp/CHANGELOG.md +++ b/packages/components/psammead-timestamp/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 0.3.2 | [PR#???](https://github.com/bbc/psammead/pull/???) Update story to use dirDecorator | | 0.3.1 | [PR#493](https://github.com/bbc/psammead/pull/493) Add optional padding prop | | 0.3.0 | [PR#494](https://github.com/bbc/psammead/pull/494) Make script a required prop. | | 0.2.0 | [PR#461](https://github.com/bbc/psammead/pull/461) Make timestamp typography styling agnostic | diff --git a/packages/components/psammead-timestamp/package-lock.json b/packages/components/psammead-timestamp/package-lock.json index 7fd40a4a6e..5974065eca 100644 --- a/packages/components/psammead-timestamp/package-lock.json +++ b/packages/components/psammead-timestamp/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-timestamp", - "version": "0.3.1", + "version": "0.3.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -38,6 +38,16 @@ "resolved": "https://registry.npmjs.org/@bbc/gel-foundations/-/gel-foundations-1.2.0.tgz", "integrity": "sha512-OpEJf42FSgyZRN0e9pJFm9eYmzbhfB7W7EWlrjh46fWlozyVwKA4uaTPUoGHLbXJkMOhPdpfM3gOAxbuM0FnrQ==" }, + "@bbc/psammead-storybook-helpers": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@bbc/psammead-storybook-helpers/-/psammead-storybook-helpers-2.1.1.tgz", + "integrity": "sha512-kKpeH97+PY439LoUkTceNtgJynjRbwU9AbmNjsZ18h+alVR2PbZ2j2uYXTo6ux1DiCN3L15aLZmu4K3VordLmw==", + "dev": true, + "requires": { + "@bbc/gel-foundations": "^1.2.0", + "react-helmet": "^5.2.0" + } + }, "@bbc/psammead-test-helpers": { "version": "0.3.4", "resolved": "https://registry.npmjs.org/@bbc/psammead-test-helpers/-/psammead-test-helpers-0.3.4.tgz", @@ -140,6 +150,12 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, + "exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -211,12 +227,40 @@ "react-is": "^16.8.1" } }, + "react-fast-compare": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", + "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==", + "dev": true + }, + "react-helmet": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", + "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", + "dev": true, + "requires": { + "object-assign": "^4.1.1", + "prop-types": "^15.5.4", + "react-fast-compare": "^2.0.2", + "react-side-effect": "^1.1.0" + } + }, "react-is": { "version": "16.8.6", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==", "dev": true }, + "react-side-effect": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz", + "integrity": "sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw==", + "dev": true, + "requires": { + "exenv": "^1.2.1", + "shallowequal": "^1.0.1" + } + }, "react-test-renderer": { "version": "16.8.6", "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.8.6.tgz", @@ -245,6 +289,12 @@ "object-assign": "^4.1.1" } }, + "shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", diff --git a/packages/components/psammead-timestamp/package.json b/packages/components/psammead-timestamp/package.json index a4cf08188e..2e420e1d61 100644 --- a/packages/components/psammead-timestamp/package.json +++ b/packages/components/psammead-timestamp/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-timestamp", - "version": "0.3.1", + "version": "0.3.2", "main": "dist/index.js", "description": "React styled component for displaying a timestamp with a suitable semantic markup", "repository": { @@ -20,6 +20,7 @@ "@bbc/gel-foundations": "^1.2.0" }, "devDependencies": { + "@bbc/psammead-storybook-helpers": "^2.1.1", "@bbc/psammead-test-helpers": "^0.3.0", "styled-components": "^4.1.3" }, diff --git a/packages/components/psammead-timestamp/src/index.stories.jsx b/packages/components/psammead-timestamp/src/index.stories.jsx index cf772a27a2..1a33dd2633 100644 --- a/packages/components/psammead-timestamp/src/index.stories.jsx +++ b/packages/components/psammead-timestamp/src/index.stories.jsx @@ -3,6 +3,7 @@ import { storiesOf } from '@storybook/react'; // eslint-disable-line import/no-e import { text, select, boolean, withKnobs } from '@storybook/addon-knobs'; import * as typography from '@bbc/gel-foundations/typography'; import { latin } from '@bbc/gel-foundations/scripts'; +import { dirDecorator } from '@bbc/psammead-storybook-helpers'; import notes from '../README.md'; import Timestamp from '.'; @@ -20,6 +21,7 @@ const styles = Object.keys(typography) storiesOf('Timestamp', module) .addDecorator(withKnobs) + .addDecorator(dirDecorator) .add( 'default', () => { From 5b781f0d4cc0fdc2d99cb54fe34b7f8d1a308606 Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 13 May 2019 11:10:40 +0300 Subject: [PATCH 7/7] Update PR number --- packages/components/psammead-brand/CHANGELOG.md | 2 +- packages/components/psammead-caption/CHANGELOG.md | 2 +- packages/components/psammead-media-indicator/CHANGELOG.md | 2 +- packages/components/psammead-timestamp/CHANGELOG.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/components/psammead-brand/CHANGELOG.md b/packages/components/psammead-brand/CHANGELOG.md index 9c0ff82fbf..fa598905ab 100644 --- a/packages/components/psammead-brand/CHANGELOG.md +++ b/packages/components/psammead-brand/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | | ------- | ----------- | -| 1.0.2 | [PR#???](https://github.com/bbc/psammead/pull/???) Update story to use dirDecorator | +| 1.0.2 | [PR#515](https://github.com/bbc/psammead/pull/515) Update story to use dirDecorator | | 1.0.1 | [PR#476](https://github.com/bbc/psammead/pull/476) Fail gracefully if brand svg is not provided | | 1.0.0 | [PR#457](https://github.com/bbc/psammead/pull/457) Enable passing of different svgs | | 0.3.4 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | diff --git a/packages/components/psammead-caption/CHANGELOG.md b/packages/components/psammead-caption/CHANGELOG.md index b22dd3796f..1c726f0a8d 100644 --- a/packages/components/psammead-caption/CHANGELOG.md +++ b/packages/components/psammead-caption/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | |---------|-------------| -| 1.1.4 | [PR#???](https://github.com/bbc/psammead/pull/???) Update story to use dirDecorator | +| 1.1.4 | [PR#515](https://github.com/bbc/psammead/pull/515) Update story to use dirDecorator | | 1.1.3 | [PR#491](https://github.com/bbc/psammead/pull/491) Remove bottom padding from paragraphs within Caption | | 1.1.2 | [PR#498](https://github.com/bbc/psammead/pull/498) Update stories to use new input provider | | 1.1.1 | [PR#459](https://github.com/bbc/psammead/pull/459) Add custom propTypes shape | diff --git a/packages/components/psammead-media-indicator/CHANGELOG.md b/packages/components/psammead-media-indicator/CHANGELOG.md index c89bc6bf8f..e9248ceeef 100644 --- a/packages/components/psammead-media-indicator/CHANGELOG.md +++ b/packages/components/psammead-media-indicator/CHANGELOG.md @@ -3,5 +3,5 @@ | Version | Description | | ------- | ----------- | -| 0.1.1 | [PR#???](https://github.com/BBC-News/psammead/pull/???) Update story to use dirDecorator | +| 0.1.1 | [PR#515](https://github.com/BBC-News/psammead/pull/515) Update story to use dirDecorator | | 0.1.0 | [PR#448](https://github.com/BBC-News/psammead/pull/448) Create initial package. | diff --git a/packages/components/psammead-timestamp/CHANGELOG.md b/packages/components/psammead-timestamp/CHANGELOG.md index d95ef2b508..523869d8b6 100644 --- a/packages/components/psammead-timestamp/CHANGELOG.md +++ b/packages/components/psammead-timestamp/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | |---------|-------------| -| 0.3.2 | [PR#???](https://github.com/bbc/psammead/pull/???) Update story to use dirDecorator | +| 0.3.2 | [PR#515](https://github.com/bbc/psammead/pull/515) Update story to use dirDecorator | | 0.3.1 | [PR#493](https://github.com/bbc/psammead/pull/493) Add optional padding prop | | 0.3.0 | [PR#494](https://github.com/bbc/psammead/pull/494) Make script a required prop. | | 0.2.0 | [PR#461](https://github.com/bbc/psammead/pull/461) Make timestamp typography styling agnostic |