Skip to content

Commit

Permalink
Update Monaco to laster 0.4 release (0.49)
Browse files Browse the repository at this point in the history
This is in line with discussions on chat to target 5.75 so it will be in the ESR
which is helpful for the bettermsgtpl extension
  • Loading branch information
eileenmcnaughton committed Jun 17, 2024
1 parent ec2b33f commit f111dbb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion Civi/Angular/Page/Modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,13 @@ public static function buildAngularModules($event) {
public function digestJs($files) {
$scripts = [];
foreach ($files as $file) {
$scripts[] = \CRM_Utils_JS::stripComments(file_get_contents($file));
$content = file_get_contents($file);
if (str_contains($file, 'monaco-editor')) {
$scripts[] = $content;
}
else {
$scripts[] = \CRM_Utils_JS::stripComments($content);
}
}
$scripts = \CRM_Utils_JS::dedupeClosures(
$scripts,
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
"ignore": [".*", "*.json", "*.md", "Makefile", "*/*"]
},
"monaco-editor": {
"url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.25.2.tgz",
"url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.49.0.tgz",
"path": "bower_components/monaco-editor",
"ignore": ["dev", "esm"]
},
Expand Down

0 comments on commit f111dbb

Please sign in to comment.