Browse Source

update import lines

Yuki Takei 2 years ago
parent
commit
ae216fed79
100 changed files with 148 additions and 147 deletions
  1. 3 2
      apps/app/bin/download-cdn-resources.ts
  2. 2 1
      apps/app/config/next-i18next.config.js
  3. 1 3
      apps/app/src/client/models/Linker.js
  4. 1 1
      apps/app/src/client/services/AdminAppContainer.js
  5. 1 1
      apps/app/src/client/services/AdminCustomizeContainer.js
  6. 1 1
      apps/app/src/client/services/AdminExternalAccountsContainer.js
  7. 1 1
      apps/app/src/client/services/AdminGeneralSecurityContainer.js
  8. 1 2
      apps/app/src/client/services/AdminGitHubSecurityContainer.js
  9. 1 2
      apps/app/src/client/services/AdminGoogleSecurityContainer.js
  10. 1 1
      apps/app/src/client/services/AdminHomeContainer.js
  11. 1 1
      apps/app/src/client/services/AdminImportContainer.js
  12. 1 1
      apps/app/src/client/services/AdminLdapSecurityContainer.js
  13. 1 1
      apps/app/src/client/services/AdminLocalSecurityContainer.js
  14. 1 1
      apps/app/src/client/services/AdminMarkDownContainer.js
  15. 1 1
      apps/app/src/client/services/AdminNotificationContainer.js
  16. 1 2
      apps/app/src/client/services/AdminOidcSecurityContainer.js
  17. 1 2
      apps/app/src/client/services/AdminSamlSecurityContainer.js
  18. 1 1
      apps/app/src/client/services/AdminSlackIntegrationLegacyContainer.js
  19. 1 1
      apps/app/src/client/services/AdminUsersContainer.js
  20. 1 1
      apps/app/src/client/services/page-operation.ts
  21. 1 1
      apps/app/src/client/util/bookmark-utils.ts
  22. 1 1
      apps/app/src/client/util/locale-utils.ts
  23. 1 1
      apps/app/src/components/Admin/AuditLog/ActivityTable.tsx
  24. 1 1
      apps/app/src/components/Admin/Common/AdminNavigation.tsx
  25. 1 1
      apps/app/src/components/Admin/Customize/CustomizeThemeOptions.tsx
  26. 1 1
      apps/app/src/components/Admin/Customize/ThemeColorBox.tsx
  27. 1 1
      apps/app/src/components/Admin/Security/GitHubSecuritySettingContents.jsx
  28. 1 1
      apps/app/src/components/Admin/Security/GoogleSecuritySettingContents.jsx
  29. 1 1
      apps/app/src/components/Admin/Security/OidcSecuritySettingContents.jsx
  30. 1 1
      apps/app/src/components/Admin/Security/SamlSecuritySettingContents.jsx
  31. 1 1
      apps/app/src/components/Admin/UserGroup/UserGroupDeleteModal.tsx
  32. 1 2
      apps/app/src/components/Admin/UserGroup/UserGroupForm.tsx
  33. 1 3
      apps/app/src/components/Admin/UserGroup/UserGroupModal.tsx
  34. 1 1
      apps/app/src/components/Admin/UserGroup/UserGroupPage.tsx
  35. 1 1
      apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx
  36. 2 2
      apps/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx
  37. 1 1
      apps/app/src/components/Admin/UserGroupDetail/UserGroupPageList.tsx
  38. 1 1
      apps/app/src/components/Admin/UserGroupDetail/UserGroupUserModal.tsx
  39. 1 1
      apps/app/src/components/Admin/Users/ExternalAccountTable.tsx
  40. 1 1
      apps/app/src/components/Admin/Users/GrantAdminButton.tsx
  41. 1 1
      apps/app/src/components/Admin/Users/GrantReadOnlyButton.tsx
  42. 1 1
      apps/app/src/components/Admin/Users/RevokeAdminButton.tsx
  43. 1 1
      apps/app/src/components/Admin/Users/RevokeAdminMenuItem.tsx
  44. 1 1
      apps/app/src/components/Admin/Users/RevokeReadOnlyMenuItem.tsx
  45. 1 1
      apps/app/src/components/Admin/Users/StatusSuspendMenuItem.tsx
  46. 1 1
      apps/app/src/components/Admin/Users/UserMenu.tsx
  47. 1 1
      apps/app/src/components/Admin/Users/UserTable.tsx
  48. 1 1
      apps/app/src/components/Bookmarks/BookmarkFolderItem.tsx
  49. 1 1
      apps/app/src/components/Bookmarks/BookmarkFolderTree.tsx
  50. 3 2
      apps/app/src/components/Bookmarks/BookmarkItem.tsx
  51. 2 1
      apps/app/src/components/Comments.tsx
  52. 3 3
      apps/app/src/components/Common/Dropdown/PageItemControl.tsx
  53. 1 1
      apps/app/src/components/ContentLinkButtons.tsx
  54. 1 1
      apps/app/src/components/CreateTemplateModal.jsx
  55. 5 5
      apps/app/src/components/DescendantsPageList.tsx
  56. 1 1
      apps/app/src/components/DuplicatedPathsTable.tsx
  57. 1 1
      apps/app/src/components/IdenticalPathPage.tsx
  58. 1 1
      apps/app/src/components/InAppNotification/InAppNotificationElm.tsx
  59. 1 1
      apps/app/src/components/InAppNotification/InAppNotificationList.tsx
  60. 1 1
      apps/app/src/components/InAppNotification/PageNotification/PageModelNotification.tsx
  61. 1 1
      apps/app/src/components/InAppNotification/PageNotification/UserModelNotification.tsx
  62. 1 1
      apps/app/src/components/InstallerForm.tsx
  63. 1 1
      apps/app/src/components/Layout/RawLayout.tsx
  64. 1 1
      apps/app/src/components/LikeButtons.tsx
  65. 1 1
      apps/app/src/components/Me/DisassociateModal.tsx
  66. 2 2
      apps/app/src/components/Navbar/AuthorInfo.tsx
  67. 1 1
      apps/app/src/components/Navbar/GlobalSearch.tsx
  68. 7 8
      apps/app/src/components/Navbar/GrowiContextualSubNavigation.tsx
  69. 6 3
      apps/app/src/components/Navbar/SubNavButtons.tsx
  70. 1 1
      apps/app/src/components/Page/CopyDropdown.jsx
  71. 1 1
      apps/app/src/components/Page/RevisionLoader.tsx
  72. 1 1
      apps/app/src/components/PageAccessoriesModal/PageAttachment.tsx
  73. 1 1
      apps/app/src/components/PageAlert/PageStaleAlert.tsx
  74. 1 1
      apps/app/src/components/PageAttachment/DeleteAttachmentModal.tsx
  75. 1 1
      apps/app/src/components/PageAttachment/PageAttachmentList.tsx
  76. 1 1
      apps/app/src/components/PageComment/Comment.tsx
  77. 1 1
      apps/app/src/components/PageComment/ReplyComments.tsx
  78. 1 1
      apps/app/src/components/PageContentFooter.tsx
  79. 1 1
      apps/app/src/components/PageCreateModal.jsx
  80. 7 4
      apps/app/src/components/PageDeleteModal.tsx
  81. 2 3
      apps/app/src/components/PageEditor.tsx
  82. 1 1
      apps/app/src/components/PageEditor/ConflictDiffModal.tsx
  83. 1 1
      apps/app/src/components/PageEditorByHackmd.tsx
  84. 1 1
      apps/app/src/components/PageHistory/PageRevisionTable.tsx
  85. 2 3
      apps/app/src/components/PageHistory/Revision.tsx
  86. 2 3
      apps/app/src/components/PageHistory/RevisionDiff.tsx
  87. 1 1
      apps/app/src/components/PageList/PageList.tsx
  88. 4 3
      apps/app/src/components/PageList/PageListItemL.tsx
  89. 1 2
      apps/app/src/components/PageList/PageListItemS.tsx
  90. 2 2
      apps/app/src/components/PagePathAutoComplete.jsx
  91. 2 1
      apps/app/src/components/PagePathNav.tsx
  92. 2 2
      apps/app/src/components/PageRenameModal.tsx
  93. 3 2
      apps/app/src/components/PageSideContents.tsx
  94. 1 1
      apps/app/src/components/PageTimeline.tsx
  95. 1 1
      apps/app/src/components/ReactMarkdownComponents/NextLink.tsx
  96. 2 1
      apps/app/src/components/RecentCreated/RecentCreated.tsx
  97. 2 1
      apps/app/src/components/RevisionComparer/RevisionComparer.tsx
  98. 2 2
      apps/app/src/components/SavePageControls.tsx
  99. 2 2
      apps/app/src/components/SavePageControls/GrantSelector.tsx
  100. 3 3
      apps/app/src/components/SearchPage/SearchResultList.tsx

