Revert "Move eslint to separate file"

Ives van Hoorne · Ives van Hoorne · commit 1536e9b33666 · 2017-04-05T13:51:24.000+02:00
This reverts commit 41fb032.
diff --git a/src/app/index.html b/src/app/index.html
@@ -35,6 +35,8 @@
     ga('send', 'pageview');
   </script>
   <script src="https://cdn.ravenjs.com/3.14.0/raven.min.js" crossorigin="anonymous"></script>
+
+  </script>
 </head>
 
 <body style="margin: 0; padding: 0;">
diff --git a/src/app/pages/Sandbox/Editor/Content/subviews/CodeEditor/index.js b/src/app/pages/Sandbox/Editor/Content/subviews/CodeEditor/index.js
@@ -244,13 +244,9 @@ export default class CodeEditor extends React.PureComponent {
     }
 
     if (preferences.lintEnabled) {
-      System.import('app/utils/codemirror/eslint-lint')
-        .then(initializer => {
-          return initializer.default();
-        })
-        .then(() => {
-          this.codemirror.setOption('lint', true);
-        });
+      System.import('app/utils/codemirror/eslint-lint').then(() => {
+        this.codemirror.setOption('lint', true);
+      });
     } else {
       this.codemirror.setOption('lint', false);
     }
diff --git a/src/app/utils/codemirror/eslint-lint.js b/src/app/utils/codemirror/eslint-lint.js
@@ -2,7 +2,7 @@ import CodeMirror from 'codemirror';
 import 'codemirror/addon/lint/lint.css';
 import 'codemirror/addon/lint/lint';
 import fixer from 'eslint/lib/util/source-code-fixer';
-import delay from '../../store/services/delay';
+import './eslint';
 
 const allRules = {
   'react/jsx-uses-react': require('eslint-plugin-react/lib/rules/jsx-uses-react'),
@@ -68,6 +68,10 @@ const allRules = {
   'react/jsx-tag-spacing': require('eslint-plugin-react/lib/rules/jsx-tag-spacing'),
 };
 
+try {
+  eslint.defineRules(allRules);
+} catch (e) {}
+
 const defaultConfig = {
   extends: ['prettier', 'prettier/react', 'prettier/flowtype'],
   parserOptions: {
@@ -1602,19 +1606,4 @@ export function fix(source) {
   return fixer.applyFixes(eslint.getSourceCode(), errors);
 }
 
-export default (async function initialize() {
-  if (!window.eslint) {
-    // Add eslint as script
-    const script = document.createElement('script');
-    script.setAttribute('src', 'http://eslint.org/js/app/eslint.js');
-    script.setAttribute('async', false);
-    document.head.appendChild(script);
-  }
-
-  while (!window.eslint) {
-    await delay(100);
-  }
-
-  eslint.defineRules(allRules);
-  CodeMirror.registerHelper('lint', 'javascript', validator);
-});
+CodeMirror.registerHelper('lint', 'javascript', validator);
diff --git a/src/app/utils/codemirror/eslint.js b/src/app/utils/codemirror/eslint.js
