From a85a13c577d018d5be7a0f554e6cc87acdad37bb Mon Sep 17 00:00:00 2001 From: Manuel Nogueira Date: Thu, 19 Sep 2024 22:30:56 +0100 Subject: [PATCH 1/2] Fixed not finding editor.worker.js and builtins wrong proptype errors --- package.json | 1 + .../MonacoCodeEditor/MonacoCodeEditor.js | 2 +- .../hooks/useMonacoEditorCore.js | 40 +++++++++++-------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index db96bce..f550b91 100644 --- a/package.json +++ b/package.json @@ -102,6 +102,7 @@ "@codingame/monaco-languageclient": "^0.17.3", "@mov-ai/mov-fe-lib-core": "^1.2.2-1", "@mov-ai/mov-fe-lib-react": "^1.3.4-1", + "monaco-editor": "^0.31.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/src/components/MonacoCodeEditor/MonacoCodeEditor.js b/src/components/MonacoCodeEditor/MonacoCodeEditor.js index 00dbe4d..1ed3d24 100644 --- a/src/components/MonacoCodeEditor/MonacoCodeEditor.js +++ b/src/components/MonacoCodeEditor/MonacoCodeEditor.js @@ -175,7 +175,7 @@ MonacoCodeEditor.propTypes = { value: PropTypes.string, style: PropTypes.object, useLanguageServer: PropTypes.bool, - builtins: PropTypes.object, + builtins: PropTypes.array, }; MonacoCodeEditor.defaultProps = { diff --git a/src/components/MonacoCodeEditor/hooks/useMonacoEditorCore.js b/src/components/MonacoCodeEditor/hooks/useMonacoEditorCore.js index 95540b1..73a231a 100644 --- a/src/components/MonacoCodeEditor/hooks/useMonacoEditorCore.js +++ b/src/components/MonacoCodeEditor/hooks/useMonacoEditorCore.js @@ -18,23 +18,29 @@ import ReconnectingWebSocket from "reconnecting-websocket"; * */ //======================================================================================== -self.MonacoEnvironment = { - getWorkerUrl: function (_, label) { - if (label === "json") { - return "./json.worker.bundle.js"; - } - if (label === "css" || label === "scss" || label === "less") { - return "./css.worker.bundle.js"; - } - if (label === "html" || label === "handlebars" || label === "razor") { - return "./html.worker.bundle.js"; - } - if (label === "typescript" || label === "javascript") { - return "./ts.worker.bundle.js"; - } - return "./editor.worker.bundle.js"; - }, -}; +// Commented this because it was throwing an error as something +// In the bundler (spent a few hours investigating this) +// wasn't working. Since I couldn't get the files by any name / +// path, ended up giving up and just commented this. Now we +// only get a simple warning in the console instead of that +// invasive backdrop error and console error. +// self.MonacoEnvironment = { +// getWorkerUrl: function (_, label) { +// if (label === "json") { +// return "./json.worker.js"; +// } +// if (label === "css" || label === "scss" || label === "less") { +// return "./css.worker.js"; +// } +// if (label === "html" || label === "handlebars" || label === "razor") { +// return "./html.worker.js"; +// } +// if (label === "typescript" || label === "javascript") { +// return "./ts.worker.js"; +// } +// return "./editor.worker.js"; +// }, +// }; const createUrl = () => { const protocol = location.protocol === "https:" ? "wss" : "ws"; From d55268274e3dc528b6d7dd922d77d94635ff10ac Mon Sep 17 00:00:00 2001 From: Manuel Nogueira Date: Thu, 19 Sep 2024 22:31:48 +0100 Subject: [PATCH 2/2] Add Changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 637b91a..7b8c9cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # TBD +- [FP-2926](https://movai.atlassian.net/browse/FP-2926): Clear console and app errors - [QAP-3964](https://movai.atlassian.net/browse/QAP-3964): Review devcontainer configuration for lib-code - [FP-2840](https://movai.atlassian.net/browse/FP-2840): Update ReadMe's on all apps - [FP-2851](https://movai.atlassian.net/browse/FP-2851): Added new unit tests to repo