update import lines

packages/app/src/client/services/AppContainer.js

@@ -3,7 +3,7 @@ import { Container } from 'unstated';
 import axios from 'axios';
 import urljoin from 'url-join';
 
-import InterceptorManager from '@commons/service/interceptor-manager';
+import InterceptorManager from '~/services/interceptor-manager';
 
 import emojiStrategy from '../util/emojione/emoji_strategy_shrinked.json';
 import GrowiRenderer from '../util/GrowiRenderer';

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

@@ -10,7 +10,7 @@ import {
   ModalFooter,
 } from 'reactstrap';
 
-import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import-option';
+import GrowiArchiveImportOption from '~/models/admin/growi-archive-import-option';
 
 import { withUnstatedContainers } from '../../../UnstatedUtils';
 import AppContainer from '~/client/services/AppContainer';

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

@@ -6,7 +6,7 @@ import { withTranslation } from 'react-i18next';
 
 import { Progress } from 'reactstrap';
 
-import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import-option';
+import GrowiArchiveImportOption from '~/models/admin/growi-archive-import-option';
 
 
 const MODE_ATTR_MAP = {

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

@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
-import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import-option';
-import ImportOptionForPages from '@commons/models/admin/import-option-for-pages';
-import ImportOptionForRevisions from '@commons/models/admin/import-option-for-revisions';
+import GrowiArchiveImportOption from '~/models/admin/growi-archive-import-option';
+import ImportOptionForPages from '~/models/admin/import-option-for-pages';
+import ImportOptionForRevisions from '~/models/admin/import-option-for-revisions';
 
 import { withUnstatedContainers } from '../../../UnstatedUtils';
 import AppContainer from '~/client/services/AppContainer';

packages/app/src/components/Navbar/GrowiSubNavigation.jsx

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 
 import { withTranslation } from 'react-i18next';
 
-import DevidedPagePath from '@commons/models/devided-page-path';
-import LinkedPagePath from '@commons/models/linked-page-path';
-import PagePathHierarchicalLink from '@commons/components/PagePathHierarchicalLink';
+import PagePathHierarchicalLink from '~/components/PagePathHierarchicalLink';
+import DevidedPagePath from '~/models/devided-page-path';
+import LinkedPagePath from '~/models/linked-page-path';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
 import AppContainer from '~/client/services/AppContainer';

packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -7,7 +7,7 @@ import * as codemirror from 'codemirror';
 import { Button } from 'reactstrap';
 import { UnControlled as ReactCodeMirror } from 'react-codemirror2';
 
-import InterceptorManager from '@commons/service/interceptor-manager';
+import InterceptorManager from '~/services/interceptor-manager';
 
 import AbstractEditor from './AbstractEditor';
 import SimpleCheatsheet from './SimpleCheatsheet';
@@ -862,9 +862,9 @@ export default class CodeMirrorEditor extends AbstractEditor {
           placeholder="search"
           editorDidMount={(editor) => {
           // add event handlers
-          editor.on('paste', this.pasteHandler);
-          editor.on('scrollCursorIntoView', this.scrollCursorIntoViewHandler);
-        }}
+            editor.on('paste', this.pasteHandler);
+            editor.on('scrollCursorIntoView', this.scrollCursorIntoViewHandler);
+          }}
           value={this.state.value}
           options={{
             mode,
@@ -897,19 +897,19 @@ export default class CodeMirrorEditor extends AbstractEditor {
           }}
           onCursor={this.cursorHandler}
           onScroll={(editor, data) => {
-          if (this.props.onScroll != null) {
+            if (this.props.onScroll != null) {
             // add line data
-            const line = editor.lineAtHeight(data.top, 'local');
-            data.line = line;
-            this.props.onScroll(data);
-          }
-        }}
+              const line = editor.lineAtHeight(data.top, 'local');
+              data.line = line;
+              this.props.onScroll(data);
+            }
+          }}
           onChange={this.changeHandler}
           onDragEnter={(editor, event) => {
-          if (this.props.onDragEnter != null) {
-            this.props.onDragEnter(event);
-          }
-        }}
+            if (this.props.onDragEnter != null) {
+              this.props.onDragEnter(event);
+            }
+          }}
         />
 
         { this.renderLoadingKeymapOverlay() }

