Skip to content

Commit c93ede1

Browse files
committed
updated packages, upgraded storybook@4 -> storybook@5
1 parent 1e5d697 commit c93ede1

File tree

7 files changed

+2427
-1855
lines changed

7 files changed

+2427
-1855
lines changed

.npmrc

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
save-exact=true
21
@natterstefan:registry=http://localhost:4873/
32
//localhost:4873/:_authToken="kG7FOb1Nem5Q1+mnSw88pg=="

.storybook/addons.js

-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@ import '@storybook/addon-knobs/register'
44
import '@storybook/addon-viewport/register'
55
import 'storybook-addon-jsx/register'
66
import '@storybook/addon-storysource/register'
7-
// import '@storybook/addon-backgrounds/register'
8-
import '@storybook/addon-options/register'

.storybook/config.js

+12-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { addDecorator, configure, setAddon } from '@storybook/react'
2-
import { withOptions } from '@storybook/addon-options'
1+
import { addParameters, configure, setAddon } from '@storybook/react'
32
import { configureViewport, INITIAL_VIEWPORTS } from '@storybook/addon-viewport'
43
import { withBackgrounds } from '@storybook/addon-backgrounds'
54
import JSXAddon from 'storybook-addon-jsx'
@@ -17,33 +16,25 @@ function loadStories() {
1716
})
1817
}
1918

20-
addDecorator(
21-
withOptions({
22-
name: '@natterstefan',
23-
url: 'https://twitter.com/natterstefan',
24-
addonPanelInRight: true,
25-
goFullScreen: false,
26-
showAddonPanel: true,
19+
addParameters({
20+
options: {
21+
brandTitle: '@natterstefan',
22+
brandUrl: 'https://twitter.com/natterstefan',
23+
isFullscreen: false,
24+
panelPosition: 'right',
25+
showNav: true,
26+
showPanel: true,
2727
showSearchBox: false,
2828
sortStoriesByKind: true,
29-
showStoriesPanel: true,
30-
}),
31-
)
29+
},
30+
})
3231

