replace import lines

packages/app/src/client/admin.jsx

@@ -25,27 +25,27 @@ import ExportArchiveDataPage from '../components/Admin/ExportArchiveDataPage';
 import FullTextSearchManagement from '../components/Admin/FullTextSearchManagement';
 import AdminNavigation from '../components/Admin/Common/AdminNavigation';
 
-import NavigationContainer from './services/NavigationContainer';
+import NavigationContainer from '~/client/services/NavigationContainer';
 
-import AdminSocketIoContainer from './services/AdminSocketIoContainer';
-import AdminHomeContainer from './services/AdminHomeContainer';
-import AdminCustomizeContainer from './services/AdminCustomizeContainer';
-import AdminUserGroupDetailContainer from './services/AdminUserGroupDetailContainer';
-import AdminUsersContainer from './services/AdminUsersContainer';
-import AdminAppContainer from './services/AdminAppContainer';
-import AdminImportContainer from './services/AdminImportContainer';
-import AdminMarkDownContainer from './services/AdminMarkDownContainer';
-import AdminExternalAccountsContainer from './services/AdminExternalAccountsContainer';
-import AdminGeneralSecurityContainer from './services/AdminGeneralSecurityContainer';
-import AdminLdapSecurityContainer from './services/AdminLdapSecurityContainer';
-import AdminLocalSecurityContainer from './services/AdminLocalSecurityContainer';
-import AdminSamlSecurityContainer from './services/AdminSamlSecurityContainer';
-import AdminOidcSecurityContainer from './services/AdminOidcSecurityContainer';
-import AdminBasicSecurityContainer from './services/AdminBasicSecurityContainer';
-import AdminGoogleSecurityContainer from './services/AdminGoogleSecurityContainer';
-import AdminGitHubSecurityContainer from './services/AdminGitHubSecurityContainer';
-import AdminTwitterSecurityContainer from './services/AdminTwitterSecurityContainer';
-import AdminNotificationContainer from './services/AdminNotificationContainer';
+import AdminSocketIoContainer from '~/client/services/AdminSocketIoContainer';
+import AdminHomeContainer from '~/client/services/AdminHomeContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
+import AdminUserGroupDetailContainer from '~/client/services/AdminUserGroupDetailContainer';
+import AdminUsersContainer from '~/client/services/AdminUsersContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
+import AdminImportContainer from '~/client/services/AdminImportContainer';
+import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
+import AdminExternalAccountsContainer from '~/client/services/AdminExternalAccountsContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminLdapSecurityContainer from '~/client/services/AdminLdapSecurityContainer';
+import AdminLocalSecurityContainer from '~/client/services/AdminLocalSecurityContainer';
+import AdminSamlSecurityContainer from '~/client/services/AdminSamlSecurityContainer';
+import AdminOidcSecurityContainer from '~/client/services/AdminOidcSecurityContainer';
+import AdminBasicSecurityContainer from '~/client/services/AdminBasicSecurityContainer';
+import AdminGoogleSecurityContainer from '~/client/services/AdminGoogleSecurityContainer';
+import AdminGitHubSecurityContainer from '~/client/services/AdminGitHubSecurityContainer';
+import AdminTwitterSecurityContainer from '~/client/services/AdminTwitterSecurityContainer';
+import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 
 import { appContainer, componentMappings } from './base';
 

packages/app/src/client/app.jsx

@@ -38,15 +38,15 @@ import PersonalSettings from '../components/Me/PersonalSettings';
 import GrowiSubNavigation from '../components/Navbar/GrowiSubNavigation';
 import GrowiSubNavigationSwitcher from '../components/Navbar/GrowiSubNavigationSwitcher';
 
-import NavigationContainer from './services/NavigationContainer';
-import PageContainer from './services/PageContainer';
-import PageHistoryContainer from './services/PageHistoryContainer';
-import RevisionComparerContainer from './services/RevisionComparerContainer';
-import CommentContainer from './services/CommentContainer';
-import EditorContainer from './services/EditorContainer';
-import TagContainer from './services/TagContainer';
-import PersonalContainer from './services/PersonalContainer';
-import PageAccessoriesContainer from './services/PageAccessoriesContainer';
+import NavigationContainer from '~/client/services/NavigationContainer';
+import PageContainer from '~/client/services/PageContainer';
+import PageHistoryContainer from '~/client/services/PageHistoryContainer';
+import RevisionComparerContainer from '~/client/services/RevisionComparerContainer';
+import CommentContainer from '~/client/services/CommentContainer';
+import EditorContainer from '~/client/services/EditorContainer';
+import TagContainer from '~/client/services/TagContainer';
+import PersonalContainer from '~/client/services/PersonalContainer';
+import PageAccessoriesContainer from '~/client/services/PageAccessoriesContainer';
 
 import { appContainer, componentMappings } from './base';
 

