Merge pull request #18988 from seamuslee001/dev_core_2197

dev/core#2197 Deploy monaco-editor using composer.json / composer dow…
civicrm · Nov 19, 2020 · 07340f3 · 07340f3
2 parents 56db180 + e1cb865
commit 07340f3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 137 deletions.
diff --git a/composer.json b/composer.json
@@ -213,6 +213,10 @@
         "url": "https://github.com/markedjs/marked/archive/v0.8.0.zip",
         "ignore": [".*", "*.json", "*.md", "Makefile", "*/*"]
       },
+      "monaco-editor": {
+        "url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz",
+        "path": "ext/afform/html/bower_components/monaco-editor"
+      },
       "google-code-prettify": {
         "url": "https://github.com/tcollard/google-code-prettify/archive/v1.0.5.zip",
         "ignore": ["closure-compiler", "js-modules", "tests", "yui-compressor", "Makefile", "examples", "*.html", "run_prettify*js"]

diff --git a/composer.lock b/composer.lock
diff --git a/ext/afform/html/afform_html.php b/ext/afform/html/afform_html.php
@@ -4,7 +4,7 @@
 use CRM_AfformHtml_ExtensionUtil as E;
 
 if (!defined('AFFORM_HTML_MONACO')) {
-  define('AFFORM_HTML_MONACO', 'node_modules/monaco-editor/min/vs');
+  define('AFFORM_HTML_MONACO', 'bower_components/monaco-editor/min/vs');
 }
 
 /**
@@ -153,7 +153,7 @@ function afform_html_civicrm_check(&$messages) {
   if (!file_exists($dir)) {
     $messages[] = new CRM_Utils_Check_Message(
       'afform_html_monaco',
-      ts('Afform HTML is missing its "node_modules" folder. Please consult the README.md for current installation instructions.'),
+      ts('Afform HTML is missing its "bower_components" folder. Please consult the README.md for current installation instructions.'),
       ts('Afform HTML: Packages are missing'),
       \Psr\Log\LogLevel::CRITICAL,
       'fa-chain-broken'

diff --git a/ext/afform/html/bin/setup.sh b/ext/afform/html/bin/setup.sh
diff --git a/ext/afform/html/package-lock.json b/ext/afform/html/package-lock.json
diff --git a/ext/afform/html/package.json b/ext/afform/html/package.json