33-
configureViewport({
32+
addParameters({
3433
viewports: {
3534
...INITIAL_VIEWPORTS,
3635
},
3736
})
3837

39-
// NOTE: does not work when using <GlobalStyles /> in a story
40-
// addDecorator(
41-
// withBackgrounds([
42-
// { name: 'gray', value: '#efefef' },
43-
// { name: 'white', value: '#fff', default: true },
44-
// ]),
45-
// )
46-
4738
setAddon(JSXAddon)
4839

4940
configure(loadStories, module)

.storybook/webpack.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* Docs
33
* - https://github.com/storybooks/storybook/tree/master/addons/storysource#getting-started
44
*/
5-
module.exports = function(baseConfig, env, defaultConfig) {
6-
defaultConfig.module.rules.push({
5+
module.exports = ({ config }) => {
6+
config.module.rules.push({
77
test: /\.stories\.jsx?$/,
88
exclude: /node_modules/,
99
loaders: [require.resolve('@storybook/addon-storysource/loader')],
1010
enforce: 'pre',
1111
})
1212

13-
return defaultConfig
13+
return config
1414
}

README.md

+21
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
Build your own React component library managed with lerna and presented with
1010
storybook.
1111

12+
## Features
13+
14+
- [react-hooks](https://reactjs.org/docs/hooks-overview.html) support ⚛
15+
- integrated [storybook@5](https://storybook.js.org) :books:
16+
- example components built with styled-components 💅
17+
1218
## Getting started
1319

1420
Use `yarn` instead of `npm`, because we rely on [`yarn`'s `workspaces` feature](https://yarnpkg.com/lang/en/docs/workspaces/).
@@ -72,6 +78,21 @@ the root folder (uses lerna).
7278
In order to publish your packages to npm, simply change the `registry` property
7379
in each `package.json`'s `publishConfig`.
7480

81+
## Contribution
82+
83+
PRs are welcome and I am happy if you want to contribute! Just let me know,
84+
please.
85+
86+
### Forks
87+
88+
If this repository is forked and I see further progress on the forked repo, I am
89+
very happy to list your work here. It's awesome to see, when people start using
90+
and moving this repository even further.
91+
92+
- [https://github.com/sebastianescribano/react-component-library-lerna](https://github.com/sebastianescribano/react-component-library-lerna):
93+
they are really pushing it. They integrated a CLI to create packages from a
94+
template, for instance.
95+
7596
## Licence
7697

7798
[MIT](LICENCE)

package.json

+36-42
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,9 @@
5050
"url": "git+https://github.com/natterstefan/react-component-library-lerna.git"
5151
},
5252
"workspaces": {
53-
"packages": [
54-
"packages/*"
55-
]
53+
"packages": ["packages/*"]
5654
},
57-
"keywords": [
58-
"lerna"
59-
],
55+
"keywords": ["lerna"],
6056
"author": "Stefan Natter",
6157
"license": "MIT",
6258
"bugs": {
@@ -65,58 +61,56 @@
6561
"homepage": "https://github.com/natterstefan/react-component-library-lerna#readme",
6662
"devDependencies": {
6763
"@babel/cli": "^7.2.3",
68-
"@babel/core": "^7.2.2",
69-
"@babel/preset-env": "^7.3.1",
64+
"@babel/core": "^7.3.4",
65+
"@babel/preset-env": "^7.3.4",
7066
"@babel/preset-react": "^7.0.0",
71-
"@storybook/addon-actions": "^4.1.11",
72-
"@storybook/addon-backgrounds": "^4.1.11",
67+
"@storybook/addon-actions": "^5.0.1",
7368
"@storybook/addon-console": "^1.1.0",
74-
"@storybook/addon-knobs": "^4.1.11",
75-
"@storybook/addon-options": "^4.1.11",
76-
"@storybook/addon-storysource": "^4.1.11",
77-
"@storybook/addon-viewport": "^4.1.11",
78-
"@storybook/react": "^4.1.11",
69+
"@storybook/addon-knobs": "^5.0.1",
70+
"@storybook/addon-storysource": "^5.0.1",
71+
"@storybook/addon-viewport": "^5.0.1",
72+
"@storybook/react": "^5.0.1",
7973
"babel-core": "7.0.0-bridge.0",
8074
"babel-eslint": "^10.0.1",
81-
"babel-jest": "24.1.0",
75+
"babel-jest": "^24.3.1",
8276
"babel-loader": "^8.0.5",
83-
"babel-plugin-styled-components": "1.10.0",
84-
"enzyme": "3.8.0",
85-
"enzyme-adapter-react-16": "1.9.1",
86-
"enzyme-to-json": "3.3.5",
87-
"eslint": "^5.13.0",
77+
"babel-plugin-styled-components": "^1.10.0",
78+
"enzyme": "^3.9.0",
79+
"enzyme-adapter-react-16": "^1.10.0",
80+
"enzyme-to-json": "^3.3.5",
81+
"eslint": "^5.15.1",
8882
"eslint-config-ns": "^0.3.0",
89-
"eslint-import-resolver-lerna": "^1.0.0",
83+
"eslint-import-resolver-lerna": "^1.1.0",
9084
"eslint-plugin-import": "^2.16.0",
91-
"eslint-plugin-jest": "^22.2.2",
92-
"eslint-plugin-jsx-a11y": "^6.2.0",
85+
"eslint-plugin-jest": "^22.3.0",
86+
"eslint-plugin-jsx-a11y": "^6.2.1",
9387
"eslint-plugin-prettier": "^3.0.1",
9488
"eslint-plugin-react": "^7.12.4",
9589
"husky": "^1.3.1",
96-
"jest": "24.1.0",
97-
"jest-environment-jsdom": "24.0.0",
98-
"jest-environment-jsdom-global": "1.1.0",
99-
"jest-styled-components": "6.3.1",
100-
"lerna": "^3.11.0",
101-
"lint-staged": "^8.1.3",
90+
"jest": "^24.3.1",
91+
"jest-environment-jsdom": "^24.3.1",
92+
"jest-environment-jsdom-global": "^1.1.1",
93+
"jest-styled-components": "^6.3.1",
94+
"lerna": "^3.13.1",
95+
"lint-staged": "^8.1.5",
10296
"prettier": "^1.16.4",
103-
"react-scripts": "^2.1.3",
104-
"remark-cli": "6.0.1",
105-
"remark-lint": "6.0.4",
106-
"remark-preset-lint-recommended": "3.0.2",
97+
"react-scripts": "^2.1.8",
98+
"remark-cli": "^6.0.1",
99+
"remark-lint": "^6.0.4",
100+
"remark-preset-lint-recommended": "^3.0.2",
107101
"rimraf": "^2.6.3",
108102
"storybook-addon-jsx": "^6.0.0",
109103
"storybook-readme": "^4.0.5",
110-
"stylelint": "9.10.1",
111-
"stylelint-config-recommended": "2.1.0",
112-
"stylelint-config-styled-components": "0.1.1",
113-
"stylelint-processor-styled-components": "1.5.2",
114-
"webpack": "4.29.3",
115-
"webpack-cli": "3.2.3"
104+
"stylelint": "^9.10.1",
105+
"stylelint-config-recommended": "^2.1.0",
106+
"stylelint-config-styled-components": "^0.1.1",
107+
"stylelint-processor-styled-components": "^1.5.2",
108+
"webpack": "^4.29.6",
109+
"webpack-cli": "^3.2.3"
116110
},
117111
"dependencies": {
118-
"react": "^16.8.1",
119-
"react-dom": "^16.8.1",
112+
"react": "^16.8.4",
113+
"react-dom": "^16.8.4",
120114
"styled-components": "4.1.3"
121115
}
122116
}

0 commit comments

Comments
 (0)