update import lines

packages/app/src/client/util/GrowiRenderer.js

@@ -1,5 +1,7 @@
 import MarkdownIt from 'markdown-it';
 
+import loggerFactory from '~/utils/logger';
+
 import Linker from './PreProcessor/Linker';
 import CsvToTable from './PreProcessor/CsvToTable';
 import EasyGrid from './PreProcessor/EasyGrid';
@@ -19,7 +21,7 @@ import DrawioViewerConfigurer from './markdown-it/drawio-viewer';
 import TableWithHandsontableButtonConfigurer from './markdown-it/table-with-handsontable-button';
 import HeaderWithEditLinkConfigurer from './markdown-it/header-with-edit-link';
 
-const logger = require('~/utils/logger')('growi:util:GrowiRenderer');
+const logger = loggerFactory('growi:util:GrowiRenderer');
 
 export default class GrowiRenderer {
 

packages/app/src/client/util/apiv3ErrorHandler.js

@@ -1,9 +1,10 @@
 // API v3 sends an array of errors in res.data.errors.
 // API v3 errors need to extracted from an error object in order to properly handle them.
 
+import loggerFactory from '~/utils/logger';
 import { toArrayIfNot } from '~/utils/array-utils';
 
-const logger = require('~/utils/logger')('growi:apiv3');
+const logger = loggerFactory('growi:apiv3');
 
 const apiv3ErrorHandler = (_err, header = 'Error') => {
   // extract api errors from general 400 err

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

@@ -1,9 +1,11 @@
 import path from 'path';
 import { listLocaleIds } from '~/utils/locale-utils';
+import loggerFactory from '~/utils/logger';
 
 const swig = require('swig-templates');
 const onHeaders = require('on-headers');
-const logger = require('~/utils/logger')('growi:crowi:dev');
+
+const logger = loggerFactory('growi:crowi:dev');
 
 
 class CrowiDev {

packages/app/src/server/middlewares/apiv3-form-validator.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:middlewares:ApiV3FormValidator');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:middlewares:ApiV3FormValidator');
 const { validationResult } = require('express-validator');
 
 const ErrorV3 = require('../models/vo/error-apiv3');

packages/app/src/server/models/attachment.js

@@ -1,3 +1,5 @@
+import loggerFactory from '~/utils/logger';
+
 // disable no-return-await for model functions
 /* eslint-disable no-return-await */
 
@@ -8,7 +10,8 @@ const mongoose = require('mongoose');
 const uniqueValidator = require('mongoose-unique-validator');
 const mongoosePaginate = require('mongoose-paginate-v2');
 const { addSeconds } = require('date-fns');
-const logger = require('~/utils/logger')('growi:models:attachment');
+
+const logger = loggerFactory('growi:models:attachment');
 
 const ObjectId = mongoose.Schema.Types.ObjectId;
 

packages/app/src/server/models/revision.js

@@ -1,9 +1,11 @@
+import loggerFactory from '~/utils/logger';
+
 // disable no-return-await for model functions
 /* eslint-disable no-return-await */
 
 module.exports = function(crowi) {
   // eslint-disable-next-line no-unused-vars
-  const logger = require('~/utils/logger')('growi:models:revision');
+  const logger = loggerFactory('growi:models:revision');
 
   const mongoose = require('mongoose');
   const mongoosePaginate = require('mongoose-paginate-v2');

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

@@ -1,7 +1,10 @@
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:routes:admin');
+const debug = require('debug')('growi:routes:admin');
+
 /* eslint-disable no-use-before-define */
 module.exports = function(crowi, app) {
-  const debug = require('debug')('growi:routes:admin');
-  const logger = require('~/utils/logger')('growi:routes:admin');
 
   const models = crowi.models;
   const UserGroup = models.UserGroup;

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

@@ -1,7 +1,9 @@
+import loggerFactory from '~/utils/logger';
+
 /* eslint-disable no-use-before-define */
 
 
-const logger = require('~/utils/logger')('growi:routes:attachment');
+const logger = loggerFactory('growi:routes:attachment');
 
 const { serializePageSecurely } = require('../models/serializers/page-serializer');
 const { serializeRevisionSecurely } = require('../models/serializers/revision-serializer');

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

@@ -1,3 +1,5 @@
+import loggerFactory from '~/utils/logger';
+
 /**
  * @swagger
  *  tags:
@@ -44,7 +46,7 @@ const { serializeUserSecurely } = require('../models/serializers/user-serializer
  */
 
 module.exports = function(crowi, app) {
-  const logger = require('~/utils/logger')('growi:routes:comment');
+  const logger = loggerFactory('growi:routes:comment');
   const Comment = crowi.model('Comment');
   const User = crowi.model('User');
   const Page = crowi.model('Page');

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

@@ -1,6 +1,8 @@
+import loggerFactory from '~/utils/logger';
+
 /* eslint-disable no-use-before-define */
 
-const logger = require('~/utils/logger')('growi:routes:hackmd');
+const logger = loggerFactory('growi:routes:hackmd');
 const path = require('path');
 const fs = require('graceful-fs');
 const swig = require('swig-templates');

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

@@ -1,5 +1,7 @@
+import loggerFactory from '~/utils/logger';
+
 module.exports = function(crowi) {
-  const logger = require('~/utils/logger')('growi:routes:installer');
+  const logger = loggerFactory('growi:routes:installer');
   const path = require('path');
   const fs = require('graceful-fs');
 

packages/app/src/server/routes/login-passport.js

@@ -1,8 +1,10 @@
+import loggerFactory from '~/utils/logger';
+
 /* eslint-disable no-use-before-define */
 
 module.exports = function(crowi, app) {
   const debug = require('debug')('growi:routes:login-passport');
-  const logger = require('~/utils/logger')('growi:routes:login-passport');
+  const logger = loggerFactory('growi:routes:login-passport');
   const passport = require('passport');
   const ExternalAccount = crowi.model('ExternalAccount');
   const passportService = crowi.passportService;

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

@@ -1,3 +1,5 @@
+import loggerFactory from '~/utils/logger';
+
 // disable all of linting
 // because this file is a deprecated legacy of Crowi
 
@@ -5,7 +7,7 @@
 
 module.exports = function(crowi, app) {
   const debug = require('debug')('growi:routes:login');
-  const logger = require('~/utils/logger')('growi:routes:login');
+  const logger = loggerFactory('growi:routes:login');
   const path = require('path');
   const User = crowi.model('User');
   const { configManager, appService, aclService, mailService } = crowi;

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

@@ -1,3 +1,5 @@
+import loggerFactory from '~/utils/logger';
+
 const { isCreatablePage } = require('~/utils/path-utils');
 const { serializePageSecurely } = require('../models/serializers/page-serializer');
 const { serializeRevisionSecurely } = require('../models/serializers/revision-serializer');
@@ -129,7 +131,7 @@ const { serializeUserSecurely } = require('../models/serializers/user-serializer
 /* eslint-disable no-use-before-define */
 module.exports = function(crowi, app) {
   const debug = require('debug')('growi:routes:page');
-  const logger = require('~/utils/logger')('growi:routes:page');
+  const logger = loggerFactory('growi:routes:page');
   const swig = require('swig-templates');
 
   const pathUtils = require('growi-commons').pathUtils;
@@ -148,8 +150,8 @@ module.exports = function(crowi, app) {
   const globalNotificationService = crowi.getGlobalNotificationService();
   const userNotificationService = crowi.getUserNotificationService();
 
-  const XssOption = require('../../lib/service/xss/xssOption');
-  const Xss = require('../../lib/service/xss/index');
+  const XssOption = require('~/services/xss/xssOption');
+  const Xss = require('~/services/xss/index');
   const initializedConfig = {
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:xss:isEnabledPrevention'),
     tagWhiteList: xssService.getTagWhiteList(),

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

@@ -1,7 +1,9 @@
+import loggerFactory from '~/utils/logger';
+
 // eslint-disable-next-line no-unused-vars
-const logger = require('~/utils/logger')('growi:service:CustomizeService');
+const logger = loggerFactory('growi:service:CustomizeService');
 
-const DevidedPagePath = require('@commons/models/devided-page-path');
+const DevidedPagePath = require('~/models/devided-page-path');
 
 const S2sMessage = require('../models/vo/s2s-message');
 const S2sMessageHandlable = require('./s2s-messaging/handlable');

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

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:services:ExportService'); // eslint-disable-line no-unused-vars
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:services:ExportService'); // eslint-disable-line no-unused-vars
 
 const fs = require('fs');
 const path = require('path');

packages/app/src/server/service/file-uploader-switch.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:FileUploader');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:FileUploader');
 
 const S2sMessage = require('../models/vo/s2s-message');
 const S2sMessageHandlable = require('./s2s-messaging/handlable');

packages/app/src/server/service/file-uploader/aws.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:fileUploaderAws');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:fileUploaderAws');
 
 const urljoin = require('url-join');
 const aws = require('aws-sdk');

packages/app/src/server/service/file-uploader/gcs.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:fileUploaderAws');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:fileUploaderAws');
 
 const urljoin = require('url-join');
 const { Storage } = require('@google-cloud/storage');

packages/app/src/server/service/file-uploader/gridfs.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:fileUploaderGridfs');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:fileUploaderGridfs');
 const mongoose = require('mongoose');
 const util = require('util');
 

packages/app/src/server/service/file-uploader/index.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:FileUploaderServise');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:FileUploaderServise');
 
 const envToModuleMappings = {
   aws:     'aws',

packages/app/src/server/service/file-uploader/local.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:fileUploaderLocal');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:fileUploaderLocal');
 
 const fs = require('fs');
 const path = require('path');

packages/app/src/server/service/global-notification/global-notification-mail.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:GlobalNotificationMailService'); // eslint-disable-line no-unused-vars
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:GlobalNotificationMailService'); // eslint-disable-line no-unused-vars
 const nodePath = require('path');
 
 /**

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

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:GlobalNotificationSlackService'); // eslint-disable-line no-unused-vars
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:GlobalNotificationSlackService'); // eslint-disable-line no-unused-vars
 const urljoin = require('url-join');
 
 const { encodeSpaces } = require('~/utils/path-utils');

packages/app/src/server/service/global-notification/index.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:GlobalNotificationService');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:GlobalNotificationService');
 const GloabalNotificationSlack = require('./global-notification-slack');
 const GloabalNotificationMail = require('./global-notification-mail');
 

packages/app/src/server/service/growi-bridge.js

@@ -1,8 +1,11 @@
+import loggerFactory from '~/utils/logger';
+
 const fs = require('fs');
 const path = require('path');
 const streamToPromise = require('stream-to-promise');
 const unzipper = require('unzipper');
-const logger = require('~/utils/logger')('growi:services:GrowiBridgeService'); // eslint-disable-line no-unused-vars
+
+const logger = loggerFactory('growi:services:GrowiBridgeService'); // eslint-disable-line no-unused-vars
 
 /**
  * the service class for bridging GROWIs (export and import)

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

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:services:ImportService'); // eslint-disable-line no-unused-vars
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:services:ImportService'); // eslint-disable-line no-unused-vars
 const fs = require('fs');
 const path = require('path');
 

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

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:mail');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:mail');
 
 const nodemailer = require('nodemailer');
 const swig = require('swig-templates');

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

@@ -1,9 +1,12 @@
+import loggerFactory from '~/utils/logger';
+
 const mongoose = require('mongoose');
 const escapeStringRegexp = require('escape-string-regexp');
-const logger = require('~/utils/logger')('growi:models:page');
+
+const logger = loggerFactory('growi:models:page');
 const debug = require('debug')('growi:models:page');
 const { Writable } = require('stream');
-const { createBatchStream } = require('@server/util/batch-stream');
+const { createBatchStream } = require('~/server/util/batch-stream');
 const { isTrashPage } = require('~/utils/path-utils');
 const { serializePageSecurely } = require('../models/serializers/page-serializer');
 

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

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:PassportService');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:PassportService');
 const urljoin = require('url-join');
 const luceneQueryParser = require('lucene-query-parser');
 

packages/app/src/server/service/s2s-messaging/base.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:s2s-messaging:base');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:s2s-messaging:base');
 
 const S2sMessageHandlable = require('./handlable');
 

packages/app/src/server/service/s2s-messaging/index.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:s2s-messaging:S2sMessagingServiceFactory');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:s2s-messaging:S2sMessagingServiceFactory');
 
 const envToModuleMappings = {
   redis:   'redis',

packages/app/src/server/service/s2s-messaging/nchan.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:s2s-messaging:nchan');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:s2s-messaging:nchan');
 
 const path = require('path');
 const axios = require('axios');

packages/app/src/server/service/s2s-messaging/redis.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:s2s-messaging:redis');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:s2s-messaging:redis');
 
 module.exports = function(crowi) {
   logger.warn('Config pub/sub with Redis has not implemented yet.');

packages/app/src/server/service/search-delegator/elasticsearch.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:search-delegator:elasticsearch');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:search-delegator:elasticsearch');
 const elasticsearch = require('elasticsearch');
 const mongoose = require('mongoose');
 

packages/app/src/server/service/search-delegator/searchbox.js

@@ -1,5 +1,7 @@
+import loggerFactory from '~/utils/logger';
+
 // eslint-disable-next-line no-unused-vars
-const logger = require('~/utils/logger')('growi:service:search-delegator:searchbox');
+const logger = loggerFactory('growi:service:search-delegator:searchbox');
 
 const ElasticsearchDelegator = require('./elasticsearch');
 

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

@@ -1,5 +1,7 @@
+import loggerFactory from '~/utils/logger';
+
 // eslint-disable-next-line no-unused-vars
-const logger = require('~/utils/logger')('growi:service:search');
+const logger = loggerFactory('growi:service:search');
 
 class SearchService {
 

packages/app/src/server/service/slack-notification.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:SlackNotification'); // eslint-disable-line no-unused-vars
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:SlackNotification'); // eslint-disable-line no-unused-vars
 /**
  * the service class of SlackNotificationService
  */

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

@@ -1,5 +1,7 @@
 
-const logger = require('~/utils/logger')('growi:service:SlackBotService');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:SlackBotService');
 const mongoose = require('mongoose');
 const axios = require('axios');
 const { formatDistanceStrict } = require('date-fns');

packages/app/src/server/service/socket-io.js

@@ -1,9 +1,11 @@
+import loggerFactory from '~/utils/logger';
+
 const socketIo = require('socket.io');
 const expressSession = require('express-session');
 const passport = require('passport');
 const socketioSession = require('@kobalab/socket.io-session');
 
-const logger = require('~/utils/logger')('growi:service:socket-io');
+const logger = loggerFactory('growi:service:socket-io');
 
 
 /**

packages/app/src/server/service/system-events/sync-page-status.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:system-events:SyncPageStatusService');
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:system-events:SyncPageStatusService');
 
 const S2sMessage = require('../../models/vo/s2s-message');
 const { S2cMessagePageUpdated } = require('../../models/vo/s2c-message');

packages/app/src/server/service/user-group.js

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:UserGroupService'); // eslint-disable-line no-unused-vars
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:UserGroupService'); // eslint-disable-line no-unused-vars
 
 const mongoose = require('mongoose');
 

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

@@ -1,4 +1,6 @@
-const logger = require('~/utils/logger')('growi:service:XssSerivce'); // eslint-disable-line no-unused-vars
+import loggerFactory from '~/utils/logger';
+
+const logger = loggerFactory('growi:service:XssSerivce'); // eslint-disable-line no-unused-vars
 
 const Xss = require('~/services/xss');
 const { tags, attrs } = require('~/services/xss/recommended-whitelist');

packages/app/src/server/util/importer.js

@@ -1,3 +1,5 @@
+import loggerFactory from '~/utils/logger';
+
 /**
  * importer
  */
@@ -5,7 +7,7 @@
 /* eslint-disable no-use-before-define */
 
 module.exports = (crowi) => {
-  const logger = require('~/utils/logger')('growi:util:importer');
+  const logger = loggerFactory('growi:util:importer');
   const esa = require('esa-nodejs');
   const createGrowiPages = require('./createGrowiPagesFromImports')(crowi);
   const restQiitaAPIService = crowi.getRestQiitaAPIService();

packages/app/src/server/util/middlewares.js

@@ -1,3 +1,5 @@
+import loggerFactory from '~/utils/logger';
+
 // don't add any more middlewares to this file.
 // all new middlewares should be an independent file under /server/middlewares
 // eslint-disable-next-line no-unused-vars
@@ -6,7 +8,8 @@ const { formatDistanceStrict } = require('date-fns');
 const pathUtils = require('growi-commons').pathUtils;
 const md5 = require('md5');
 const entities = require('entities');
-const logger = require('~/utils/logger')('growi:lib:middlewares');
+
+const logger = loggerFactory('growi:lib:middlewares');
 
 module.exports = (crowi) => {
   const { configManager } = crowi;