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

Update styled components in all packages #713

Merged
merged 17 commits into from
Jul 2, 2019
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
};
19 changes: 5 additions & 14 deletions .storybook/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -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 => (
Expand Down
95 changes: 38 additions & 57 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"storybook": "NODE_ENV=development start-storybook -p 8180 -c .storybook",
"test": "npm run test:lint && npm run test:lint:css && npm run test:unit && npm run test:packages",
"test:packages": "lerna run test",
"test:lint": "eslint --ext .js,jsx,json ./packages ./scripts",
"test:lint": "eslint --ext .js,jsx,json ./packages ./scripts --fix",
pjlee11 marked this conversation as resolved.
Show resolved Hide resolved
"test:lint:css": "stylelint 'packages/**/*.js' 'packages/**/*.jsx' 'scripts/**/*.js'",
"test:unit": "npm run build && jest --verbose --coverage",
"updateSnapshots": "npm run ci:packages && npm run test:unit -- -u"
Expand All @@ -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": {
Expand Down
Loading