diff --git a/app/javascript/mastodon/features/emoji/emoji_compressed.js b/app/javascript/mastodon/features/emoji/emoji_compressed.js index 1bc08fb368..10eb440a55 100644 --- a/app/javascript/mastodon/features/emoji/emoji_compressed.js +++ b/app/javascript/mastodon/features/emoji/emoji_compressed.js @@ -20,8 +20,8 @@ const emojiMap = require('./emoji_map.json'); // This json file is downloaded from https://github.com/iamcal/emoji-data/ // and is used to correct the sheet coordinates since we're using that repo's sheet const emojiSheetData = require('./emoji_sheet.json'); -const unicodeToFilename = require('./unicode_to_filename_s'); -const unicodeToUnifiedName = require('./unicode_to_unified_name_s'); +const { unicodeToFilename } = require('./unicode_to_filename_s'); +const { unicodeToUnifiedName } = require('./unicode_to_unified_name_s'); // Grabbed from `emoji_utils` to avoid circular dependency function unifiedToNative(unified) { diff --git a/app/javascript/mastodon/features/emoji/unicode_to_filename_s.js b/app/javascript/mastodon/features/emoji/unicode_to_filename_s.js index 95c21b7cc0..d00563ea6f 100644 --- a/app/javascript/mastodon/features/emoji/unicode_to_filename_s.js +++ b/app/javascript/mastodon/features/emoji/unicode_to_filename_s.js @@ -1,6 +1,7 @@ // taken from: // https://github.com/twitter/twemoji/blob/47732c7/twemoji-generator.js#L848-L866 -export default function unicodeToFilename(str) { +// eslint-disable-next-line import/no-commonjs, no-undef +exports.unicodeToFilename = (str) => { let result = ''; let charCode = 0; let p = 0; diff --git a/app/javascript/mastodon/features/emoji/unicode_to_unified_name_s.js b/app/javascript/mastodon/features/emoji/unicode_to_unified_name_s.js index 05880be16b..f5dc6431a4 100644 --- a/app/javascript/mastodon/features/emoji/unicode_to_unified_name_s.js +++ b/app/javascript/mastodon/features/emoji/unicode_to_unified_name_s.js @@ -6,7 +6,8 @@ function padLeft(str, num) { return str; } -export default function unicodeToUnifiedName(str) { +// eslint-disable-next-line import/no-commonjs, no-undef +exports.unicodeToUnifiedName = (str) => { let output = ''; for (let i = 0; i < str.length; i += 2) {