about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorkibi! <marrus-sh@users.noreply.github.com>2018-01-15 21:17:03 -0800
committerkibi! <marrus-sh@users.noreply.github.com>2018-01-15 21:17:03 -0800
commitcda845ae0e731a0ac3e7e58235c99cbbf93dda69 (patch)
treebf8e7fcdc96f02bf6b4ce0973ef91c4becc2b08e /app/javascript
parent89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (diff)
Fix mailer to use webpack core
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/core/mailer.js1
-rw-r--r--app/javascript/core/theme.yml3
-rw-r--r--app/javascript/flavours/glitch/theme.yml1
-rw-r--r--app/javascript/flavours/vanilla/theme.yml1
-rw-r--r--app/javascript/packs/mailer.js1
5 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/core/mailer.js b/app/javascript/core/mailer.js
new file mode 100644
index 000000000..46a23a66a
--- /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 0dc05a149..f48ab40c0 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 100e89e3e..0c8342c44 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 6f6a32c37..f54c231fe 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 732fc1698..000000000
--- a/app/javascript/packs/mailer.js
+++ /dev/null
@@ -1 +0,0 @@
-require('../styles/mailer.scss');