techhub/mastodon
2
0
Fork 0
Code Activity

Upgrade storybook to v3 (#3558)

Browse Source
This commit is contained in:
Yamagishi Kazutoshi
2017-06-04 23:26:07 +09:00
committed by Eugen Rochko
parent e07b57852e
commit b0fe58dc69
8 changed files with 500 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storybook/config.js
View File

@@ -1,6 +1,5 @@
import { configure, setAddon } from '@kadira/storybook';
import { configure } from '@storybook/react';
import React from 'react';
import { storiesOf, action } from '@kadira/storybook';
import { addLocaleData } from 'react-intl';
import en from 'react-intl/locale-data/en';
import '../app/javascript/styles/application.scss';

3
storybook/stories/autosuggest_textarea.story.js
View File

@@ -1,6 +1,7 @@
import React from 'react';
import { List } from 'immutable';
import { action, storiesOf } from '@kadira/storybook';
import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
import AutosuggestTextarea from 'mastodon/components/autosuggest_textarea';
const props = {

3
storybook/stories/button.story.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { action, storiesOf } from '@kadira/storybook';
import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
import Button from 'mastodon/components/button';
storiesOf('Button', module)

3
storybook/stories/character_counter.story.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { storiesOf } from '@kadira/storybook';
import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
import CharacterCounter from 'mastodon/features/compose/components/character_counter';
storiesOf('CharacterCounter', module)

3
storybook/stories/loading_indicator.story.js
View File

@@ -1,6 +1,7 @@
import React from 'react';
import { IntlProvider } from 'react-intl';
import { storiesOf } from '@kadira/storybook';
import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
import en from 'mastodon/locales/en.json';
import LoadingIndicator from 'mastodon/components/loading_indicator';

10
storybook/webpack.config.js
View File

@@ -2,7 +2,7 @@ const path = require('path');
module.exports = {
module: {
loaders: [
rules: [
{
test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i,
loader: 'url-loader',
@@ -14,10 +14,8 @@ module.exports = {
],
},
resolve: {
modulesDirectories: [
path.resolve(__dirname, '..', 'storybook'),
path.resolve(__dirname, '..', 'app', 'javascript'),
path.resolve(__dirname, '..', 'node_modules'),
],
alias: {
mastodon: path.resolve(__dirname, '..', 'app', 'javascript', 'mastodon'),
},
},
};