Remove manual resolution for monaco-editor and fix version incompatibility

This commit is contained in:
Pirate Praveen 2021-10-03 00:48:38 +05:30
parent 56ce90ad98
commit 11639f79c4
3 changed files with 26 additions and 1 deletions

View file

@ -0,0 +1,24 @@
This is removed in newer versions already.
Bug, Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995572
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
"mathjax": "3",
"mermaid": "^8.10.2",
"minimatch": "^3.0.4",
- "monaco-editor": "^0.25.2",
+ "monaco-editor": "^0.26.1",
"monaco-editor-webpack-plugin": "^4.0.0",
"monaco-yaml": "^2.5.1",
"mousetrap": "1.6.5",
@@ -270,8 +270,7 @@
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
},
"resolutions": {
- "chokidar": "^3.4.0",
- "monaco-editor": "0.24.0"
+ "chokidar": "^3.4.0"
},
"engines": {
"node": ">=10.13.0",

View file

@ -166,7 +166,7 @@ Use debian packaged node modules when available
"mermaid": "^8.10.2",
- "minimatch": "^3.0.4",
+ "minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.25.2",
"monaco-editor": "^0.26.1",
"monaco-editor-webpack-plugin": "^4.0.0",
"monaco-yaml": "^2.5.1",
"mousetrap": "1.6.5",

View file

@ -16,6 +16,7 @@
0499-92-relax-rexml.patch
0499-93-relax-autoprefixer-rails.patch
0500-set-webpack-root.patch
0510-remove-manual-resolution-for-monaco-editor.patch
0510-remove-dev-dependencies.patch
0610-source-init-functions.patch
0630-fix-mail-room-path.patch