Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Enable ESLint rules import/* (#5414)

Browse source 
* Enable ESLint rules import/*

* fix
This commit is contained in:
Yamagishi Kazutoshi 2017-10-16 18:12:09 +09:00 • committed by Eugen Rochko
parent fa0be3f834
commit bf0ee1a25c
9 changed files with 81 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/base_polyfills.js
View file

@ -1,5 +1,5 @@
import 'intl';
import 'intl/locale-data/jsonp/en.js';
import 'intl/locale-data/jsonp/en';
import 'es6-symbol/implement';
import includes from 'array-includes';
import assign from 'object-assign';

1
app/javascript/mastodon/containers/mastodon.js
View file

@ -10,6 +10,7 @@ import { hydrateStore } from '../actions/store';
import { connectUserStream } from '../actions/streaming';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from '../locales';
const { localeData, messages } = getLocale();
addLocaleData(localeData);

15
app/javascript/mastodon/features/compose/containers/autosuggest_status_container.js
View file

@ -1,15 +0,0 @@
import { connect } from 'react-redux';
import AutosuggestStatus from '../components/autosuggest_status';
import { makeGetStatus } from '../../../selectors';
const makeMapStateToProps = () => {
const getStatus = makeGetStatus();
const mapStateToProps = (state, { id }) => ({
status: getStatus(state, id),
});
return mapStateToProps;
};
export default connect(makeMapStateToProps)(AutosuggestStatus);

3
app/javascript/mastodon/features/emoji/emoji_compressed.js
View file

@ -9,7 +9,8 @@ const { unicodeToFilename } = require('./unicode_to_filename');
const { unicodeToUnifiedName } = require('./unicode_to_unified_name');
const emojiMap = require('./emoji_map.json');
const { emojiIndex } = require('emoji-mart');
const emojiMartData = require('emoji-mart/dist/data').default;
const { default: emojiMartData } = require('emoji-mart/dist/data');
const excluded = ['®', '©', '™'];
const skins = ['🏻', '🏼', '🏽', '🏾', '🏿'];
const shortcodeMap = {};

2
app/javascript/mastodon/main.js
View file

@ -1,5 +1,5 @@
import * as WebPushSubscription from './web_push_subscription';
import Mastodon from 'mastodon/containers/mastodon';
import Mastodon from './containers/mastodon';
import React from 'react';
import ReactDOM from 'react-dom';
import ready from './ready';

2
app/javascript/packs/common.js
View file

@ -1,6 +1,6 @@
import { start } from 'rails-ujs';
import 'font-awesome/css/font-awesome.css';
require('font-awesome/css/font-awesome.css');
require.context('../images/', true);
start();