From d5970471613e7fcb1d0fabbb59711dffb3adfa5e Mon Sep 17 00:00:00 2001
From: Stuart Clark <stu@rtclark.net>
Date: Sun, 23 Aug 2026 20:31:06 +0000
Subject: [PATCH] fix(drupal): hold decoupled_router below 2.0.7

---
 CHANGELOG.md         |  9 +++++++++
 drupal/composer.json | 45 ++++++++++++++++++++++++++++++++------------
 drupal/composer.lock |  2 +-
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec3a704..3b44c1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,15 @@ minor is for.
 
 ### Dependencies
 
+- `drupal/decoupled_router` is held below 2.0.7. That release gave
+  `RouterPathTranslatorSubscriber::onPathTranslation()` a `: void` return
+  type, and druxt 1.2.1 declares its three subscribers without one, so
+  the container fails to rebuild: `drush cr` aborts, Drupal keeps serving
+  from the old container, and druxt's subscribers are silently absent.
+  Nothing here required decoupled_router directly, so only the lock stood
+  between an update and a broken site. The constraint comes off when
+  druxt releases a version carrying the fix
+  ([#3618675](https://www.drupal.org/i/3618675)).
 - GitHub Actions on v7: `actions/checkout`, `actions/setup-node`,
   `actions/upload-artifact` and `codecov/codecov-action`.
 - Nuxt dependencies: core-js 3.50.0, dotenv 17, Cypress 15,
diff --git a/drupal/composer.json b/drupal/composer.json
index 55ac9ea..ae46004 100644
--- a/drupal/composer.json
+++ b/drupal/composer.json
@@ -20,6 +20,7 @@
         "drupal/core-composer-scaffold": "~11",
         "drupal/core-project-message": "~11",
         "drupal/core-recommended": "~11",
+        "drupal/decoupled_router": "^2.0 <2.0.7",
         "drupal/druxt": "^1.2",
         "drupal/simple_oauth": "^6",
         "drush/drush": "^13",
@@ -59,26 +60,46 @@
             }
         },
         "installer-paths": {
-            "web/core": ["type:drupal-core"],
-            "web/libraries/{$name}": ["type:drupal-library"],
-            "web/modules/contrib/{$name}": ["type:drupal-module"],
-            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
-            "web/themes/contrib/{$name}": ["type:drupal-theme"],
-            "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
-            "web/modules/custom/{$name}": ["type:drupal-custom-module"],
-            "web/profiles/custom/{$name}": ["type:drupal-custom-profile"],
-            "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
+            "web/core": [
+                "type:drupal-core"
+            ],
+            "web/libraries/{$name}": [
+                "type:drupal-library"
+            ],
+            "web/modules/contrib/{$name}": [
+                "type:drupal-module"
+            ],
+            "web/profiles/contrib/{$name}": [
+                "type:drupal-profile"
+            ],
+            "web/themes/contrib/{$name}": [
+                "type:drupal-theme"
+            ],
+            "drush/Commands/contrib/{$name}": [
+                "type:drupal-drush"
+            ],
+            "web/modules/custom/{$name}": [
+                "type:drupal-custom-module"
+            ],
+            "web/profiles/custom/{$name}": [
+                "type:drupal-custom-profile"
+            ],
+            "web/themes/custom/{$name}": [
+                "type:drupal-custom-theme"
+            ]
         },
         "drupal-core-project-message": {
-            "include-keys": ["homepage", "support"],
+            "include-keys": [
+                "homepage",
+                "support"
+            ],
             "post-create-project-cmd-message": [
                 "<bg=blue;fg=white>                                                         </>",
-                "<bg=blue;fg=white>  Congratulations, you’ve installed the Drupal codebase  </>",
+                "<bg=blue;fg=white>  Congratulations, you\u2019ve installed the Drupal codebase  </>",
                 "<bg=blue;fg=white>  from the drupal/recommended-project template!          </>",
                 "<bg=blue;fg=white>                                                         </>",
                 "",
                 "<bg=yellow;fg=black>Next steps</>:",
-
                 "  * Install the site: https://www.drupal.org/docs/8/install",
                 "  * Read the user guide: https://www.drupal.org/docs/user_guide/en/index.html",
                 "  * Get support: https://www.drupal.org/support",
diff --git a/drupal/composer.lock b/drupal/composer.lock
index 0785d16..a39c339 100644
--- a/drupal/composer.lock
+++ b/drupal/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": "9ad0d9677aeafb1d99d2eef32572cce6",
+    "content-hash": "b3421cbdcfecc946cc0ca6023d068677",
     "packages": [
         {
             "name": "asm89/stack-cors",