about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/emoji
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2017-10-16 18:12:09 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-10-16 11:12:09 +0200
commitbf0ee1a25c10105e096d677782d9c0ae3e36f5a5 (patch)
tree4bf50ac36caa4499ce05694e483eedabbcdf9ce7 /app/javascript/mastodon/features/emoji
parentfa0be3f834b54bb276eb5233195181fa3760710f (diff)
Enable ESLint rules import/* (#5414)
* Enable ESLint rules import/*

* fix
Diffstat (limited to 'app/javascript/mastodon/features/emoji')
-rw-r--r--app/javascript/mastodon/features/emoji/emoji_compressed.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/emoji/emoji_compressed.js b/app/javascript/mastodon/features/emoji/emoji_compressed.js
index 3bd89cf3b..c0cba952a 100644
--- a/app/javascript/mastodon/features/emoji/emoji_compressed.js
+++ b/app/javascript/mastodon/features/emoji/emoji_compressed.js
@@ -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   = {};