bundle codemirror css into editor package directly (#2090)

nteract · Nov 23, 2017 · 2fcc1e3 · 2fcc1e3
1 parent 7014988
commit 2fcc1e3
Show file tree

Hide file tree

Showing 4 changed files with 531 additions and 6 deletions.
diff --git a/packages/desktop/src/notebook/main.css b/packages/desktop/src/notebook/main.css
@@ -2,8 +2,5 @@
   App
  */
 @import "../../node_modules/normalize.css/normalize.css";
-@import "../../node_modules/codemirror/lib/codemirror.css";
-@import "../../node_modules/codemirror/addon/hint/show-hint.css";
-@import "../../node_modules/codemirror/addon/dialog/dialog.css";
 @import "../../node_modules/nteract-assets/fonts/source-sans-pro/source-sans-pro.css";
 @import "../../node_modules/nteract-assets/fonts/source-code-pro/source-code-pro.css";
diff --git a/packages/editor/src/index.js b/packages/editor/src/index.js
@@ -22,6 +22,9 @@ import type { EditorChange, ScrollInfo, CMI, CMDoc } from "./types";
 
 import styles from "./styles";
 
+import codemirrorStyles from "./vendored/codemirror";
+import showHintStyles from "./vendored/show-hint";
+
 function normalizeLineEndings(str) {
   if (!str) return str;
   return str.replace(/\r\n|\r/g, "\n");
@@ -137,11 +140,10 @@ class CodeMirrorEditor extends React.Component<
 
     require("codemirror/addon/hint/show-hint");
     require("codemirror/addon/hint/anyword-hint");
-    require("codemirror/addon/search/search");
-    require("codemirror/addon/search/searchcursor");
+
     require("codemirror/addon/edit/matchbrackets");
     require("codemirror/addon/edit/closebrackets");
-    require("codemirror/addon/dialog/dialog");
+
     require("codemirror/addon/comment/comment.js");
 
     require("codemirror/mode/python/python");
@@ -396,6 +398,8 @@ class CodeMirrorEditor extends React.Component<
           autoComplete="off"
           className="CodeMirror-code initialTextAreaForCodeMirror"
         />
+        <style jsx>{showHintStyles}</style>
+        <style jsx>{codemirrorStyles}</style>
         <style jsx>{styles}</style>
       </div>
     );