Format with prettier, bump deps (#37)

General repo maintenance

extensions/emoji/.gitignore

@@ -4,3 +4,4 @@ composer.phar
 Thumbs.db
 node_modules
 js/dist/*
+.vscode

extensions/emoji/js/.prettierrc.json

@@ -0,0 +1,6 @@
+{
+  "printWidth": 150,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "es5"
+}

extensions/emoji/js/package.json

@@ -2,14 +2,15 @@
   "private": true,
   "name": "@flarum/emoji",
   "dependencies": {
-    "flarum-webpack-config": "0.1.0-beta.10",
+    "flarum-webpack-config": "^1.0.0",
     "simple-emoji-map": "^0.4.1",
-    "twemoji": "^13.0.0",
+    "twemoji": "^13.1.0",
-    "webpack": "^4.43.0",
+    "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12"
   },
   "scripts": {
     "dev": "webpack --mode development --watch",
-    "build": "webpack --mode production"
+    "build": "webpack --mode production",
+    "format": "prettier --write src"
   }
 }

extensions/emoji/js/src/forum/addComposerAutocomplete.js

@@ -27,7 +27,6 @@ export default function addComposerAutocomplete() {
       .bindTo($editor);
 
     $editor.after($container);
-
   });
 
   extend(TextEditor.prototype, 'buildEditorParams', function (params) {
@@ -79,7 +78,8 @@ export default function addComposerAutocomplete() {
               onclick={() => applySuggestion(emoji)}
               onmouseenter={function () {
                 dropdown.setIndex($(this).parent().index() - 1);
-              }}>
+              }}
+            >
               <img alt={emoji} class="emoji" draggable="false" loading="lazy" src={`${cdn}72x72/${code}.png`} />
               {name}
             </button>
@@ -91,14 +91,14 @@ export default function addComposerAutocomplete() {
 
           // Build a regular expression to do a fuzzy match of the given input string
           const fuzzyRegexp = function (str) {
-            const reEscape = new RegExp('\\(([' + ('+.*?[]{}()^$|\\'.replace(/(.)/g, '\\$1')) + '])\\)', 'g');
+            const reEscape = new RegExp('\\(([' + '+.*?[]{}()^$|\\'.replace(/(.)/g, '\\$1') + '])\\)', 'g');
-            return new RegExp('(.*)' + (str.toLowerCase().replace(/(.)/g, '($1)(.*?)')).replace(reEscape, '(\\$1)') + '$', 'i');
+            return new RegExp('(.*)' + str.toLowerCase().replace(/(.)/g, '($1)(.*?)').replace(reEscape, '(\\$1)') + '$', 'i');
           };
           const regTyped = fuzzyRegexp(typed);
 
           let maxSuggestions = 7;
 
-          const findMatchingEmojis = matcher => {
+          const findMatchingEmojis = (matcher) => {
             for (let i = 0; i < emojiKeys.length && maxSuggestions > 0; i++) {
               const curEmoji = emojiKeys[i];
 
@@ -116,16 +116,18 @@ export default function addComposerAutocomplete() {
           };
 
           // First, try to find all emojis starting with the given string
-          findMatchingEmojis(emoji => emoji.indexOf(typed) === 0);
+          findMatchingEmojis((emoji) => emoji.indexOf(typed) === 0);
 
           // If there are still suggestions left, try for some fuzzy matches
-          findMatchingEmojis(emoji => regTyped.test(emoji));
+          findMatchingEmojis((emoji) => regTyped.test(emoji));
 
-          const suggestions = similarEmoji.map(emoji => ({
+          const suggestions = similarEmoji
-            emoji,
+            .map((emoji) => ({
-            name: emojiMap[emoji][0],
+              emoji,
-            code: getEmojiIconCode(emoji),
+              name: emojiMap[emoji][0],
-          })).map(makeSuggestion);
+              code: getEmojiIconCode(emoji),
+            }))
+            .map(makeSuggestion);
 
           if (suggestions.length) {
             dropdown.items = suggestions;
@@ -165,10 +167,11 @@ export default function addComposerAutocomplete() {
   });
 
   extend(TextEditor.prototype, 'toolbarItems', function (items) {
-    items.add('emoji', (
+    items.add(
+      'emoji',
       <TextEditorButton onclick={() => this.attrs.composer.editor.insertAtCursor(' :')} icon="far fa-smile">
         {app.translator.trans('flarum-emoji.forum.composer.emoji_tooltip')}
       </TextEditorButton>
-    ));
+    );
   });
 }

extensions/emoji/js/src/forum/fragments/AutocompleteDropdown.js

@@ -10,16 +10,20 @@ export default class AutocompleteDropdown extends Fragment {
     return (
       <ul className="Dropdown-menu EmojiDropdown">
         <li className="Dropdown-header">{app.translator.trans('flarum-emoji.forum.composer.type_to_search_text')}</li>
-        {this.items.map(item => <li key={item.attrs.key}>{item}</li>)}
+        {this.items.map((item) => (
+          <li key={item.attrs.key}>{item}</li>
+        ))}
       </ul>
     );
   }
 
   show(left, top) {
-    this.$().show().css({
+    this.$()
-      left: left + 'px',
+      .show()
-      top: top + 'px'
+      .css({
-    });
+        left: left + 'px',
+        top: top + 'px',
+      });
     this.active = true;
   }
 
@@ -32,7 +36,7 @@ export default class AutocompleteDropdown extends Fragment {
     this.keyWasJustPressed = true;
     this.setIndex(this.index + delta, true);
     clearTimeout(this.keyWasJustPressedTimeout);
-    this.keyWasJustPressedTimeout = setTimeout(() => this.keyWasJustPressed = false, 500);
+    this.keyWasJustPressedTimeout = setTimeout(() => (this.keyWasJustPressed = false), 500);
   }
 
   complete() {

extensions/emoji/js/src/forum/helpers/getEmojiIconCode.js

@@ -1,11 +1,11 @@
-/*! Copyright Twitter Inc. and other contributors. Licensed under MIT *//*
+/*! Copyright Twitter Inc. and other contributors. Licensed under MIT */ /*
   https://github.com/twitter/twemoji/blob/gh-pages/LICENSE
 */
 
 import twemoji from 'twemoji';
 
 // avoid using a string literal like '\u200D' here because minifiers expand it inline
-const U200D = String.fromCharCode(0x200D);
+const U200D = String.fromCharCode(0x200d);
 
 // avoid runtime RegExp creation for not so smart,
 // not JIT based, and old browsers / engines
@@ -19,8 +19,5 @@ const UFE0Fg = /\uFE0F/g;
  * @return  string    the code point
  */
 export default function getEmojiIconCode(emoji) {
-  return twemoji.convert.toCodePoint(emoji.indexOf(U200D) < 0 ?
+  return twemoji.convert.toCodePoint(emoji.indexOf(U200D) < 0 ? emoji.replace(UFE0Fg, '') : emoji);
-    emoji.replace(UFE0Fg, '') :
-    emoji
-  );
 }

extensions/emoji/js/src/forum/renderEmoji.js

@@ -15,7 +15,7 @@ const options = {
 };
 
 export default function renderEmoji() {
-  override(Post.prototype, 'contentHtml', function(original) {
+  override(Post.prototype, 'contentHtml', function (original) {
     const contentHtml = original();
 
     if (this.oldContentHtml !== contentHtml) {