From be525dd4db1eea26ea06a98ce0a5ac59159b413b Mon Sep 17 00:00:00 2001
From: kibi! <marrus-sh@users.noreply.github.com>
Date: Mon, 15 Jan 2018 21:17:03 -0800
Subject: [PATCH] Fix mailer to use webpack core

---
 app/javascript/core/mailer.js             | 1 +
 app/javascript/core/theme.yml             | 3 +++
 app/javascript/flavours/glitch/theme.yml  | 1 +
 app/javascript/flavours/vanilla/theme.yml | 1 +
 app/javascript/packs/mailer.js            | 1 -
 app/views/layouts/mailer.html.haml        | 2 +-
 6 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/core/mailer.js
 delete mode 100644 app/javascript/packs/mailer.js

diff --git a/app/javascript/core/mailer.js b/app/javascript/core/mailer.js
new file mode 100644
index 0000000000..46a23a66a9
--- /dev/null
+++ b/app/javascript/core/mailer.js
@@ -0,0 +1 @@
+import 'styles/mailers.scss';
diff --git a/app/javascript/core/theme.yml b/app/javascript/core/theme.yml
index 0dc05a1493..f48ab40c06 100644
--- a/app/javascript/core/theme.yml
+++ b/app/javascript/core/theme.yml
@@ -10,6 +10,9 @@ pack:
   embed: embed.js
   error:
   home:
+  mailer:
+    filename: mailer.js
+    stylesheet: true
   modal:
   public: public.js
   settings: settings.js
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index 100e89e3e3..0c8342c443 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -15,6 +15,7 @@ pack:
     - flavours/glitch/async/getting_started
     - flavours/glitch/async/home_timeline
     - flavours/glitch/async/notifications
+  mailer:
   modal:
   public: packs/public.js
   settings:
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index 6f6a32c376..f54c231fe5 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -15,6 +15,7 @@ pack:
     - features/compose
     - features/home_timeline
     - features/notifications
+  mailer:
   modal:
   public: public.js
   settings:
diff --git a/app/javascript/packs/mailer.js b/app/javascript/packs/mailer.js
deleted file mode 100644
index 732fc16981..0000000000
--- a/app/javascript/packs/mailer.js
+++ /dev/null
@@ -1 +0,0 @@
-require('../styles/mailer.scss');
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 8a7ce43691..5119001378 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -6,7 +6,7 @@
 
     %title/
 
-    = stylesheet_pack_tag 'mailer'
+    = stylesheet_pack_tag 'core/mailer'
   %body
     %table.email-table{ cellspacing: 0, cellpadding: 0 }
       %tbody