update import lines

packages/app/src/client/base.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Xss from '@commons/service/xss';
+import Xss from '~/services/xss';
 import loggerFactory from '~/utils/logger';
 
 import GrowiNavbar from '../components/Navbar/GrowiNavbar';

packages/app/src/client/util/PreProcessor/XssFilter.js

@@ -1,5 +1,5 @@
-import Xss from '@commons/service/xss';
-import XssOption from '@commons/service/xss/xssOption';
+import Xss from '~/services/xss';
+import XssOption from '~/services/xss/xssOption';
 
 export default class XssFilter {
 

packages/app/src/client/util/interceptor/drawio-interceptor.js

@@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
 import { Provider } from 'unstated';
 import { BasicInterceptor } from 'growi-commons';
 
-import Drawio from '../../components/Drawio';
+import Drawio from '~/components/Drawio';
 
 /**
  * The interceptor for draw.io

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

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { tags, attrs } from '../../../../../lib/service/xss/recommended-whitelist';
+import { tags, attrs } from '~/services/xss/recommended-whitelist';
 
 import AppContainer from '~/client/services/AppContainer';
 import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';

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

@@ -6,7 +6,7 @@ import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastSuccess, toastError } from '~/client/util/apiNotification';
-import { tags, attrs } from '../../../../../lib/service/xss/recommended-whitelist';
+import { tags, attrs } from '~/services/xss/recommended-whitelist';
 
 import AppContainer from '~/client/services/AppContainer';
 import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';

packages/app/src/components/Hotkeys/HotkeysDetector.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import { GlobalHotKeys } from 'react-hotkeys';
 
-import HotkeyStroke from '../../models/HotkeyStroke';
+import HotkeyStroke from '~/client/models/HotkeyStroke';
 
 const HotkeysDetector = (props) => {
 

packages/app/src/components/Page.jsx

@@ -7,7 +7,7 @@ import AppContainer from '~/client/services/AppContainer';
 import PageContainer from '~/client/services/PageContainer';
 import EditorContainer from '~/client/services/EditorContainer';
 
-import MarkdownTable from '../models/MarkdownTable';
+import MarkdownTable from '~/client/models/MarkdownTable';
 
 import LinkEditModal from './PageEditor/LinkEditModal';
 import RevisionRenderer from './Page/RevisionRenderer';

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

@@ -5,7 +5,7 @@ import {
 } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 import geu from './GridEditorUtil';
-import BootstrapGrid from '../../models/BootstrapGrid';
+import BootstrapGrid from '~/client/models/BootstrapGrid';
 
 const resSizes = BootstrapGrid.ResponsiveSize;
 const resSizeObj = {

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

@@ -12,7 +12,7 @@ import { debounce } from 'throttle-debounce';
 
 
 import MarkdownTableDataImportForm from './MarkdownTableDataImportForm';
-import MarkdownTable from '../../models/MarkdownTable';
+import MarkdownTable from '~/client/models/MarkdownTable';
 import ExpandOrContractButton from '../ExpandOrContractButton';
 
 const DEFAULT_HOT_HEIGHT = 300;

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

@@ -20,7 +20,7 @@ import AppContainer from '~/client/services/AppContainer';
 import PageContainer from '~/client/services/PageContainer';
 
 import SearchTypeahead from '../SearchTypeahead';
-import Linker from '../../models/Linker';
+import Linker from '~/client/models/Linker';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
 

packages/app/src/components/PageEditor/MarkdownLinkUtil.js

@@ -1,4 +1,4 @@
-import Linker from '../../models/Linker';
+import Linker from '~/client/models/Linker';
 
 /**
  * Utility for markdown link

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

@@ -5,7 +5,7 @@ import {
   Collapse,
 } from 'reactstrap';
 
-import MarkdownTable from '../../models/MarkdownTable';
+import MarkdownTable from '~/client/models/MarkdownTable';
 
 export default class MarkdownTableDataImportForm extends React.Component {
 

packages/app/src/components/PageEditor/MarkdownTableInterceptor.js

@@ -1,7 +1,7 @@
 import { BasicInterceptor } from 'growi-commons';
 
 import mtu from './MarkdownTableUtil';
-import MarkdownTable from '../../models/MarkdownTable';
+import MarkdownTable from '~/client/models/MarkdownTable';
 
 /**
  * Interceptor for markdown table

packages/app/src/components/PageEditor/MarkdownTableUtil.js

@@ -1,4 +1,4 @@
-import MarkdownTable from '../../models/MarkdownTable';
+import MarkdownTable from '~/client/models/MarkdownTable';
 
 /**
  * Utility for markdown table

packages/app/src/server/crowi/index.js

@@ -3,7 +3,7 @@ const logger = require('@alias/logger')('growi:crowi');
 const pkg = require('@root/package.json');
 const InterceptorManager = require('@commons/service/interceptor-manager');
 const CdnResourcesService = require('@commons/service/cdn-resources-service');
-const Xss = require('@commons/service/xss');
+const Xss = require('~/services/xss');
 const { getMongoUri, mongoOptions } = require('@commons/util/mongoose-utils');
 
 const path = require('path');

packages/app/src/server/routes/admin.js

@@ -15,7 +15,7 @@ module.exports = function(crowi, app) {
     exportService,
   } = crowi;
 
-  const recommendedWhitelist = require('@commons/service/xss/recommended-whitelist');
+  const recommendedWhitelist = require('~/services/xss/recommended-whitelist');
   const ApiResponse = require('../util/apiResponse');
   const importer = require('../util/importer')(crowi);
 

packages/app/src/server/service/xss.js

@@ -1,7 +1,7 @@
 const logger = require('@alias/logger')('growi:service:XssSerivce'); // eslint-disable-line no-unused-vars
 
-const Xss = require('@commons/service/xss');
-const { tags, attrs } = require('@commons/service/xss/recommended-whitelist');
+const Xss = require('~/services/xss');
+const { tags, attrs } = require('~/services/xss/recommended-whitelist');
 
 /**
  * the service class of XssSerivce

packages/app/src/services/xss/xssOption.js

@@ -1,7 +1,7 @@
 class XssOption {
 
   constructor(config) {
-    const recommendedWhitelist = require('./recommended-whitelist');
+    const recommendedWhitelist = require('~/services/xss/recommended-whitelist');
     const initializedConfig = (config != null) ? config : {};
 
     this.isEnabledXssPrevention = initializedConfig.isEnabledXssPrevention || true;