From 93d759f91abf0d3b405b93451758c1faf4464a30 Mon Sep 17 00:00:00 2001 From: Kevin Jilissen Date: Sat, 8 Nov 2025 22:56:23 +0100 Subject: [PATCH] Use the correct monaco package The `monaco` package is some indepdantly maintained build and not the original monaco editor. It also seemed incredibly outdated (9y) and not API compatible with the current `monaco` release and broke the editors. Switch to `monaco-editor` instead. --- webapp/package.json | 2 +- webapp/public/js/monaco/vs | 2 +- webapp/var/log/.gitkeep | 0 webapp/yarn.lock | 21 +++++++++++++++++---- 4 files changed, 19 insertions(+), 6 deletions(-) mode change 100644 => 100755 webapp/var/log/.gitkeep diff --git a/webapp/package.json b/webapp/package.json index 80d349ca3c..fcb1bdf6ff 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -5,7 +5,7 @@ "d3": "3.5.17", "file-saver": "^2.0.5", "jquery-debounce-throttle": "^1.0.6-rc.0", - "monaco": "^1.201704190613.0", + "monaco-editor": "^0.54.0", "nvd3": "1.8.6", "select2": "^4.0.13" } diff --git a/webapp/public/js/monaco/vs b/webapp/public/js/monaco/vs index b21f0ed5a3..9c7d1c653b 120000 --- a/webapp/public/js/monaco/vs +++ b/webapp/public/js/monaco/vs @@ -1 +1 @@ -../../../node_modules/monaco/build/vs \ No newline at end of file +../../../node_modules/monaco-editor/min/vs/ \ No newline at end of file diff --git a/webapp/var/log/.gitkeep b/webapp/var/log/.gitkeep old mode 100644 new mode 100755 diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 4290963e43..a5ab78227d 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -17,6 +17,11 @@ d3@3.5.17: resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" integrity sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg== +dompurify@3.1.7: + version "3.1.7" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a" + integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ== + file-saver@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" @@ -34,10 +39,18 @@ jquery@>=1.7: resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de" integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== -monaco@^1.201704190613.0: - version "1.201704190613.0" - resolved "https://registry.npmjs.org/monaco/-/monaco-1.201704190613.0.tgz" - integrity sha512-xcQUOfa7inJdhOjHmwxILMIyPk4nl80E9AVvwyz5PUC2uEbxSjNUR9tjEIUxR+rR5o0xe64lqsIpChSzu8YMOQ== +marked@14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-14.0.0.tgz#79a1477358a59e0660276f8fec76de2c33f35d83" + integrity sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ== + +monaco-editor@^0.54.0: + version "0.54.0" + resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.54.0.tgz#c0d6ebb46b83f1bef6f67f6aa471e38ba7ef8231" + integrity sha512-hx45SEUoLatgWxHKCmlLJH81xBo0uXP4sRkESUpmDQevfi+e7K1VuiSprK6UpQ8u4zOcKNiH0pMvHvlMWA/4cw== + dependencies: + dompurify "3.1.7" + marked "14.0.0" nvd3@1.8.6: version "1.8.6"