ACMS-000: Make media independent, remove common dependency.

modules/acquia_cms_audio/acquia_cms_audio.info.yml

@@ -4,8 +4,8 @@ description: "Provides an Audio media type and related configuration."
 type: module
 core_version_requirement: ^9.4 || ^10 || ^11
 dependencies:
-  - acquia_cms_common:acquia_cms_common
   - drupal:media
   - drupal:media_library
+  - drupal:taxonomy
   - media_entity_soundcloud:media_entity_soundcloud
   - field_group:field_group

modules/acquia_cms_audio/acquia_cms_audio.install

@@ -5,11 +5,20 @@
  * Install, update and uninstall functions for the acquia_cms_audio module.
  */
 
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
+
 /**
  * Implements hook_install().
  */
 function acquia_cms_audio_install($is_syncing) {
   if (!$is_syncing) {
-    _acquia_cms_common_editor_config_rewrite();
+    $optional_install_path = \Drupal::service('extension.path.resolver')->getPath('module', 'acquia_cms_audio') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
+    if (is_dir($optional_install_path)) {
+      $config_installer = \Drupal::service('config.installer');
+      $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
+      $config_installer->installOptionalConfig($storage, ['module' => 'acquia_cms_audio']);
+    }
   }
 }

modules/acquia_cms_audio/composer.json

@@ -4,9 +4,11 @@
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
     "require": {
-        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1",
         "drupal/media_entity_soundcloud": "^3.1"
     },
