Skip to content

Commit 7493c77

Browse files
author
Maja Wichrowska
committed
Bump storybook version to v3 and webpack to v2
1 parent 2883081 commit 7493c77

20 files changed

+99
-51
lines changed

Diff for: ‎.storybook/.eslintrc

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"rules": {
3+
"import/no-extraneous-dependencies": [2, {
4+
"devDependencies": true
5+
}],
6+
"global-require": 2,
7+
}
8+
}

Diff for: ‎.storybook/addons.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
import '@kadira/storybook/addons';
2-
import '@kadira/storybook-addon-options/register';
1+
/* eslint-disable import/no-extraneous-dependencies, import/extensions */
2+
3+
import '@storybook/addon-actions/register';
4+
import '@storybook/addon-links/register';

Diff for: ‎.storybook/config.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { configure, addDecorator, setAddon } from '@kadira/storybook';
4-
import infoAddon from '@kadira/react-storybook-addon-info';
5-
import { setOptions } from '@kadira/storybook-addon-options';
3+
import { configure, addDecorator, setAddon } from '@storybook/react';
4+
import infoAddon from '@storybook/addon-info';
5+
import { setOptions } from '@storybook/addon-options';
6+
import './storybook.scss';
67
import '../css/styles.scss';
78

89
addDecorator((story) => {

Diff for: ‎.storybook/head.html

-1
This file was deleted.

Diff for: ‎public/storybook.css renamed to ‎.storybook/storybook.scss

File renamed without changes.

Diff for: ‎.storybook/webpack.config.js

+24-8
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,35 @@ const path = require('path');
22

33
module.exports = {
44
module: {
5-
loaders: [
5+
rules: [
66
{
7-
test: /\.scss$/,
8-
loaders: ['style', 'raw', 'sass'],
9-
include: path.resolve(__dirname, '../css/')
7+
test: /\.scss$/,
8+
use: ['style-loader', 'raw-loader', 'sass-loader'],
9+
include: [
10+
path.resolve(__dirname, './'),
11+
path.resolve(__dirname, '../css/'),
12+
],
1013
},
1114
{
1215
test: /\.svg$/,
13-
loader: 'babel!react-svg'
14-
}
15-
]
16+
use: [
17+
{
18+
loader: 'babel-loader',
19+
query: {
20+
presets: ['airbnb'],
21+
},
22+
},
23+
{
24+
loader: 'react-svg-loader',
25+
query: {
26+
jsx: true,
27+
},
28+
},
29+
],
30+
},
31+
],
1632
},
1733
resolve: {
18-
extensions: ['', '.js', '.jsx'],
34+
extensions: ['.js', '.jsx'],
1935
},
2036
};

Diff for: ‎karma.conf.js

+17-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = (config) => {
2727
}),
2828
],
2929
module: {
30-
loaders: [
30+
rules: [
3131
{
3232
test: /\.jsx?$/,
3333
loader: 'babel-loader',
@@ -42,19 +42,32 @@ module.exports = (config) => {
4242
},
4343
{
4444
test: /\.svg$/,
45-
loader: 'babel!react-svg',
45+
use: [
46+
{
47+
loader: 'babel-loader',
48+
query: {
49+
presets: ['airbnb'],
50+
},
51+
},
52+
{
53+
loader: 'react-svg-loader',
54+
query: {
55+
jsx: true,
56+
},
57+
},
58+
],
4659
include: [
4760
path.join(__dirname, 'src'),
4861
],
4962
},
5063
{ test: /\.json$/, loader: 'json-loader' },
5164

5265
// Inject the Airbnb shims into the bundle
53-
{ test: /test\/_helpers/, loader: 'imports?shims=airbnb-js-shims' },
66+
{ test: /test\/_helpers/, loader: 'imports-loader?shims=airbnb-js-shims' },
5467
],
5568
},
5669
resolve: {
57-
extensions: ['', '.js', '.jsx'],
70+
extensions: ['.js', '.jsx'],
5871
},
5972
},
6073

Diff for: ‎package.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"cover": "cross-env NODE_ENV=test node --max-old-space-size=2048 $(which nyc) npm run mocha test",
1414
"lint": "eslint --ext .js,.jsx src test",
1515
"mocha": "mocha ./test/_helpers",
16-
"storybook:uninstall": "rimraf node_modules/@kadira node_modules/react-modal node_modules/react-dom-factories node_modules/react-svg-loader",
17-
"react:clean": "npm run storybook:uninstall && npm uninstall --no-save react react-dom react-addons-test-utils react-test-renderer && rimraf node_modules/react-test-renderer node_modules/react && npm prune",
16+
"storybook:uninstall": "rimraf node_modules/@storybook node_modules/react-modal node_modules/react-dom-factories node_modules/react-svg-loader",
17+
"react:clean": "npm run storybook:uninstall && npm install ajv ajv-keywords && npm uninstall --no-save react react-dom react-addons-test-utils react-test-renderer && rimraf node_modules/react-test-renderer node_modules/react && npm prune",
1818
"react:14": "rimraf node_modules/.bin/npm && npm run react:clean && npm i --no-save [email protected] [email protected] [email protected] && npm run storybook:uninstall && npm prune",
1919
"react:15": "rimraf node_modules/.bin/npm && npm run react:clean && npm i --no-save react@15 react-dom@15 react-addons-test-utils@15 react-test-renderer@15 && npm run storybook:uninstall && npm prune",
2020
"pretest": "npm run --silent lint",
2121
"tests-only": "npm run mocha --silent test",
2222
"tests-karma": "karma start",
2323
"test": "npm run tests-only && npm run tests-karma",
24-
"storybook": "start-storybook -p 9001 -s ./public",
24+
"storybook": "start-storybook -p 9001",
2525
"tag": "git tag v$npm_package_version",
2626
"gh-pages:clean": "rimraf _gh-pages",
2727
"gh-pages:build": "$(npm bin)/build-storybook -o _gh-pages",
@@ -49,14 +49,13 @@
4949
},
5050
"homepage": "https://github.com/airbnb/react-dates#readme",
5151
"devDependencies": {
52-
"@kadira/react-storybook-addon-info": "^3.4.0",
53-
"@kadira/storybook": "^2.35.3",
54-
"@kadira/storybook-addon-options": "^1.0.2",
55-
"@kadira/storybook-addons": "^1.6.1",
52+
"@storybook/addon-info": "^3.1.6",
53+
"@storybook/addon-options": "^3.1.6",
54+
"@storybook/react": "^3.1.6",
5655
"airbnb-js-shims": "^1.1.1",
5756
"babel-cli": "^6.24.1",
5857
"babel-core": "^6.25.0",
59-
"babel-loader": "^6.4.1",
58+
"babel-loader": "^7.1.1",
6059
"babel-plugin-istanbul": "^4.1.4",
6160
"babel-plugin-syntax-jsx": "^6.18.0",
6261
"babel-plugin-transform-replace-object-assign": "^0.2.1",
@@ -96,11 +95,11 @@
9695
"react-test-renderer": "^15.5.4",
9796
"rimraf": "^2.6.1",
9897
"safe-publish-latest": "^1.1.1",
99-
"sass-loader": "^4.1.1",
98+
"sass-loader": "^6.0.6",
10099
"sinon": "^2.3.5",
101100
"sinon-sandbox": "^1.0.2",
102101
"style-loader": "^0.16.1",
103-
"webpack": "^1.15.0"
102+
"webpack": "^2.6.1"
104103
},
105104
"dependencies": {
106105
"airbnb-prop-types": "^2.5.4",

Diff for: ‎stories/DateRangePicker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import moment from 'moment';
33
import momentJalaali from 'moment-jalaali';
4-
import { storiesOf } from '@kadira/storybook';
4+
import { storiesOf } from '@storybook/react';
55

66
import DateRangePickerWrapper from '../examples/DateRangePickerWrapper';
77

Diff for: ‎stories/DateRangePicker_calendar.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { storiesOf } from '@kadira/storybook';
3+
import { storiesOf } from '@storybook/react';
44

55
import { VERTICAL_ORIENTATION, ANCHOR_RIGHT } from '../constants';
66

@@ -136,12 +136,6 @@ storiesOf('DRP - Calendar Props', module)
136136
autoFocus
137137
/>
138138
))
139-
.addWithInfo('with keyboard shorcuts panel hidden', () => (
140-
<DateRangePickerWrapper
141-
hideKeyboardShortcutsPanel
142-
autoFocus
143-
/>
144-
))
145139
.addWithInfo('with RTL support (and anchor right)', () => (
146140
<div style={{ float: 'right' }}>
147141
<DateRangePickerWrapper

Diff for: ‎stories/DateRangePicker_day.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { storiesOf } from '@kadira/storybook';
3+
import { storiesOf } from '@storybook/react';
44

55
import isSameDay from '../src/utils/isSameDay';
66
import isInclusivelyAfterDay from '../src/utils/isInclusivelyAfterDay';

Diff for: ‎stories/DateRangePicker_input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { storiesOf } from '@kadira/storybook';
3+
import { storiesOf } from '@storybook/react';
44

55
import DateRangePickerWrapper from '../examples/DateRangePickerWrapper';
66

Diff for: ‎stories/DayPicker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { storiesOf } from '@kadira/storybook';
2+
import { storiesOf } from '@storybook/react';
33
import DayPicker from '../src/components/DayPicker';
44

55
import {

Diff for: ‎stories/DayPickerRangeController.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { storiesOf, action } from '@kadira/storybook';
3+
import { storiesOf, action } from '@storybook/react';
44

55
import isSameDay from '../src/utils/isSameDay';
66
import isInclusivelyAfterDay from '../src/utils/isInclusivelyAfterDay';

Diff for: ‎stories/DayPickerSingleDateController.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { storiesOf, action } from '@kadira/storybook';
3+
import { storiesOf, action } from '@storybook/react';
44

55
import isSameDay from '../src/utils/isSameDay';
66
import isInclusivelyAfterDay from '../src/utils/isInclusivelyAfterDay';

Diff for: ‎stories/SingleDatePicker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import moment from 'moment';
33
import momentJalaali from 'moment-jalaali';
4-
import { storiesOf } from '@kadira/storybook';
4+
import { storiesOf } from '@storybook/react';
55

66
import SingleDatePickerWrapper from '../examples/SingleDatePickerWrapper';
77

Diff for: ‎stories/SingleDatePicker_calendar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { storiesOf } from '@kadira/storybook';
3+
import { storiesOf } from '@storybook/react';
44

55
import SingleDatePickerWrapper from '../examples/SingleDatePickerWrapper';
66

Diff for: ‎stories/SingleDatePicker_day.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { storiesOf } from '@kadira/storybook';
3+
import { storiesOf } from '@storybook/react';
44

55
import isInclusivelyAfterDay from '../src/utils/isInclusivelyAfterDay';
66
import isSameDay from '../src/utils/isSameDay';

Diff for: ‎stories/SingleDatePicker_input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import moment from 'moment';
3-
import { storiesOf } from '@kadira/storybook';
3+
import { storiesOf } from '@storybook/react';
44

55
import SingleDatePickerWrapper from '../examples/SingleDatePickerWrapper';
66

Diff for: ‎webpack.config.js

+22-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
entry: entries,
1818
output: {
1919
filename: '[name].js',
20-
path: './lib/components/',
20+
path: path.join(__dirname, 'lib/components/'),
2121
libraryTarget: 'commonjs2',
2222
},
2323
externals(context, request, callback) {
@@ -33,7 +33,7 @@ module.exports = {
3333
return callback(null, true);
3434
},
3535
module: {
36-
loaders: [
36+
rules: [
3737
{
3838
test: /\.js/,
3939
loader: 'babel-loader',
@@ -50,11 +50,27 @@ module.exports = {
5050
presets: ['airbnb']
5151
}
5252
},
53-
// react-svg loads svg files as react components
54-
{ test: /\.svg$/, loader: 'babel!react-svg', include: path.join(__dirname, 'src') },
55-
],
53+
{
54+
test: /\.svg$/,
55+
use: [
56+
{
57+
loader: 'babel-loader',
58+
query: {
59+
presets: ['airbnb']
60+
}
61+
},
62+
{
63+
loader: 'react-svg-loader',
64+
query: {
65+
jsx: true
66+
}
67+
}
68+
],
69+
include: path.join(__dirname, 'src'),
70+
}
71+
]
5672
},
5773
resolve: {
58-
extensions: ['', '.js', '.jsx'],
74+
extensions: ['.js', '.jsx'],
5975
},
6076
};

0 commit comments

Comments
 (0)