packages/app/src/client/base.jsx

@@ -8,8 +8,8 @@ import GrowiNavbarBottom from '../components/Navbar/GrowiNavbarBottom';
 import HotkeysManager from '../components/Hotkeys/HotkeysManager';
 import PageCreateModal from '../components/PageCreateModal';
 
-import AppContainer from './services/AppContainer';
-import SocketIoContainer from './services/SocketIoContainer';
+import AppContainer from '~/client/services/AppContainer';
+import SocketIoContainer from '~/client/services/SocketIoContainer';
 
 const logger = loggerFactory('growi:cli:app');
 

packages/app/src/client/nologin.jsx

@@ -5,7 +5,7 @@ import { I18nextProvider } from 'react-i18next';
 
 import { i18nFactory } from './util/i18n';
 
-import AppContainer from './services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
 import InstallerForm from '../components/InstallerForm';
 import LoginForm from '../components/LoginForm';

packages/app/src/client/util/apiNotification.js

@@ -1,7 +1,7 @@
 // show API error/sucess toastr
 
 import * as toastr from 'toastr';
-import toArrayIfNot from '../../../lib/util/toArrayIfNot';
+import { toArrayIfNot } from '~/utils/array-utils';
 
 const toastrOption = {
   error: {

packages/app/src/client/util/apiv3ErrorHandler.js

@@ -1,7 +1,7 @@
 // API v3 sends an array of errors in res.data.errors.
 // API v3 errors need to extracted from an error object in order to properly handle them.
 
-import toArrayIfNot from '../../../lib/util/toArrayIfNot';
+import { toArrayIfNot } from '~/utils/array-utils';
 
 const logger = require('@alias/logger')('growi:apiv3');
 

packages/app/src/components/Admin/AdminHome/AdminHome.jsx

@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
-import { toastError } from '../../../util/apiNotification';
+import { toastError } from '~/client/util/apiNotification';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminHomeContainer from '../../../services/AdminHomeContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminHomeContainer from '~/client/services/AdminHomeContainer';
 import SystemInfomationTable from './SystemInfomationTable';
 import InstalledPluginTable from './InstalledPluginTable';
 import EnvVarsTable from './EnvVarsTable';

packages/app/src/components/Admin/AdminHome/InstalledPluginTable.jsx

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminHomeContainer from '../../../services/AdminHomeContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminHomeContainer from '~/client/services/AdminHomeContainer';
 
 class InstalledPluginTable extends React.Component {
 

packages/app/src/components/Admin/AdminHome/SystemInfomationTable.jsx

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminHomeContainer from '../../../services/AdminHomeContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminHomeContainer from '~/client/services/AdminHomeContainer';
 
 class SystemInformationTable extends React.Component {
 

packages/app/src/components/Admin/App/AppSetting.jsx

@@ -6,9 +6,9 @@ import loggerFactory from '@alias/logger';
 import { localeMetadatas } from '../../../util/i18n';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 const logger = loggerFactory('growi:appSettings');

packages/app/src/components/Admin/App/AppSettingsPage.jsx

@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 
 import AppSettingsPageContents from './AppSettingsPageContents';
 

packages/app/src/components/Admin/App/AwsSetting.jsx

@@ -4,8 +4,8 @@ import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 
 function AwsSetting(props) {
   const { t, adminAppContainer } = props;

packages/app/src/components/Admin/App/FileUploadSetting.jsx

@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 import AwsSetting from './AwsSetting';

packages/app/src/components/Admin/App/GcsSettings.jsx

@@ -5,8 +5,8 @@ import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 
 
 function GcsSetting(props) {

packages/app/src/components/Admin/App/MailSetting.jsx

@@ -2,11 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 import SmtpSetting from './SmtpSetting';
 import SesSetting from './SesSetting';
 

packages/app/src/components/Admin/App/PluginSetting.jsx

@@ -4,10 +4,10 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 // eslint-disable-next-line no-unused-vars

packages/app/src/components/Admin/App/SesSetting.jsx

@@ -7,8 +7,8 @@ import { withUnstatedContainers } from '../../UnstatedUtils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
 
-import AppContainer from '../../../services/AppContainer';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 
 function SmtpSetting(props) {
   const { adminAppContainer } = props;

packages/app/src/components/Admin/App/SiteUrlSetting.jsx

@@ -4,10 +4,10 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 const logger = loggerFactory('growi:appSettings');

packages/app/src/components/Admin/App/SmtpSetting.jsx

@@ -7,8 +7,8 @@ import { withUnstatedContainers } from '../../UnstatedUtils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
 
-import AppContainer from '../../../services/AppContainer';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminAppContainer from '~/client/services/AdminAppContainer';
 
 function SmtpSetting(props) {
   const { adminAppContainer, t } = props;

packages/app/src/components/Admin/Common/AdminNavigation.jsx

@@ -8,7 +8,7 @@ import urljoin from 'url-join';
 
 import { pathUtils } from 'growi-commons';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
 const AdminNavigation = (props) => {

packages/app/src/components/Admin/Customize/Customize.jsx

@@ -3,12 +3,12 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 
 import loggerFactory from '@alias/logger';
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
-import AppContainer from '../../../services/AppContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
+import AppContainer from '~/client/services/AppContainer';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
 import CustomizeLayoutSetting from './CustomizeLayoutSetting';

packages/app/src/components/Admin/Customize/CustomizeCssSetting.jsx

@@ -4,11 +4,11 @@ import { withTranslation } from 'react-i18next';
 import { Card, CardBody } from 'reactstrap';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 import CustomCssEditor from '../CustomCssEditor';
 

packages/app/src/components/Admin/Customize/CustomizeFunctionSetting.jsx

@@ -4,11 +4,11 @@ import { withTranslation } from 'react-i18next';
 import { Card, CardBody } from 'reactstrap';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 import CustomizeFunctionOption from './CustomizeFunctionOption';
 import PagingSizeUncontrolledDropdown from './PagingSizeUncontrolledDropdown';

packages/app/src/components/Admin/Customize/CustomizeHeaderSetting.jsx

@@ -4,11 +4,11 @@ import { withTranslation } from 'react-i18next';
 import { Card, CardBody } from 'reactstrap';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 import CustomHeaderEditor from '../CustomHeaderEditor';
 

packages/app/src/components/Admin/Customize/CustomizeHighlightSetting.jsx

@@ -7,11 +7,11 @@ import {
 } from 'reactstrap';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 class CustomizeHighlightSetting extends React.Component {

packages/app/src/components/Admin/Customize/CustomizeLayoutSetting.jsx

@@ -2,9 +2,9 @@ import React, { useCallback, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 import { isDarkMode as isDarkModeByUtil } from '../../../util/color-scheme';
 
 const isDarkMode = isDarkModeByUtil();

packages/app/src/components/Admin/Customize/CustomizeScriptSetting.jsx

@@ -4,11 +4,11 @@ import { withTranslation } from 'react-i18next';
 import { Card, CardBody } from 'reactstrap';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 import CustomScriptEditor from '../CustomScriptEditor';
 

packages/app/src/components/Admin/Customize/CustomizeThemeOptions.jsx

@@ -5,9 +5,9 @@ import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import ThemeColorBox from './ThemeColorBox';
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 
 class CustomizeThemeOptions extends React.Component {
 

packages/app/src/components/Admin/Customize/CustomizeThemeSetting.jsx

@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
 import CustomizeThemeOptions from './CustomizeThemeOptions';
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 class CustomizeThemeSetting extends React.Component {

packages/app/src/components/Admin/Customize/CustomizeTitle.jsx

@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import { Card, CardBody } from 'reactstrap';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 class CustomizeTitle extends React.Component {
 

packages/app/src/components/Admin/ElasticsearchManagement/ElasticsearchManagement.jsx

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminSocketIoContainer from '../../../services/AdminSocketIoContainer';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import AdminSocketIoContainer from '~/client/services/AdminSocketIoContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 import StatusTable from './StatusTable';
 import ReconnectControls from './ReconnectControls';

packages/app/src/components/Admin/ElasticsearchManagement/RebuildIndexControls.jsx

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminSocketIoContainer from '../../../services/AdminSocketIoContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminSocketIoContainer from '~/client/services/AdminSocketIoContainer';
 
 import LabeledProgressBar from '../Common/LabeledProgressBar';
 

packages/app/src/components/Admin/ExportArchiveData/ArchiveFilesTable.jsx

@@ -4,7 +4,7 @@ import { withTranslation } from 'react-i18next';
 import { format } from 'date-fns';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
 import ArchiveFilesTableMenu from './ArchiveFilesTableMenu';
 

packages/app/src/components/Admin/ExportArchiveData/ArchiveFilesTableMenu.jsx

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-// import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+// import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 class ArchiveFilesTableMenu extends React.Component {
 

packages/app/src/components/Admin/ExportArchiveData/SelectCollectionsModal.jsx

@@ -7,8 +7,8 @@ import {
 import * as toastr from 'toastr';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-// import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+// import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 
 const GROUPS_PAGE = [

packages/app/src/components/Admin/ExportArchiveDataPage.jsx

@@ -5,10 +5,10 @@ import * as toastr from 'toastr';
 
 
 import { withUnstatedContainers } from '../UnstatedUtils';
-// import { toastSuccess, toastError } from '../../../util/apiNotification';
+// import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../services/AppContainer';
-import AdminSocketIoContainer from '../../services/AdminSocketIoContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminSocketIoContainer from '~/client/services/AdminSocketIoContainer';
 
 import LabeledProgressBar from './Common/LabeledProgressBar';
 

packages/app/src/components/Admin/FullTextSearchManagement.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
-import AppContainer from '../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
 import ElasticsearchManagement from './ElasticsearchManagement/ElasticsearchManagement';
 

packages/app/src/components/Admin/ImportData/GrowiArchive/ImportCollectionConfigurationModal.jsx

@@ -13,8 +13,8 @@ import {
 import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import-option';
 
 import { withUnstatedContainers } from '../../../UnstatedUtils';
-import AppContainer from '../../../../services/AppContainer';
-// import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+// import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 
 class ImportCollectionConfigurationModal extends React.Component {

packages/app/src/components/Admin/ImportData/GrowiArchive/ImportForm.jsx

@@ -7,9 +7,9 @@ import ImportOptionForPages from '@commons/models/admin/import-option-for-pages'
 import ImportOptionForRevisions from '@commons/models/admin/import-option-for-revisions';
 
 import { withUnstatedContainers } from '../../../UnstatedUtils';
-import AppContainer from '../../../../services/AppContainer';
-import AdminSocketIoContainer from '../../../../services/AdminSocketIoContainer';
-import { toastSuccess, toastError } from '../../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import AdminSocketIoContainer from '~/client/services/AdminSocketIoContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 
 import ImportCollectionItem, { DEFAULT_MODE, MODE_RESTRICTED_COLLECTION } from './ImportCollectionItem';

packages/app/src/components/Admin/ImportData/GrowiArchive/UploadForm.jsx

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../../UnstatedUtils';
-import AppContainer from '../../../../services/AppContainer';
-import { toastError } from '../../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import { toastError } from '~/client/util/apiNotification';
 
 class UploadForm extends React.Component {
 

packages/app/src/components/Admin/ImportData/GrowiArchiveSection.jsx

@@ -4,8 +4,8 @@ import { withTranslation } from 'react-i18next';
 import * as toastr from 'toastr';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-// import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+// import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 import UploadForm from './GrowiArchive/UploadForm';
 import ImportForm from './GrowiArchive/ImportForm';

packages/app/src/components/Admin/ImportData/ImportDataPageContents.jsx

@@ -5,7 +5,7 @@ import { withUnstatedContainers } from '../../UnstatedUtils';
 
 import GrowiArchiveSection from './GrowiArchiveSection';
 
-import AdminImportContainer from '../../../services/AdminImportContainer';
+import AdminImportContainer from '~/client/services/AdminImportContainer';
 
 class ImportDataPageContents extends React.Component {
 

packages/app/src/components/Admin/ImportDataPage.jsx

@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
-import toArrayIfNot from '../../../../lib/util/toArrayIfNot';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../SuspenseUtils';
 
-import AdminImportContainer from '../../services/AdminImportContainer';
-import { toastError } from '../../util/apiNotification';
+import AdminImportContainer from '~/client/services/AdminImportContainer';
+import { toastError } from '~/client/util/apiNotification';
 
 import ImportDataPageContents from './ImportData/ImportDataPageContents';
 

packages/app/src/components/Admin/ManageExternalAccount.jsx

@@ -5,10 +5,10 @@ import { withTranslation } from 'react-i18next';
 import PaginationWrapper from '../PaginationWrapper';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
-import AppContainer from '../../services/AppContainer';
-import AdminExternalAccountsContainer from '../../services/AdminExternalAccountsContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminExternalAccountsContainer from '~/client/services/AdminExternalAccountsContainer';
 import ExternalAccountTable from './Users/ExternalAccountTable';
-import { toastError } from '../../util/apiNotification';
+import { toastError } from '~/client/util/apiNotification';
 
 
 class ManageExternalAccount extends React.Component {

packages/app/src/components/Admin/MarkdownSetting/IndentForm.jsx

@@ -9,9 +9,9 @@ import {
 } from 'reactstrap';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AdminMarkDownContainer from '../../../services/AdminMarkDownContainer';
+import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 const logger = loggerFactory('growi:importer');

packages/app/src/components/Admin/MarkdownSetting/LineBreakForm.jsx

@@ -6,11 +6,11 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 
-import AppContainer from '../../../services/AppContainer';
-import AdminMarkDownContainer from '../../../services/AdminMarkDownContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 const logger = loggerFactory('growi:importer');

packages/app/src/components/Admin/MarkdownSetting/MarkDownSetting.jsx

@@ -4,12 +4,12 @@ import PropTypes from 'prop-types';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
 import MarkDownSettingContents from './MarkDownSettingContents';
-import AdminMarkDownContainer from '../../../services/AdminMarkDownContainer';
+import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
 
 const logger = loggerFactory('growi:MarkDown');
 

packages/app/src/components/Admin/MarkdownSetting/PresentationForm.jsx

@@ -5,10 +5,10 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminMarkDownContainer from '../../../services/AdminMarkDownContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 const logger = loggerFactory('growi:markdown:presentation');

packages/app/src/components/Admin/MarkdownSetting/WhiteListInput.jsx

@@ -5,8 +5,8 @@ import { withTranslation } from 'react-i18next';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { tags, attrs } from '../../../../../lib/service/xss/recommended-whitelist';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminMarkDownContainer from '../../../services/AdminMarkDownContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
 
 class WhiteListInput extends React.Component {
 

packages/app/src/components/Admin/MarkdownSetting/XssForm.jsx

@@ -5,11 +5,11 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 import { tags, attrs } from '../../../../../lib/service/xss/recommended-whitelist';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminMarkDownContainer from '../../../services/AdminMarkDownContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 import WhiteListInput from './WhiteListInput';

packages/app/src/components/Admin/Notification/GlobalNotification.jsx

@@ -5,10 +5,10 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminNotificationContainer from '../../../services/AdminNotificationContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 import GlobalNotificationList from './GlobalNotificationList';
 
 const logger = loggerFactory('growi:GlobalNotification');

packages/app/src/components/Admin/Notification/GlobalNotificationList.jsx

@@ -5,10 +5,10 @@ import urljoin from 'url-join';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminNotificationContainer from '../../../services/AdminNotificationContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 
 import NotificationDeleteModal from './NotificationDeleteModal';
 import NotificationTypeIcon from './NotificationTypeIcon';

packages/app/src/components/Admin/Notification/ManageGlobalNotification.jsx

@@ -5,11 +5,11 @@ import urljoin from 'url-join';
 
 import loggerFactory from '@alias/logger';
 
-import { toastError } from '../../../util/apiNotification';
+import { toastError } from '~/client/util/apiNotification';
 
 import TriggerEventCheckBox from './TriggerEventCheckBox';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
 const logger = loggerFactory('growi:manageGlobalNotification');

packages/app/src/components/Admin/Notification/NotificationSetting.jsx

@@ -5,11 +5,11 @@ import loggerFactory from '@alias/logger';
 
 import { TabContent, TabPane } from 'reactstrap';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminNotificationContainer from '../../../services/AdminNotificationContainer';
+import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 
 import { CustomNavTab } from '../../CustomNavigation/CustomNav';
 

packages/app/src/components/Admin/Notification/SlackAppConfiguration.jsx

@@ -5,10 +5,10 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminNotificationContainer from '../../../services/AdminNotificationContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
 
 const logger = loggerFactory('growi:slackAppConfiguration');

packages/app/src/components/Admin/Notification/SlackIntegrationNotificationSetting.jsx

@@ -5,11 +5,11 @@ import loggerFactory from '@alias/logger';
 
 import { TabContent, TabPane } from 'reactstrap';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminNotificationContainer from '../../../services/AdminNotificationContainer';
+import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 
 import { CustomNavTab } from '../../CustomNavigation/CustomNav';
 

packages/app/src/components/Admin/Notification/UserNotificationRow.jsx

@@ -4,8 +4,8 @@ import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminNotificationContainer from '../../../services/AdminNotificationContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 
 import NotificationTypeIcon from './NotificationTypeIcon';
 

packages/app/src/components/Admin/Notification/UserTriggerNotification.jsx

@@ -5,10 +5,10 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminNotificationContainer from '../../../services/AdminNotificationContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 import UserNotificationRow from './UserNotificationRow';
 
 const logger = loggerFactory('growi:slackAppConfiguration');

packages/app/src/components/Admin/Security/BasicSecuritySetting.jsx

@@ -3,11 +3,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminBasicSecurityContainer from '../../../services/AdminBasicSecurityContainer';
+import AdminBasicSecurityContainer from '~/client/services/AdminBasicSecurityContainer';
 
 import BasicSecurityManagementContents from './BasicSecuritySettingContents';
 

packages/app/src/components/Admin/Security/BasicSecuritySettingContents.jsx

@@ -4,10 +4,10 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
-import AdminBasicSecurityContainer from '../../../services/AdminBasicSecurityContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminBasicSecurityContainer from '~/client/services/AdminBasicSecurityContainer';
 
 class BasicSecurityManagementContents extends React.Component {
 

packages/app/src/components/Admin/Security/FacebookSecuritySetting.jsx

@@ -5,8 +5,8 @@ import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 
 class FacebookSecurityManagement extends React.Component {
 

packages/app/src/components/Admin/Security/GitHubSecuritySetting.jsx

@@ -3,11 +3,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminGitHubSecurityContainer from '../../../services/AdminGitHubSecurityContainer';
+import AdminGitHubSecurityContainer from '~/client/services/AdminGitHubSecurityContainer';
 
 import GitHubSecuritySettingContents from './GitHubSecuritySettingContents';
 

packages/app/src/components/Admin/Security/GitHubSecuritySettingContents.jsx

@@ -4,10 +4,10 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
-import AdminGitHubSecurityContainer from '../../../services/AdminGitHubSecurityContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminGitHubSecurityContainer from '~/client/services/AdminGitHubSecurityContainer';
 
 class GitHubSecurityManagementContents extends React.Component {
 

packages/app/src/components/Admin/Security/GoogleSecuritySetting.jsx

@@ -3,11 +3,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminGoogleSecurityContainer from '../../../services/AdminGoogleSecurityContainer';
+import AdminGoogleSecurityContainer from '~/client/services/AdminGoogleSecurityContainer';
 import GoogleSecurityManagementContents from './GoogleSecuritySettingContents';
 
 let retrieveErrors = null;

packages/app/src/components/Admin/Security/GoogleSecuritySettingContents.jsx

@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
-import AdminGoogleSecurityContainer from '../../../services/AdminGoogleSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminGoogleSecurityContainer from '~/client/services/AdminGoogleSecurityContainer';
 
 class GoogleSecurityManagementContents extends React.Component {
 

packages/app/src/components/Admin/Security/LdapAuthTest.jsx

@@ -4,10 +4,10 @@ import { withTranslation } from 'react-i18next';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminLdapSecurityContainer from '../../../services/AdminLdapSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminLdapSecurityContainer from '~/client/services/AdminLdapSecurityContainer';
 
 const logger = loggerFactory('growi:security:AdminLdapSecurityContainer');
 

packages/app/src/components/Admin/Security/LdapAuthTestModal.jsx

@@ -10,8 +10,8 @@ import {
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminLdapSecurityContainer from '../../../services/AdminLdapSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminLdapSecurityContainer from '~/client/services/AdminLdapSecurityContainer';
 import LdapAuthTest from './LdapAuthTest';
 
 

packages/app/src/components/Admin/Security/LdapSecuritySetting.jsx

@@ -2,11 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminLdapSecurityContainer from '../../../services/AdminLdapSecurityContainer';
+import AdminLdapSecurityContainer from '~/client/services/AdminLdapSecurityContainer';
 
 import LdapSecuritySettingContents from './LdapSecuritySettingContents';
 

packages/app/src/components/Admin/Security/LdapSecuritySettingContents.jsx

@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
-import AdminLdapSecurityContainer from '../../../services/AdminLdapSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminLdapSecurityContainer from '~/client/services/AdminLdapSecurityContainer';
 import LdapAuthTestModal from './LdapAuthTestModal';
 
 

packages/app/src/components/Admin/Security/LocalSecuritySetting.jsx

@@ -3,11 +3,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminLocalSecurityContainer from '../../../services/AdminLocalSecurityContainer';
+import AdminLocalSecurityContainer from '~/client/services/AdminLocalSecurityContainer';
 
 import LocalSecuritySettingContents from './LocalSecuritySettingContents';
 

packages/app/src/components/Admin/Security/LocalSecuritySettingContents.jsx

@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
-import AdminLocalSecurityContainer from '../../../services/AdminLocalSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminLocalSecurityContainer from '~/client/services/AdminLocalSecurityContainer';
 
 class LocalSecuritySettingContents extends React.Component {
 

packages/app/src/components/Admin/Security/OidcSecuritySetting.jsx

@@ -3,11 +3,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminOidcSecurityContainer from '../../../services/AdminOidcSecurityContainer';
+import AdminOidcSecurityContainer from '~/client/services/AdminOidcSecurityContainer';
 
 import OidcSecurityManagementContents from './OidcSecuritySettingContents';
 

packages/app/src/components/Admin/Security/OidcSecuritySettingContents.jsx

@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
-import AdminOidcSecurityContainer from '../../../services/AdminOidcSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminOidcSecurityContainer from '~/client/services/AdminOidcSecurityContainer';
 
 class OidcSecurityManagementContents extends React.Component {
 

packages/app/src/components/Admin/Security/SamlSecuritySetting.jsx

@@ -3,10 +3,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
+import { toastError } from '~/client/util/apiNotification';
 
-import AdminSamlSecurityContainer from '../../../services/AdminSamlSecurityContainer';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import AdminSamlSecurityContainer from '~/client/services/AdminSamlSecurityContainer';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
 import SamlSecuritySettingContents from './SamlSecuritySettingContents';

packages/app/src/components/Admin/Security/SamlSecuritySettingContents.jsx

@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
-import AdminSamlSecurityContainer from '../../../services/AdminSamlSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminSamlSecurityContainer from '~/client/services/AdminSamlSecurityContainer';
 
 class SamlSecurityManagementContents extends React.Component {
 

packages/app/src/components/Admin/Security/SecurityManagement.jsx

@@ -1,12 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { toastError } from '../../../util/apiNotification';
+import { toastError } from '~/client/util/apiNotification';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import SecurityManagementContents from './SecurityManagementContents';
 
 let retrieveErrors = null;

packages/app/src/components/Admin/Security/SecuritySetting.jsx

@@ -4,10 +4,10 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 
 class SecuritySetting extends React.Component {
 

packages/app/src/components/Admin/Security/ShareLinkSetting.jsx

@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 import PaginationWrapper from '../../PaginationWrapper';
 
-import AppContainer from '../../../services/AppContainer';
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 
 import DeleteAllShareLinksModal from './DeleteAllShareLinksModal';
 import ShareLinkList from '../../ShareLink/ShareLinkList';

packages/app/src/components/Admin/Security/TwitterSecuritySetting.jsx

@@ -3,11 +3,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastError } from '../../../util/apiNotification';
-import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
+import { toastError } from '~/client/util/apiNotification';
+import { toArrayIfNot } from '~/utils/array-utils';
 import { withLoadingSppiner } from '../../SuspenseUtils';
 
-import AdminTwitterSecurityContainer from '../../../services/AdminTwitterSecurityContainer';
+import AdminTwitterSecurityContainer from '~/client/services/AdminTwitterSecurityContainer';
 
 import TwitterSecuritySettingContents from './TwitterSecuritySettingContents';
 

packages/app/src/components/Admin/Security/TwitterSecuritySettingContents.jsx

@@ -4,10 +4,10 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
-import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
-import AdminTwitterSecurityContainer from '../../../services/AdminTwitterSecurityContainer';
+import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
+import AdminTwitterSecurityContainer from '~/client/services/AdminTwitterSecurityContainer';
 
 class TwitterSecurityManagementContents extends React.Component {
 

packages/app/src/components/Admin/SlackIntegration/CustomBotWithProxySettings.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
 import loggerFactory from '@alias/logger';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 import CustomBotWithProxyConnectionStatus from './CustomBotWithProxyConnectionStatus';
 import WithProxyAccordions from './WithProxyAccordions';
 import DeleteSlackBotSettingsModal from './DeleteSlackBotSettingsModal';

packages/app/src/components/Admin/SlackIntegration/CustomBotWithoutProxySecretTokenSection.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 
 const CustomBotWithoutProxySecretTokenSection = (props) => {

packages/app/src/components/Admin/SlackIntegration/CustomBotWithoutProxySettings.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import CustomBotWithoutProxySettingsAccordion, { botInstallationStep } from './CustomBotWithoutProxySettingsAccordion';
 import CustomBotWithoutProxyConnectionStatus from './CustomBotWithoutProxyConnectionStatus';

packages/app/src/components/Admin/SlackIntegration/CustomBotWithoutProxySettingsAccordion.jsx

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import Accordion from '../Common/Accordion';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import MessageBasedOnConnection from './MessageBasedOnConnection';
 import CustomBotWithoutProxySecretTokenSection from './CustomBotWithoutProxySecretTokenSection';

packages/app/src/components/Admin/SlackIntegration/OfficialBotSettings.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import loggerFactory from '@alias/logger';
 import { useTranslation } from 'react-i18next';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 import CustomBotWithProxyConnectionStatus from './CustomBotWithProxyConnectionStatus';
 import WithProxyAccordions from './WithProxyAccordions';
 import DeleteSlackBotSettingsModal from './DeleteSlackBotSettingsModal';

packages/app/src/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -1,9 +1,9 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 import OfficialBotSettings from './OfficialBotSettings';
 import CustomBotWithoutProxySettings from './CustomBotWithoutProxySettings';

packages/app/src/components/Admin/SlackIntegration/WithProxyAccordions.jsx

@@ -6,8 +6,8 @@ import { CopyToClipboard } from 'react-copy-to-clipboard';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
-import AppContainer from '../../../services/AppContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
 import Accordion from '../Common/Accordion';
 import { addLogs } from './slak-integration-util';
 import MessageBasedOnConnection from './MessageBasedOnConnection';

packages/app/src/components/Admin/UserGroup/UserGroupCreateForm.jsx

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 class UserGroupCreateForm extends React.Component {
 

packages/app/src/components/Admin/UserGroup/UserGroupDeleteModal.jsx

@@ -6,7 +6,7 @@ import {
 } from 'reactstrap';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
 /**
  * Delete User Group Select component

packages/app/src/components/Admin/UserGroup/UserGroupPage.jsx

@@ -6,8 +6,8 @@ import UserGroupCreateForm from './UserGroupCreateForm';
 import UserGroupDeleteModal from './UserGroupDeleteModal';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 class UserGroupPage extends React.Component {
 

packages/app/src/components/Admin/UserGroup/UserGroupTable.jsx

@@ -4,7 +4,7 @@ import { withTranslation } from 'react-i18next';
 import dateFnsFormat from 'date-fns/format';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
 class UserGroupTable extends React.Component {
 

packages/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.jsx

@@ -7,7 +7,7 @@ import UserGroupUserTable from './UserGroupUserTable';
 import UserGroupUserModal from './UserGroupUserModal';
 import UserGroupPageList from './UserGroupPageList';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
+import AppContainer from '~/client/services/AppContainer';
 
 class UserGroupDetailPage extends React.Component {
 

packages/app/src/components/Admin/UserGroupDetail/UserGroupEditForm.jsx

@@ -4,9 +4,9 @@ import { withTranslation } from 'react-i18next';
 import dateFnsFormat from 'date-fns/format';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminUserGroupDetailContainer from '../../../services/AdminUserGroupDetailContainer';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import AdminUserGroupDetailContainer from '~/client/services/AdminUserGroupDetailContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 class UserGroupEditForm extends React.Component {
 

packages/app/src/components/Admin/UserGroupDetail/UserGroupPageList.jsx

@@ -5,9 +5,9 @@ import { withTranslation } from 'react-i18next';
 import Page from '../../PageList/Page';
 import PaginationWrapper from '../../PaginationWrapper';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminUserGroupDetailContainer from '../../../services/AdminUserGroupDetailContainer';
-import { toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import AdminUserGroupDetailContainer from '~/client/services/AdminUserGroupDetailContainer';
+import { toastError } from '~/client/util/apiNotification';
 
 class UserGroupPageList extends React.Component {
 

packages/app/src/components/Admin/UserGroupDetail/UserGroupUserFormByInput.jsx

@@ -5,9 +5,9 @@ import { withTranslation } from 'react-i18next';
 import { AsyncTypeahead } from 'react-bootstrap-typeahead';
 import { debounce } from 'throttle-debounce';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminUserGroupDetailContainer from '../../../services/AdminUserGroupDetailContainer';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import AdminUserGroupDetailContainer from '~/client/services/AdminUserGroupDetailContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 import UserPicture from '../../User/UserPicture';
 
 class UserGroupUserFormByInput extends React.Component {

packages/app/src/components/Admin/UserGroupDetail/UserGroupUserModal.jsx

@@ -7,8 +7,8 @@ import {
 
 import UserGroupUserFormByInput from './UserGroupUserFormByInput';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminUserGroupDetailContainer from '../../../services/AdminUserGroupDetailContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminUserGroupDetailContainer from '~/client/services/AdminUserGroupDetailContainer';
 import RadioButtonForSerchUserOption from './RadioButtonForSerchUserOption';
 import CheckBoxForSerchUserOption from './CheckBoxForSerchUserOption';
 

packages/app/src/components/Admin/UserGroupDetail/UserGroupUserTable.jsx

@@ -5,9 +5,9 @@ import dateFnsFormat from 'date-fns/format';
 
 import UserPicture from '../../User/UserPicture';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminUserGroupDetailContainer from '../../../services/AdminUserGroupDetailContainer';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import AppContainer from '~/client/services/AppContainer';
+import AdminUserGroupDetailContainer from '~/client/services/AdminUserGroupDetailContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 class UserGroupUserTable extends React.Component {
 

packages/app/src/components/Admin/UserManagement.jsx

@@ -6,10 +6,10 @@ import PaginationWrapper from '../PaginationWrapper';
 
 
 import { withUnstatedContainers } from '../UnstatedUtils';
-import { toastError } from '../../util/apiNotification';
+import { toastError } from '~/client/util/apiNotification';
 
-import AppContainer from '../../services/AppContainer';
-import AdminUsersContainer from '../../services/AdminUsersContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 
 import PasswordResetModal from './Users/PasswordResetModal';
 import InviteUserControl from './Users/InviteUserControl';

packages/app/src/components/Admin/Users/ExternalAccountTable.jsx

@@ -4,10 +4,10 @@ import { withTranslation } from 'react-i18next';
 import dateFnsFormat from 'date-fns/format';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import AdminExternalAccountsContainer from '../../../services/AdminExternalAccountsContainer';
+import AppContainer from '~/client/services/AppContainer';
+import AdminExternalAccountsContainer from '~/client/services/AdminExternalAccountsContainer';
 
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
 
 class ExternalAccountTable extends React.Component {
 

packages/app/src/components/Admin/Users/GiveAdminButton.jsx

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
-import AdminUsersContainer from '../../../services/AdminUsersContainer';
+import AppContainer from '~/client/services/AppContainer';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
+import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 
 class GiveAdminButton extends React.Component {