pull latest and fix after conflicts

.eslintrc.js

@@ -22,6 +22,6 @@ module.exports = {
   rules: {
     'react/jsx-one-expression-per-line': 'off',
     'linebreak-style': process.platform === 'win32' ? 'off' : ['error', 'unix'],
-    "import/no-extraneous-dependencies": 'off'
+    "import/no-extraneous-dependencies": 'off',
   },
 };

.storybook/config.js

@@ -8,14 +8,8 @@ import {
   AMP_SCRIPT,
   AMP_NO_SCRIPT,
 } from '@bbc/psammead-assets/amp-boilerplate';
-import {
-  F_REITH_SERIF_MEDIUM,
-  F_REITH_SERIF_MEDIUM_ITALIC,
-  F_REITH_SANS_REGULAR,
-  F_REITH_SANS_ITALIC,
-  F_REITH_SANS_BOLD,
-  F_REITH_SANS_BOLD_ITALIC,
-} from '@bbc/psammead-styles/fonts';
+import * as fontFaces from '@bbc/psammead-styles/fonts';
+
 import Helmet from 'react-helmet';
 
 const theme = create({
@@ -55,12 +49,9 @@ const GlobalStyle = createGlobalStyle`
     box-sizing: inherit;
   }
 
-  ${F_REITH_SERIF_MEDIUM}
-  ${F_REITH_SERIF_MEDIUM_ITALIC}
-  ${F_REITH_SANS_REGULAR}
-  ${F_REITH_SANS_ITALIC}
-  ${F_REITH_SANS_BOLD}
-  ${F_REITH_SANS_BOLD_ITALIC}
+  
+  ${Object.values(fontFaces).join('')}
+
 `;
 
 addDecorator(story => (

package.json

@@ -33,8 +33,8 @@
   },
   "homepage": "https://github.com/bbc/psammead#readme",
   "dependencies": {
-    "@bbc/psammead-styles": "^0.4.1",
-    "styled-components": "^4.3.1",
+    "@bbc/psammead-styles": "^1.0.0",
+    "styled-components": "^4.3.2",
     "styled-normalize": "^8.0.4"
   },
   "devDependencies": {

packages/components/psammead-brand/CHANGELOG.md

@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 | ------- | ----------- |
+| 4.1.3   | [PR#713](https://github.com/bbc/psammead/pull/713) Update `styled-components` to 4.3.2 |
 | 4.1.2   | [PR#684](https://github.com/bbc/psammead/pull/684) Update brand spacing breakpoint to kick in at 25rem |
 | 4.1.1   | [PR#677](https://github.com/bbc/psammead/pull/677) Use `@bbc/[email protected]` |
 | 4.1.0   | [PR#647](https://github.com/bbc/psammead/pull/647) Add transparent borders with borderTop and borderBottom props |