Issue #2882198: Resolved merged conflicts.

config/optional/captcha.settings.yml

-default_challenge: captcha/Math
-description: 'This question is for testing whether or not you are a human visitor and to prevent automated spam submissions.'
-administration_mode: false
-allow_on_admin_pages: false
-add_captcha_description: true
-default_validation: 1
-persistence: 2
-enable_stats: true
-log_wrong_responses: true

config/optional/recaptcha.settings.yml

-site_key: ''
-secret_key: ''
-widget:
-  theme: light
-  type: image
-  size: compact
-  tabindex: 0
-  noscript: false

modules/varbase_features/varbase_media/config/install/entity_browser.browser.editor_media_browser.yml

@@ -31,16 +31,16 @@ widgets:
     weight: -10
     label: Library
     id: view
-  6f017ab9-9cbd-43e3-8af6-9dc1e19c38c7:
+  de21079a-e999-45ca-bd49-46f77bb9bb1d:
     settings:
+      form_mode: default
       media_entity_bundle: image
       upload_location: 'public://[date:custom:Y]-[date:custom:m]'
-      dropzone_description: 'Drop files here to upload them'
+      dropzone_description: 'Drop image files here to upload them'
       max_filesize: 32M
       extensions: 'jpg jpeg gif png'
-      submit_text: 'Select media'
-      auto_select: false
-    uuid: 6f017ab9-9cbd-43e3-8af6-9dc1e19c38c7
-    weight: -9
+      submit_text: 'Select  an image'
+    uuid: de21079a-e999-45ca-bd49-46f77bb9bb1d
+    weight: 3
     label: Upload
-    id: dropzonejs_media_entity
+    id: dropzonejs_media_entity_inline_entity_form

modules/varbase_features/varbase_media/config/install/entity_browser.browser.image_browser.yml

@@ -31,16 +31,16 @@ widgets:
     weight: -10
     label: Library
     id: view
-  f71e3128-5112-4b12-9593-e981f35ba988:
+  1ddfc2ef-3937-42ee-8ac8-0e79892b3127:
     settings:
+      form_mode: default
       media_entity_bundle: image
       upload_location: 'public://[date:custom:Y]-[date:custom:m]'
       dropzone_description: 'Drop image files here to upload them'
       max_filesize: 32M
       extensions: 'jpg jpeg gif png'
-      submit_text: 'Select Image'
-      auto_select: false
-    uuid: f71e3128-5112-4b12-9593-e981f35ba988
-    weight: -9
+      submit_text: 'Select an image'
+    uuid: 1ddfc2ef-3937-42ee-8ac8-0e79892b3127
+    weight: 3
     label: Upload
-    id: dropzonejs_media_entity
+    id: dropzonejs_media_entity_inline_entity_form

modules/varbase_features/varbase_media/config/install/entity_browser.browser.images_browser.yml

@@ -25,22 +25,22 @@ widgets:
     settings:
       view: browser
       view_display: images_browser
-      submit_text: 'Select Images'
+      submit_text: 'Select image(s)'
       auto_select: false
     uuid: c5fb0857-c353-41b5-a553-407d7b906e83
     weight: -10
     label: Library
     id: view
-  77cdc7ee-5d61-4f75-9450-6713b641ad97:
+  5a10940f-c1dd-47bc-a4d4-76bc1a0a4c34:
     settings:
+      form_mode: default
       media_entity_bundle: image
       upload_location: 'public://[date:custom:Y]-[date:custom:m]'
       dropzone_description: 'Drop image files here to upload them'
       max_filesize: 32M
       extensions: 'jpg jpeg gif png'
-      submit_text: 'Select entities'
-      auto_select: false
-    uuid: 77cdc7ee-5d61-4f75-9450-6713b641ad97
-    weight: -9
+      submit_text: 'Select image(s)'
+    uuid: 5a10940f-c1dd-47bc-a4d4-76bc1a0a4c34
+    weight: 3
     label: Upload
-    id: dropzonejs_media_entity
+    id: dropzonejs_media_entity_inline_entity_form

src/composer/ScriptHandler.php

@@ -56,6 +56,12 @@ class ScriptHandler {
       // Alter development.services.yml to have Varbase's Local development services.
       copy(getcwd() . '/src/assets/development.services.yml', $drupal_root . '/sites/development.services.yml');
     }
+    
+    // Copy ACE librarary into /modules/contrib/ace_editor/libraries.
+    if ($fs->exists($drupal_root . '/libraries/ace/src-min-noconflict/ace.js')) {
+      mkdir($drupal_root . '/modules/contrib/ace_editor/libraries', 0777, true);
+      rename($drupal_root . '/libraries/ace', $drupal_root . '/modules/contrib/ace_editor/libraries/ace');
+    }
 
   }