Merge pull request #37 from Jobsity/fix/monaco-worker

Fix/monaco worker
Jobsity · Aug 9, 2018 · 48db345 · 48db345
2 parents bc8d863 + 953eeac
commit 48db345
Show file tree

Hide file tree

Showing 13 changed files with 266 additions and 6 deletions.
diff --git a/public/index.html b/public/index.html
@@ -39,16 +39,16 @@
   </body>
 </html>
 
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.13.1/min/vs/loader.js"></script>
+<script type="text/javascript" src="%PUBLIC_URL%/vs/loader.js"></script>
 <script>
   require.config({
     paths: {
-      "vs": 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.13.1/min/vs'
+      "vs": '../node_modules/monaco-editor/min/vs'
     }
   });
   window.MonacoEnvironment = {
     getWorkerUrl: function (workerId, label) {
-      return "/monaco-editor-worker-loader-proxy.js";
+      return 'vs/base/worker/workerMain.js';
     }
   };
 </script>
diff --git a/public/monaco-editor-worker-loader-proxy.js b/public/monaco-editor-worker-loader-proxy.js
@@ -1,5 +1,5 @@
 self.MonacoEnvironment = {
-  baseUrl: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.13.1/min/'
-}
+  baseUrl: '../node_modules/monaco-editor/min',
+};
 
-  importScripts('https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.13.1/min/vs/base/worker/workerMain.js') // eslint-disable-line
+  importScripts('vs/base/worker/workerMain.js') // eslint-disable-line
diff --git a/public/vs/base/worker/workerMain.js b/public/vs/base/worker/workerMain.js
diff --git a/public/vs/language/css/cssMode.js b/public/vs/language/css/cssMode.js
diff --git a/public/vs/language/css/cssWorker.js b/public/vs/language/css/cssWorker.js
diff --git a/public/vs/language/html/htmlMode.js b/public/vs/language/html/htmlMode.js
diff --git a/public/vs/language/html/htmlWorker.js b/public/vs/language/html/htmlWorker.js
diff --git a/public/vs/language/json/jsonMode.js b/public/vs/language/json/jsonMode.js
diff --git a/public/vs/language/json/jsonWorker.js b/public/vs/language/json/jsonWorker.js
diff --git a/public/vs/language/typescript/lib/typescriptServices.js b/public/vs/language/typescript/lib/typescriptServices.js
diff --git a/public/vs/language/typescript/tsMode.js b/public/vs/language/typescript/tsMode.js
diff --git a/public/vs/language/typescript/tsWorker.js b/public/vs/language/typescript/tsWorker.js
diff --git a/public/vs/loader.js b/public/vs/loader.js