Selaa lähdekoodia

update import lines

Yuki Takei 4 vuotta sitten
vanhempi
sitoutus
1a2fa451b0

+ 1 - 1
packages/app/src/client/services/PageContainer.js

@@ -4,7 +4,7 @@ import loggerFactory from '@alias/logger';
 
 import * as entities from 'entities';
 import * as toastr from 'toastr';
-import { isTrashPage } from '@commons/util/path-utils';
+import { isTrashPage } from '~/utils/path-utils';
 import { toastError } from '../util/apiNotification';
 
 import {

+ 1 - 1
packages/app/src/components/ComparePathsTable.jsx

@@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next';
 import { withUnstatedContainers } from './UnstatedUtils';
 
 import PageContainer from '~/client/services/PageContainer';
-import { convertToNewAffiliationPath } from '../../../lib/util/path-utils';
+import { convertToNewAffiliationPath } from '~/utils/path-utils';
 
 function ComparePathsTable(props) {
   const {

+ 1 - 1
packages/app/src/components/ContentLinkButtons.jsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 
-import { isTopPage } from '@commons/util/path-utils';
+import { isTopPage } from '~/utils/path-utils';
 import AppContainer from '~/client/services/AppContainer';
 import NavigationContainer from '~/client/services/NavigationContainer';
 import PageContainer from '~/client/services/PageContainer';

+ 1 - 1
packages/app/src/components/DuplicatedPathsTable.jsx

@@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next';
 import { withUnstatedContainers } from './UnstatedUtils';
 
 import PageContainer from '~/client/services/PageContainer';
-import { convertToNewAffiliationPath } from '../../../lib/util/path-utils';
+import { convertToNewAffiliationPath } from '~/utils/path-utils';
 
 function DuplicatedPathsTable(props) {
   const {

+ 1 - 1
packages/app/src/components/Navbar/AuthorInfo.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { userPageRoot } from '@commons/util/path-utils';
+import { userPageRoot } from '~/utils/path-utils';
 import { format } from 'date-fns';
 
 import UserPicture from '../User/UserPicture';

+ 1 - 1
packages/app/src/components/Page/CopyDropdown.jsx

@@ -12,7 +12,7 @@ import {
 
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 
-import { encodeSpaces } from '@commons/util/path-utils';
+import { encodeSpaces } from '~/utils/path-utils';
 
 /* eslint-disable react/prop-types */
 const DropdownItemContents = ({ title, contents }) => (

+ 1 - 1
packages/app/src/components/Page/PageManagement.jsx

@@ -4,7 +4,7 @@ import { UncontrolledTooltip } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 import urljoin from 'url-join';
 
-import { isTopPage } from '@commons/util/path-utils';
+import { isTopPage } from '~/utils/path-utils';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import AppContainer from '~/client/services/AppContainer';
 import PageContainer from '~/client/services/PageContainer';

+ 1 - 1
packages/app/src/components/PageCreateModal.jsx

@@ -9,7 +9,7 @@ import { format } from 'date-fns';
 
 import {
   userPageRoot, isCreatablePage, generateEditorPath,
-} from '@commons/util/path-utils';
+} from '~/utils/path-utils';
 import { pathUtils } from 'growi-commons';
 
 import AppContainer from '~/client/services/AppContainer';

+ 1 - 1
packages/app/src/components/PageList/PageListMeta.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import templateChecker from '@commons/util/template-checker';
-import { isTopPage } from '@commons/util/path-utils';
+import { isTopPage } from '~/utils/path-utils';
 
 export default class PageListMeta extends React.Component {
 

+ 1 - 1
packages/app/src/components/RevisionComparer/RevisionComparer.jsx

@@ -6,7 +6,7 @@ import {
   Dropdown, DropdownToggle, DropdownMenu, DropdownItem,
 } from 'reactstrap';
 
-import { encodeSpaces } from '@commons/util/path-utils';
+import { encodeSpaces } from '~/utils/path-utils';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
 

+ 1 - 1
packages/app/src/components/User/UserPicture.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { userPageRoot } from '@commons/util/path-utils';
+import { userPageRoot } from '~/utils/path-utils';
 
 import { UncontrolledTooltip } from 'reactstrap';
 

+ 1 - 1
packages/app/src/lib/models/linked-page-path.js

@@ -1,5 +1,5 @@
 const { pathUtils } = require('growi-commons');
-const { isTrashPage } = require('@commons/util/path-utils');
+const { isTrashPage } = require('~/utils/path-utils');
 
 const DevidedPagePath = require('./devided-page-path');
 

+ 1 - 1
packages/app/src/server/models/page.js

@@ -14,7 +14,7 @@ const differenceInYears = require('date-fns/differenceInYears');
 
 const { pathUtils } = require('growi-commons');
 const templateChecker = require('@commons/util/template-checker');
-const { isTopPage, isTrashPage } = require('@commons/util/path-utils');
+const { isTopPage, isTrashPage } = require('~/utils/path-utils');
 const escapeStringRegexp = require('escape-string-regexp');
 
 const ObjectId = mongoose.Schema.Types.ObjectId;

+ 1 - 1
packages/app/src/server/routes/apiv3/page.js

@@ -7,7 +7,7 @@ const { body, query } = require('express-validator');
 
 const router = express.Router();
 
-const { convertToNewAffiliationPath } = require('../../../lib/util/path-utils');
+const { convertToNewAffiliationPath } = require('~/utils/path-utils');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 

+ 2 - 2
packages/app/src/server/routes/apiv3/pages.js

@@ -6,7 +6,7 @@ const pathUtils = require('growi-commons').pathUtils;
 
 const { body } = require('express-validator');
 const { query } = require('express-validator');
-const { isCreatablePage } = require('@commons/util/path-utils');
+const { isCreatablePage } = require('~/utils/path-utils');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 const router = express.Router();
@@ -458,7 +458,7 @@ module.exports = (crowi) => {
   ];
 
   router.get('/list', accessTokenParser, loginRequired, validator.displayList, apiV3FormValidator, async(req, res) => {
-    const { isTrashPage } = require('@commons/util/path-utils');
+    const { isTrashPage } = require('~/utils/path-utils');
 
     const { path } = req.query;
     const limit = parseInt(req.query.limit) || await crowi.configManager.getConfig('crowi', 'customize:showPageLimitationS') || 10;

+ 1 - 1
packages/app/src/server/routes/page.js

@@ -1,4 +1,4 @@
-const { isCreatablePage } = require('@commons/util/path-utils');
+const { isCreatablePage } = require('~/utils/path-utils');
 const { serializePageSecurely } = require('../models/serializers/page-serializer');
 const { serializeRevisionSecurely } = require('../models/serializers/revision-serializer');
 const { serializeUserSecurely } = require('../models/serializers/user-serializer');

+ 1 - 1
packages/app/src/server/service/global-notification/global-notification-slack.js

@@ -1,7 +1,7 @@
 const logger = require('@alias/logger')('growi:service:GlobalNotificationSlackService'); // eslint-disable-line no-unused-vars
 const urljoin = require('url-join');
 
-const { encodeSpaces } = require('@commons/util/path-utils');
+const { encodeSpaces } = require('~/utils/path-utils');
 
 /**
  * sub service class of GlobalNotificationSetting

+ 1 - 1
packages/app/src/server/service/page.js

@@ -4,7 +4,7 @@ const logger = require('@alias/logger')('growi:models:page');
 const debug = require('debug')('growi:models:page');
 const { Writable } = require('stream');
 const { createBatchStream } = require('@server/util/batch-stream');
-const { isTrashPage } = require('@commons/util/path-utils');
+const { isTrashPage } = require('~/utils/path-utils');
 const { serializePageSecurely } = require('../models/serializers/page-serializer');
 
 const BULK_REINDEX_SIZE = 100;

+ 1 - 1
packages/app/src/server/util/createGrowiPagesFromImports.js

@@ -1,4 +1,4 @@
-const { isCreatablePage } = require('@commons/util/path-utils');
+const { isCreatablePage } = require('~/utils/path-utils');
 
 module.exports = (crowi) => {
   const Page = crowi.model('Page');

+ 1 - 1
packages/app/src/test/util/path-utils.test.js

@@ -1,4 +1,4 @@
-const { isTopPage, convertToNewAffiliationPath, isCreatablePage } = require('../../lib/util/path-utils');
+const { isTopPage, convertToNewAffiliationPath, isCreatablePage } = require('~/utils/path-utils');
 
 
 describe('TopPage Path test', () => {