mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 09:08:24 +00:00
Upgrade storybook to v3 (#3558)
This commit is contained in:
parent
e07b57852e
commit
b0fe58dc69
|
@ -111,7 +111,8 @@
|
|||
"websocket.js": "^0.1.7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@kadira/storybook": "^2.35.3",
|
||||
"@storybook/addon-actions": "^3.0.0",
|
||||
"@storybook/react": "^3.0.0",
|
||||
"babel-eslint": "^7.2.3",
|
||||
"chai": "^4.0.1",
|
||||
"chai-enzyme": "^0.7.1",
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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'),
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue