diff --git a/composer.json b/composer.json index 7b3f49c..81fb73a 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "composer/installers": "^2.0", - "drupal/content_as_config": "^1.0", "drupal/core-composer-scaffold": "^10.1", "drupal/core-project-message": "^10.1", "drupal/core-recommended": "^10.1", "drupal/linked_field": "^1.5", "drupal/page_manager": "^4.0@RC", + "drupal/structure_sync": "^2.0", "wikimedia/composer-merge-plugin": "^2.1" }, "conflict": { diff --git a/composer.lock b/composer.lock index 5e6900a..7bd1ed5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6f7bb41c95f4533d58bfab814ac15a11", + "content-hash": "c3928c7423d5cd515cdd45ef1f337f09", "packages": [ { "name": "asm89/stack-cors", @@ -2569,71 +2569,6 @@ "source": "https://git.drupalcode.org/project/config_update" } }, - { - "name": "drupal/content_as_config", - "version": "1.0.10", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/content_as_config.git", - "reference": "1.0.10" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/content_as_config-1.0.10.zip", - "reference": "1.0.10", - "shasum": "3ed5dd56486a98b6832eb6fea257792d5af145b4" - }, - "require": { - "drupal/core": "^9.3 || ^10" - }, - "conflict": { - "drupal/structure_sync": "*" - }, - "require-dev": { - "drupal/feeds": "*", - "drupal/group": "*" - }, - "suggest": { - "drupal/markdown": "Render module help more elegantly." - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "1.0.10", - "datestamp": "1665066743", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - }, - "drush": { - "services": { - "drush.services.yml": "^9" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Daniel Johnson (daniel_j)", - "homepage": "https://www.drupal.org/u/daniel_j", - "role": "Maintainer" - } - ], - "description": "Allows content entities to be exported/imported as configuration.", - "homepage": "https://drupal.org/project/content_as_config", - "keywords": [ - "Configuration", - "Drupal" - ], - "support": { - "source": "https://git.drupalcode.org/project/content_as_config", - "issues": "https://www.drupal.org/project/issues/content_as_config" - } - }, { "name": "drupal/content_lock", "version": "2.3.0", @@ -6205,6 +6140,87 @@ "source": "https://git.drupalcode.org/project/sophron" } }, + { + "name": "drupal/structure_sync", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/structure_sync.git", + "reference": "2.0.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/structure_sync-2.0.5.zip", + "reference": "2.0.5", + "shasum": "eb744625ba3a8caf731dc7406b29797c8416f744" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10", + "php": ">=7.1" + }, + "require-dev": { + "drush/drush": "^9 || ^10 || ^11" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.5", + "datestamp": "1681378126", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": "^9 || ^10 || ^11" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "colan", + "homepage": "https://www.drupal.org/user/58704" + }, + { + "name": "fidovdbos", + "homepage": "https://www.drupal.org/user/1494332" + }, + { + "name": "joachim", + "homepage": "https://www.drupal.org/user/107701" + }, + { + "name": "louis-cuny", + "homepage": "https://www.drupal.org/user/3606332" + }, + { + "name": "mparker17", + "homepage": "https://www.drupal.org/user/536298" + }, + { + "name": "spiderman", + "homepage": "https://www.drupal.org/user/1631" + }, + { + "name": "timKruijsen", + "homepage": "https://www.drupal.org/user/3513437" + }, + { + "name": "vinlaurens", + "homepage": "https://www.drupal.org/user/2945689" + } + ], + "description": "Tool for syncing structural data that is stored as content.", + "homepage": "https://www.drupal.org/project/structure_sync", + "support": { + "source": "https://git.drupalcode.org/project/structure_sync" + } + }, { "name": "drupal/synonyms", "version": "2.1.2", diff --git a/config/sync/content_as_config.block_content.yml b/config/sync/content_as_config.block_content.yml deleted file mode 100644 index 9d1fd34..0000000 --- a/config/sync/content_as_config.block_content.yml +++ /dev/null @@ -1,51 +0,0 @@ -0f466d17-17b0-4d5a-8453-982b4ddcc2bf: - uuid: 0f466d17-17b0-4d5a-8453-982b4ddcc2bf - id: '3' - info: Contacts - langcode: fr - type: node_block - reusable: '1' - fields: - field_node: - - - target_id: '2' -6aedcd97-72c8-4328-b52d-f4d2a5285b96: - uuid: 6aedcd97-72c8-4328-b52d-f4d2a5285b96 - id: '5' - info: 'Logo reha' - langcode: fr - type: logo_link - reusable: '1' - fields: - field_lien: - - - uri: 'http://reha.figli.io' - title: '' - options: { } - field_logo: - - - target_id: '4' - alt: 'Programme Reha Héritages' - title: '' - width: '3000' - height: '3000' -734a55bb-b11d-4498-bb55-5a6cb1924aa8: - uuid: 734a55bb-b11d-4498-bb55-5a6cb1924aa8 - id: '4' - info: 'Logo ministère' - langcode: fr - type: logo_link - reusable: '1' - fields: - field_lien: - - - uri: 'http://reha.figli.io' - title: '' - options: { } - field_logo: - - - target_id: '3' - alt: 'Ministère de la transition écologique et de la cohésion des territoires' - title: '' - width: '1584' - height: '1319' diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 9e2d9c2..4d25a4a 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -23,7 +23,6 @@ module: config_translation: 0 config_update: 0 contact: 0 - content_as_config: 0 content_lock: 0 content_lock_timeout: 0 context: 0