Merge branch 'ide-update-monaco' into 'master'
Upgrading Monaco Closes #38607 See merge request gitlab-org/gitlab-ce!14629
This commit is contained in:
commit
b69861c204
|
@ -22,7 +22,8 @@ const RepoEditor = {
|
|||
const monacoInstance = Helper.monaco.editor.create(this.$el, {
|
||||
model: null,
|
||||
readOnly: false,
|
||||
contextmenu: false,
|
||||
contextmenu: true,
|
||||
scrollBeyondLastLine: false,
|
||||
});
|
||||
|
||||
Helper.monacoInstance = monacoInstance;
|
||||
|
|
|
@ -236,7 +236,7 @@ var config = {
|
|||
from: path.join(ROOT_PATH, `node_modules/monaco-editor/${IS_PRODUCTION ? 'min' : 'dev'}/vs`),
|
||||
to: 'monaco-editor/vs',
|
||||
transform: function(content, path) {
|
||||
if (/\.js$/.test(path) && !/worker/i.test(path)) {
|
||||
if (/\.js$/.test(path) && !/worker/i.test(path) && !/typescript/i.test(path)) {
|
||||
return (
|
||||
'(function(){\n' +
|
||||
'var define = this.define, require = this.require;\n' +
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
"jszip": "^3.1.3",
|
||||
"jszip-utils": "^0.0.2",
|
||||
"marked": "^0.3.6",
|
||||
"monaco-editor": "0.8.3",
|
||||
"monaco-editor": "0.10.0",
|
||||
"mousetrap": "^1.4.6",
|
||||
"name-all-modules-plugin": "^1.0.1",
|
||||
"pikaday": "^1.5.1",
|
||||
|
|
|
@ -4148,9 +4148,9 @@ moment@2.x:
|
|||
version "2.17.1"
|
||||
resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
|
||||
|
||||
monaco-editor@0.8.3:
|
||||
version "0.8.3"
|
||||
resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.8.3.tgz#523bdf2d1524db2c2dfc3cae0a7b6edc48d6dea6"
|
||||
monaco-editor@0.10.0:
|
||||
version "0.10.0"
|
||||
resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.10.0.tgz#6604932585fe9c1f993f000a503d0d20fbe5896a"
|
||||
|
||||
mousetrap@^1.4.6:
|
||||
version "1.4.6"
|
||||
|
|
Loading…
Reference in New Issue