From e6d0156438ee687f476d9dc1f641723f71cb42c8 Mon Sep 17 00:00:00 2001
From: EvieePy <evieepy@gmail.com>
Date: Tue, 4 Oct 2022 11:14:07 +1000
Subject: [PATCH] Possible fix to monaco loader trying to load from CDN rather
 than a local build.

---
 mystbin/frontend/components/MonacoEditor.tsx |  6 +++-
 mystbin/frontend/package.json                |  3 ++
 mystbin/frontend/yarn.lock                   | 33 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/mystbin/frontend/components/MonacoEditor.tsx b/mystbin/frontend/components/MonacoEditor.tsx
index 21074442..ec3e7a90 100644
--- a/mystbin/frontend/components/MonacoEditor.tsx
+++ b/mystbin/frontend/components/MonacoEditor.tsx
@@ -1,3 +1,4 @@
+import loader from '@monaco-editor/loader';
 import {
   monaco,
   ControlledEditor,
@@ -5,7 +6,10 @@ import {
 } from "@monaco-editor/react";
 import { PropsWithoutRef } from "react";
 
-monaco.init().then((monaco) => {
+
+loader.config({ monaco })
+
+loader.init().then((monaco) => {
   // MystBin Dark
   monaco.editor.defineTheme("mystBinDark", {
     base: "vs-dark",
diff --git a/mystbin/frontend/package.json b/mystbin/frontend/package.json
index 8fcd72b1..c179b270 100644
--- a/mystbin/frontend/package.json
+++ b/mystbin/frontend/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
+    "@fortawesome/fontawesome-svg-core": "^6.2.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/x-grid": "^4.0.0-alpha.37",
@@ -31,6 +32,8 @@
     "flux": "^4.0.1",
     "http-proxy": "^1.18.1",
     "install": "^0.13.0",
+    "monaco-editor": "^0.34.0",
+    "monaco-editor-webpack-plugin": "^7.0.1",
     "mui-datatables": "^4.2.2",
     "next": "^11.0.0",
     "react": "17.0.1",
diff --git a/mystbin/frontend/yarn.lock b/mystbin/frontend/yarn.lock
index 4ef7c3d9..118e30ab 100644
--- a/mystbin/frontend/yarn.lock
+++ b/mystbin/frontend/yarn.lock
@@ -333,6 +333,18 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@fortawesome/fontawesome-common-types@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz#76467a94aa888aeb22aafa43eb6ff889df3a5a7f"
+  integrity sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==
+
+"@fortawesome/fontawesome-svg-core@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz#11856eaf4dd1d865c442ddea1eed8ee855186ba2"
+  integrity sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.2.0"
+
 "@hapi/accept@5.0.2":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.2.tgz#ab7043b037e68b722f93f376afb05e85c0699523"
@@ -2738,6 +2750,15 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+loader-utils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
+  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -2896,6 +2917,18 @@ mkdirp@^0.5.0:
   dependencies:
     minimist "^1.2.5"
 
+monaco-editor-webpack-plugin@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-7.0.1.tgz#ba19c60aba990184e36ad8722b1ed6a564527c7c"
+  integrity sha512-M8qIqizltrPlIbrb73cZdTWfU9sIsUVFvAZkL3KGjAHmVWEJ0hZKa/uad14JuOckc0GwnCaoGHvMoYtJjVyCzw==
+  dependencies:
+    loader-utils "^2.0.2"
+
+monaco-editor@^0.34.0:
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.34.0.tgz#b1749870a1f795dbfc4dc03d8e9b646ddcbeefa7"
+  integrity sha512-VF+S5zG8wxfinLKLrWcl4WUizMx+LeJrG4PM/M78OhcwocpV0jiyhX/pG6Q9jIOhrb/ckYi6nHnaR5OojlOZCQ==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"