Update for webpack

extensions/emoji/bootstrap.php

@@ -14,9 +14,9 @@ use s9e\TextFormatter\Configurator;
 
 return [
     (new Extend\Assets('forum'))
-        ->asset(__DIR__.'/js/forum/dist/extension.js')
-        ->asset(__DIR__.'/less/forum/extension.less')
-        ->bootstrapper('flarum/emoji/main'),
+        ->js(__DIR__.'/js/forum/dist/main.js')
+        ->asset(__DIR__.'/less/forum/extension.less'),
+
     new Extend\FormatterConfiguration(function (Configurator $config) {
         $config->Emoji->useEmojiOne();
         $config->Emoji->omitImageSize();

extensions/emoji/js/forum/Gulpfile.js

@@ -1,10 +0,0 @@
-var gulp = require('flarum-gulp');
-
-gulp({
-  modules: {
-    'flarum/emoji': 'src/**/*.js'
-  },
-  files: [
-    'bower_components/textarea-caret-position/index.js'
-  ]
-});

extensions/emoji/js/forum/bower.json

@@ -1,6 +0,0 @@
-{
-  "name": "flarum-emoji",
-  "devDependencies": {
-    "textarea-caret-position": "~3.0.0"
-  }
-}

extensions/emoji/js/forum/package.json

@@ -1,7 +1,13 @@
 {
-  "private": true,
+  "name": "@flarum/flarum-ext-emoji-forum",
   "devDependencies": {
-    "gulp": "^3.9.1",
-    "flarum-gulp": "^0.2.0"
+    "flarum-webpack-config": "^0.1.0-beta.6"
+  },
+  "scripts": {
+    "watch": "node_modules/webpack/bin/webpack.js --mode development --watch",
+    "build": "node_modules/webpack/bin/webpack.js --mode production"
+  },
+  "dependencies": {
+    "textarea-caret": "^3.1.0"
   }
 }

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

@@ -1,11 +1,11 @@
-/*global getCaretCoordinates*/
+import getCaretCoordinates from 'textarea-caret';
 
 import { extend } from 'flarum/extend';
 import ComposerBody from 'flarum/components/ComposerBody';
-import emojiMap from 'flarum/emoji/helpers/emojiMap';
+import emojiMap from './helpers/emojiMap';
 import KeyboardNavigatable from 'flarum/utils/KeyboardNavigatable';
 
-import AutocompleteDropdown from 'flarum/emoji/components/AutocompleteDropdown';
+import AutocompleteDropdown from './components/AutocompleteDropdown';
 
 export default function addComposerAutocomplete() {
 

extensions/emoji/js/forum/src/index.js

@@ -2,7 +2,7 @@ import { override } from 'flarum/extend';
 import app from 'flarum/app';
 import Post from 'flarum/models/Post';
 
-import addComposerAutocomplete from 'flarum/emoji/addComposerAutocomplete';
+import addComposerAutocomplete from './addComposerAutocomplete';
 
 app.initializers.add('flarum-emoji', () => {
   // After typing ':' in the composer, show a dropdown suggesting a bunch of

extensions/emoji/js/forum/webpack.config.js

@@ -0,0 +1,3 @@
+const config = require('flarum-webpack-config');
+
+module.exports = config();