ACMS-746: Bundled content breaking config imports (#806)

acquia · May 26, 2021 · a7f39a0 · a7f39a0
1 parent e410bf9
commit a7f39a0
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 2 deletions.
diff --git a/acquia_cms.info.yml b/acquia_cms.info.yml
@@ -29,6 +29,7 @@ install:
   - cohesion_style_guide
   - cohesion_style_helpers
   - cohesion_sync
+  - config_ignore
   - cohesion_templates
   - cohesion_website_settings
   - collapsiblock

diff --git a/composer.json b/composer.json
@@ -34,6 +34,7 @@
         "drupal/autologout": "^1",
         "drupal/checklistapi": "^2.0",
         "drupal/collapsiblock": "^3",
+        "drupal/config_ignore": "^2.3",
         "drupal/config_rewrite": "1.3",
         "drupal/core": "^9.1.7",
         "drupal/default_content": "^2",

diff --git a/composer.lock b/composer.lock
diff --git a/config/optional/config_ignore.settings.yml b/config/optional/config_ignore.settings.yml
@@ -0,0 +1,4 @@
+ignored_config_entities:
+  - 'language.entity.*'
+  - 'media.type.image:uuid'
+  - 'crop.type.focal_point:uuid'
diff --git a/modules/acquia_cms_common/src/Services/AcmsUtilityService.php b/modules/acquia_cms_common/src/Services/AcmsUtilityService.php
@@ -62,7 +62,10 @@ public function rebuildSiteStudio() {
     $batch = &batch_get();
     $batch = NULL;
     unset($batch);
-    return DX8CommandHelpers::rebuild([]);
+    return DX8CommandHelpers::rebuild([
+      'verbose' => '',
+      'no-cache-clear' => FALSE,
+    ]);
   }
 
   /**