From 1205908233e2660f28758522fba1195ebc2e6d53 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 17 Jun 2020 23:45:36 +0100
Subject: [PATCH] Revert "Desktop: Change codemirror to user import syntax
 (#3375)"

This reverts commit 3a7a068196cb79954f1671affad1c2af31270dd9.
---
 .eslintignore                                                | 1 -
 .gitignore                                                   | 1 -
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx | 5 ++---
 .../gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.ts       | 4 ----
 4 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.ts

diff --git a/.eslintignore b/.eslintignore
index b5d781a1f..95ee02579 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -69,7 +69,6 @@ ElectronClient/gui/NoteEditor/NoteBody/AceEditor/Toolbar.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js
-ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
diff --git a/.gitignore b/.gitignore
index e56ea0e3b..8a335fcba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,6 @@ ElectronClient/gui/NoteEditor/NoteBody/AceEditor/Toolbar.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js
-ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
diff --git a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx b/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
index 2c1521fba..c9331c29e 100644
--- a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
+++ b/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
@@ -1,8 +1,5 @@
 import * as React from 'react';
 import { useEffect, useImperativeHandle, useState, useRef, useCallback, forwardRef } from 'react';
-
-import * as CodeMirror from 'codemirror';
-
 import 'codemirror/addon/comment/comment';
 import 'codemirror/addon/dialog/dialog';
 import 'codemirror/addon/edit/closebrackets';
@@ -28,6 +25,8 @@ import 'codemirror/mode/clike/clike';
 import 'codemirror/mode/diff/diff';
 import 'codemirror/mode/sql/sql';
 
+const CodeMirror = require('codemirror');
+
 export interface CancelledKeys {
 	mac: string[],
 	default: string[],
diff --git a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.ts b/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.ts
deleted file mode 100644
index a62abffe5..000000000
--- a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/codemirror.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Declare codemirror module so that we can import it using the import syntax.
-// This also means it will implicitly have the any type, which is necessary because
-// of the flexible manner that codemirror is made https://discuss.codemirror.net/t/basic-codemirror-configuration-in-typescript-project/2047/2
-declare module 'codemirror';