Merge pull request #864 from UN-OCHA/develop

D10 deploy

composer.json

@@ -31,15 +31,16 @@
     "drupal/conditional_fields": "^4.0@alpha",
     "drupal/config_filter": "^2.4",
     "drupal/config_split": "^2.0.0-beta4",
-    "drupal/core-composer-scaffold": "^9.5",
-    "drupal/core-project-message": "^9.5",
-    "drupal/core-recommended": "^9.5",
+    "drupal/core-composer-scaffold": "^10",
+    "drupal/core-project-message": "^10",
+    "drupal/core-recommended": "^10",
     "drupal/csp": "^1.16",
+    "drupal/csv_serialization": "^2.0 || ^3.0",
     "drupal/ctools": "^4.0",
     "drupal/date_recur": "^3.0",
     "drupal/date_recur_modular": "^3.0",
     "drupal/diff": "^1.0@RC",
-    "drupal/dynamic_entity_reference": "^1.16",
+    "drupal/dynamic_entity_reference": "^1.16 || ^3.1",
     "drupal/entityqueue": "^1.0",
     "drupal/environment_indicator": "^4.0",
     "drupal/facets": "^2.0",
@@ -49,7 +50,7 @@
     "drupal/file_entity": "^2.0@beta",
     "drupal/flag": "^4.0@alpha",
     "drupal/flexible_permissions": "^1.0@beta",
-    "drupal/geocoder": "^3.20",
+    "drupal/geocoder": "^3.2 || ^4.9",
     "drupal/geofield": "^1.3",
     "drupal/geofield_map": "^2.38",
     "drupal/geophp": "^1.0@beta",
@@ -73,7 +74,7 @@
     "drupal/search_api": "^1.14",
     "drupal/seckit": "^2.0",
     "drupal/select2": "^1.6",
-    "drupal/select_a11y": "^1.0",
+    "drupal/select_a11y": "^1.0 || ^2.0",
     "drupal/select_or_other": "^4.0",
     "drupal/seven": "^1.0",
     "drupal/social_auth_hid": "^3.1",
@@ -91,9 +92,11 @@
     "drupal/viewsreference": "^2.0@beta",
     "drupal/webform": "^6.2@beta",
     "drupal/xmlsitemap": "^1.4",
-    "drush/drush": "^11.0",
+    "drush/drush": "^12",
+    "mglaman/composer-drupal-lenient": "^1.0",
     "npm-asset/select2": "^4.0",
     "oomphinc/composer-installers-extender": "^2.0",
+    "orakili/composer-drupal-info-file-patch-helper": "^1.0",
     "phpoffice/phpspreadsheet": "^1.16",
     "symfony/flex": "^1.17",
     "unocha/common_design": "^8",
@@ -108,17 +111,15 @@
   },
   "require-dev": {
     "drupal/coder": "^8.3",
-    "drupal/console": "~1.0",
-    "drupal/core-dev": "^9.5",
-    "drupal/dev_mode": "^2.3",
-    "drupal/devel": "^5.0.2",
+    "drupal/core-dev": "^10",
+    "drupal/dev_mode": "^2.6",
+    "drupal/devel": "^5.1",
     "drupal/devel_php": "^1.5",
-    "drupal/upgrade_rector": "1.x-dev@dev",
     "kint-php/kint": "^3.3",
     "phpmd/phpmd": "^2.6",
     "phpspec/prophecy-phpunit": "^2",
     "slevomat/coding-standard": "^7.0",
-    "weitzman/drupal-test-traits": "^1.5",
+    "weitzman/drupal-test-traits": "^2.1",
     "weitzman/logintrait": "^1.1"
   },
   "conflict": {
@@ -138,10 +139,20 @@
       "drupal/console-extend-plugin": true,
       "oomphinc/composer-installers-extender": true,
       "symfony/flex": true,
-      "wikimedia/composer-merge-plugin": true
+      "wikimedia/composer-merge-plugin": true,
+      "mglaman/composer-drupal-lenient": true,
+      "orakili/composer-drupal-info-file-patch-helper": true,
+      "phpstan/extension-installer": true
     }
   },
   "extra": {
+    "drupal-lenient": {
+        "constraint": "^10",
+        "allowed-list": [
+            "drupal/maintenance200",
+            "drupal/theme_switcher"
+        ]
+    },
     "drush": {
       "services": {
         "drush.services.yml": "^10"