Yuki Takei 4 lat temu
rodzic
commit
5791ad535d

+ 4 - 2
packages/app/src/client/util/interceptor/detach-code-blocks.js

@@ -1,5 +1,7 @@
 import { BasicInterceptor } from 'growi-commons';
 
+import loggerFactory from '~/utils/logger';
+
 class DetachCodeBlockUtil {
 
   static createReplaceStr(replaceId) {
@@ -15,7 +17,7 @@ export class DetachCodeBlockInterceptor extends BasicInterceptor {
 
   constructor(crowi) {
     super();
-    this.logger = require('~/utils/logger')('growi:DetachCodeBlockInterceptor');
+    this.logger = loggerFactory('growi:interceptor:DetachCodeBlockInterceptor');
 
     this.crowi = crowi;
     this.crowiForJquery = crowi.getCrowiForJquery();
@@ -95,7 +97,7 @@ export class RestoreCodeBlockInterceptor extends BasicInterceptor {
 
   constructor(crowi) {
     super();
-    this.logger = require('~/utils/logger')('growi:DetachCodeBlockInterceptor');
+    this.logger = loggerFactory('growi:interceptor:DetachCodeBlockInterceptor');
 
     this.crowi = crowi;
     this.crowiForJquery = crowi.getCrowiForJquery();

+ 2 - 1
packages/app/src/components/Page/RevisionLoader.jsx

@@ -6,6 +6,7 @@ import { Waypoint } from 'react-waypoint';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import GrowiRenderer from '~/client/util/GrowiRenderer';
 import AppContainer from '~/client/services/AppContainer';
+import loggerFactory from '~/utils/logger';
 
 import RevisionRenderer from './RevisionRenderer';
 
@@ -16,7 +17,7 @@ class RevisionLoader extends React.Component {
 
   constructor(props) {
     super(props);
-    this.logger = require('~/utils/logger')('growi:Page:RevisionLoader');
+    this.logger = loggerFactory('growi:Page:RevisionLoader');
 
     this.state = {
       markdown: '',

+ 5 - 3
packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -7,7 +7,11 @@ import * as codemirror from 'codemirror';
 import { Button } from 'reactstrap';
 import { UnControlled as ReactCodeMirror } from 'react-codemirror2';
 
+import * as loadScript from 'simple-load-script';
+import * as loadCssSync from 'load-css-file';
+
 import InterceptorManager from '~/services/interceptor-manager';
+import loggerFactory from '~/utils/logger';
 
 import AbstractEditor from './AbstractEditor';
 import SimpleCheatsheet from './SimpleCheatsheet';
@@ -26,8 +30,6 @@ import HandsontableModal from './HandsontableModal';
 import EditorIcon from './EditorIcon';
 import DrawioModal from './DrawioModal';
 
-const loadScript = require('simple-load-script');
-const loadCssSync = require('load-css-file');
 // set save handler
 codemirror.commands.save = (instance) => {
   if (instance.codeMirrorEditor != null) {
@@ -93,7 +95,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
 
   constructor(props) {
     super(props);
-    this.logger = require('~/utils/logger')('growi:PageEditor:CodeMirrorEditor');
+    this.logger = loggerFactory('growi:PageEditor:CodeMirrorEditor');
 
     this.state = {
       value: this.props.value,

+ 2 - 1
packages/app/src/components/PageEditor/TextAreaEditor.jsx

@@ -3,6 +3,7 @@ import React from 'react';
 
 import { Input } from 'reactstrap';
 import InterceptorManager from '~/services/interceptor-manager';
+import loggerFactory from '~/utils/logger';
 
 
 import AbstractEditor from './AbstractEditor';
@@ -16,7 +17,7 @@ export default class TextAreaEditor extends AbstractEditor {
 
   constructor(props) {
     super(props);
-    this.logger = require('~/utils/logger')('growi:PageEditor:TextAreaEditor');
+    this.logger = loggerFactory('growi:PageEditor:TextAreaEditor');
 
     this.state = {
       value: this.props.value,

+ 1 - 1
packages/app/src/services/interceptor-manager.js

@@ -104,4 +104,4 @@ class InterceptorManager {
 
 }
 
-module.exports = InterceptorManager;
+export default InterceptorManager;