Put eslint on own domain

Ives van Hoorne · Ives van Hoorne · commit cd103cd4a2d2 · 2017-04-05T14:30:40.000+02:00
diff --git a/src/app/index.html b/src/app/index.html
@@ -35,8 +35,6 @@
     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,9 +244,13 @@ export default class CodeEditor extends React.PureComponent {
     }
 
     if (preferences.lintEnabled) {
-      System.import('app/utils/codemirror/eslint-lint').then(() => {
-        this.codemirror.setOption('lint', true);
-      });
+      System.import('app/utils/codemirror/eslint-lint')
+        .then(initializer => {
+          return initializer.default();
+        })
+        .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,8 +2,8 @@ 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 './eslint';
 import error from '../error';
+import delay from '../../store/services/delay';
 
 const allRules = {
   'react/jsx-uses-react': require('eslint-plugin-react/lib/rules/jsx-uses-react'),
@@ -69,12 +69,6 @@ const allRules = {
   'react/jsx-tag-spacing': require('eslint-plugin-react/lib/rules/jsx-tag-spacing'),
 };
 
-try {
-  window.eslint.defineRules(allRules);
-} catch (e) {
-  error(e);
-}
-
 const defaultConfig = {
   extends: ['prettier', 'prettier/react', 'prettier/flowtype'],
   parserOptions: {
@@ -1609,4 +1603,19 @@ export function fix(source) {
   return fixer.applyFixes(window.eslint.getSourceCode(), errors);
 }
 
-CodeMirror.registerHelper('lint', 'javascript', validator);
+export default (async function initialize() {
+  if (!window.eslint) {
+    // Add eslint as script
+    const script = document.createElement('script');
+    script.setAttribute('src', 'static/js/eslint.3.18.0.js');
+    script.setAttribute('async', false);
+    document.head.appendChild(script);
+  }
+
+  while (!window.eslint) {
+    await delay(100);
+  }
+
+  window.eslint.defineRules(allRules);
+  CodeMirror.registerHelper('lint', 'javascript', validator);
+});
diff --git a/src/homepage/index.html b/src/homepage/index.html
@@ -145,4 +145,4 @@ <h3>Example Projects</h3>
   </script>
 </body>
 
-</html>
+</html>
diff --git a/src/homepage/static/js/eslint.3.18.0.js b/src/homepage/static/js/eslint.3.18.0.js

-Original file line number
+Diff line change
   </script>
 </body>
 -</html>
 +</html>