diff --git a/.github/workflows/update-monaco-editor.yml b/.github/workflows/update-monaco-editor.yml deleted file mode 100644 index 646aa98f..00000000 --- a/.github/workflows/update-monaco-editor.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Update Monaco-editor -on: - workflow_dispatch: - push: - branches: - - 'dependabot/npm_and_yarn/develop/monaco-editor-**' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - run: ./bin/update-monaco - - name: Commit changes - uses: EndBug/add-and-commit@v9 - with: - author_name: ${{ github.actor }} - author_email: ${{ github.actor }}@users.noreply.github.com - message: 'Update Monaco-editor' diff --git a/bin/update-monaco b/bin/update-monaco deleted file mode 100755 index dbddd571..00000000 --- a/bin/update-monaco +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -monacoVersion="$(jq -r '.dependencies."monaco-editor"' package.json)" -monacoVersion="${monacoVersion:1}" - -if [[ $(uname) == "Darwin" ]]; -then - sed -i '' -E "s/monaco-editor\/[^/]*/monaco-editor\/$monacoVersion/g" ./src/app.html -else - sed -i'' -E "s/monaco-editor\/[^/]*/monaco-editor\/$monacoVersion/g" ./src/app.html -fi - diff --git a/src/lib/components/editor.svelte b/src/lib/components/editor.svelte index daff9b0d..ec2bd3d9 100644 --- a/src/lib/components/editor.svelte +++ b/src/lib/components/editor.svelte @@ -9,7 +9,7 @@ let divEl: HTMLDivElement = null; let editor: monaco.editor.IStandaloneCodeEditor; - let Monaco; + let Monaco: typeof monaco; export let text: string; export let language: string; @@ -23,19 +23,19 @@ overviewRulerLanes: 0 }; let oldText = text; - $: editor && Monaco?.editor.setModelLanguage(editor.getModel(), language); + $: editor && Monaco.editor.setModelLanguage(editor.getModel(), language); $: { if (text !== oldText) { - if ($stateStore.updateEditor) { - editor?.setValue(text); + if (editor && $stateStore.updateEditor) { + editor.setValue(text); } oldText = text; } - editor && Monaco?.editor.setModelMarkers(editor.getModel(), 'test', $stateStore.errorMarkers); + editor && Monaco.editor.setModelMarkers(editor.getModel(), 'test', $stateStore.errorMarkers); } themeStore.subscribe(({ isDark }) => { - editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid'); + editor && Monaco.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid'); }); const dispatch = createEventDispatcher();