Skip to content

Commit effc3f2

Browse files
authored
feat: ⚡️storybook upgrade (close #26)
resolve #26
2 parents 1e07126 + 87d8b07 commit effc3f2

File tree

3 files changed

+2855
-2876
lines changed

3 files changed

+2855
-2876
lines changed

.storybook/webpack.config.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
// load the default config generator.
22
const path = require('path');
33

4-
module.exports = (baseConfig, env, defaultConfig) => {
4+
module.exports = ({ config }) => {
55
// Extend it as you need.
66
// For example, add typescript loader:
7-
defaultConfig.module.rules.push({
7+
config.module.rules.push({
88
test: /\.(ts|tsx)$/,
99
use: [
1010
require.resolve('awesome-typescript-loader'),
1111
require.resolve('react-docgen-typescript-loader'),
1212
],
1313
});
1414

15-
defaultConfig.module.rules.push({
15+
config.module.rules.push({
1616
test: /\.scss$/,
17-
loaders: ['style-loader', 'css-loader', 'sass-loader'],
17+
use: [
18+
require.resolve('style-loader'),
19+
require.resolve('css-loader'),
20+
require.resolve('sass-loader'),
21+
],
1822
});
1923

20-
defaultConfig.resolve.modules.push(path.join(__dirname, '../'));
21-
defaultConfig.resolve.extensions.push('.ts', '.tsx');
22-
return defaultConfig;
24+
config.resolve.modules.push(path.join(__dirname, '../'));
25+
config.resolve.extensions.push('.ts', '.tsx');
26+
return config;
2327
};

package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,21 @@
7575
]
7676
},
7777
"devDependencies": {
78-
"@babel/core": "^7.2.2",
79-
"@storybook/addon-actions": "^4.1.11",
80-
"@storybook/addon-info": "^4.1.11",
81-
"@storybook/addon-jest": "^4.1.11",
82-
"@storybook/addon-knobs": "^4.1.11",
83-
"@storybook/addon-links": "^4.1.11",
84-
"@storybook/addon-options": "^4.1.11",
85-
"@storybook/addons": "^4.1.11",
86-
"@storybook/cli": "^4.1.11",
87-
"@storybook/react": "^4.1.11",
78+
"@babel/core": "^7.4.3",
79+
"@emotion/core": "^10.0.10",
80+
"@storybook/addon-actions": "^5.0.6",
81+
"@storybook/addon-info": "^5.0.6",
82+
"@storybook/addon-jest": "^5.0.6",
83+
"@storybook/addon-knobs": "^5.0.6",
84+
"@storybook/addon-links": "^5.0.6",
85+
"@storybook/addon-options": "^5.0.6",
86+
"@storybook/addons": "^5.0.6",
87+
"@storybook/cli": "^5.0.6",
88+
"@storybook/react": "^5.0.6",
8889
"@storybook/storybook-deployer": "^2.8.1",
8990
"@types/classnames": "^2.2.6",
9091
"@types/enzyme": "^3.1.15",
91-
"@types/jest": "^23.3.12",
92+
"@types/jest": "^24.0.11",
9293
"@types/lodash": "^4.14.118",
9394
"@types/react": "^16.7.13",
9495
"@types/react-dom": "^16.0.11",
@@ -98,7 +99,7 @@
9899
"@types/storybook__react": "^4.0.0",
99100
"awesome-typescript-loader": "^5.2.1",
100101
"babel-loader": "^8.0.5",
101-
"clean-webpack-plugin": "0.1.19",
102+
"clean-webpack-plugin": "2.0.1",
102103
"cross-env": "5.2.0",
103104
"css-loader": "2.1.0",
104105
"enzyme": "^3.8.0",
@@ -107,7 +108,7 @@
107108
"file-loader": "3.0.1",
108109
"html-webpack-plugin": "3.2.0",
109110
"husky": "^1.3.1",
110-
"jest": "^23.6.0",
111+
"jest": "^24.7.0",
111112
"lint-staged": "^8.1.0",
112113
"node-sass": "4.11.0",
113114
"prettier": "^1.15.3",
@@ -117,13 +118,13 @@
117118
"sass-loader": "7.1.0",
118119
"sinon": "^7.2.2",
119120
"style-loader": "0.23.1",
120-
"ts-jest": "^23.10.5",
121+
"ts-jest": "^24.0.1",
121122
"ts-loader": "^5.3.3",
122123
"ts-mockito": "^2.3.1",
123124
"tslint": "^5.12.1",
124125
"tslint-config-airbnb": "^5.11.1",
125126
"tslint-config-prettier": "^1.17.0",
126-
"tslint-react": "^3.6.0",
127+
"tslint-react": "^4.0.0",
127128
"typescript": "^3.2.2",
128129
"url-loader": "^1.1.2",
129130
"webpack": "4.28.4",

0 commit comments

Comments
 (0)