+    "require-dev": {
+        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1"
+    },
     "repositories": {
         "assets": {
             "type": "composer",

modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.default.yml

@@ -2,9 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - media.type.audio
   module:
     - field_group

modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.media_library.yml

@@ -3,9 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_form_mode.media.media_library
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - media.type.audio
   module:
     - field_group

modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.default.yml

@@ -2,9 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - media.type.audio
   module:
     - media_entity_soundcloud

modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.embedded.yml

@@ -3,9 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.embedded
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - media.type.audio
   module:
     - media_entity_soundcloud

modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.media_library.yml

@@ -3,9 +3,7 @@ status: false
 dependencies:
   config:
     - core.entity_view_mode.media.media_library
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - image.style.medium
     - media.type.audio
   module:

modules/acquia_cms_audio/config/optional/field.storage.media.field_categories.yml

@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_categories
+field_name: field_categories
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/acquia_cms_audio/config/optional/taxonomy.vocabulary.tags.yml

@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Tags
+vid: tags
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0

modules/acquia_cms_audio/tests/src/Functional/AudioTest.php

@@ -19,7 +19,10 @@ class AudioTest extends MediaTypeTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_audio'];
+  protected static $modules = [
+    'acquia_cms_audio',
+    'acquia_cms_common'
+  ];
 
   /**
    * Disable strict config schema checks in this test.

modules/acquia_cms_audio/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php

@@ -19,6 +19,7 @@ class Ckeditor5ConfigurationTest extends Ckeditor5ConfigurationTestBase {
    */
   protected static $modules = [
     'acquia_cms_audio',
+    'acquia_cms_common',
   ];
 
   /**

modules/acquia_cms_common/config/optional/taxonomy.vocabulary.categories.yml

@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Categories
+vid: categories
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0

modules/acquia_cms_document/acquia_cms_document.info.yml

@@ -4,7 +4,8 @@ description: "Provides a Document media type and related configuration."
 type: module
 core_version_requirement: ^9.4 || ^10 || ^11
 dependencies:
+  - drupal:file
   - drupal:media
   - drupal:media_library
-  - acquia_cms_common:acquia_cms_common
+  - drupal:taxonomy
   - field_group:field_group

modules/acquia_cms_document/acquia_cms_document.install

@@ -5,11 +5,20 @@
  * Install, update and uninstall functions for the acquia_cms_document module.
  */
 
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
+
 /**
  * Implements hook_install().
  */
 function acquia_cms_document_install($is_syncing) {
   if (!$is_syncing) {
-    _acquia_cms_common_editor_config_rewrite();
+    $optional_install_path = \Drupal::service('extension.path.resolver')->getPath('module', 'acquia_cms_document') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
+    if (is_dir($optional_install_path)) {
+      $config_installer = \Drupal::service('config.installer');
+      $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
+      $config_installer->installOptionalConfig($storage, ['module' => 'acquia_cms_document']);
+    }
   }
 }

modules/acquia_cms_document/composer.json

@@ -3,7 +3,7 @@
     "description": "Provides a Document media type and related configuration.",
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
-    "require": {
+    "require-dev": {
         "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1"
     },
     "repositories": {

modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.default.yml

@@ -2,9 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.document.field_categories
     - field.field.media.document.field_media_file
-    - field.field.media.document.field_tags
     - media.type.document
   module:
     - field_group

modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.media_library.yml

@@ -3,9 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_form_mode.media.media_library
-    - field.field.media.document.field_categories
     - field.field.media.document.field_media_file
-    - field.field.media.document.field_tags
     - media.type.document
   module:
     - field_group

modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.default.yml

@@ -2,10 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.document.field_categories
     - field.field.media.document.field_media_file
-    - field.field.media.document.field_tags
-    - image.style.card
     - media.type.document
   module:
     - image

modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.embedded.yml

@@ -3,9 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.embedded
-    - field.field.media.document.field_categories
     - field.field.media.document.field_media_file
-    - field.field.media.document.field_tags
     - media.type.document
   module:
     - file

modules/acquia_cms_document/config/optional/field.storage.media.field_categories.yml

@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_categories
+field_name: field_categories
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/acquia_cms_document/config/optional/field.storage.media.field_tags.yml

@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_tags
+field_name: field_tags
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/acquia_cms_document/config/optional/taxonomy.vocabulary.categories.yml

@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Categories
+vid: categories
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0

modules/acquia_cms_document/config/optional/taxonomy.vocabulary.tags.yml

@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Tags
+vid: tags
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0

modules/acquia_cms_document/tests/src/Functional/DocumentPermissionsTest.php

@@ -18,6 +18,7 @@ class DocumentPermissionsTest extends MediaPermissionsTestBase {
    */
   protected static $modules = [
     'acquia_cms_document',
+    'acquia_cms_common',
   ];
 
   /**

modules/acquia_cms_document/tests/src/Functional/DocumentTest.php

@@ -19,7 +19,10 @@ class DocumentTest extends MediaTypeTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_document'];
+  protected static $modules = [
+    'acquia_cms_document',
+    'acquia_cms_common',
+  ];
 
   /**
    * Disable strict config schema checks in this test.

modules/acquia_cms_document/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php

@@ -19,6 +19,7 @@ class Ckeditor5ConfigurationTest extends Ckeditor5ConfigurationTestBase {
    */
   protected static $modules = [
     'acquia_cms_document',
+    'acquia_cms_common',
   ];
 
   /**

modules/acquia_cms_document/tests/src/FunctionalJavascript/DocumentEmbedTest.php

@@ -18,7 +18,10 @@ class DocumentEmbedTest extends MediaEmbedTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_document'];
+  protected static $modules = [
+    'acquia_cms_document',
+    'acquia_cms_common',
+  ];
 
   /**
    * Disable strict config schema checks in this test.

modules/acquia_cms_image/acquia_cms_image.info.yml

@@ -4,10 +4,11 @@ description: "Provides an Image media type and related configuration."
 type: module
 core_version_requirement: ^9.4 || ^10 || ^11
 dependencies:
-  - acquia_cms_common:acquia_cms_common
+  - drupal:file
+  - drupal:image
   - drupal:media
   - drupal:media_library
+  - drupal:taxonomy
   - imce:imce
-  - drupal:image
   - field_group:field_group
   - focal_point:focal_point

modules/acquia_cms_image/acquia_cms_image.install

@@ -6,6 +6,9 @@
  */
 
 use Drupal\acquia_cms_image\SiteLogo;
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Installer\InstallerKernel;
 use Drupal\image\Entity\ImageStyle;
 
@@ -14,7 +17,12 @@ use Drupal\image\Entity\ImageStyle;
  */
 function acquia_cms_image_install($is_syncing) {
   if (!$is_syncing) {
-    _acquia_cms_common_editor_config_rewrite(TRUE);
+    $optional_install_path = \Drupal::service('extension.path.resolver')->getPath('module', 'acquia_cms_image') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
+    if (is_dir($optional_install_path)) {
+      $config_installer = \Drupal::service('config.installer');
+      $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
+      $config_installer->installOptionalConfig($storage, ['module' => 'acquia_cms_image']);
+    }
     \Drupal::classResolver(SiteLogo::class)->createLogo()->setLogo();
   }
 }

modules/acquia_cms_image/composer.json

@@ -4,11 +4,13 @@
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
     "require": {
-        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1",
         "drupal/focal_point": "^2.1",
         "drupal/imagemagick": "^3.4 || ^4.0",
         "drupal/imce": "^2.2 || ^3.0"
     },
+    "require-dev": {
+        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1"
+    },
     "repositories": {
         "assets": {
             "type": "composer",