From 6c519a75809082e09d94c40c27bdb113bbacaafd Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 13 Feb 2020 00:09:51 +0000 Subject: [PATCH] Add drupal/config_ignore, ignore block config --- composer.json | 1 + composer.lock | 132 +++++++++++++++++- config/sync/block.block.claro_breadcrumbs.yml | 22 --- config/sync/block.block.claro_content.yml | 22 --- .../sync/block.block.claro_local_actions.yml | 20 --- config/sync/block.block.claro_messages.yml | 22 --- config/sync/block.block.claro_page_title.yml | 20 --- .../block.block.claro_primary_local_tasks.yml | 22 --- ...lock.block.claro_secondary_local_tasks.yml | 22 --- .../sync/block.block.seven_local_actions.yml | 20 --- config/sync/block.block.seven_local_tasks.yml | 22 --- config/sync/block.block.seven_messages.yml | 22 --- config/sync/block.block.seven_page_title.yml | 20 --- config/sync/block.block.sitebranding.yml | 23 --- config/sync/block.block.stark_admin.yml | 27 ---- config/sync/block.block.stark_branding.yml | 25 ---- .../sync/block.block.stark_local_actions.yml | 20 --- config/sync/block.block.stark_local_tasks.yml | 22 --- config/sync/block.block.stark_messages.yml | 22 --- config/sync/block.block.stark_page_title.yml | 20 --- config/sync/block.block.stark_tools.yml | 27 ---- config/sync/config_ignore.settings.yml | 4 + config/sync/core.extension.yml | 3 + 23 files changed, 139 insertions(+), 421 deletions(-) delete mode 100644 config/sync/block.block.claro_breadcrumbs.yml delete mode 100644 config/sync/block.block.claro_content.yml delete mode 100644 config/sync/block.block.claro_local_actions.yml delete mode 100644 config/sync/block.block.claro_messages.yml delete mode 100644 config/sync/block.block.claro_page_title.yml delete mode 100644 config/sync/block.block.claro_primary_local_tasks.yml delete mode 100644 config/sync/block.block.claro_secondary_local_tasks.yml delete mode 100644 config/sync/block.block.seven_local_actions.yml delete mode 100644 config/sync/block.block.seven_local_tasks.yml delete mode 100644 config/sync/block.block.seven_messages.yml delete mode 100644 config/sync/block.block.seven_page_title.yml delete mode 100644 config/sync/block.block.sitebranding.yml delete mode 100644 config/sync/block.block.stark_admin.yml delete mode 100644 config/sync/block.block.stark_branding.yml delete mode 100644 config/sync/block.block.stark_local_actions.yml delete mode 100644 config/sync/block.block.stark_local_tasks.yml delete mode 100644 config/sync/block.block.stark_messages.yml delete mode 100644 config/sync/block.block.stark_page_title.yml delete mode 100644 config/sync/block.block.stark_tools.yml create mode 100644 config/sync/config_ignore.settings.yml diff --git a/composer.json b/composer.json index 4d8bbbdd2..9a926861c 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ "require": { "composer/installers": "^1.2", "drupal/admin_toolbar": "^2.0", + "drupal/config_ignore": "^2.2", "drupal/core-composer-scaffold": "^8.8", "drupal/core-recommended": "^8.8", "drupal/markdown": "^1.3", diff --git a/composer.lock b/composer.lock index 9a09cfe13..5e7197f18 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": "e7ad5371f667de7abca35f6df8f9c752", + "content-hash": "62e6320a4cda0cebc0ed9be529c173ca", "packages": [ { "name": "asm89/stack-cors", @@ -1635,6 +1635,136 @@ "issues": "https://www.drupal.org/project/issues/admin_toolbar" } }, + { + "name": "drupal/config_filter", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/config_filter.git", + "reference": "8.x-1.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "81210684c378dab856b3c2bce5eeaa58992d2efc" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "suggest": { + "drupal/config_split": "Split site configuration for different environments." + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.5", + "datestamp": "1572542288", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Fabian Bircher", + "homepage": "https://www.drupal.org/u/bircher", + "email": "opensource@fabianbircher.com", + "role": "Maintainer" + }, + { + "name": "Nuvole Web", + "homepage": "http://nuvole.org", + "email": "info@nuvole.org", + "role": "Maintainer" + }, + { + "name": "pescetti", + "homepage": "https://www.drupal.org/user/436244" + } + ], + "description": "Config Filter allows other modules to interact with a ConfigStorage through filter plugins.", + "homepage": "https://www.drupal.org/project/config_filter", + "keywords": [ + "Drupal", + "configuration", + "configuration management" + ], + "support": { + "source": "http://cgit.drupalcode.org/config_filter", + "issues": "https://www.drupal.org/project/issues/config_filter", + "irc": "irc://irc.freenode.org/drupal-contribute" + } + }, + { + "name": "drupal/config_ignore", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/config_ignore.git", + "reference": "8.x-2.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-2.2.zip", + "reference": "8.x-2.2", + "shasum": "18af5772087b90dd4b83c2c6e292d8ea2f8834e0" + }, + "require": { + "drupal/config_filter": "1.*", + "drupal/core": "~8.0" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + }, + "drupal": { + "version": "8.x-2.2", + "datestamp": "1576528386", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Tommy Lynge Jørgensen", + "homepage": "https://www.drupal.org/u/tlyngej", + "email": "tlyngej@gmail.com", + "role": "Maintainer" + }, + { + "name": "Fabian Bircher", + "homepage": "https://www.drupal.org/u/bircher", + "role": "Maintainer" + }, + { + "name": "tlyngej", + "homepage": "https://www.drupal.org/user/413139" + } + ], + "description": "Ignore certain configuration during import.", + "homepage": "http://drupal.org/project/config_ignore", + "support": { + "source": "http://cgit.drupalcode.org/config_ignore", + "issues": "http://drupal.org/project/config_ignore", + "irc": "irc://irc.freenode.org/drupal-contribute" + } + }, { "name": "drupal/core", "version": "8.8.2", diff --git a/config/sync/block.block.claro_breadcrumbs.yml b/config/sync/block.block.claro_breadcrumbs.yml deleted file mode 100644 index a1d787450..000000000 --- a/config/sync/block.block.claro_breadcrumbs.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 969c3a3e-5985-4625-845a-9552bcb6efeb -langcode: en -status: true -dependencies: - module: - - system - theme: - - claro -_core: - default_config_hash: b6mUaCq5YPapRUABXRHfNTT6fxWIj5lgf0Mg4HaRJ_I -id: claro_breadcrumbs -theme: claro -region: breadcrumb -weight: 0 -provider: null -plugin: system_breadcrumb_block -settings: - id: system_breadcrumb_block - label: Breadcrumbs - provider: system - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.claro_content.yml b/config/sync/block.block.claro_content.yml deleted file mode 100644 index 6b6b49506..000000000 --- a/config/sync/block.block.claro_content.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 29371eba-1fff-4f25-9801-afa69b1d1be8 -langcode: en -status: true -dependencies: - module: - - system - theme: - - claro -_core: - default_config_hash: QTwkfDaGeBUk6aerktJBDXso4fCsqLTQOuWKXE1xMPU -id: claro_content -theme: claro -region: content -weight: 0 -provider: null -plugin: system_main_block -settings: - id: system_main_block - label: 'Main page content' - provider: system - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.claro_local_actions.yml b/config/sync/block.block.claro_local_actions.yml deleted file mode 100644 index d7b2ba312..000000000 --- a/config/sync/block.block.claro_local_actions.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: d30cc398-e902-454a-9be7-bb966a4e0579 -langcode: en -status: true -dependencies: - theme: - - claro -_core: - default_config_hash: osZQ9lL2jTdH5am4LJiZ29RaivhzOf6vCpoRy6FZwIE -id: claro_local_actions -theme: claro -region: content -weight: -10 -provider: null -plugin: local_actions_block -settings: - id: local_actions_block - label: 'Primary admin actions' - provider: core - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.claro_messages.yml b/config/sync/block.block.claro_messages.yml deleted file mode 100644 index c5baff017..000000000 --- a/config/sync/block.block.claro_messages.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 53bb392d-ba68-4f82-ab6b-f1fba7c460c8 -langcode: en -status: true -dependencies: - module: - - system - theme: - - claro -_core: - default_config_hash: iIy-YIc9d9s1isAtTIKWDBKd6kd2r6LxoYz_-hkLJco -id: claro_messages -theme: claro -region: highlighted -weight: 0 -provider: null -plugin: system_messages_block -settings: - id: system_messages_block - label: 'Status messages' - provider: system - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.claro_page_title.yml b/config/sync/block.block.claro_page_title.yml deleted file mode 100644 index ad690f0e9..000000000 --- a/config/sync/block.block.claro_page_title.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: c3edbbe4-02e6-49cf-b4b4-d60974dd3bbb -langcode: en -status: true -dependencies: - theme: - - claro -_core: - default_config_hash: gfXKmThltk6eewwrjAEaxVPxzPEVHV1UfNjjOUQ5A7g -id: claro_page_title -theme: claro -region: header -weight: -30 -provider: null -plugin: page_title_block -settings: - id: page_title_block - label: 'Page title' - provider: core - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.claro_primary_local_tasks.yml b/config/sync/block.block.claro_primary_local_tasks.yml deleted file mode 100644 index a698f5ebd..000000000 --- a/config/sync/block.block.claro_primary_local_tasks.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 6ba46314-73af-4ef1-99d8-dfaef4a097d0 -langcode: en -status: true -dependencies: - theme: - - claro -_core: - default_config_hash: 7cvXIzw8NabmQCWMPqBz0mvIQZzXUZB3OeOTa5eqbCo -id: claro_primary_local_tasks -theme: claro -region: header -weight: 0 -provider: null -plugin: local_tasks_block -settings: - id: local_tasks_block - label: 'Primary tabs' - provider: core - label_display: '0' - primary: true - secondary: false -visibility: { } diff --git a/config/sync/block.block.claro_secondary_local_tasks.yml b/config/sync/block.block.claro_secondary_local_tasks.yml deleted file mode 100644 index 021b613de..000000000 --- a/config/sync/block.block.claro_secondary_local_tasks.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: cadf8e76-8675-412b-a118-af3ad14fb5e9 -langcode: en -status: true -dependencies: - theme: - - claro -_core: - default_config_hash: D_hUB_AW2IvKbVo3lVG-B2KfTsX6xJ-CxfOcRYUnL3E -id: claro_secondary_local_tasks -theme: claro -region: pre_content -weight: 0 -provider: null -plugin: local_tasks_block -settings: - id: local_tasks_block - label: 'Secondary tabs' - provider: core - label_display: '0' - primary: false - secondary: true -visibility: { } diff --git a/config/sync/block.block.seven_local_actions.yml b/config/sync/block.block.seven_local_actions.yml deleted file mode 100644 index 74f9e74ea..000000000 --- a/config/sync/block.block.seven_local_actions.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 12629376-aca1-46af-ba64-98c09fdad096 -langcode: en -status: true -dependencies: - theme: - - seven -_core: - default_config_hash: PffmQ-ABSz5tFjWmVsR7NesunDnEivvopnJnBjl8KNE -id: seven_local_actions -theme: seven -region: content -weight: -10 -provider: null -plugin: local_actions_block -settings: - id: local_actions_block - label: 'Primary admin actions' - provider: core - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.seven_local_tasks.yml b/config/sync/block.block.seven_local_tasks.yml deleted file mode 100644 index 4f5552126..000000000 --- a/config/sync/block.block.seven_local_tasks.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 5e0d075c-773a-4a4b-9e0d-fc65726ff2fb -langcode: en -status: true -dependencies: - theme: - - seven -_core: - default_config_hash: c-06bbElRY5sKmglk74ppgTW93Et4-EJFyNiUZMb8JY -id: seven_local_tasks -theme: seven -region: content -weight: -20 -provider: null -plugin: local_tasks_block -settings: - id: local_tasks_block - label: Tabs - provider: core - label_display: '0' - primary: true - secondary: true -visibility: { } diff --git a/config/sync/block.block.seven_messages.yml b/config/sync/block.block.seven_messages.yml deleted file mode 100644 index 7456739ed..000000000 --- a/config/sync/block.block.seven_messages.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 3fdc788c-faa7-47fb-a3d2-38215919a663 -langcode: en -status: true -dependencies: - module: - - system - theme: - - seven -_core: - default_config_hash: 5MNdk3fpMKx_xxBTcz2T11DL4XEU1H5SgHl8BsYdFsA -id: seven_messages -theme: seven -region: highlighted -weight: 0 -provider: null -plugin: system_messages_block -settings: - id: system_messages_block - label: 'Status messages' - provider: system - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.seven_page_title.yml b/config/sync/block.block.seven_page_title.yml deleted file mode 100644 index 8f5850610..000000000 --- a/config/sync/block.block.seven_page_title.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 7bf7fccd-646d-4319-8eba-e15681318903 -langcode: en -status: true -dependencies: - theme: - - seven -_core: - default_config_hash: 8yptDf6WrXxeyevUz4nP5vfr7BtxQqCBMninhV2IJ1g -id: seven_page_title -theme: seven -region: content -weight: -30 -provider: null -plugin: page_title_block -settings: - id: page_title_block - label: 'Page title' - provider: core - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.sitebranding.yml b/config/sync/block.block.sitebranding.yml deleted file mode 100644 index 195016786..000000000 --- a/config/sync/block.block.sitebranding.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 2a431fd0-5784-4c38-84ab-ed9570be93e6 -langcode: en -status: true -dependencies: - module: - - system - theme: - - seven -id: sitebranding -theme: seven -region: header -weight: 0 -provider: null -plugin: system_branding_block -settings: - id: system_branding_block - label: 'Site branding' - provider: system - label_display: '0' - use_site_logo: true - use_site_name: true - use_site_slogan: true -visibility: { } diff --git a/config/sync/block.block.stark_admin.yml b/config/sync/block.block.stark_admin.yml deleted file mode 100644 index e58fabadf..000000000 --- a/config/sync/block.block.stark_admin.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 8f32c239-c91f-488f-a6c9-d13c7473a41b -langcode: en -status: true -dependencies: - config: - - system.menu.admin - module: - - system - theme: - - stark -_core: - default_config_hash: OFEDxrButmQ8Vac1kiVr1gtw6vYKuSJPr9cJQZVKCKg -id: stark_admin -theme: stark -region: sidebar_first -weight: 1 -provider: null -plugin: 'system_menu_block:admin' -settings: - id: 'system_menu_block:admin' - label: Administration - provider: system - label_display: visible - level: 1 - depth: 0 - expand_all_items: false -visibility: { } diff --git a/config/sync/block.block.stark_branding.yml b/config/sync/block.block.stark_branding.yml deleted file mode 100644 index 316062195..000000000 --- a/config/sync/block.block.stark_branding.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 4096dab7-6874-43e7-abb0-6dd3c0024ee0 -langcode: en -status: true -dependencies: - module: - - system - theme: - - stark -_core: - default_config_hash: fRKXNB91UxDvEMkzCR8ZBsawfC6Fqbme2gtobei3gu4 -id: stark_branding -theme: stark -region: header -weight: 0 -provider: null -plugin: system_branding_block -settings: - id: system_branding_block - label: 'Site branding' - provider: system - label_display: '0' - use_site_logo: true - use_site_name: true - use_site_slogan: true -visibility: { } diff --git a/config/sync/block.block.stark_local_actions.yml b/config/sync/block.block.stark_local_actions.yml deleted file mode 100644 index 8f4660a5b..000000000 --- a/config/sync/block.block.stark_local_actions.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: b00477b1-2be0-4e06-8242-ca66ebe3dfa0 -langcode: en -status: true -dependencies: - theme: - - stark -_core: - default_config_hash: PffmQ-ABSz5tFjWmVsR7NesunDnEivvopnJnBjl8KNE -id: stark_local_actions -theme: stark -region: content -weight: -10 -provider: null -plugin: local_actions_block -settings: - id: local_actions_block - label: 'Primary admin actions' - provider: core - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.stark_local_tasks.yml b/config/sync/block.block.stark_local_tasks.yml deleted file mode 100644 index 5edbced9c..000000000 --- a/config/sync/block.block.stark_local_tasks.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 75fa3863-a513-417c-997e-d19dd88d93e5 -langcode: en -status: true -dependencies: - theme: - - stark -_core: - default_config_hash: c-06bbElRY5sKmglk74ppgTW93Et4-EJFyNiUZMb8JY -id: stark_local_tasks -theme: stark -region: content -weight: -20 -provider: null -plugin: local_tasks_block -settings: - id: local_tasks_block - label: Tabs - provider: core - label_display: '0' - primary: true - secondary: true -visibility: { } diff --git a/config/sync/block.block.stark_messages.yml b/config/sync/block.block.stark_messages.yml deleted file mode 100644 index a1982d39d..000000000 --- a/config/sync/block.block.stark_messages.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 14214c70-2d38-401d-9ca1-268398b712a0 -langcode: en -status: true -dependencies: - module: - - system - theme: - - stark -_core: - default_config_hash: 5MNdk3fpMKx_xxBTcz2T11DL4XEU1H5SgHl8BsYdFsA -id: stark_messages -theme: stark -region: highlighted -weight: 0 -provider: null -plugin: system_messages_block -settings: - id: system_messages_block - label: 'Status messages' - provider: system - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.stark_page_title.yml b/config/sync/block.block.stark_page_title.yml deleted file mode 100644 index 85890cfc0..000000000 --- a/config/sync/block.block.stark_page_title.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 3bac4e2c-27dc-4d60-8d3f-26a13aa0ec5e -langcode: en -status: true -dependencies: - theme: - - stark -_core: - default_config_hash: 8yptDf6WrXxeyevUz4nP5vfr7BtxQqCBMninhV2IJ1g -id: stark_page_title -theme: stark -region: content -weight: -30 -provider: null -plugin: page_title_block -settings: - id: page_title_block - label: 'Page title' - provider: core - label_display: '0' -visibility: { } diff --git a/config/sync/block.block.stark_tools.yml b/config/sync/block.block.stark_tools.yml deleted file mode 100644 index 3d7f22bfc..000000000 --- a/config/sync/block.block.stark_tools.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: fea32e7f-a2ae-4202-8fd9-f0d809ba37a9 -langcode: en -status: true -dependencies: - config: - - system.menu.tools - module: - - system - theme: - - stark -_core: - default_config_hash: uUF2GYN2x5fcmOu26M-gwqUA-yVWMDD_MRmnYfmPzlM -id: stark_tools -theme: stark -region: sidebar_first -weight: 0 -provider: null -plugin: 'system_menu_block:tools' -settings: - id: 'system_menu_block:tools' - label: Tools - provider: system - label_display: visible - level: 1 - depth: 0 - expand_all_items: false -visibility: { } diff --git a/config/sync/config_ignore.settings.yml b/config/sync/config_ignore.settings.yml new file mode 100644 index 000000000..7b084e2d5 --- /dev/null +++ b/config/sync/config_ignore.settings.yml @@ -0,0 +1,4 @@ +ignored_config_entities: + - 'block.block.*' +_core: + default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 6203a9dc3..ca5d0510e 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -3,6 +3,9 @@ module: admin_toolbar_tools: 0 block: 0 breakpoint: 0 + config: 0 + config_filter: 0 + config_ignore: 0 datetime: 0 dblog: 0 dynamic_page_cache: 0