packages/app/src/components/PageEditor/TextAreaEditor.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 // import PropTypes from 'prop-types';
 
-import InterceptorManager from '@commons/service/interceptor-manager';
-
 import { Input } from 'reactstrap';
+import InterceptorManager from '~/services/interceptor-manager';
+
 
 import AbstractEditor from './AbstractEditor';
 
@@ -259,10 +259,10 @@ export default class TextAreaEditor extends AbstractEditor {
           innerRef={(c) => { this.textarea = c }}
           defaultValue={this.state.value}
           onChange={(e) => {
-          if (this.props.onChange != null) {
-            this.props.onChange(e.target.value);
-          }
-        }}
+            if (this.props.onChange != null) {
+              this.props.onChange(e.target.value);
+            }
+          }}
         />
       </React.Fragment>
     );

packages/app/src/components/PageList/PagePathLabel.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import DevidedPagePath from '@commons/models/devided-page-path';
+import DevidedPagePath from '~/models/devided-page-path';
 
 const PagePathLabel = (props) => {
 

packages/app/src/components/Sidebar/RecentChanges.jsx

@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 
 import { withTranslation } from 'react-i18next';
 
+import PagePathHierarchicalLink from '~/components/PagePathHierarchicalLink';
 import loggerFactory from '~/utils/logger';
 
-import DevidedPagePath from '@commons/models/devided-page-path';
-import LinkedPagePath from '@commons/models/linked-page-path';
-import PagePathHierarchicalLink from '@commons/components/PagePathHierarchicalLink';
+import DevidedPagePath from '~/models/devided-page-path';
+import LinkedPagePath from '~/models/linked-page-path';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
 import AppContainer from '~/client/services/AppContainer';

packages/app/src/server/routes/apiv3/import.js

@@ -7,7 +7,7 @@ const multer = require('multer');
 
 const express = require('express');
 
-const GrowiArchiveImportOption = require('@commons/models/admin/growi-archive-import-option');
+const GrowiArchiveImportOption = require('~/models/admin/growi-archive-import-option');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 

packages/app/src/server/routes/apiv3/overwrite-params/pages.js

@@ -1,7 +1,7 @@
 const mongoose = require('mongoose');
 
 // eslint-disable-next-line no-unused-vars
-const ImportOptionForPages = require('@commons/models/admin/import-option-for-pages');
+const ImportOptionForPages = require('~/models/admin/import-option-for-pages');
 
 const { ObjectId } = mongoose.Types;
 

packages/app/src/server/routes/apiv3/overwrite-params/revisions.js

@@ -1,7 +1,7 @@
 const mongoose = require('mongoose');
 
 // eslint-disable-next-line no-unused-vars
-const ImportOptionForPages = require('@commons/models/admin/import-option-for-pages');
+const ImportOptionForPages = require('~/models/admin/import-option-for-pages');
 
 const { ObjectId } = mongoose.Types;
 

packages/app/src/server/routes/apiv3/security-setting.js

@@ -1,4 +1,5 @@
 import loggerFactory from '~/utils/logger';
+import { removeNullPropertyFromObject } from '~/utils/object-utils';
 
 const logger = loggerFactory('growi:routes:apiv3:security-setting');
 
@@ -8,7 +9,6 @@ const router = express.Router();
 
 const { body } = require('express-validator');
 const ErrorV3 = require('../../models/vo/error-apiv3');
-const removeNullPropertyFromObject = require('../../../lib/util/removeNullPropertyFromObject');
 
 const validator = {
   generalSetting: [