logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: c52090dbfe45a53730419485e46dda80ec10dda1
parent: 807c192fcf3a6cd0f4c712ec43130fbffddcc6c6
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Thu, 25 May 2017 12:23:14 +0900

fix storybook (#3292)


Diffstat:

Mpackage.json2+-
Mstorybook/stories/loading_indicator.story.js4++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json @@ -7,7 +7,7 @@ "build:production": "NODE_ENV=production yarn webpack -- --config config/webpack/production.js", "manage:translations": "node ./config/webpack/translationRunner.js", "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js", - "storybook": "start-storybook -p 9001 -c storybook", + "storybook": "NODE_ENV=test start-storybook -p 9001 -c storybook", "test": "npm run test:lint && npm run test:mocha", "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ storyboard/ streaming/", "test:mocha": "NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx", diff --git a/storybook/stories/loading_indicator.story.js b/storybook/stories/loading_indicator.story.js @@ -1,12 +1,12 @@ import React from 'react'; import { IntlProvider } from 'react-intl'; import { storiesOf } from '@kadira/storybook'; -import getMessagesForLocale from 'mastodon/locales'; +import en from 'mastodon/locales/en.json'; import LoadingIndicator from 'mastodon/components/loading_indicator'; storiesOf('LoadingIndicator', module) .add('default state', () => ( - <IntlProvider locale='en' messages={getMessagesForLocale('en')}> + <IntlProvider locale='en' messages={en}> <LoadingIndicator /> </IntlProvider> ));