fix growi-bridge-service export-service imports

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

@@ -25,9 +25,11 @@ import { aclService as aclServiceSingletonInstance } from '../service/acl';
 import AppService from '../service/app';
 import AttachmentService from '../service/attachment';
 import { configManager as configManagerSingletonInstance } from '../service/config-manager';
+import ExportService from '../service/export';
 import { instanciate as instanciateExternalAccountService } from '../service/external-account';
 import { FileUploader, getUploader } from '../service/file-uploader'; // eslint-disable-line no-unused-vars
 import { G2GTransferPusherService, G2GTransferReceiverService } from '../service/g2g-transfer';
+import GrowiBridgeService from '../service/growi-bridge';
 import { InstallerService } from '../service/installer';
 import PageService from '../service/page';
 import PageGrantService from '../service/page-grant';
@@ -683,14 +685,12 @@ Crowi.prototype.setupUserGroupService = async function() {
 };
 
 Crowi.prototype.setUpGrowiBridge = async function() {
-  const GrowiBridgeService = require('../service/growi-bridge');
   if (this.growiBridgeService == null) {
     this.growiBridgeService = new GrowiBridgeService(this);
   }
 };
 
 Crowi.prototype.setupExport = async function() {
-  const ExportService = require('../service/export');
   if (this.exportService == null) {
     this.exportService = new ExportService(this);
   }

apps/app/src/server/service/export.ts

@@ -10,7 +10,8 @@ import CollectionProgressingStatus from '../models/vo/collection-progressing-sta
 
 import AppService from './app';
 import ConfigLoader from './config-loader';
-import GrowiBridgeService, { ZipFileStat } from './growi-bridge';
+import GrowiBridgeService from './growi-bridge';
+import { ZipFileStat } from './interfaces/export';
 
 
 const logger = loggerFactory('growi:services:ExportService'); // eslint-disable-line no-unused-vars

apps/app/src/server/service/growi-bridge.ts

@@ -5,22 +5,12 @@ import unzipper from 'unzipper';
 
 import loggerFactory from '~/utils/logger';
 
+import { ZipFileStat } from './interfaces/export';
+
 const streamToPromise = require('stream-to-promise');
 
 const logger = loggerFactory('growi:services:GrowiBridgeService'); // eslint-disable-line no-unused-vars
 
-export type ZipFileStat = {
-  meta: object;
-  fileName: string;
-  zipFilePath: string;
-  fileStat: fs.Stats;
-  innerFileStats: {
-      fileName: string;
-      collectionName: string;
-      size: number;
-  }[];
-} | null
-
 /**
  * the service class for bridging GROWIs (export and import)
  * common properties and methods between export service and import service are defined in this service

apps/app/src/server/service/interfaces/export.ts

@@ -0,0 +1,13 @@
+import { Stats } from 'fs';
+
+export type ZipFileStat = {
+  meta: object;
+  fileName: string;
+  zipFilePath: string;
+  fileStat: Stats;
+  innerFileStats: {
+      fileName: string;
+      collectionName: string;
+      size: number;
+  }[];
+} | null