From 5d4dc81fdf6735ef75e6ad7944700e70834e43ac Mon Sep 17 00:00:00 2001 From: Stanislav Romanov Date: Mon, 5 Sep 2022 18:08:46 +0300 Subject: [PATCH] Fix monaco errors --- app/components/monaco-editor.js | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/app/components/monaco-editor.js b/app/components/monaco-editor.js index 42a9481..c693d39 100644 --- a/app/components/monaco-editor.js +++ b/app/components/monaco-editor.js @@ -1,23 +1,6 @@ import { action } from '@ember/object'; import Component from '@glimmer/component'; -import * as monaco from 'monaco-editor'; - -window.MonacoEnvironment = { - getWorker(_, label) { - if (label === 'editorWorkerService') { - return new Worker( - new URL('monaco-editor/esm/vs/editor/editor.worker', import.meta.url) - ); - } else if (label === 'json') { - return new Worker( - new URL( - 'monaco-editor/esm/vs/language/json/json.worker', - import.meta.url - ) - ); - } - }, -}; +import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'; export default class MonacoEditorComponent extends Component { @action @@ -25,13 +8,15 @@ export default class MonacoEditorComponent extends Component { this.editor = monaco.editor.create(el, { value: this.args.value, language: this.args.language, - // scrollBeyondLastLine: false, - // wordWrap: 'on', - // wrappingStrategy: 'advanced', minimap: { enabled: false, }, - // overviewRulerLanes: 0, }); } + + willDestroy() { + this.editor?.dispose(); + + super.willDestroy(...arguments); + } }