fix(drupal): require druxt 1.2.2 and lift the decoupled_router hold

CHANGELOG.md

@@ -26,7 +26,7 @@ minor is for.
 ### Breaking changes
 
 - Drupal 9 to **Drupal 11.4.5**, with the Druxt ecosystem modules on
-  their D11-compatible releases (druxt 1.2.1, decoupled_router 2.0.6,
+  their D11-compatible releases (druxt 1.2.2, decoupled_router 2.0.7,
   simple_oauth 6.x, jsonapi_menu_items, jsonapi_views).
 - The Gitpod and CircleCI configuration is gone, replaced by a dev
   container and GitHub Actions / GitLab CI.
@@ -147,15 +147,20 @@ minor is for.
 
 ### Dependencies
 
-- `drupal/decoupled_router` is held below 2.0.7. That release gave
+- `drupal/druxt` `^1.2.2` and `drupal/decoupled_router` `^2.0`, locked at
+  1.2.2 and 2.0.7. decoupled_router 2.0.7 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)).
+  type, and druxt 1.2.1 declared its three subscribers without one, so
+  the container failed to rebuild: `drush cr` aborted, Drupal kept
+  serving from the old container, and druxt's subscribers were silently
+  absent. druxt 1.2.2 carries the fix
+  ([#3618675](https://www.drupal.org/i/3618675)), so the hold below
+  2.0.7 is gone, and `^1.2.2` rather than `^1.2` stops Composer putting
+  1.2.1 next to 2.0.7 again.
+- The local `ViewsPathTranslatorSubscriber` patch is dropped: both fixes
+  it carried shipped in druxt 1.2.2
+  ([#3558380](https://www.drupal.org/i/3558380),
+  [#3618677](https://www.drupal.org/i/3618677)).
 - 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,

drupal/composer.json

@@ -20,8 +20,8 @@
         "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/decoupled_router": "^2.0",
+        "drupal/druxt": "^1.2.2",
         "drupal/simple_oauth": "^6",
         "drush/drush": "^13",
         "vlucas/phpdotenv": "^5.5"
@@ -108,11 +108,6 @@
                 "  * Remove the plugin that prints this message:",
                 "      composer remove drupal/core-project-message"
             ]
-        },
-        "patches": {
-            "drupal/druxt": {
-                "Fix ViewsPathTranslatorSubscriber crash on views with no JSON:API route": "patches/druxt-views-path-translator-route-name.patch"
-            }
         }
     }
 }

drupal/patches.lock.json

@@ -1,17 +1,4 @@
 {
-    "_hash": "391b5a33d2407054254ca78e1904fad9298d7c202cdb6ae1fabe017568d593cf",
-    "patches": {
-        "drupal/druxt": [
-            {
-                "package": "drupal/druxt",
-                "description": "Fix ViewsPathTranslatorSubscriber crash on views with no JSON:API route",
-                "url": "patches/druxt-views-path-translator-route-name.patch",
-                "sha256": "fd5654d5cdcea769f3be061dd0e74e9fdf03af960b929959b8d806dbad147077",
-                "depth": 1,
-                "extra": {
-                    "provenance": "root"
-                }
-            }
-        ]
-    }
+    "_hash": "6142bfcb78f54dfbf5247ae5e463f25bdb8fff1890806e2e45aa81a59c211653",
+    "patches": []
 }