Require images in common.js (#4232)

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index 1f8ebb72145a5b179cfe3cee1c9ea4a83c47276a..cc422c10991596386b821a2febbbeb2049951a00 100644 (file)
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -8,8 +8,6 @@ function main() {
   const React = require('react');
   const ReactDOM = require('react-dom');
 
-  require.context('../images/', true);
-
   if (window.history && history.replaceState) {
     const { pathname, search, hash } = window.location;
     const path = pathname + search + hash;

diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index a0cb91ae4b9aff82f97bdb58b4ce8e3f09f3b846..ba7053f1fcbba7230762f996f1a3065e8ee28b60 100644 (file)
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -4,4 +4,6 @@ import { start } from 'rails-ujs';
 require('font-awesome/css/font-awesome.css');
 require('mastodon-application-style');
 
+require.context('../images/', true);
+
 start();

diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 6e6ba34769f58f33afb8b13cab92bb7d17b8792a..371e0f4453341a5adee1220bb4c97b658eaed5d8 100644 (file)
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -6,8 +6,6 @@ import { getLocale } from '../mastodon/locales';
 import loadPolyfills from '../mastodon/load_polyfills';
 import ready from '../mastodon/ready';
 
-require.context('../images/', true);
-
 const { localeData } = getLocale();
 localeData.forEach(IntlRelativeFormat.__addLocaleData);