Fix select2 using webpack-built assets

core/admin/mailu/ui/templates/admin/create.html

@@ -8,11 +8,8 @@
 {% call macros.box() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
-  {{ macros.form_field(form.admin, id='admin') }}
+  {{ macros.form_field(form.admin, class_='mailselect') }}
   {{ macros.form_field(form.submit) }}
-  <script>
-    $("#admin").select2();
-  </script>
 </form>
 {% endcall %}
 {% endblock %}

core/admin/mailu/ui/templates/alias/create.html

@@ -14,15 +14,9 @@
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }}
   {{ macros.form_field(form.wildcard) }}
-  {{ macros.form_field(form.destination, id='destination') }}
+  {{ macros.form_field(form.destination, class_='mailselect') }}
   {{ macros.form_field(form.comment) }}
   {{ macros.form_field(form.submit) }}
-  <script>
-    $("#destination").select2({
-      tags: true,
-      tokenSeparators: [',', ' ']
-    })
-  </script>
 </form>
 {% endcall %}
 {% endblock %}

core/admin/mailu/ui/templates/macros.html

@@ -31,14 +31,14 @@
   </div>
 {% endmacro %}
 
-{% macro form_individual_field(field, prepend='', append='', label=True) %}
+{% macro form_individual_field(field, prepend='', append='', label=True, class_="") %}
   {% if field.type == "BooleanField" %}
     {{ field(**kwargs) }}<span>&nbsp;&nbsp;</span>
     {{ field.label if label else '' }}
   {% else %}
     {{ field.label if label else '' }}{{ form_field_errors(field) }}
     {% if prepend or append %}<div class="input-group">{% endif %}
-      {{ prepend|safe }}{{ field(class_="form-control", **kwargs) }}{{ append|safe }}
+      {{ prepend|safe }}{{ field(class_="form-control " + class_, **kwargs) }}{{ append|safe }}
     {% if prepend or append %}</div>{% endif %}
   {% endif %}
 {% endmacro %}

core/admin/mailu/ui/templates/manager/create.html

@@ -12,11 +12,8 @@
 {% call macros.box() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
-  {{ macros.form_field(form.manager, id='manager') }}
+  {{ macros.form_field(form.manager, class_='mailselect') }}
   {{ macros.form_field(form.submit) }}
-  <script>
-    $("#manager").select2();
-  </script>
 </form>
 {% endcall %}
 {% endblock %}

core/admin/package.json

@@ -25,6 +25,7 @@
     "node-sass": "^4.12.0",
     "popper.js": "^1.15.0",
     "sass-loader": "^7.1.0",
+    "select2": "^4.0.7-rc.0",
     "style-loader": "^0.23.1",
     "url-loader": "^1.1.2",
     "webpack": "^4.30.0",

core/admin/webpack.config.js

@@ -16,12 +16,8 @@ module.exports = {
         rules: [
             {
                 test: /\.js$/,
-                use: {
-                    loader: "babel-loader",
-                    options: {
-                        presets: ['@babel/preset-env']
-                    }
-                }
+                use: ['babel-loader']
+
             },
             {
                 test: /\.scss$/,