✨ allow for client side opting out of using monaco

laquasicinque · Jul 11, 2021 · eaf873b · eaf873b
1 parent 3f68be7
commit eaf873b
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 30 deletions.
diff --git a/dist/6640.module.js b/dist/6640.module.js
diff --git a/dist/module.js b/dist/module.js
diff --git a/src/editor.ts b/src/editor.ts
@@ -1,9 +1,10 @@
-import * as monaco from "monaco-editor";
 import { debounce } from "./utils/debounce";
 import { settings } from "./settings";
 import { NewOptionsType } from "./types";
+import type * as MonacoTypings from "monaco-editor";
 
-const activeEditors = new Set<monaco.editor.IStandaloneCodeEditor>();
+const activeEditors = new Set<MonacoTypings.editor.IStandaloneCodeEditor>();
+export let monaco: typeof import("monaco-editor");
 
 export function updateActiveEditors<T extends keyof NewOptionsType>(
   str: T,
@@ -16,24 +17,33 @@ export function updateActiveEditors<T extends keyof NewOptionsType>(
   }
 }
 
-export function registerTypes(filePath: string, code: string) {
-  const modifiedPath = filePath
-    // strip relative
-    .replace(/^(?:\.\.?\/)*/giu, "")
-    // replace starting point with `injected/`
-    .replace(/^\/?/gu, "injected/")
-    // add/replace ending with `.d.ts`
-    .replace(/(?:(:\.\d)?\.ts)?\$/giu, ".d.ts");
-
-  monaco.languages.typescript.javascriptDefaults.addExtraLib(
-    code,
-    modifiedPath
-  );
+export let registerTypes = (_: string, __: string): void => {};
 
-  monaco.editor.createModel(code, "typescript", monaco.Uri.parse(modifiedPath));
-}
+export async function setupMonaco() {
+  monaco = await import("monaco-editor");
+
+  // redefine registerTypes
+  registerTypes = async function registerTypes(filePath: string, code: string) {
+    const modifiedPath = filePath
+      // strip relative
+      .replace(/^(?:\.\.?\/)*/giu, "")
+      // replace starting point with `injected/`
+      .replace(/^\/?/gu, "injected/")
+      // add/replace ending with `.d.ts`
+      .replace(/(?:(:\.\d)?\.ts)?\$/giu, ".d.ts");
+
+    monaco.languages.typescript.javascriptDefaults.addExtraLib(
+      code,
+      modifiedPath
+    );
+
+    monaco.editor.createModel(
+      code,
+      "typescript",
+      monaco.Uri.parse(modifiedPath)
+    );
+  };
 
-export function setupMonaco() {
   monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
     noSemanticValidation: true,
     noSyntaxValidation: false,

diff --git a/src/module.ts b/src/module.ts
@@ -1,17 +1,19 @@
 import { attachMonacoEditor, registerTypes, setupMonaco } from "./editor";
 import { furnaceFix } from "./fixes/furnace";
 import { bailOnMacroEditor } from "./fixes/macroeditor";
-import { registerSettings } from "./settings";
+import { registerSettings, settings } from "./settings";
 
 
 Hooks.once("init", async function () {
   registerSettings();
-  setupMonaco()
-
-  Hooks.callAll("monaco-editor.ready", registerTypes);
+  if (settings.enableMonacoEditor) {
+    await setupMonaco()
+    Hooks.callAll("monaco-editor.ready", registerTypes);
+  }
 });
 
 Hooks.on("monaco-editor.ready", async (register: typeof registerTypes) => {
+  console.log("Monaco Editor | Load types")
   // Load in definitions from @league-of-foundry-developers/foundry-vtt-types
   const context = require.context("./typings", true, /\.ts$/i, "lazy-once");
   const results = await Promise.allSettled(
@@ -30,7 +32,9 @@ Hooks.on("monaco-editor.ready", async (register: typeof registerTypes) => {
 });
 
 Hooks.on("renderMacroConfig", ({ form }: { form: HTMLFormElement }) => {
-  bailOnMacroEditor()
-  furnaceFix(form);
-  attachMonacoEditor(form)
+  if (settings.enableMonacoEditor) {
+    bailOnMacroEditor()
+    furnaceFix(form);
+    attachMonacoEditor(form)
+  }
 });
diff --git a/src/settings/index.ts b/src/settings/index.ts
@@ -12,6 +12,7 @@ type Settings = {
   theme: string;
   fontSize: number;
   wordWrap: boolean;
+  enableMonacoEditor: boolean;
 };
 
 /**
@@ -39,26 +40,30 @@ export function registerSettings() {
 
   defineSetting("fontFamily", {
     default: `Jetbrains Mono, Fira Code, san-serif`,
-    type: String,
   });
 
   defineSetting("fontLigatures", {
-    type: Boolean,
     default: true,
   });
 
   defineSetting("fontSize", {
-    type: Number,
     default: 12,
   });
 
   defineSetting("wordWrap", {
-    type: Boolean,
     default: true,
     onChange(value) {
       updateActiveEditors("wordWrap", value ? "on" : "off")
     }
   });
+
+  defineSetting("enableMonacoEditor", {
+    default: true,
+    onChange: () => {
+      // force a reload
+      window.location.reload()
+    }
+  })
 }
 
 function defineSetting<T>(