BBC-archive · RichardPK · Oct 19, 2020 · Oct 19, 2020 · Oct 19, 2020 · Oct 19, 2020
diff --git a/packages/components/psammead-brand/CHANGELOG.md b/packages/components/psammead-brand/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 | ------- | ----------- |
+| 7.0.3 | [PR#3927](https://github.com/bbc/psammead/pull/3927) Remove unnecessary comment and linting |
 | 7.0.2 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-visually-hidden-text, @bbc/psammead-styles |
 | 7.0.1 | [PR#3894](https://github.com/bbc/psammead/pull/3894) Talos - Bump Dependencies - @bbc/psammead-script-link |
 | 7.0.0 | [PR#3891](https://github.com/bbc/psammead/pull/3891) Migrate to Emotion. |

diff --git a/packages/components/psammead-brand/package-lock.json b/packages/components/psammead-brand/package-lock.json
diff --git a/packages/components/psammead-brand/package.json b/packages/components/psammead-brand/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-brand",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,

diff --git a/packages/components/psammead-brand/src/index.jsx b/packages/components/psammead-brand/src/index.jsx
@@ -111,15 +111,12 @@ const BrandSvg = styled.svg`
     fill: windowText;
   }
 
-  /* stylelint-disable */
-  /* https://www.styled-components.com/docs/advanced#referring-to-other-components */
   ${StyledLink}:hover &,
     ${StyledLink}:focus & {
     text-decoration: none;
     border-bottom: ${GEL_SPACING_HLF} solid ${props => props.logoColour};
     margin-bottom: -${GEL_SPACING_HLF};
   }
-  /* stylelint-enable */
 `;
 
 const LocalisedBrandName = ({ product, serviceLocalisedName }) =>

diff --git a/packages/components/psammead-media-player/CHANGELOG.md b/packages/components/psammead-media-player/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version       | Description                                                                                                                  |
 | ------------- | ---------------------------------------------------------------------------------------------------------------------------- |
+| 5.0.2 | [PR#3927](https://github.com/bbc/psammead/pull/3927) Remove styled components reference in comments |
 | 5.0.1 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-assets |
 | 5.0.0 | [PR#3902](https://github.com/bbc/psammead/pull/3902) Migrate to emotion |
 | 4.0.4 | [PR#3903](https://github.com/bbc/psammead/pull/3903) Talos - Bump Dependencies - @bbc/psammead-play-button |

diff --git a/packages/components/psammead-media-player/package-lock.json b/packages/components/psammead-media-player/package-lock.json
diff --git 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.0.1",
+  "version": "5.0.2",
   "description": "Provides a media player with optional placeholder",
   "main": "dist/index.js",
   "module": "esm/index.js",

diff --git a/packages/components/psammead-media-player/src/Placeholder/index.jsx b/packages/components/psammead-media-player/src/Placeholder/index.jsx
@@ -15,8 +15,6 @@ const StyledPlaceholder = styled.div`
   ${({ noJsClassName }) => `cursor: ${noJsClassName ? 'default' : 'pointer'};`}
 `;
 
-/* stylelint-disable */
-/* https://www.styled-components.com/docs/advanced#referring-to-other-components */
 const StyledPlayButton = styled(PlayButton)`
   position: absolute;
   bottom: 0;
@@ -31,7 +29,6 @@ const StyledPlayButton = styled(PlayButton)`
     background-color: ${C_POSTBOX};
   }
 `;
-/* stylelint-enable */
 
 const Placeholder = ({
   onClick,

diff --git a/packages/components/psammead-navigation/CHANGELOG.md b/packages/components/psammead-navigation/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 8.0.2 | [PR#3927](https://github.com/bbc/psammead/pull/3927) Remove comment referencing styled-components. |
 | 8.0.1 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles, @bbc/psammead-visually-hidden-text |
 | 8.0.0 | [PR#3900](https://github.com/bbc/psammead/pull/3900) Migrate to Emotion. |
 | 7.0.3 | [PR#3883](https://github.com/bbc/psammead/pull/3883) Talos - Bump Dependencies - @bbc/psammead-assets, @bbc/psammead-styles, @bbc/psammead-visually-hidden-text |

diff --git a/packages/components/psammead-navigation/package-lock.json b/packages/components/psammead-navigation/package-lock.json
diff --git a/packages/components/psammead-navigation/package.json b/packages/components/psammead-navigation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-navigation",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "A navigation bar to use on index pages",
   "main": "dist/index.js",
   "module": "esm/index.js",

diff --git a/packages/components/psammead-navigation/src/DropdownNavigation/index.jsx b/packages/components/psammead-navigation/src/DropdownNavigation/index.jsx
@@ -178,14 +178,6 @@ const getButtonDimensions = lineHeight =>
   `height: ${calculateButtonSide(lineHeight)}rem;
   width: ${calculateButtonSide(lineHeight)}rem;`;
 
-// React allows us to put non-standard HTML attributes onto elements
-// whereas styled-components filters them out.
-// The `on` amp attribute is classed as non-standard, therefore we
-// make a react element which spreads the props as attributes
-// and style the React button.
-// For some reason the styled-components filtering only happens on SSR
-// so is not visible in tests or storybook, only once everything is
-// integrated into simorgh.
 // eslint-disable-next-line react/prop-types
 const Button = ({ script, ...props }) => <button type="button" {...props} />;
 

diff --git a/packages/components/psammead-script-link/CHANGELOG.md b/packages/components/psammead-script-link/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 3.0.2 | [PR#3927](https://github.com/bbc/psammead/pull/3927) Remove comment referencing styled-components |
 | 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 |

diff --git a/packages/components/psammead-script-link/package-lock.json b/packages/components/psammead-script-link/package-lock.json
diff --git 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.1",
+  "version": "3.0.2",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,

diff --git a/packages/components/psammead-script-link/src/index.jsx b/packages/components/psammead-script-link/src/index.jsx
@@ -36,14 +36,11 @@ const StyledSpan = styled.span`
   height: calc(100%);
   padding: 0 ${GEL_SPACING};
 
-  /* stylelint-disable */
-  /* https://www.styled-components.com/docs/advanced#referring-to-other-components */
   ${StyledLink}:hover &,
   ${StyledLink}:focus & {
     margin: 0;
     border: 0.1875rem solid ${C_WHITE};
   }
-  /* stylelint-enable */
 
   @media (max-width: ${GEL_GROUP_2_SCREEN_WIDTH_MAX}) {
     line-height: calc(${GEL_SPACING_QUIN} - ${GEL_SPACING});

diff --git a/packages/components/psammead-useful-links/CHANGELOG.md b/packages/components/psammead-useful-links/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 3.0.2 | [PR#3927](https://github.com/bbc/psammead/pull/3927) Remove styled components reference |
 | 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 |

diff --git a/packages/components/psammead-useful-links/package-lock.json b/packages/components/psammead-useful-links/package-lock.json
diff --git 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.1",
+  "version": "3.0.2",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,
@@ -13,7 +13,7 @@
     "bbc",
     "links",
     "useful-links",
-    "styled-components",
+    "emotion",
     "link-promo"
   ],
   "author": {

diff --git a/packages/utilities/psammead-test-helpers/CHANGELOG.md b/packages/utilities/psammead-test-helpers/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 5.0.1 | [PR#3927](https://github.com/bbc/psammead/pull/3927) Remove reference to styled-components in pacakge description |
 | 5.0.0 | [PR#3869](https://github.com/bbc/psammead/pull/3869) shouldMatchSnapshot simplified to work with Emotion |
 | 4.0.0 | [PR#3636](https://github.com/bbc/psammead/pull/3636) Decouple from jest-styled-components |
 | 3.1.5 | [PR#3388](https://github.com/bbc/psammead/pull/3388) Update react-helmet to 6.0.0 |

diff --git a/packages/utilities/psammead-test-helpers/package-lock.json b/packages/utilities/psammead-test-helpers/package-lock.json
diff --git a/packages/utilities/psammead-test-helpers/package.json b/packages/utilities/psammead-test-helpers/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@bbc/psammead-test-helpers",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,
-  "description": "A collection of helper methods for implementing Jest snapshot tests for styled-components, required by many Psammead components.",
+  "description": "A collection of helper methods for implementing Jest snapshot tests for emotion, required by many Psammead components.",
   "repository": {
     "type": "git",
     "url": "https://github.com/bbc/psammead/tree/latest/packages/utilities/psammead-test-helpers"