reuse CodeMirror instance

src/cm/index.js

@@ -2,7 +2,7 @@ import {template} from '@/js/localization';
 import * as prefs from '@/js/prefs';
 import {WINDOWS} from '@/js/ua';
 import {deepMerge} from '@/js/util';
-import CodeMirror from 'codemirror';
+import CM from 'codemirror';
 import 'codemirror/lib/codemirror.css';
 import 'codemirror/addon/comment/comment';
 import 'codemirror/addon/dialog/dialog';
@@ -35,7 +35,7 @@ import '@/vendor-overwrites/codemirror-addon/match-highlighter.js';
 import {THEME_KEY} from './themes';
 import './index.css';
 
-export {CodeMirror};
+export const CodeMirror = CM; // workaround for webpack's `codemirror_default()` import
 export * from './themes';
 
 export const extraKeys = Object.assign(CodeMirror.defaults.extraKeys || {}, {

src/edit/autocomplete.js

@@ -3,7 +3,7 @@ import {getStyleAtPos} from '@/cm/util';
 import {kCssPropSuffix, UCD} from '@/js/consts';
 import * as prefs from '@/js/prefs';
 import {hasOwn, stringAsRegExpStr, tryRegExp} from '@/js/util';
-import CodeMirror from 'codemirror';
+import {CodeMirror} from '@/cm';
 import {
   addSuffix, autocompleteOnTyping, Completion, execAt, findAllCssVars, getTokenState, isSameToken,
   testAt, USO_INVALID_VAR, USO_VALID_VAR,

src/edit/global-search.js

@@ -5,7 +5,7 @@ import {setInputValue} from '@/js/dom-util';
 import {htmlToTemplateCache, templateCache} from '@/js/localization';
 import {chromeLocal} from '@/js/storage-util';
 import {debounce, stringAsRegExp, t, tryRegExp} from '@/js/util';
-import CodeMirror from 'codemirror';
+import {CodeMirror} from '@/cm';
 import editor from './editor';
 import html from './global-search.html';
 

src/edit/index.js

@@ -1,7 +1,7 @@
 import '@/js/dom-init';
 import {tBody} from '@/js/localization';
 import * as prefs from '@/js/prefs';
-import CodeMirror from 'codemirror';
+import {CodeMirror} from '@/cm';
 import CompactHeader from './compact-header';
 import editor from './editor';
 import EditorHeader from './editor-header';

src/edit/moz-section-finder.js

@@ -1,5 +1,5 @@
 import {deepEqual} from '@/js/util';
-import CodeMirror from 'codemirror';
+import {CodeMirror} from '@/cm';
 import {trimCommentLabel} from './util';
 
 export default function MozSectionFinder(cm) {

src/edit/moz-section-widget.js

@@ -4,7 +4,7 @@ import {messageBox} from '@/js/dom-util';
 import {htmlToTemplate, templateCache} from '@/js/localization';
 import * as msg from '@/js/msg';
 import {sleep, t} from '@/js/util';
-import CodeMirror from 'codemirror';
+import {CodeMirror} from '@/cm';
 import editor from './editor';
 import MozSectionFinder from './moz-section-finder';
 import {htmlAppliesTo} from './util';

src/edit/sections-editor-section.js

@@ -5,7 +5,7 @@ import {templateCache, htmlToTemplate, template} from '@/js/localization';
 import * as prefs from '@/js/prefs';
 import {FROM_CSS, TO_CSS} from '@/js/sections-util';
 import {debounce} from '@/js/util';
-import CodeMirror from 'codemirror';
+import {CodeMirror} from '@/cm';
 import {initBeautifyButton} from './beautify';
 import cmFactory from './codemirror-factory';
 import editor from './editor';

src/edit/source-editor.js

@@ -6,7 +6,7 @@ import {API} from '@/js/msg-api';
 import * as prefs from '@/js/prefs';
 import {styleToCss} from '@/js/sections-util';
 import {RX_META, t} from '@/js/util';
-import CodeMirror from 'codemirror';
+import {CodeMirror} from '@/cm';
 import cmFactory from './codemirror-factory';
 import editor, {failRegexp} from './editor';
 import * as linterMan from './linter';

src/js/color/color-view.js

@@ -1,7 +1,7 @@
 import {getStyleAtPos} from '@/cm/util';
 import * as colorConverter from '@/js/color/color-converter';
 import ColorPicker from '@/js/color/color-picker';
-import CodeMirror from 'codemirror';
+import {CodeMirror} from '@/cm';
 
 //region Constants