Merging UI-kit integration branch into develop, pre RC1. (#723)

* ACMS-660: Swapping in new UI Kit. * ACMS-660: Renaming site_studio folders to dx8. * ACMS-660: Remove remaining site studio configuration. * ACMS-662: Export the acquia_cms_articles sync package. * ACMS-665: Export the acquia_cms_events sync package. * ACMS-662: Export the acquia_cms_image sync package. * ACMS-663: Export the acquia_cms_page sync package. * ACMS-664: Export the acquia_cms_person sync package. * ACMS-665: Export the acquia_cms_place sync package. * ACMS-661: Export the acquia_cms_search sync package. * ACMS-661: Export the acquia_cms_video sync package. * ACMS-661: Export the acquia_cms core sync packages. * ACMS-661: Fixup: Include files for core components and helpers packages. * ACMS-661: fixup: Add missing sync package configuration. * ACMS-661: Add Site Studio Sync Package third party via config_rewrite. * ACMS-661: Add developer-facing documentation for sync packages. * ACMS-660: Remove the monolithic UI Kit export from misc/. * ACMS-000: Update tests for new UI kit. * ACMS-661: Fixup leading slashes in */config/dx8/packages.yml. * ACMS-661: Replace ACMS core ui kit packages with a single core package. * ACMS-661: Install sync packages from acms modules last. * Remove no longer needed core sub packages. * ACMS-000: Remove old component tests. * ACMS-601: Removing image presets. * ACMS-661: Removing cohesion:rebuild from install_tasks, updating docs, and committing lockfile. * ACMS-667: Replacing acquia_cms_starter default content. * ACMS-667: Updating DEVELOPING.md. * ACMS-667: Site logo fix. * ACMS-667: Fixing Maps API key error on drush install. * ACMS-667: Removing pubsec demo. * ACMS-667: Upgrading site studio to 6.4.2. * ACMS-660: Swapping in new UI Kit. * ACMS-660: Renaming site_studio folders to dx8. * ACMS-660: Remove remaining site studio configuration. * ACMS-662: Export the acquia_cms_articles sync package. * ACMS-665: Export the acquia_cms_events sync package. * ACMS-662: Export the acquia_cms_image sync package. * ACMS-663: Export the acquia_cms_page sync package. * ACMS-664: Export the acquia_cms_person sync package. * ACMS-665: Export the acquia_cms_place sync package. * ACMS-661: Export the acquia_cms_search sync package. * ACMS-661: Export the acquia_cms_video sync package. * ACMS-661: Export the acquia_cms core sync packages. * ACMS-661: Fixup: Include files for core components and helpers packages. * ACMS-661: fixup: Add missing sync package configuration. * ACMS-661: Add Site Studio Sync Package third party via config_rewrite. * ACMS-661: Add developer-facing documentation for sync packages. * ACMS-660: Remove the monolithic UI Kit export from misc/. * ACMS-661: Fixup leading slashes in */config/dx8/packages.yml. * ACMS-661: Replace ACMS core ui kit packages with a single core package. * ACMS-661: Install sync packages from acms modules last. * Remove no longer needed core sub packages. * ACMS-000: Update tests for new UI kit. * ACMS-000: Remove old component tests. * ACMS-601: Removing image presets. * ACMS-661: Removing cohesion:rebuild from install_tasks, updating docs, and committing lockfile. * ACMS-667: Replacing acquia_cms_starter default content. * ACMS-667: Updating DEVELOPING.md. * ACMS-667: Site logo fix. * ACMS-667: Fixing Maps API key error on drush install. * ACMS-667: Removing pubsec demo. * ACMS-667: Upgrading site studio to 6.4.2. * ACMS-667: Warning message fix for missing GMaps key. * ACMS-601: Adding image presets. * ACMS-601: More view modes. ACMS-601: Removing redundant view mode. * ACMS-667: troubleshooting events search issues. * ACMS-688: Update site studio to 6.4.3. (#699) * ACMS-689: Fixing card slider views. * ACMS-679: Fixing issue with fields being added to searc_api index. * ACMS-000: Fixing search box styling. * ACMS-000: Fix array_flip warning on cohesion sync package import/export. (#700) * ACMS-000: Fix array_flip warning on cohesion sync package import/export. * ACMS-000: Update composer.lock after patch. * ACMS-000: Fix node teaser link selector for ContentTypeListTestBase. (#703) * ACMS-655: Use styles from new UI Kit for 403 and 404 pages. (#704) * ACMS-687: Refactor tests for new UI kit. (#698) * ACMS-539: TabsBlockTest and PastEventsBlockTest. * ACMS-539: Change test for new Site Studio search element. * ACMS-687: Fix tabs test. * ACMS-687: Fix travis issue, change key for xpath * ACMS-687: Document Embed Test. * ACMS-687: Change document embed test. * ACMS-687: Refactor Search Test. * ACMS-687: recent articles and upcoming events tests. * ACMS-687: Fix typo. * ACMS-687: Try Travis config change. * ACMS-687: Travis config change. * ACMS-687: Undo travis change. * ACMS-687: Search test edits. * ACMS-000: Fix node teaser link selector for ContentTypeListTestBase. (#703) * ACMS-687: Missing cohesion:rebuild on full installs. * ACMS-687: Move cohesion:rebuild command. * ACMS-687: Embed tests, search test, hero test. * ACMS-687: Fix test case for acquia_cms_document & acquia_cms_video * ACMS-687: Fix test case for acquia_cms_support module * ACMS-687: Pin entity clone to 1.0-beta4 so patch will apply. Co-authored-by: saurabh tripathi <[email protected]> Co-authored-by: Brian Reese <[email protected]> Co-authored-by: Michael Sherron <[email protected]> Co-authored-by: Chandan Singh <[email protected]> * ACMS-670: Fixing media embed issues. * ACMS-670: Setting default text format to Site Studio. * ACMS-661: Moving ACMS logo to acquia_cms_image. * ACMS-687: Changes to search and hero tests. (#708) * ACMS-000: Temp changes to hero and search tests. * ACMS-687: Remove redundant comments. * ACMS-000: Exclude contenthub from Orca packages. (#707) * ACMS-000: Exclude contenthub from Orca packages. * ACMS-000: Pin contenthub. * ACMS-666: Fixing date format for event pages. (#709) Co-authored-by: Aaron Ellison <[email protected]> * ACMS-691: Removing development credentials from repo. (#706) * Mts tests fix (#710) * ACMS-601: Image work had incorrectly moved shared config entities. * ACMS-601: Default config hash shouldn't be in embedded media config file. * ACMS-601: Overridden Config tests needed row index update. * ACMS-601: Adjust config override test row count again, disabling search test. * ACMS-601: removing deprecated functional JS test assertions. * ACMS-601: switching view_modes form optional to required in acms common. * ACMS-694: Move place type into taxonomy fieldset (#713) * ACMS-693: Page titlt for 404 and 403 pages. (#714) * ACMS-000: Fixes to line breaks and hero BG image. * Updating test artifacts, merging latest from develop into integration. (#717) * ACMS-000: Updating test artifacts for new acquia_search. (#697) * ACMS-637: Editing some of the console help text, and adding acquia_cm… (#691) * ACMS-637: Editing some of the console help text, and adding acquia_cms root dir to config import list. * ACMS-673: Extend 'acms:config-reset' drush command to support --hard option * ACMS-637: Fix config import optional directory * ACMS-637: Fix config import for acquia_cms_search module Co-authored-by: Michael Sherron <[email protected]> * ACMS-449: Add script to create a tarball for Acquia Cloud. (#666) * ACMS-449: Add script to create tarball. * ACMS-449: WIP * ACMS-449: Update create-tarball script. * ACMS-449: Update ConfigureProject. * ACMS-682: Update images for site studio components based on new UI kit on tour page. (#712) * ACMS-682: Update images for site studio components based on new UI kit * ACMS-682: Pin entity clone to 1.0-beta4 so patch can apply * ACMS-667: Update backstop references for new uikit and starter. * ACMS-687: Updating testing artifacts, and typo in tour page. Co-authored-by: kdruckman <[email protected]> Co-authored-by: Chandan Singh <[email protected]> * ACMS-000: Move image styles to acquia_cms_common and remove deprecated style. (#718) * ACMS-000: Update config sync and content tests (#719) * ACMS-000: Move image styles to acquia_cms_common and remove deprecated style. * ACMS-000: Update config sync and content tests. * ACMS-000: Add test groups. * ACMS-601: Regenerating test artifacts and backstop references. * ACMS-000: Revert backstop index file. (#721) * ACMS-000: testing adding a cache clear before running backstop tests. * ACMS-000: removing unused entity_form_display for image. * ACMS-000: wrong path to drush. * ACMS-000: Move drush cache clear. * ACMS-000: Verbose output. * ACMS-000: Remove drush clear. * ACMS-000: pa11y. * ACMS-000: Regenerating starter testing artifacts. Co-authored-by: Aaron Ellison <[email protected]> Co-authored-by: Brian Reese <[email protected]> Co-authored-by: kdruckman <[email protected]> Co-authored-by: Gaurav Goyal <[email protected]> Co-authored-by: Brian Reese <[email protected]> Co-authored-by: ganesh41 <[email protected]> Co-authored-by: saurabh tripathi <[email protected]> Co-authored-by: Chandan Singh <[email protected]> Co-authored-by: Chandan Singh <[email protected]>
acquia · Mar 17, 2021 · da2cd85 · da2cd85
1 parent f65a362
commit da2cd85
Show file tree

Hide file tree

Showing 859 changed files with 29,987 additions and 7,224 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 bower_components/
-/composer.lock
 docroot/
 .DS_Store
 .idea/

diff --git a/.travis.yml b/.travis.yml
@@ -27,10 +27,8 @@ env:
     - ACMS_FILES_ARTIFACT=$TRAVIS_BUILD_DIR/tests/acms-files.tar.gz
     - ACMS_STARTER_DB_ARTIFACT=$TRAVIS_BUILD_DIR/tests/acms-starter.sql.gz
     - ACMS_STARTER_FILES_ARTIFACT=$TRAVIS_BUILD_DIR/tests/acms-files-starter.tar.gz
-    - ACMS_PUBSEC_DB_ARTIFACT=$TRAVIS_BUILD_DIR/tests/acms-pubsec.sql.gz
-    - ACMS_PUBSEC_FILES_ARTIFACT=$TRAVIS_BUILD_DIR/tests/acms-files-pubsec.tar.gz
     # By default, no PHPUnit test groups are excluded.
-    - ACMS__JOB_EXCLUDE_PHPUNIT_TEST_GROUP=
+    - ACMS__JOB_EXCLUDE_PHPUNIT_TEST_GROUP=disabled
     # Provide your package's name.
     - ORCA_SUT_NAME=acquia/acquia_cms
     # Specify the name of the nearest Git version branch, e.g., 1.x or 8.x-1.x.
@@ -73,20 +71,17 @@ matrix:
     # Exclude push group tests on this job to exclude low and medium risk tests.
     - { name: "Isolated test on current dev Drupal core version", if: type = push, env: ACMS_JOB=base ACMS__JOB_EXCLUDE_PHPUNIT_TEST_GROUP="push" ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
     - { name: "Starter", env: ACMS_JOB=starter ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
-    - { name: "PubSec Demo", env: ACMS_JOB=pubsec ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
     # Exclude pr group tests to exclude only low-risk tests during PR builds.
     - { name: "Isolated test on current dev Drupal core version - PR Tests", if: type = pull_request, env: ACMS_JOB=base ACMS__JOB_EXCLUDE_PHPUNIT_TEST_GROUP="pr" ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
     # The following jobs run only during cron runs, and fully install the site before
     # running tests.
     - { name: "Isolated test on current dev Drupal core version - Full Install", if: type = cron, env: ACMS_JOB=base_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
     - { name: "Starter - Full Install", if: type = cron, env: ACMS_JOB=starter_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
-    - { name: "PubSec Demo - Full Install", if: type = cron, env: ACMS_JOB=pubsec_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
     # Acquia CMS is going to support both PHP 7.3 and PHP 7.4 until Acquia Cloud
     # officially stop support for PHP 7.3.
     # Run the following jobs on PHP 7.3 to make sure it works fine, during cron run.
     - { php: "7.3", name: "[PHP 7.3] - Isolated test on current dev Drupal core version - Full Install", if: type = cron, env: ACMS_JOB=base_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV }
     - { php: "7.3", name: "[PHP 7.3] - Starter - Full Install", if: type = cron, env: ACMS_JOB=starter_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV }
-    - { php: "7.3", name: "[PHP 7.3] - PubSec Demo - Full Install", if: type = cron, env: ACMS_JOB=pubsec_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV }
     # Uncomment the following four lines to enable the corresponding tests once
     # the next major version of Drupal core has an alpha release or earlier.
     # Until then it's wasteful to use CI jobs on them, even if they exit early.

diff --git a/DEVELOPING.md b/DEVELOPING.md
@@ -5,12 +5,13 @@ These instructions assume that you have an Acquia Cloud account, and that you ar
 
 You should also have:
 * PHP 7.3 or later installed. (`php --version`)
-* Composer 1.9.2 or later. (`composer --version`)
-* An invitation to the Acquia Engineering subscription in Acquia Cloud. Your manager or technical architect should be able to get you an invitation to this subscription if you need one.
+* Composer 2 or later. (`composer --version`)
+* An invitation to the Acquia CMS development subscription in Acquia Cloud.
+Contact Michael Sherron or Prafful Nagwani for an invitation.
 * A GitHub account which is authorized within the Acquia organization and can access https://github.com/acquia/acquia_cms.
 
 ### Background
-To provide a consistent environment for our development team, Acquia CMS is developed using Acquia's Cloud IDE service, which provides a VSCode-like developer experience. It is possible to work on Acquia CMS on your own machine, using your IDE of choice, but that is not the recommended set-up in most circumstances.
+To provide a consistent environment for our development team, Acquia CMS is developed using Acquia's Cloud IDE service, which provides a VSCode-like developer experience. It is possible to work on Acquia CMS on your own machine, using an IDE of your choice, but we do not recommend that set-up in most circumstances.
 
 ### Setting up a Cloud IDE
 Because there is a limited number of Cloud IDEs available to the Acquia CMS team, each active developer should only need (and have) one. Therefore, you should only do this once.
@@ -41,15 +42,42 @@ composer install
 
 ### Installing Acquia CMS
 
+* Once your Composer vendor folder has been built, you can now install Drupal and Acquia CMS.
+* First, either browse to the site and use the Installer UI and follow the directions.
+* Or you can use our handy Composer script, `composer acms:install` and follow the directions.
+* Once the installer is complete, you can either build from scratch, or you can
+install the starter site. To do so, first log into Drupal and go to the Dashboard.
+* At minimum, you must set the Google Maps API key. If you don't have an API key,
+just enter any string. Note that using an invalid API key will throw an error
+during content creation.
+* Then run `drush en acquia_cms_starter`. This will create a demo site with
+default components.
+
 #### Installing from the Command Line
 For development purposes, it's easiest to install Acquia CMS at the command line using Drush. In these instructions, I assume that you have the [Drush launcher](https://github.com/drush-ops/drush-launcher) installed globally in your PATH (`drush --version`).
 
-To save time and resources, Acquia CMS will not by default import any templates from Cohesion during installation. If you want to automatically import Cohesion templates during installation, you'll need to provide the Cohesion API key and organization key, which you can get from your manager or technical architect, as environment variables:
+To save time and resources, Acquia CMS will not by default import any templates from Cohesion during installation. If you want to automatically import Cohesion templates during installation, you'll need to provide the Cohesion API key and organization key, which you can get from ACMS leaders, as environment variables:
+```
+export SITESTUDIO_API_KEY='[replaceme]'
+export SITESTUDIO_ORG_KEY='[replaceme]'
+```
+
+Additionally, Acquia CMS includes `acquia_cms_development` as a helper module for ACMS dev team members to configure credentials for most of our major integrations.
+
+Credentials for these services are not stored in the repository. The development module looks for the credentials it needs as environment variables. To set these,
+you can run the following export commands. Note :
 ```
-export SITESTUDIO_API_KEY=foo
-export SITESTUDIO_ORG_KEY=bar
+export CONNECTOR_KEY=‘[replaceme]’
+export CONNECTOR_ID=‘[replaceme]’
+export SHIELD_USER='[replaceme]'
+export SHIELD_PASS='[replaceme]'
+export GMAPS_KEY='[replaceme]'
+export SEARCH_UUID='[replaceme]'
 ```
-Cloud IDEs come with a preconfigured MySQL database, so to install Acquia CMS on a Cloud IDE, simply run `drush site:install acquia_cms --yes --account-pass admin`.
+
+To get access to these variables, reach out to your technical lead or product owner.
+
+Cloud IDEs come with a preconfigured MySQL database. To install Acquia CMS on a Cloud IDE, simply run `composer acms:install` and follow the instructions.
 
 It can take a lot of memory to install Acquia CMS. If you run into memory errors, try increasing the memory limit when installing Acquia CMS:
 ```
@@ -60,14 +88,9 @@ If 2 GB *still* isn't enough memory, try raising the limit even more.
 #### Installing through the Browser
 Due to some of the work being done on Acquia CMS (specifically related to installation tasks) it may be necessary to do a manual install through the browser.
 
-In this case, you will need to manually drop your existing database with mysql and then re-visit the site via your browser.
+In this case, you will need to manually drop your existing database with drush and then re-visit the site via your browser.
 
-For Cloud IDEs that can be accomplished with:
-```
-mysql -u root
-drop database drupal;
-exit
-```
+For Cloud IDEs that can be accomplished by running `drush sql-drop`.
 
 ### Running tests
 
@@ -118,7 +141,7 @@ cd docroot
 
 As our testing strategy evolves to shorten Travis build times, lower risk tests
 will move to overnight cron builds. To improve our collective efficiency, it is
-important that developers run tests locally to verify changes while work is in 
+important that developers run tests locally to verify changes while work is in
 progress. See instructions above for running individual tests and group/module
 tests to run tests that are especially relevant to current work in progress.
 
@@ -202,6 +225,26 @@ Then, install Acquia CMS as detailed in the "Installing Acquia CMS" section abov
 
 Once you've installed Acquia CMS, how you serve it is up to you. For local development, the most convenient option is PHP's built-in web server: `drush runserver 8080`.
 
+### Updating site studio configuration
+The Acquia CMS profile contains both core and module-specific Site Studio Sync Packages. Site Studio Sync Packages can be configured via the UI at the path `/admin/cohesion/sync/packages`.
+
+The following are the recommended steps for creating and updating Site Studio Sync Packages for Acquia CMS:
+1. Add and install the [cohesion_sync_extras](https://github.com/acquia/cohesion-sync-extras-poc) module.
+1. Install the acquia_cms_development module if it isn't already installed. This module contains additional export configuration for each Sync Package entity.
+1. If creating a new Sync Package, add the following cohesion_sync_extras export settings to the package:
+
+    | Setting                              | Value                                                                                            |
+    | ------------------------------------ | ------------------------------------------------------------------------------------------------ |
+    | Export plugin                        | Export to module                                                                                 |
+    | Module machine name                  | The Acquia CMS module containing the package. Or `acquia_cms` to export directly to the profile. |
+    | Export individual yaml files         | Checked, to force generation of a separate yaml file for each config object.                     |
+    | Exclude config dependencies          | Checked, to force exclusion of calculated config dependencies.                                   |
+    | Exclude file dependencies            | Checked, to force exclusion of calculate file dependencies.                                      |
+    | Include Sync Package export settings | Unchecked. These settings should be excluded from the public facing Sync Package entity.         |
+
+1. If creating a new Sync Package, export the Sync Package third party settings to `acquia_cms_development/config/rewrite/cohesion_sync.package.<package>.yml`.
+1. Export sync packages via drush: `drush package:export:all`.
+
 ### Updating Acquia Claro theming
 * Update SCSS as per requirement in Acquia Claro theme.
 * Use `composer install:frontend` and `composer build:frontend` to compile SCSS into CSS.

diff --git a/README.md b/README.md
@@ -6,14 +6,15 @@ An opinionated implementation of Drupal 9 for running low code websites in the A
 
 If you're contributing to Acquia CMS as a developer, see our install instructions in [DEVELOPING.md](/DEVELOPING.md).
 
-If you're participating in the early access program (Alpha, Beta) or implementing
-Acquia CMS as a starting point for a new Drupal 9 project, please use
-[Acquia CMS Project](https://github.com/acquia/acquia-cms-project).
+If you're installing Acquia CMS to build a Drupal project on the Acquia platform,
+we invite you to use the Acquia CMS Composer template:
+[Acquia CMS Project](https://github.com/acquia/acquia-cms-project). This repository
+is for developers contributing to the Acquia CMS distribution.
 
 ## Documentation
 
-[@TODO] User-facing documentation for Acquia CMS lives on Acquia's documentation website.
-Onboarding documentation [can be found here](/DEVELOPING.md).
+User-facing documentation for Acquia CMS lives on
+[Acquia's documentation website](https://docs.acquia.com).
 
 ## Releases
 

diff --git a/acquia-pipelines.yml b/acquia-pipelines.yml
@@ -1,6 +1,5 @@
 # This file is used by Acquia Pipelines continuous integration. Upon success, an
-# artifact is deployed to the orionacms (f63c4427-2738-4e14-a756-5f7b80b74062)
-# subscription on Acquia Cloud.
+# artifact is deployed to the `orionacms` subscription on Acquia Cloud.
 version: 1.1.0
 services:
   - php:

diff --git a/acquia_cms.info.yml b/acquia_cms.info.yml
@@ -6,15 +6,15 @@ distribution:
   install:
     finish_url: '/admin/tour'
 install:
-  - acquia_cms_article
   - acquia_cms_common
+  - acquia_cms_search
+  - acquia_cms_article
+  - acquia_cms_image
   - acquia_cms_document
   - acquia_cms_event
-  - acquia_cms_image
   - acquia_cms_page
   - acquia_cms_person
   - acquia_cms_place
-  - acquia_cms_search
   - acquia_cms_toolbar
   - acquia_cms_tour
   - acquia_cms_video

diff --git a/acquia_cms.profile b/acquia_cms.profile
@@ -87,12 +87,18 @@ function acquia_cms_install_tasks(): array {
     'type' => 'batch',
     'run' => $cohesion_configured ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP,
   ];
-  $tasks['acquia_cms_rebuild_site_studio'] = [
-    'display_name' => t('Rebuild Site Studio'),
-    'display' => $cohesion_configured,
-    'type' => 'batch',
-    'run' => $cohesion_configured ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP,
-  ];
+
+  // Don't include the rebuild task if installing via Drush, we automate that
+  // elsewhere.
+  if (PHP_SAPI !== 'cli') {
+    $tasks['acquia_cms_rebuild_site_studio'] = [
+      'display_name' => t('Rebuild Site Studio'),
+      'display' => $cohesion_configured,
+      'type' => 'batch',
+      'run' => $cohesion_configured ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP,
+    ];
+  }
+
   $tasks['acquia_cms_install_additional_modules'] = [];
 
   // If the user has opted in for Acquia Telemetry, send heartbeat event.
@@ -248,8 +254,9 @@ function acquia_cms_rebuild_cohesion() {
  *   Batch for rebuild operation.
  */
 function acquia_cms_rebuild_site_studio() {
+
   // Get the batch array filled with operations that should be performed during
-  // rebuild.
+  // rebuild. Also, we explicitly do not clear the cache during site install.
   $batch = WebsiteSettingsController::batch(TRUE);
   if (isset($batch['error'])) {
     Drupal::messenger()->addError($batch['error']);

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         "acquia/memcache-settings": "^1",
         "cweagans/composer-patches": "^1.7",
         "drupal/acquia_connector": "^3",
-        "drupal/acquia_contenthub": "^2.16",
+        "drupal/acquia_contenthub": "2.20",
         "drupal/acquia_lift": "^4.2",
         "drupal/acquia_purge": "^1",
         "drupal/acquia_search": "^3.0",
@@ -138,6 +138,9 @@
             "drupal/core": "-p2"
         },
         "patches": {
+            "acquia/cohesion": {
+                "Prevent possible array_flip warning on config import/export": "https://gist.githubusercontent.com/brianreese/9f5f8000853d76a3e805e5a6a39a94ba/raw/33152583acbb7888d436f1f8ce5e69609c080dee/site-studio-array-flip-warning.patch"
+            },
             "drupal/acquia_telemetry-acquia_telemetry": {
                 "Add check for core index": "https://www.drupal.org/files/issues/2020-08-18/3165473-27.patch"
             },
@@ -193,6 +196,9 @@
             "@putenv MODULES_DIR=./docroot/sites/all",
             "if [ \"$PIPELINE_ENV\" != \"true\" ]; then composer build:local; fi;"
         ],
+        "acms:install": [
+            "bash install-acms"
+        ],
         "build:frontend": [
             "Composer\\Config::disableProcessTimeout",
             "cd themes/acquia_claro && npm run build",