diff --git a/app/application.js b/app/application.js index 906247ea3..c0f54ff1d 100644 --- a/app/application.js +++ b/app/application.js @@ -1,7 +1,8 @@ import loadPolyfills from './soapbox/load_polyfills'; -import { start } from './soapbox/common'; -start(); +require('fork-awesome/css/fork-awesome.css'); + +require.context('./images/', true); loadPolyfills().then(() => { require('./soapbox/main').default(); diff --git a/app/soapbox/common.js b/app/soapbox/common.js deleted file mode 100644 index 6947fd07c..000000000 --- a/app/soapbox/common.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -import Rails from 'rails-ujs'; - -export function start() { - require('fork-awesome/css/fork-awesome.css'); - require.context('../images/', true); - - try { - Rails.start(); - } catch (e) { - // If called twice - } -}; diff --git a/package.json b/package.json index e407f8788..308f37eea 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,6 @@ "prop-types": "^15.5.10", "punycode": "^2.1.0", "qrcode.react": "^1.0.0", - "rails-ujs": "^5.2.3", "react": "^16.13.1", "react-color": "^2.18.1", "react-dom": "^16.13.1", diff --git a/yarn.lock b/yarn.lock index 3129a175f..f14e28b41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9406,11 +9406,6 @@ railroad-diagrams@^1.0.0: resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234= -rails-ujs@^5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/rails-ujs/-/rails-ujs-5.2.3.tgz#4b65ea781a6befe62e96da6362165286a1fe4099" - integrity sha512-rYgj185MowWFBJI1wdac2FkX4yFYe4+3jJPlB+CTY7a4rmIyg0TqE4vYZmSBBesp7blPUa57oqKzwQjN7eVbEQ== - randexp@0.4.6: version "0.4.6" resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"