+ 3 - 2
apps/app/bin/download-cdn-resources.ts

@@ -3,11 +3,12 @@
  *
  * @author Yuki Takei <yuki@weseek.co.jp>
  */
-import { envUtils } from '@growi/core';
+import { envUtils } from '@growi/core/dist/utils';
 
-import CdnResourcesDownloader from './cdn/cdn-resources-downloader';
 import loggerFactory from '../src/utils/logger';
 
+import CdnResourcesDownloader from './cdn/cdn-resources-downloader';
+
 const logger = loggerFactory('growi:bin:download-cdn-resources');
 
 // check env var

+ 2 - 1
apps/app/config/next-i18next.config.js

@@ -1,6 +1,7 @@
 const path = require('path');
 
-const { isServer, AllLang, Lang } = require('@growi/core');
+const { AllLang, Lang } = require('@growi/core/dist/interfaces');
+const { isServer } = require('@growi/core/dist/utils');
 const I18nextChainedBackend = require('i18next-chained-backend').default;
 const I18NextHttpBackend = require('i18next-http-backend');
 const I18NextLocalStorageBackend = require('i18next-localstorage-backend').default;

+ 1 - 3
apps/app/src/client/models/Linker.js

@@ -1,7 +1,5 @@
 
-import { pagePathUtils } from '@growi/core';
-
-const { encodeSpaces } = pagePathUtils;
+import { encodeSpaces } from '@growi/core/dist/utils/page-path-utils';
 
 export default class Linker {
 

+ 1 - 1
apps/app/src/client/services/AdminAppContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import { apiv3Get, apiv3Post, apiv3Put } from '../util/apiv3-client';

+ 1 - 1
apps/app/src/client/services/AdminCustomizeContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import loggerFactory from '~/utils/logger';

+ 1 - 1
apps/app/src/client/services/AdminExternalAccountsContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import loggerFactory from '~/utils/logger';

+ 1 - 1
apps/app/src/client/services/AdminGeneralSecurityContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import {

+ 1 - 2
apps/app/src/client/services/AdminGitHubSecurityContainer.js

@@ -1,6 +1,5 @@
-import { isServer, pathUtils } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
-import urljoin from 'url-join';
 
 import loggerFactory from '~/utils/logger';
 import { removeNullPropertyFromObject } from '~/utils/object-utils';

+ 1 - 2
apps/app/src/client/services/AdminGoogleSecurityContainer.js

@@ -1,6 +1,5 @@
-import { isServer, pathUtils } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
-import urljoin from 'url-join';
 
 import loggerFactory from '~/utils/logger';
 import { removeNullPropertyFromObject } from '~/utils/object-utils';

+ 1 - 1
apps/app/src/client/services/AdminHomeContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import loggerFactory from '~/utils/logger';

+ 1 - 1
apps/app/src/client/services/AdminImportContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import loggerFactory from '~/utils/logger';

+ 1 - 1
apps/app/src/client/services/AdminLdapSecurityContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import loggerFactory from '~/utils/logger';

+ 1 - 1
apps/app/src/client/services/AdminLocalSecurityContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import loggerFactory from '~/utils/logger';

+ 1 - 1
apps/app/src/client/services/AdminMarkDownContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import { apiv3Get, apiv3Put } from '../util/apiv3-client';

+ 1 - 1
apps/app/src/client/services/AdminNotificationContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import {

+ 1 - 2
apps/app/src/client/services/AdminOidcSecurityContainer.js

@@ -1,6 +1,5 @@
-import { isServer, pathUtils } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
-import urljoin from 'url-join';
 
 import loggerFactory from '~/utils/logger';
 import { removeNullPropertyFromObject } from '~/utils/object-utils';

+ 1 - 2
apps/app/src/client/services/AdminSamlSecurityContainer.js

@@ -1,6 +1,5 @@
-import { isServer, pathUtils } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
-import urljoin from 'url-join';
 
 import loggerFactory from '~/utils/logger';
 import { removeNullPropertyFromObject } from '~/utils/object-utils';

+ 1 - 1
apps/app/src/client/services/AdminSlackIntegrationLegacyContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { Container } from 'unstated';
 
 import { apiv3Get, apiv3Put } from '../util/apiv3-client';

+ 1 - 1
apps/app/src/client/services/AdminUsersContainer.js

@@ -1,4 +1,4 @@
-import { isServer } from '@growi/core';
+import { isServer } from '@growi/core/dist/utils';
 import { debounce } from 'throttle-debounce';
 import { Container } from 'unstated';
 

+ 1 - 1
apps/app/src/client/services/page-operation.ts

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import { SubscriptionStatusType, Nullable } from '@growi/core';
+import { SubscriptionStatusType, type Nullable } from '@growi/core/dist/interfaces';
 import urljoin from 'url-join';
 
 import { OptionsToSave } from '~/interfaces/page-operation';

+ 1 - 1
apps/app/src/client/util/bookmark-utils.ts

@@ -1,4 +1,4 @@
-import { IRevision, Ref } from '@growi/core';
+import type { IRevision, Ref } from '@growi/core/dist/interfaces';
 
 import { BookmarkFolderItems } from '~/interfaces/bookmark-info';
 

+ 1 - 1
apps/app/src/client/util/locale-utils.ts

@@ -1,6 +1,6 @@
 import type { IncomingHttpHeaders } from 'http';
 
-import { Lang } from '@growi/core';
+import { Lang } from '@growi/core/dist/interfaces';
 
 import * as nextI18NextConfig from '^/config/next-i18next.config';
 

+ 1 - 1
apps/app/src/components/Admin/AuditLog/ActivityTable.tsx

@@ -1,6 +1,6 @@
 import React, { FC, useState, useCallback } from 'react';
 
-import { pagePathUtils } from '@growi/core';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import { format } from 'date-fns';
 import { CopyToClipboard } from 'react-copy-to-clipboard';

+ 1 - 1
apps/app/src/components/Admin/Common/AdminNavigation.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';
 import urljoin from 'url-join';

+ 1 - 1
apps/app/src/components/Admin/Customize/CustomizeThemeOptions.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { GrowiThemeMetadata, GrowiThemeSchemeType } from '@growi/core';
+import { type GrowiThemeMetadata, GrowiThemeSchemeType } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import { ThemeColorBox } from './ThemeColorBox';

+ 1 - 1
apps/app/src/components/Admin/Customize/ThemeColorBox.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import type { GrowiThemeMetadata } from '@growi/core';
+import type { GrowiThemeMetadata } from '@growi/core/dist/interfaces';
 
 
 type Props = {

+ 1 - 1
apps/app/src/components/Admin/Security/GitHubSecuritySettingContents.jsx

@@ -1,7 +1,7 @@
 /* eslint-disable react/no-danger */
 import React from 'react';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import urljoin from 'url-join';

+ 1 - 1
apps/app/src/components/Admin/Security/GoogleSecuritySettingContents.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import urljoin from 'url-join';

+ 1 - 1
apps/app/src/components/Admin/Security/OidcSecuritySettingContents.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import urljoin from 'url-join';

+ 1 - 1
apps/app/src/components/Admin/Security/SamlSecuritySettingContents.jsx

@@ -1,7 +1,7 @@
 /* eslint-disable react/no-danger */
 import React from 'react';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import { Collapse } from 'reactstrap';

+ 1 - 1
apps/app/src/components/Admin/UserGroup/UserGroupDeleteModal.tsx

@@ -2,12 +2,12 @@ import React, {
   FC, useCallback, useState, useMemo,
 } from 'react';
 
+import type { IUserGroupHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import {
   Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 
-import { IUserGroupHasId } from '~/interfaces/user';
 
 /**
  * Delete User Group Select component

+ 1 - 2
apps/app/src/components/Admin/UserGroup/UserGroupForm.tsx

@@ -1,10 +1,9 @@
 import React, { FC, useCallback, useState } from 'react';
 
+import type { IUserGroupHasId } from '@growi/core/dist/interfaces';
 import dateFnsFormat from 'date-fns/format';
 import { useTranslation } from 'next-i18next';
 
-import { IUserGroupHasId } from '~/interfaces/user';
-
 type Props = {
   userGroup: IUserGroupHasId,
   parentUserGroup?: IUserGroupHasId,

+ 1 - 3
apps/app/src/components/Admin/UserGroup/UserGroupModal.tsx

@@ -2,14 +2,12 @@ import React, {
   FC, useState, useEffect, useCallback,
 } from 'react';
 
-import { Ref } from '@growi/core';
+import type { Ref, IUserGroup, IUserGroupHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import {
   Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 
-import { IUserGroup, IUserGroupHasId } from '~/interfaces/user';
-
 type Props = {
   userGroup?: IUserGroupHasId,
   buttonLabel?: string,

+ 1 - 1
apps/app/src/components/Admin/UserGroup/UserGroupPage.tsx

@@ -1,11 +1,11 @@
 import React, { FC, useState, useCallback } from 'react';
 
+import type { IUserGroup, IUserGroupHasId } from '@growi/core/dist/interfaces';
 import dynamic from 'next/dynamic';
 import { useTranslation } from 'react-i18next';
 
 import { apiv3Delete, apiv3Post, apiv3Put } from '~/client/util/apiv3-client';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import { IUserGroup, IUserGroupHasId } from '~/interfaces/user';
 import { useIsAclEnabled } from '~/stores/context';
 import { useSWRxUserGroupList, useSWRxChildUserGroupList, useSWRxUserGroupRelationList } from '~/stores/user-group';
 

+ 1 - 1
apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx

@@ -2,7 +2,7 @@ import React, {
   FC, useState, useEffect,
 } from 'react';
 
-import type { IUserGroupHasId, IUserGroupRelation, IUserHasId } from '@growi/core';
+import type { IUserGroupHasId, IUserGroupRelation, IUserHasId } from '@growi/core/dist/interfaces';
 import dateFnsFormat from 'date-fns/format';
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';

+ 2 - 2
apps/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -2,7 +2,8 @@ import React, {
   useState, useCallback, useEffect, useMemo,
 } from 'react';
 
-import { objectIdUtils } from '@growi/core';
+import type { IUserGroup, IUserGroupHasId } from '@growi/core/dist/interfaces';
+import { objectIdUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import dynamic from 'next/dynamic';
 import Link from 'next/link';
@@ -12,7 +13,6 @@ import {
   apiv3Get, apiv3Put, apiv3Delete, apiv3Post,
 } from '~/client/util/apiv3-client';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import { IUserGroup, IUserGroupHasId } from '~/interfaces/user';
 import { SearchTypes, SearchType } from '~/interfaces/user-group';
 import Xss from '~/services/xss';
 import { useIsAclEnabled } from '~/stores/context';

+ 1 - 1
apps/app/src/components/Admin/UserGroupDetail/UserGroupPageList.tsx

@@ -1,10 +1,10 @@
 import React, { useEffect, useState, useCallback } from 'react';
 
+import type { IPageHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import { apiv3Get } from '~/client/util/apiv3-client';
 import { toastError } from '~/client/util/toastr';
-import { IPageHasId } from '~/interfaces/page';
 
 import { PageListItemS } from '../../PageList/PageListItemS';
 import PaginationWrapper from '../../PaginationWrapper';

+ 1 - 1
apps/app/src/components/Admin/UserGroupDetail/UserGroupUserModal.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 
+import type { IUserGroupHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import {
   Modal, ModalHeader, ModalBody,
 } from 'reactstrap';
 
-import { IUserGroupHasId } from '~/interfaces/user';
 import { SearchTypes, SearchType } from '~/interfaces/user-group';
 
 import CheckBoxForSerchUserOption from './CheckBoxForSerchUserOption';

+ 1 - 1
apps/app/src/components/Admin/Users/ExternalAccountTable.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IAdminExternalAccount } from '@growi/core';
+import type { IAdminExternalAccount } from '@growi/core/dist/interfaces';
 import dateFnsFormat from 'date-fns/format';
 import { useTranslation } from 'next-i18next';
 

+ 1 - 1
apps/app/src/components/Admin/Users/GrantAdminButton.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IUserHasId } from '@growi/core';
+import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';

+ 1 - 1
apps/app/src/components/Admin/Users/GrantReadOnlyButton.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IUserHasId } from '@growi/core';
+import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';

+ 1 - 1
apps/app/src/components/Admin/Users/RevokeAdminButton.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IUserHasId } from '@growi/core';
+import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';

+ 1 - 1
apps/app/src/components/Admin/Users/RevokeAdminMenuItem.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IUserHasId } from '@growi/core';
+import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';

+ 1 - 1
apps/app/src/components/Admin/Users/RevokeReadOnlyMenuItem.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IUserHasId } from '@growi/core';
+import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';

+ 1 - 1
apps/app/src/components/Admin/Users/StatusSuspendMenuItem.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IUserHasId } from '@growi/core';
+import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';

+ 1 - 1
apps/app/src/components/Admin/Users/UserMenu.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 
-import { IUserHasId, USER_STATUS } from '@growi/core';
+import { type IUserHasId, USER_STATUS } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import {
   UncontrolledDropdown, DropdownToggle, DropdownMenu,

+ 1 - 1
apps/app/src/components/Admin/Users/UserTable.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IUserHasId } from '@growi/core';
+import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import dateFnsFormat from 'date-fns/format';
 import { useTranslation } from 'next-i18next';

+ 1 - 1
apps/app/src/components/Bookmarks/BookmarkFolderItem.tsx

@@ -2,6 +2,7 @@ import {
   FC, useCallback, useState,
 } from 'react';
 
+import type { IPageToDeleteWithMeta } from '@growi/core/dist/interfaces';
 import { DropdownToggle } from 'reactstrap';
 
 import {
@@ -13,7 +14,6 @@ import { TriangleIcon } from '~/components/Icons/TriangleIcon';
 import {
   BookmarkFolderItems, DragItemDataType, DragItemType, DRAG_ITEM_TYPE,
 } from '~/interfaces/bookmark-info';
-import { IPageToDeleteWithMeta } from '~/interfaces/page';
 import { onDeletedBookmarkFolderFunction } from '~/interfaces/ui';
 import { useBookmarkFolderDeleteModal } from '~/stores/modal';
 

+ 1 - 1
apps/app/src/components/Bookmarks/BookmarkFolderTree.tsx

@@ -1,11 +1,11 @@
 
 import React, { useCallback } from 'react';
 
+import type { IPageToDeleteWithMeta } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';
 
 import { toastSuccess } from '~/client/util/toastr';
-import { IPageToDeleteWithMeta } from '~/interfaces/page';
 import { OnDeletedFunction } from '~/interfaces/ui';
 import {
   useSWRxUserBookmarks, useSWRMUTxCurrentUserBookmarks,

+ 3 - 2
apps/app/src/components/Bookmarks/BookmarkItem.tsx

@@ -2,7 +2,9 @@ import React, { useCallback, useState } from 'react';
 
 import nodePath from 'path';
 
-import { DevidedPagePath, pathUtils } from '@growi/core';
+import type { IPageHasId, IPageInfoAll, IPageToDeleteWithMeta } from '@growi/core/dist/interfaces';
+import { DevidedPagePath } from '@growi/core/dist/models';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';
 import { UncontrolledTooltip, DropdownToggle } from 'reactstrap';
@@ -13,7 +15,6 @@ import { addBookmarkToFolder, renamePage } from '~/client/util/bookmark-utils';
 import { ValidationTarget } from '~/client/util/input-validator';
 import { toastError, toastSuccess } from '~/client/util/toastr';
 import { BookmarkFolderItems, DragItemDataType, DRAG_ITEM_TYPE } from '~/interfaces/bookmark-info';
-import { IPageHasId, IPageInfoAll, IPageToDeleteWithMeta } from '~/interfaces/page';
 import { usePutBackPageModal } from '~/stores/modal';
 import { mutateAllPageInfo, useSWRMUTxCurrentPage, useSWRxPageInfo } from '~/stores/page';
 

+ 2 - 1
apps/app/src/components/Comments.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useRef } from 'react';
 
-import { type IRevisionHasId, pagePathUtils } from '@growi/core';
+import type { IRevisionHasId } from '@growi/core/dist/interfaces';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import dynamic from 'next/dynamic';
 
 import { ROOT_ELEM_ID as PageCommentRootElemId, type PageCommentProps } from '~/components/PageComment';

+ 3 - 3
apps/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -2,6 +2,9 @@ import React, {
   useState, useCallback, useEffect,
 } from 'react';
 
+import {
+  type IPageInfoAll, isIPageInfoForOperation,
+} from '@growi/core/dist/interfaces';
 import { getCustomModifiers } from '@growi/ui/dist/utils';
 import { useTranslation } from 'next-i18next';
 import {
@@ -9,9 +12,6 @@ import {
 } from 'reactstrap';
 
 import { NotAvailableForGuest } from '~/components/NotAvailableForGuest';
-import {
-  IPageInfoAll, isIPageInfoForOperation,
-} from '~/interfaces/page';
 import { IPageOperationProcessData } from '~/interfaces/page-operation';
 import { useSWRxPageInfo } from '~/stores/page';
 import loggerFactory from '~/utils/logger';

+ 1 - 1
apps/app/src/components/ContentLinkButtons.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { IUserHasId } from '@growi/core';
+import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { Link as ScrollLink } from 'react-scroll';
 
 import { RecentlyCreatedIcon } from '~/components/Icons/RecentlyCreatedIcon';

+ 1 - 1
apps/app/src/components/CreateTemplateModal.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import { Modal, ModalHeader, ModalBody } from 'reactstrap';

+ 5 - 5
apps/app/src/components/DescendantsPageList.tsx

@@ -1,13 +1,13 @@
 import React, { useCallback, useState } from 'react';
 
-import { useTranslation } from 'next-i18next';
-
-import { toastSuccess } from '~/client/util/toastr';
-import {
+import type {
   IDataWithMeta,
   IPageHasId,
   IPageInfoForOperation,
-} from '~/interfaces/page';
+} from '@growi/core/dist/interfaces';
+import { useTranslation } from 'next-i18next';
+
+import { toastSuccess } from '~/client/util/toastr';
 import { IPagingResult } from '~/interfaces/paging-result';
 import { OnDeletedFunction, OnPutBackedFunction } from '~/interfaces/ui';
 import { useIsGuestUser, useIsReadOnlyUser, useIsSharedUser } from '~/stores/context';

+ 1 - 1
apps/app/src/components/DuplicatedPathsTable.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { pagePathUtils } from '@growi/core';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 
 

+ 1 - 1
apps/app/src/components/IdenticalPathPage.tsx

@@ -1,6 +1,6 @@
 import React, { FC } from 'react';
 
-import { DevidedPagePath } from '@growi/core';
+import { DevidedPagePath } from '@growi/core/dist/models';
 import { useTranslation } from 'next-i18next';
 
 import { useCurrentPathname } from '~/stores/context';

+ 1 - 1
apps/app/src/components/InAppNotification/InAppNotificationElm.tsx

@@ -2,7 +2,7 @@ import React, {
   FC, useRef,
 } from 'react';
 
-import { HasObjectId } from '@growi/core';
+import type { HasObjectId } from '@growi/core/dist/interfaces';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import { DropdownItem } from 'reactstrap';
 

+ 1 - 1
apps/app/src/components/InAppNotification/InAppNotificationList.tsx

@@ -1,6 +1,6 @@
 import React, { FC } from 'react';
 
-import { HasObjectId } from '@growi/core';
+import type { HasObjectId } from '@growi/core/dist/interfaces';
 
 import type { IInAppNotification, PaginateResult } from '~/interfaces/in-app-notification';
 

+ 1 - 1
apps/app/src/components/InAppNotification/PageNotification/PageModelNotification.tsx

@@ -2,7 +2,7 @@ import React, {
   forwardRef, ForwardRefRenderFunction, useImperativeHandle,
 } from 'react';
 
-import { HasObjectId } from '@growi/core';
+import type { HasObjectId } from '@growi/core/dist/interfaces';
 import { PagePathLabel } from '@growi/ui/dist/components/PagePath/PagePathLabel';
 import { useRouter } from 'next/router';
 

+ 1 - 1
apps/app/src/components/InAppNotification/PageNotification/UserModelNotification.tsx

@@ -2,7 +2,7 @@ import React, {
   forwardRef, ForwardRefRenderFunction, useImperativeHandle,
 } from 'react';
 
-import { HasObjectId } from '@growi/core';
+import type { HasObjectId } from '@growi/core/dist/interfaces';
 import { useRouter } from 'next/router';
 
 import type { IInAppNotificationOpenable } from '~/client/interfaces/in-app-notification-openable';

+ 1 - 1
apps/app/src/components/InstallerForm.tsx

@@ -2,7 +2,7 @@ import {
   FormEventHandler, memo, useCallback, useState,
 } from 'react';
 
-import { Lang, AllLang } from '@growi/core';
+import { Lang, AllLang } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';
 

+ 1 - 1
apps/app/src/components/Layout/RawLayout.tsx

@@ -1,6 +1,6 @@
 import React, { ReactNode, useState } from 'react';
 
-import { ColorScheme } from '@growi/core';
+import { ColorScheme } from '@growi/core/dist/interfaces';
 import Head from 'next/head';
 import { ToastContainer } from 'react-toastify';
 import { useIsomorphicLayoutEffect } from 'usehooks-ts';

+ 1 - 1
apps/app/src/components/LikeButtons.tsx

@@ -1,9 +1,9 @@
 import React, { FC, useState, useCallback } from 'react';
 
+import type { IUser } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import { UncontrolledTooltip, Popover, PopoverBody } from 'reactstrap';
 
-import { IUser } from '../interfaces/user';
 
 import UserPictureList from './User/UserPictureList';
 

+ 1 - 1
apps/app/src/components/Me/DisassociateModal.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import type { IExternalAccountHasId } from '@growi/core';
+import type { IExternalAccountHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import {
   Modal,

+ 2 - 2
apps/app/src/components/Navbar/AuthorInfo.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { pagePathUtils } from '@growi/core';
-import type { IUser } from '@growi/core';
+import type { IUser } from '@growi/core/dist/interfaces';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import { format } from 'date-fns';
 import Link from 'next/link';

+ 1 - 1
apps/app/src/components/Navbar/GlobalSearch.tsx

@@ -4,7 +4,7 @@ import React, {
 
 import assert from 'assert';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';
 

+ 7 - 8
apps/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -1,8 +1,11 @@
 import React, { useState, useEffect, useCallback } from 'react';
 
-import {
-  isPopulated, IUser, pagePathUtils, IPagePopulatedToShowRevision,
-} from '@growi/core';
+import { isPopulated } from '@growi/core/dist/interfaces';
+import type {
+  IUser, IPagePopulatedToShowRevision,
+  IPageToRenameWithMeta, IPageWithMeta, IPageInfoForEntity,
+} from '@growi/core/dist/interfaces';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
@@ -11,9 +14,6 @@ import { DropdownItem } from 'reactstrap';
 import { exportAsMarkdown, updateContentWidth, useUpdateStateAfterSave } from '~/client/services/page-operation';
 import { apiPost } from '~/client/util/apiv1-client';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import {
-  IPageToRenameWithMeta, IPageWithMeta, IPageInfoForEntity,
-} from '~/interfaces/page';
 import { OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction } from '~/interfaces/ui';
 import {
   useCurrentPathname,
@@ -47,7 +47,6 @@ import type { SubNavButtonsProps } from './SubNavButtons';
 import AuthorInfoStyles from './AuthorInfo.module.scss';
 import PageEditorModeManagerStyles from './PageEditorModeManager.module.scss';
 
-const { isUsersHomePage } = pagePathUtils;
 
 const AuthorInfoSkeleton = () => <Skeleton additionalClass={`${AuthorInfoStyles['grw-author-info-skeleton']} py-1`} />;
 
@@ -399,7 +398,7 @@ const GrowiContextualSubNavigation = (props: GrowiContextualSubNavigationProps):
               />
             )}
           </div>
-          {(isAbleToShowPageAuthors && !isCompactMode && !isUsersHomePage(path ?? '')) && (
+          {(isAbleToShowPageAuthors && !isCompactMode && !pagePathUtils.isUsersHomePage(path ?? '')) && (
             <ul className={`${AuthorInfoStyles['grw-author-info']} text-nowrap border-left d-none d-lg-block d-edit-none py-2 pl-4 mb-0 ml-3`}>
               <li className="pb-1">
                 {currentPage != null

+ 6 - 3
apps/app/src/components/Navbar/SubNavButtons.tsx

@@ -1,5 +1,11 @@
 import React, { useCallback, useMemo } from 'react';
 
+import type {
+  IPageInfoForOperation, IPageToDeleteWithMeta, IPageToRenameWithMeta,
+} from '@growi/core/dist/interfaces';
+import {
+  isIPageInfoForEntity, isIPageInfoForOperation,
+} from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import { DropdownItem } from 'reactstrap';
 
@@ -7,9 +13,6 @@ import {
   toggleLike, toggleSubscribe,
 } from '~/client/services/page-operation';
 import { toastError } from '~/client/util/toastr';
-import {
-  IPageInfoForOperation, IPageToDeleteWithMeta, IPageToRenameWithMeta, isIPageInfoForEntity, isIPageInfoForOperation,
-} from '~/interfaces/page';
 import { useIsGuestUser, useIsReadOnlyUser } from '~/stores/context';
 import { IPageForPageDuplicateModal } from '~/stores/modal';
 

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

@@ -2,7 +2,7 @@ import React, {
   useState, useMemo, useCallback,
 } from 'react';
 
-import { pagePathUtils } from '@growi/core';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import { CopyToClipboard } from 'react-copy-to-clipboard';

+ 1 - 1
apps/app/src/components/Page/RevisionLoader.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 
-import type { Ref, IRevision, IRevisionHasId } from '@growi/core';
+import type { Ref, IRevision, IRevisionHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import type { RendererOptions } from '~/interfaces/renderer-options';

+ 1 - 1
apps/app/src/components/PageAccessoriesModal/PageAttachment.tsx

@@ -2,7 +2,7 @@ import React, {
   useCallback, useMemo, useState,
 } from 'react';
 
-import { IAttachmentHasId } from '@growi/core';
+import type { IAttachmentHasId } from '@growi/core/dist/interfaces';
 
 import { useSWRxAttachments } from '~/stores/attachment';
 import { useIsGuestUser, useIsReadOnlyUser } from '~/stores/context';

+ 1 - 1
apps/app/src/components/PageAlert/PageStaleAlert.tsx

@@ -1,6 +1,6 @@
+import { isIPageInfoForEntity } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
-import { isIPageInfoForEntity } from '~/interfaces/page';
 
 import { useIsEnabledStaleNotification } from '../../stores/context';
 import { useSWRxCurrentPage, useSWRxPageInfo } from '../../stores/page';

+ 1 - 1
apps/app/src/components/PageAttachment/DeleteAttachmentModal.tsx

@@ -2,7 +2,7 @@ import React, {
   useCallback, useMemo, useState,
 } from 'react';
 
-import type { IUser } from '@growi/core';
+import type { IUser } from '@growi/core/dist/interfaces';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import { useTranslation } from 'next-i18next';
 import {

+ 1 - 1
apps/app/src/components/PageAttachment/PageAttachmentList.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { IAttachmentHasId } from '@growi/core';
+import type { IAttachmentHasId } from '@growi/core/dist/interfaces';
 import { Attachment } from '@growi/ui/dist/components/Attachment';
 import { useTranslation } from 'next-i18next';
 

+ 1 - 1
apps/app/src/components/PageComment/Comment.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo, useState } from 'react';
 
-import type { IUser } from '@growi/core';
+import type { IUser } from '@growi/core/dist/interfaces';
 import * as pathUtils from '@growi/core/dist/utils/path-utils';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import { format, parseISO } from 'date-fns';

+ 1 - 1
apps/app/src/components/PageComment/ReplyComments.tsx

@@ -1,7 +1,7 @@
 
 import React, { useState } from 'react';
 
-import type { IUser } from '@growi/core';
+import type { IUser } from '@growi/core/dist/interfaces';
 import { Collapse } from 'reactstrap';
 
 import type { RendererOptions } from '~/interfaces/renderer-options';

+ 1 - 1
apps/app/src/components/PageContentFooter.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import type { IPage, IUser } from '@growi/core';
+import type { IPage, IUser } from '@growi/core/dist/interfaces';
 import dynamic from 'next/dynamic';
 
 import type { AuthorInfoProps } from './Navbar/AuthorInfo';

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

@@ -2,7 +2,7 @@ import React, {
   useEffect, useState, useMemo,
 } from 'react';
 
-import { pagePathUtils, pathUtils } from '@growi/core';
+import { pagePathUtils, pathUtils } from '@growi/core/dist/utils';
 import { format } from 'date-fns';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';

+ 7 - 4
apps/app/src/components/PageDeleteModal.tsx

@@ -2,7 +2,12 @@ import React, {
   useState, FC, useMemo, useEffect,
 } from 'react';
 
-import { HasObjectId, pagePathUtils } from '@growi/core';
+import type {
+  HasObjectId,
+  IPageInfoForEntity, IPageToDeleteWithMeta, IDataWithMeta,
+} from '@growi/core/dist/interfaces';
+import { isIPageInfoForEntity } from '@growi/core/dist/interfaces';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import {
   Modal, ModalHeader, ModalBody, ModalFooter,
@@ -10,9 +15,7 @@ import {
 
 import { apiPost } from '~/client/util/apiv1-client';
 import { apiv3Post } from '~/client/util/apiv3-client';
-import {
-  IDeleteSinglePageApiv1Result, IDeleteManyPageApiv3Result, IPageToDeleteWithMeta, IDataWithMeta, isIPageInfoForEntity, IPageInfoForEntity,
-} from '~/interfaces/page';
+import type { IDeleteSinglePageApiv1Result, IDeleteManyPageApiv3Result } from '~/interfaces/page';
 import { usePageDeleteModal } from '~/stores/modal';
 import { useSWRxPageInfoForList } from '~/stores/page-listing';
 import loggerFactory from '~/utils/logger';

+ 2 - 3
apps/app/src/components/PageEditor.tsx

@@ -6,9 +6,8 @@ import EventEmitter from 'events';
 import nodePath from 'path';
 
 
-import {
-  IPageHasId, pathUtils,
-} from '@growi/core';
+import type { IPageHasId } from '@growi/core/dist/interfaces';
+import { pathUtils } from '@growi/core/dist/utils';
 import detectIndent from 'detect-indent';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';

+ 1 - 1
apps/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -2,6 +2,7 @@ import React, {
   useState, useEffect, useRef, useMemo, useCallback,
 } from 'react';
 
+import type { IRevisionOnConflict } from '@growi/core/dist/interfaces';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import CodeMirror from 'codemirror/lib/codemirror';
 import { format, parseISO } from 'date-fns';
@@ -19,7 +20,6 @@ import {
   useRemoteRevisionBody, useRemoteRevisionId, useRemoteRevisionLastUpdatedAt, useRemoteRevisionLastUpdateUser, useSetRemoteLatestPageData,
 } from '~/stores/remote-latest-page';
 
-import { IRevisionOnConflict } from '../../interfaces/revision';
 import ExpandOrContractButton from '../ExpandOrContractButton';
 import { UncontrolledCodeMirror } from '../UncontrolledCodeMirror';
 

+ 1 - 1
apps/app/src/components/PageEditorByHackmd.tsx

@@ -4,7 +4,7 @@ import React, {
 
 import EventEmitter from 'events';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';

+ 1 - 1
apps/app/src/components/PageHistory/PageRevisionTable.tsx

@@ -2,7 +2,7 @@ import React, {
   useEffect, useRef, useState,
 } from 'react';
 
-import { IRevisionHasId, IRevisionHasPageId } from '@growi/core';
+import type { IRevisionHasId, IRevisionHasPageId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import { useSWRxInfinitePageRevisions } from '~/stores/page';

+ 2 - 3
apps/app/src/components/PageHistory/Revision.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 
-import { IRevisionHasId, pathUtils } from '@growi/core';
+import type { IRevisionHasId } from '@growi/core/dist/interfaces';
+import { returnPathForURL } from '@growi/core/dist/utils/path-utils';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';
@@ -27,8 +28,6 @@ export const Revision = (props: RevisionProps): JSX.Element => {
     revision, isLatestRevision, hasDiff, onClose, currentPageId, currentPagePath,
   } = props;
 
-  const { returnPathForURL } = pathUtils;
-
   const renderSimplifiedNodiff = (revision: IRevisionHasId) => {
 
     const author = revision.author;

+ 2 - 3
apps/app/src/components/PageHistory/RevisionDiff.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 
-import { IRevisionHasPageId, pathUtils } from '@growi/core';
+import type { IRevisionHasPageId } from '@growi/core/dist/interfaces';
+import { returnPathForURL } from '@growi/core/dist/utils/path-utils';
 import { createPatch } from 'diff';
 import { html, Diff2HtmlConfig } from 'diff2html';
 import { useTranslation } from 'next-i18next';
@@ -29,8 +30,6 @@ export const RevisionDiff = (props: RevisioinDiffProps): JSX.Element => {
     currentRevision, previousRevision, revisionDiffOpened, currentPageId, currentPagePath, onClose,
   } = props;
 
-  const { returnPathForURL } = pathUtils;
-
   const previousText = (currentRevision._id === previousRevision._id) ? '' : previousRevision.body;
 
   const patch = createPatch(

+ 1 - 1
apps/app/src/components/PageList/PageList.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
+import type { IPageInfoForEntity, IPageWithMeta } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
-import { IPageInfoForEntity, IPageWithMeta } from '~/interfaces/page';
 import { OnDeletedFunction, OnPutBackedFunction } from '~/interfaces/ui';
 
 import { ForceHideMenuItems } from '../Common/Dropdown/PageItemControl';

+ 4 - 3
apps/app/src/components/PageList/PageListItemL.tsx

@@ -5,6 +5,10 @@ import React, {
 
 
 import { DevidedPagePath, pathUtils } from '@growi/core';
+import type {
+  IPageInfoAll, IPageWithMeta, IPageInfoForListing,
+} from '@growi/core/dist/interfaces';
+import { isIPageInfoForListing, isIPageInfoForEntity } from '@growi/core/dist/interfaces';
 import { PageListMeta } from '@growi/ui/dist/components/PagePath/PageListMeta';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import { format } from 'date-fns';
@@ -16,9 +20,6 @@ import { CustomInput } from 'reactstrap';
 import { ISelectable } from '~/client/interfaces/selectable-all';
 import { unlink, bookmark, unbookmark } from '~/client/services/page-operation';
 import { toastError } from '~/client/util/toastr';
-import {
-  IPageInfoAll, isIPageInfoForListing, isIPageInfoForEntity, IPageWithMeta, IPageInfoForListing,
-} from '~/interfaces/page';
 import { IPageSearchMeta, IPageWithSearchMeta, isIPageSearchMeta } from '~/interfaces/search';
 import {
   OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction, OnPutBackedFunction,

+ 1 - 2
apps/app/src/components/PageList/PageListItemS.tsx

@@ -1,12 +1,11 @@
 import React from 'react';
 
+import type { IPageHasId } from '@growi/core/dist/interfaces';
 import { PageListMeta } from '@growi/ui/dist/components/PagePath/PageListMeta';
 import { PagePathLabel } from '@growi/ui/dist/components/PagePath/PagePathLabel';
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import Link from 'next/link';
 
-import { IPageHasId } from '~/interfaces/page';
-
 
 type PageListItemSProps = {
   page: IPageHasId,

+ 2 - 2
apps/app/src/components/PagePathAutoComplete.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-import { pathUtils } from '@growi/core';
+import { pathUtils } from '@growi/core/dist/utils';
+import PropTypes from 'prop-types';
 
 import SearchTypeahead from './SearchTypeahead';
 

+ 2 - 1
apps/app/src/components/PagePathNav.tsx

@@ -1,6 +1,7 @@
 import React, { FC } from 'react';
 
-import { DevidedPagePath, pagePathUtils } from '@growi/core';
+import { DevidedPagePath } from '@growi/core/dist/models';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import dynamic from 'next/dynamic';
 
 import { useIsNotFound } from '~/stores/page';

+ 2 - 2
apps/app/src/components/PageRenameModal.tsx

@@ -2,7 +2,8 @@ import React, {
   useState, useEffect, useCallback, useMemo,
 } from 'react';
 
-import { pagePathUtils } from '@growi/core';
+import { isIPageInfoForEntity } from '@growi/core/dist/interfaces';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import {
   Collapse, Modal, ModalHeader, ModalBody, ModalFooter,
@@ -11,7 +12,6 @@ import { debounce } from 'throttle-debounce';
 
 import { apiv3Get, apiv3Put } from '~/client/util/apiv3-client';
 import { toastError } from '~/client/util/toastr';
-import { isIPageInfoForEntity } from '~/interfaces/page';
 import { useSiteUrl, useIsSearchServiceReachable } from '~/stores/context';
 import { usePageRenameModal } from '~/stores/modal';
 import { useSWRxPageInfo } from '~/stores/page';

+ 3 - 2
apps/app/src/components/PageSideContents.tsx

@@ -1,10 +1,11 @@
 import React from 'react';
 
-import { IPageHasId, pagePathUtils } from '@growi/core';
+import type { IPageHasId } from '@growi/core/dist/interfaces';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import { Link } from 'react-scroll';
 
-import { IPageInfoForOperation } from '~/interfaces/page';
+import type { IPageInfoForOperation } from '~/interfaces/page';
 import { useDescendantsPageListModal } from '~/stores/modal';
 import { useSWRxPageInfo } from '~/stores/page';
 

+ 1 - 1
apps/app/src/components/PageTimeline.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
+import type { IPageHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';
 
-import { IPageHasId } from '~/interfaces/page';
 import { useCurrentPagePath } from '~/stores/page';
 import { useSWRINFxPageTimeline } from '~/stores/page-timeline';
 import { useTimelineOptions } from '~/stores/renderer';

+ 1 - 1
apps/app/src/components/ReactMarkdownComponents/NextLink.tsx

@@ -1,4 +1,4 @@
-import { pagePathUtils } from '@growi/core';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import Link, { LinkProps } from 'next/link';
 
 import { useSiteUrl } from '~/stores/context';

+ 2 - 1
apps/app/src/components/RecentCreated/RecentCreated.tsx

@@ -1,8 +1,9 @@
 import React, { useState, useCallback, useEffect } from 'react';
 
+import type { IPageHasId } from '@growi/core/dist/interfaces';
+
 import { apiv3Get } from '~/client/util/apiv3-client';
 import { toastError } from '~/client/util/toastr';
-import { IPageHasId } from '~/interfaces/page';
 import loggerFactory from '~/utils/logger';
 
 import { PageListItemS } from '../PageList/PageListItemS';

+ 2 - 1
apps/app/src/components/RevisionComparer/RevisionComparer.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 
-import { IRevisionHasPageId, pagePathUtils } from '@growi/core';
+import type { IRevisionHasPageId } from '@growi/core/dist/interfaces';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import {

+ 2 - 2
apps/app/src/components/SavePageControls.tsx

@@ -2,14 +2,14 @@ import React, { useCallback } from 'react';
 
 import EventEmitter from 'events';
 
-import { pagePathUtils } from '@growi/core';
+import { pagePathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import {
   UncontrolledButtonDropdown, Button,
   DropdownToggle, DropdownMenu, DropdownItem,
 } from 'reactstrap';
 
-import { IPageGrantData } from '~/interfaces/page';
+import type { IPageGrantData } from '~/interfaces/page';
 import {
   useIsEditable, useIsAclEnabled,
 } from '~/stores/context';

+ 2 - 2
apps/app/src/components/SavePageControls/GrantSelector.tsx

@@ -1,6 +1,7 @@
 import React, { useCallback, useState } from 'react';
 
 import { isPopulated } from '@growi/core';
+import type { IUserGroupHasId } from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 import {
   UncontrolledDropdown,
@@ -9,8 +10,7 @@ import {
   Modal, ModalHeader, ModalBody,
 } from 'reactstrap';
 
-import { IPageGrantData } from '~/interfaces/page';
-import { IUserGroupHasId } from '~/interfaces/user';
+import type { IPageGrantData } from '~/interfaces/page';
 import { useCurrentUser } from '~/stores/context';
 import { useSWRxMyUserGroupRelations } from '~/stores/user-group';
 

+ 3 - 3
apps/app/src/components/SearchPage/SearchResultList.tsx

@@ -3,13 +3,13 @@ import React, {
   ForwardRefRenderFunction, useCallback, useImperativeHandle, useRef,
 } from 'react';
 
+import {
+  type IPageInfoForListing, type IPageWithMeta, isIPageInfoForListing,
+} from '@growi/core/dist/interfaces';
 import { useTranslation } from 'next-i18next';
 
 import { ISelectable, ISelectableAll } from '~/client/interfaces/selectable-all';
 import { toastSuccess } from '~/client/util/toastr';
-import {
-  IPageInfoForListing, IPageWithMeta, isIPageInfoForListing,
-} from '~/interfaces/page';
 import { IPageSearchMeta, IPageWithSearchMeta } from '~/interfaces/search';
 import { useIsGuestUser, useIsReadOnlyUser } from '~/stores/context';
 import { mutatePageTree, useSWRxPageInfoForList } from '~/stores/page-listing';

Some files were not shown because too many files changed in this diff