Browse Source

fix CI error

jam411 3 years ago
parent
commit
eab94de252

+ 4 - 2
packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -12,7 +12,7 @@ import urljoin from 'url-join';
 import InterceptorManager from '~/services/interceptor-manager';
 import loggerFactory from '~/utils/logger';
 
-import UncontrolledCodeMirrorCore from '../UncontrolledCodeMirror';
+// import UncontrolledCodeMirror from '../UncontrolledCodeMirror';
 
 import AbstractEditor from './AbstractEditor';
 import CommentMentionHelper from './CommentMentionHelper';
@@ -96,6 +96,8 @@ require('codemirror/mode/vue/vue');
 require('codemirror/mode/xml/xml');
 require('codemirror/mode/yaml/yaml');
 
+const UncontrolledCodeMirror = require('../UncontrolledCodeMirror');
+
 
 const MARKDOWN_TABLE_ACTIVATED_CLASS = 'markdown-table-activated';
 const MARKDOWN_LINK_ACTIVATED_CLASS = 'markdown-link-activated';
@@ -991,7 +993,7 @@ class CodeMirrorEditor extends AbstractEditor {
     return (
       <React.Fragment>
 
-        <UncontrolledCodeMirrorCore
+        <UncontrolledCodeMirror
           ref={(c) => { this.cm = c }}
           className={additionalClasses}
           placeholder="search"

+ 4 - 2
packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -17,13 +17,15 @@ import { useEditorMode } from '~/stores/ui';
 import PageContainer from '../../client/services/PageContainer';
 import { IRevisionOnConflict } from '../../interfaces/revision';
 import ExpandOrContractButton from '../ExpandOrContractButton';
-import UncontrolledCodeMirrorCore from '../UncontrolledCodeMirror';
+// import UncontrolledCodeMirror from '../UncontrolledCodeMirror';
 
 require('codemirror/lib/codemirror.css');
 require('codemirror/addon/merge/merge');
 require('codemirror/addon/merge/merge.css');
 const DMP = require('diff_match_patch');
 
+const UncontrolledCodeMirror = require('../UncontrolledCodeMirror');
+
 Object.keys(DMP).forEach((key) => { window[key] = DMP[key] });
 
 type ConflictDiffModalProps = {
@@ -229,7 +231,7 @@ const ConflictDiffModalCore = (props: ConflictDiffModalProps & { currentUser: IU
             <div className="col-12">
               <div className="border border-dark">
                 <h3 className="font-weight-bold my-2 mx-2">{t('modal_resolve_conflict.selected_editable_revision')}</h3>
-                <UncontrolledCodeMirrorCore
+                <UncontrolledCodeMirror
                   ref={uncontrolledRef}
                   value={resolvedRevision}
                   options={{