Restructure JS and LESS

extensions/emoji/bootstrap.php

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

extensions/emoji/js/forum.js

@@ -0,0 +1,10 @@
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+export * from './src/forum';

extensions/emoji/js/forum/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "@flarum/flarum-ext-emoji-forum",
-  "devDependencies": {
-    "flarum-webpack-config": "^0.1.0-beta.6",
-    "textarea-caret": "^3.1.0"
-  },
-  "scripts": {
-    "watch": "node_modules/webpack/bin/webpack.js --mode development --watch",
-    "build": "node_modules/webpack/bin/webpack.js --mode production"
-  }
-}

extensions/emoji/js/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "@flarum/flarum-ext-emoji",
+  "version": "0.0.0",
+  "dependencies": {
+    "flarum-webpack-config": "^0.1.0-beta.8",
+    "textarea-caret": "^3.1.0",
+    "webpack": "^4.0.0",
+    "webpack-cli": "^3.0.7"
+  },
+  "scripts": {
+    "build": "webpack --mode production --progress",
+    "watch": "webpack --mode development --watch"
+  }
+}

extensions/emoji/scripts/compile.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-# This script compiles the extension so that it can be used in a Flarum
-# installation. It should be run from the root directory of the extension.
-
-base=$PWD
-
-cd "${base}/js"
-
-if [ -f bower.json ]; then
-  bower install
-fi
-
-for app in forum admin; do
-  cd "${base}/js"
-
-  if [ -d $app ]; then
-    cd $app
-
-    if [ -f bower.json ]; then
-      bower install
-    fi
-
-    npm install
-    gulp --production
-  fi
-done