Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.

app/javascript/packs/admin.jsx

@@ -1,10 +1,9 @@
 import './public-path';
 import ready from '../mastodon/ready';
+import React from 'react';
+import ReactDOM from 'react-dom';
 
 ready(() => {
-  const React    = require('react');
-  const ReactDOM = require('react-dom');
-
   [].forEach.call(document.querySelectorAll('[data-admin-component]'), element => {
     const componentName  = element.getAttribute('data-admin-component');
     const { locale, ...componentProps } = JSON.parse(element.getAttribute('data-props'));

app/javascript/packs/public.jsx

@@ -1,12 +1,23 @@
 import './public-path';
 import loadPolyfills from '../mastodon/load_polyfills';
-import ready from '../mastodon/ready';
 import { start } from '../mastodon/common';
+
+import ready from '../mastodon/ready';
 import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
 import 'cocoon-js-vanilla';
 import axios from 'axios';
 import { throttle } from 'lodash';
 import { defineMessages } from 'react-intl';
+import * as IntlMessageFormat  from 'intl-messageformat';
+import { timeAgoString }  from '../mastodon/components/relative_timestamp';
+import { delegate }  from '@rails/ujs';
+import * as emojify  from '../mastodon/features/emoji/emoji';
+import { getLocale }  from '../mastodon/locales';
+import React  from 'react';
+import ReactDOM  from 'react-dom';
+import { createBrowserHistory }  from 'history';
+
+start();
 
 const messages = defineMessages({
   usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
@@ -14,18 +25,8 @@ const messages = defineMessages({
   passwordDoesNotMatch: { id: 'password_confirmation.mismatching', defaultMessage: 'Password confirmation does not match' },
 });
 
-start();
-
-function main() {
-  const IntlMessageFormat = require('intl-messageformat').default;
-  const { timeAgoString } = require('../mastodon/components/relative_timestamp');
-  const { delegate } = require('@rails/ujs');
-  const emojify = require('../mastodon/features/emoji/emoji').default;
-  const { getLocale } = require('../mastodon/locales');
+function loaded() {
   const { localeData } = getLocale();
-  const React = require('react');
-  const ReactDOM = require('react-dom');
-  const { createBrowserHistory } = require('history');
 
   const scrollToDetailedStatus = () => {
     const history = createBrowserHistory();
@@ -238,6 +239,11 @@ function main() {
   });
 }
 
+
+function main() {
+  ready(loaded);
+}
+
 loadPolyfills()
   .then(main)
   .then(loadKeyboardExtensions)

app/javascript/packs/share.jsx

@@ -1,23 +1,26 @@
 import './public-path';
 import loadPolyfills from '../mastodon/load_polyfills';
 import { start } from '../mastodon/common';
+import ready from '../mastodon/ready';
+import ComposeContainer  from '../mastodon/containers/compose_container';
+import React from 'react';
+import ReactDOM from 'react-dom';
 
 start();
 
 function loaded() {
-  const ComposeContainer = require('../mastodon/containers/compose_container').default;
-  const React = require('react');
-  const ReactDOM = require('react-dom');
   const mountNode = document.getElementById('mastodon-compose');
 
-  if (mountNode !== null) {
-    const props = JSON.parse(mountNode.getAttribute('data-props'));
+  if (mountNode) {
+    const attr = mountNode.getAttribute('data-props');
+    if(!attr) return;
+
+    const props = JSON.parse(attr);
     ReactDOM.render(<ComposeContainer {...props} />, mountNode);
   }
 }
 
 function main() {
-  const ready = require('../mastodon/ready').default;
   ready(loaded);
 }