Merge remote-tracking branch 'origin/master' into gs-master

 Conflicts:
	Gemfile.lock

1 files changed, 15 insertions, 0 deletions

diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb
new file mode 100644
index 000000000..4ea3ce80c
--- /dev/null
+++ b/lib/mastodon/premailer_webpack_strategy.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module PremailerWebpackStrategy
+  def load(url)
+    if Webpacker.dev_server.running?
+      url = File.join("#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}", url)
+      HTTP.get(url).to_s
+    else
+      url = url[1..-1] if url.start_with?('/')
+      File.read(Rails.root.join('public', url))
+    end
+  end
+
+  module_function :load
+end