From 7097a459be125f0c18bc4c2c77a00ba92c408bf9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 11 Oct 2022 11:23:59 +0200
Subject: [PATCH] Move flavours/glitch/utils/ready to flavours/glitch/ready

---
 app/javascript/flavours/glitch/components/media_attachments.js  | 2 +-
 app/javascript/flavours/glitch/components/status.js             | 2 +-
 app/javascript/flavours/glitch/features/emoji_picker/index.js   | 2 +-
 .../flavours/glitch/features/ui/components/columns_area.js      | 2 +-
 .../flavours/glitch/features/ui/components/focal_point_modal.js | 2 +-
 .../flavours/glitch/features/ui/components/modal_root.js        | 2 +-
 app/javascript/flavours/glitch/features/ui/index.js             | 2 +-
 .../glitch/{utils => features/ui/util}/async-components.js      | 0
 app/javascript/flavours/glitch/packs/about.js                   | 2 +-
 app/javascript/flavours/glitch/packs/admin.js                   | 2 +-
 app/javascript/flavours/glitch/packs/error.js                   | 2 +-
 app/javascript/flavours/glitch/packs/public.js                  | 2 +-
 app/javascript/flavours/glitch/packs/settings.js                | 2 +-
 app/javascript/flavours/glitch/packs/share.js                   | 2 +-
 app/javascript/flavours/glitch/{utils => }/ready.js             | 0
 app/javascript/flavours/glitch/utils/config.js                  | 2 +-
 app/javascript/flavours/glitch/utils/main.js                    | 2 +-
 17 files changed, 15 insertions(+), 15 deletions(-)
 rename app/javascript/flavours/glitch/{utils => features/ui/util}/async-components.js (100%)
 rename app/javascript/flavours/glitch/{utils => }/ready.js (100%)

diff --git a/app/javascript/flavours/glitch/components/media_attachments.js b/app/javascript/flavours/glitch/components/media_attachments.js
index dec26243580..a517fcf3007 100644
--- a/app/javascript/flavours/glitch/components/media_attachments.js
+++ b/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';
 
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index 9748f27468d..6cdc4b97195 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/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';
diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js
index bf58441f349..97032e107d5 100644
--- a/app/javascript/flavours/glitch/features/emoji_picker/index.js
+++ b/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';
diff --git a/app/javascript/flavours/glitch/features/ui/components/columns_area.js b/app/javascript/flavours/glitch/features/ui/components/columns_area.js
index 0196f691ad1..b38fe4b1713 100644
--- a/app/javascript/flavours/glitch/features/ui/components/columns_area.js
+++ b/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';
diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js
index c31a4822d03..de330b3a150 100644
--- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js
+++ b/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
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.js b/app/javascript/flavours/glitch/features/ui/components/modal_root.js
index dc612aea277..cedfabe03d6 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.js
+++ b/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 }),
diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js
index f77e895919e..3c679d3944a 100644
--- a/app/javascript/flavours/glitch/features/ui/index.js
+++ b/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';
diff --git a/app/javascript/flavours/glitch/utils/async-components.js b/app/javascript/flavours/glitch/features/ui/util/async-components.js
similarity index 100%
rename from app/javascript/flavours/glitch/utils/async-components.js
rename to app/javascript/flavours/glitch/features/ui/util/async-components.js
diff --git a/app/javascript/flavours/glitch/packs/about.js b/app/javascript/flavours/glitch/packs/about.js
index 87c8220ffa7..50e7899465c 100644
--- a/app/javascript/flavours/glitch/packs/about.js
+++ b/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);
 }
 
diff --git a/app/javascript/flavours/glitch/packs/admin.js b/app/javascript/flavours/glitch/packs/admin.js
index a866da742e9..56cdfc30a3e 100644
--- a/app/javascript/flavours/glitch/packs/admin.js
+++ b/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');
diff --git a/app/javascript/flavours/glitch/packs/error.js b/app/javascript/flavours/glitch/packs/error.js
index 424029cae85..f13e321498d 100644
--- a/app/javascript/flavours/glitch/packs/error.js
+++ b/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');
diff --git a/app/javascript/flavours/glitch/packs/public.js b/app/javascript/flavours/glitch/packs/public.js
index bf1c5816be8..d920acc0083 100644
--- a/app/javascript/flavours/glitch/packs/public.js
+++ b/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() {
diff --git a/app/javascript/flavours/glitch/packs/settings.js b/app/javascript/flavours/glitch/packs/settings.js
index 944e74d0a62..80f53bc7882 100644
--- a/app/javascript/flavours/glitch/packs/settings.js
+++ b/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';
 
diff --git a/app/javascript/flavours/glitch/packs/share.js b/app/javascript/flavours/glitch/packs/share.js
index 08fc699bb15..49c8545e7d0 100644
--- a/app/javascript/flavours/glitch/packs/share.js
+++ b/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);
 }
 
diff --git a/app/javascript/flavours/glitch/utils/ready.js b/app/javascript/flavours/glitch/ready.js
similarity index 100%
rename from app/javascript/flavours/glitch/utils/ready.js
rename to app/javascript/flavours/glitch/ready.js
diff --git a/app/javascript/flavours/glitch/utils/config.js b/app/javascript/flavours/glitch/utils/config.js
index c3e2b73aea4..932cd0cbf54 100644
--- a/app/javascript/flavours/glitch/utils/config.js
+++ b/app/javascript/flavours/glitch/utils/config.js
@@ -1,4 +1,4 @@
-import ready from './ready';
+import ready from '../ready';
 
 export let assetHost = '';
 
diff --git a/app/javascript/flavours/glitch/utils/main.js b/app/javascript/flavours/glitch/utils/main.js
index 0601e7a76dc..39a46db0025 100644
--- a/app/javascript/flavours/glitch/utils/main.js
+++ b/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');