Skip to content

Commit 7ff3deb

Browse files
authored
Merge branch 'main' into mathjax
2 parents a509c97 + dd8c2b7 commit 7ff3deb

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

webapp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"file-saver": "^2.0.5",
77
"jquery-debounce-throttle": "^1.0.6-rc.0",
88
"mathjax": "^4.0.0",
9-
"monaco": "^1.201704190613.0",
9+
"monaco-editor": "^0.54.0",
1010
"nvd3": "1.8.6",
1111
"select2": "^4.0.13"
1212
}

webapp/public/js/monaco/vs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../node_modules/monaco/build/vs
1+
../../../node_modules/monaco-editor/min/vs/

webapp/var/log/.gitkeep

100644100755
File mode changed.

webapp/yarn.lock

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ d3@3.5.17:
2222
resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
2323
integrity sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg==
2424

25+
dompurify@3.1.7:
26+
version "3.1.7"
27+
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a"
28+
integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==
29+
2530
file-saver@^2.0.5:
2631
version "2.0.5"
2732
resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
@@ -39,17 +44,25 @@ jquery@>=1.7:
3944
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
4045
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
4146

47+
marked@14.0.0:
48+
version "14.0.0"
49+
resolved "https://registry.yarnpkg.com/marked/-/marked-14.0.0.tgz#79a1477358a59e0660276f8fec76de2c33f35d83"
50+
integrity sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==
51+
4252
mathjax@^4.0.0:
4353
version "4.0.0"
4454
resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-4.0.0.tgz#ff7aa8b6bfdc7e97e41091a9ed6d8c8f8eefd2a0"
4555
integrity sha512-ThMPHiPl9ibZBInAmfoTCNq9MgCdH7ChIQ9YhKFc325noJ4DMzy9/Q14qdcuPzVJjEmC3kyXhwnERZWX3hbWzQ==
4656
dependencies:
4757
"@mathjax/mathjax-newcm-font" "^4.0.0"
4858

49-
monaco@^1.201704190613.0:
50-
version "1.201704190613.0"
51-
resolved "https://registry.npmjs.org/monaco/-/monaco-1.201704190613.0.tgz"
52-
integrity sha512-xcQUOfa7inJdhOjHmwxILMIyPk4nl80E9AVvwyz5PUC2uEbxSjNUR9tjEIUxR+rR5o0xe64lqsIpChSzu8YMOQ==
59+
monaco-editor@^0.54.0:
60+
version "0.54.0"
61+
resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.54.0.tgz#c0d6ebb46b83f1bef6f67f6aa471e38ba7ef8231"
62+
integrity sha512-hx45SEUoLatgWxHKCmlLJH81xBo0uXP4sRkESUpmDQevfi+e7K1VuiSprK6UpQ8u4zOcKNiH0pMvHvlMWA/4cw==
63+
dependencies:
64+
dompurify "3.1.7"
65+
marked "14.0.0"
5366

5467
nvd3@1.8.6:
5568
version "1.8.6"

0 commit comments

Comments
 (0)