Remove index.js

src/actions/gallery.js

@@ -1,7 +1,7 @@
 import namespacedTypes from 'namespaced-types';
 
 import config from '@/config';
-import { cachedFetch } from '@/utils';
+import cachedFetch from '@/utils/cachedFetch';
 
 export const types = namespacedTypes('gallery', [
   'SET_ITEMS',

src/actions/illust.js

@@ -1,7 +1,8 @@
 import namespacedTypes from 'namespaced-types';
 
 import config from '@/config';
-import { cachedFetch, getImagesFromZip } from '@/utils';
+import cachedFetch from '@/utils/cachedFetch';
+import getImagesFromZip from '@/utils/getImagesFromZip';
 
 export const types = namespacedTypes('illust', [
   'SET_ITEM',

src/components/Comment.js

@@ -6,7 +6,7 @@ import CSSModules from 'react-css-modules';
 import Img from 'react-image';
 import ListItem from 'react-mdl/lib/List/ListItem';
 import ListItemContent from 'react-mdl/lib/List/ListItemContent';
-import { EmojiParser } from '@/utils';
+import EmojiParser from '@/utils/EmojiParser';
 
 const Comment = ({ item }) => {
   for (const badWord of Comment.badWords) {

src/components/List.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Masonry from 'react-masonry-component';
 
-import { Item } from '@/components';
+import Item from '@/components/Item';
 
 export default class List extends React.Component {
   static propTypes = {

src/components/Login.js

@@ -10,7 +10,9 @@ import Button from 'react-mdl/lib/Button';
 import Textfield from 'react-mdl/lib/Textfield';
 import Icon from 'react-mdl/lib/Icon';
 import { FormattedMessage, injectIntl } from 'react-intl';
-import { moment, Storage, withRef } from '@/utils';
+import moment from '@/utils/moment';
+import Storage from '@/utils/Storage';
+import withRef from '@/utils/withRef';
 
 class Login extends React.Component {
   static propTypes = {

src/components/TrackPageView.js

@@ -3,7 +3,8 @@ import ReactGA from 'react-ga';
 import { Route } from 'react-router-dom';
 
 import config from '@/config';
-import { Piwik, cachedFetch } from '@/utils';
+import Piwik from '@/utils/Piwik';
+import cachedFetch from '@/utils/cachedFetch';
 
 export default class TrackPageView extends React.Component {
   constructor(props) {

src/containers/AppContainer.js

@@ -7,13 +7,13 @@ import '@/styles/Base.scss';
 import '@/styles/Reset.scss';
 
 import { history } from '@/stores';
-import {
-  GalleryContainer,
-  IllustContainer,
-  RedirectContainer,
-  NotFoundContainer
-} from '@/containers';
-import { ScrollContext, TrackPageView } from '@/components';
+import GalleryContainer from '@/containers/GalleryContainer';
+import IllustContainer from '@/containers/IllustContainer';
+import RedirectContainer from '@/containers/RedirectContainer';
+import NotFoundContainer from '@/containers/NotFoundContainer';
+
+import ScrollContext from '@/components/ScrollContext';
+import TrackPageView from '@/components/TrackPageView';
 
 const AppContainer = () => (
   <Router history={history}>

src/containers/GalleryContainer.js

@@ -15,9 +15,14 @@ import { injectIntl } from 'react-intl';
 
 import config from '@/config';
 
-import { GalleryActions } from '@/actions';
-import { InfiniteScroll, List, Loading, Refresh, Message } from '@/components';
-import { scrollTo, Storage } from '@/utils';
+import * as GalleryActions from '@/actions/gallery';
+import InfiniteScroll from '@/components/InfiniteScroll';
+import List from '@/components/List';
+import Loading from '@/components/Loading';
+import Refresh from '@/components/Refresh';
+import Message from '@/components/Message';
+import scrollTo from '@/utils/scrollTo';
+import Storage from '@/utils/Storage';
 
 @injectIntl
 export class GalleryContainerWithoutStore extends React.Component {

src/containers/IllustContainer.js

@@ -18,17 +18,17 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import config from '@/config';
 
-import { IllustActions } from '@/actions';
-import {
-  Alert,
-  Comment,
-  GifPlayer,
-  InfiniteScroll,
-  Loading,
-  Message
-} from '@/components';
-import { LoginContainer } from '@/containers';
-import { cachedFetch, moment, Storage } from '@/utils';
+import * as IllustActions from '@/actions/illust';
+import Alert from '@/components/Alert';
+import Comment from '@/components/Comment';
+import GifPlayer from '@/components/GifPlayer';
+import InfiniteScroll from '@/components/InfiniteScroll';
+import Loading from '@/components/Loading';
+import Message from '@/components/Message';
+import LoginContainer from '@/containers/LoginContainer';
+import cachedFetch from '@/utils/cachedFetch';
+import moment from '@/utils/moment';
+import Storage from '@/utils/Storage';
 
 @injectIntl
 @CSSModules(styles, { allowMultiple: true })

src/containers/LoginContainer.js

@@ -1,8 +1,12 @@
 import React from 'react';
 import { injectIntl } from 'react-intl';
 
-import { Alert, Login } from '@/components';
-import { cachedFetch, moment, Storage, withRef } from '@/utils';
+import Alert from '@/components/Alert';
+import Login from '@/components/Login';
+import cachedFetch from '@/utils/cachedFetch';
+import moment from '@/utils/moment';
+import Storage from '@/utils/Storage';
+import withRef from '@/utils/withRef';
 
 import config from '@/config';
 

src/containers/NotFoundContainer.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Message } from '@/components';
+import Message from '@/components/Message';
 
 const NotFoundContainer = () => <Message />;
 

src/containers/RedirectContainer.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl } from 'react-intl';
 
-import { Message } from '@/components';
+import Message from '@/components/Message';
 
 @injectIntl
 export default class RedirectContainer extends React.Component {

src/index.js

@@ -7,7 +7,7 @@ import { configureStore } from '@/stores';
 import AppContainer from '@/containers/AppContainer';
 
 import { IntlProvider } from 'react-intl';
-import { chooseLocale } from '@/locale';
+import chooseLocale from '@/locale/chooseLocale';
 
 const lang = chooseLocale(navigator.language);
 

src/reducers/gallery.js

@@ -1,4 +1,4 @@
-import { GalleryActions } from '@/actions';
+import * as GalleryActions from '@/actions/gallery';
 
 const types = GalleryActions.types;
 

src/reducers/illust.js

@@ -1,4 +1,4 @@
-import { IllustActions } from '@/actions';
+import * as IllustActions from '@/actions/illust';
 
 const types = IllustActions.types;
 

src/utils/cachedFetch.js

@@ -1,5 +1,7 @@
 // modify from https://www.sitepoint.com/cache-fetched-ajax-requests/
-import { hashStr, moment, Storage } from '@/utils';
+import hashStr from '@/utils/hashStr';
+import moment from '@/utils/moment';
+import Storage from '@/utils/Storage';
 
 function buildURL(url, params) {
   if (!params) {

src/utils/getImagesFromZip.js

@@ -1,5 +1,5 @@
 import JSZip from 'jszip';
-import { cachedFetch } from '@/utils';
+import cachedFetch from '@/utils/cachedFetch';
 
 export default function getImagesFromZip(zipURL) {
   return new Promise(resolve => {

test/actions/galleryTest.js

@@ -2,15 +2,17 @@ import nock from 'nock';
 import mockStore from '../helpers/mockStoreHelper';
 
 import config from '@/config';
-import { GalleryActions } from '@/actions';
+import * as GalleryActions from '@/actions/gallery';
 
 describe('GalleryActions', () => {
   afterEach(() => {
     nock.cleanAll();
   });
 
   it('fire SET_FETCH_ERROR when fetching sources has been done', done => {
-    nock(config.baseURL).get(`${config.galleryURI}?tag=nico`).reply(200);
+    nock(config.baseURL)
+      .get(`${config.galleryURI}?tag=nico`)
+      .reply(200);
 
     const expectedActions = [
       {

test/utils/EmojiParserTest.js

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { EmojiParser } from '@/utils';
+import EmojiParser from '@/utils/EmojiParser';
 
 describe('EmojiParser', () => {
   it('should parse out with a <img />', () => {

test/utils/StorageTest.js

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { Storage } from '@/utils';
+import Storage from '@/utils/Storage';
 
 describe('Storage', () => {
   it('set and get storage should work', () => {

test/utils/cachedFetchTest.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import fetchMock from 'fetch-mock';
-import { cachedFetch } from '@/utils';
+import cachedFetch from '@/utils/cachedFetch';
 
 describe('cachedFetch', () => {
   afterEach(() => {

test/utils/hashStrTest.js

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { hashStr } from '@/utils';
+import hashStr from '@/utils/hashStr';
 
 describe('hashStr', () => {
   it('hashStr of `kotori` should be -1125571242', () => {

test/utils/momentTest.js

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { moment } from '@/utils';
+import moment from '@/utils/moment';
 
 describe('moment', () => {
   it('convert YYYY-MM-DD H:i:s to JST', () => {