Move flavours/glitch/utils/ready to flavours/glitch/ready

app/javascript/flavours/glitch/components/media_attachments.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { MediaGallery, Video, Audio } from 'flavours/glitch/utils/async-components';
+import { MediaGallery, Video, Audio } from 'flavours/glitch/features/ui/util/async-components';
 import Bundle from 'flavours/glitch/features/ui/components/bundle';
 import noop from 'lodash/noop';
 

app/javascript/flavours/glitch/components/status.js

@@ -10,7 +10,7 @@ import AttachmentList from './attachment_list';
 import Card from '../features/status/components/card';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { MediaGallery, Video, Audio } from 'flavours/glitch/utils/async-components';
+import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
 import { HotKeys } from 'react-hotkeys';
 import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';
 import classNames from 'classnames';

app/javascript/flavours/glitch/features/emoji_picker/index.js

@@ -6,7 +6,7 @@ import { useEmoji } from 'flavours/glitch/actions/emojis';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { EmojiPicker as EmojiPickerAsync } from 'flavours/glitch/utils/async-components';
+import { EmojiPicker as EmojiPickerAsync } from '../ui/util/async-components';
 import Overlay from 'react-overlays/lib/Overlay';
 import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';

app/javascript/flavours/glitch/features/ui/components/columns_area.js

@@ -26,7 +26,7 @@ import {
   BookmarkedStatuses,
   ListTimeline,
   Directory,
-} from 'flavours/glitch/utils/async-components';
+} from '../../ui/util/async-components';
 import Icon from 'flavours/glitch/components/icon';
 import ComposePanel from './compose_panel';
 import NavigationPanel from './navigation_panel';

app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js

@@ -15,7 +15,7 @@ import Textarea from 'react-textarea-autosize';
 import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress';
 import CharacterCounter from 'flavours/glitch/features/compose/components/character_counter';
 import { length } from 'stringz';
-import { Tesseract as fetchTesseract } from 'flavours/glitch/utils/async-components';
+import { Tesseract as fetchTesseract } from 'flavours/glitch/features/ui/util/async-components';
 import GIFV from 'flavours/glitch/components/gifv';
 import { me } from 'flavours/glitch/initial_state';
 // eslint-disable-next-line import/no-extraneous-dependencies

app/javascript/flavours/glitch/features/ui/components/modal_root.js

@@ -29,7 +29,7 @@ import {
   PinnedAccountsEditor,
   CompareHistoryModal,
   FilterModal,
-} from 'flavours/glitch/utils/async-components';
+} from 'flavours/glitch/features/ui/util/async-components';
 
 const MODAL_COMPONENTS = {
   'MEDIA': () => Promise.resolve({ default: MediaModal }),

app/javascript/flavours/glitch/features/ui/index.js

@@ -52,7 +52,7 @@ import {
   Directory,
   Explore,
   FollowRecommendations,
-} from 'flavours/glitch/utils/async-components';
+} from './util/async-components';
 import { HotKeys } from 'react-hotkeys';
 import { me, title } from 'flavours/glitch/initial_state';
 import { closeOnboarding, INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding';

app/javascript/flavours/glitch/packs/about.js

@@ -14,7 +14,7 @@ function loaded() {
 }
 
 function main() {
-  const ready = require('flavours/glitch/utils/ready').default;
+  const ready = require('flavours/glitch/ready').default;
   ready(loaded);
 }
 

app/javascript/flavours/glitch/packs/admin.js

@@ -1,5 +1,5 @@
 import 'packs/public-path';
-import ready from 'flavours/glitch/utils/ready';
+import ready from 'flavours/glitch/ready';
 
 ready(() => {
   const React    = require('react');

app/javascript/flavours/glitch/packs/error.js

@@ -1,5 +1,5 @@
 import 'packs/public-path';
-import ready from 'flavours/glitch/utils/ready';
+import ready from 'flavours/glitch/ready';
 
 ready(() => {
   const image = document.querySelector('img');

app/javascript/flavours/glitch/packs/public.js

@@ -1,6 +1,6 @@
 import 'packs/public-path';
 import loadPolyfills from 'flavours/glitch/utils/load_polyfills';
-import ready from 'flavours/glitch/utils/ready';
+import ready from 'flavours/glitch/ready';
 import loadKeyboardExtensions from 'flavours/glitch/utils/load_keyboard_extensions';
 
 function main() {

app/javascript/flavours/glitch/packs/settings.js

@@ -1,6 +1,6 @@
 import 'packs/public-path';
 import loadPolyfills from 'flavours/glitch/utils/load_polyfills';
-import ready from 'flavours/glitch/utils/ready';
+import ready from 'flavours/glitch/ready';
 import loadKeyboardExtensions from 'flavours/glitch/utils/load_keyboard_extensions';
 import 'cocoon-js-vanilla';
 

app/javascript/flavours/glitch/packs/share.js

@@ -14,7 +14,7 @@ function loaded() {
 }
 
 function main() {
-  const ready = require('flavours/glitch/utils/ready').default;
+  const ready = require('flavours/glitch/ready').default;
   ready(loaded);
 }
 

app/javascript/flavours/glitch/utils/config.js

@@ -1,4 +1,4 @@
-import ready from './ready';
+import ready from '../ready';
 
 export let assetHost = '';
 

app/javascript/flavours/glitch/utils/main.js

@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { setupBrowserNotifications } from 'flavours/glitch/actions/notifications';
 import Mastodon, { store } from 'flavours/glitch/containers/mastodon';
-import ready from 'flavours/glitch/utils/ready';
+import ready from 'flavours/glitch/ready';
 
 const perf = require('flavours/glitch/utils/performance');