From 7d5c0333321f007696ffc7b5ba2c3d550d49ea9f Mon Sep 17 00:00:00 2001 From: s j <sj@1729.be> Date: Sat, 12 Aug 2023 07:37:08 +0200 Subject: [PATCH] ref: dependencies to dsr_recommended --- composer.json | 40 ++++++------------------------ patches/webform_views-schema.patch | 16 ------------ 2 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 patches/webform_views-schema.patch diff --git a/composer.json b/composer.json index 5f1676f..a088414 100755 --- a/composer.json +++ b/composer.json @@ -38,23 +38,18 @@ ], "require": { "cweagans/composer-patches": "^1.7", - "wikimedia/composer-merge-plugin": "^2.0", - "drupal/composer_deploy": "^1.6", "drupal/core-composer-scaffold": "^9.2", "drupal/core-recommended": "^9.2", - "drupal/dsr": "^1.0.0", + "drupal/dsr_recommended": "~1.0.0", "drupal/dsr_demo": "^1.0.0", "drupal/dsr_demo_theme": "^1.0.0", - "drupal/dsr_portal": "^1.0.0", "drupal/filecache": "^1.0", - "drupal/monitoring": "^1.9", - "drupal/purge": "^3.0", - "drupal/redis": "^1.2", - "drupal/shareholder_register_bonds": "^1.0", - "drupal/swiftmailer": "^2.0", - "drupal/twig_tweak": "^2.0", - "drupal/varnish_purge": "^2.0", - "drush/drush": "^10.0" + "wikimedia/composer-merge-plugin": "^2.0" + }, + "require-dev": { + "drupal/core-dev": "^9.2", + "drupal/devel": "^5.1", + "phpspec/prophecy-phpunit": "^2.0" }, "conflict": { "drupal/drupal": "*" @@ -67,6 +62,7 @@ }, "extra": { "composer-exit-on-patch-failure": true, + "enable-patching": true, "drupal-scaffold": { "locations": { "web-root": "web/" @@ -103,26 +99,6 @@ "web/modules/contrib/webform/composer.libraries.json", "web/modules/contrib/telephone_international_widget/composer.libraries.json" ] - }, - "patches": { - "drupal/basic": { - "install": "https://www.drupal.org/files/issues/2020-04-23/drush_binstall_is_broken_in_drupal_8.8.x-3130098-7.patch" - }, - "drupal/core": { - "entity_reference_views_exposed_filter": "https://www.drupal.org/files/issues/2021-12-02/2429699-453-9.3.x.patch", - "allow-cim-without-site-uuid": "https://www.drupal.org/files/issues/2020-03-28/3047392-17_0.patch" - }, - "drupal/webform_rrn_nrn": { - "skip-validation-if-empty": "https://www.drupal.org/files/issues/2021-07-02/webform_rrn_nrn-3221857-2.patch" - }, - "drupal/webform_views": { - "webform_views-schema": "patches/webform_views-schema.patch" - } } - }, - "require-dev": { - "drupal/core-dev": "^9.2", - "drupal/devel": "*", - "phpspec/prophecy-phpunit": "^2" } } diff --git a/patches/webform_views-schema.patch b/patches/webform_views-schema.patch deleted file mode 100644 index 115e63a..0000000 --- a/patches/webform_views-schema.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/config/schema/webform_views.schema.yml b/config/schema/webform_views.schema.yml -index 4d5a84d..462f742 100644 ---- a/config/schema/webform_views.schema.yml -+++ b/config/schema/webform_views.schema.yml -@@ -13,6 +13,11 @@ views.field.webform_submission_field: - type: integer - label: 'Delta to use' - -+# Schema definition for webform submission composite field. -+views.field.webform_submission_composite_field: -+ type: views.field.webform_submission_field -+ label: 'Webform submission composite field' -+ - # Schema definition for select filter. - views.filter.webform_submission_select_filter: - type: views.filter.in_operator -- GitLab