Skip to content

Commit 8a1ba81

Browse files
authored
fix(drupal): hold decoupled_router below 2.0.7 (#160)
1 parent 8280619 commit 8a1ba81

3 files changed

Lines changed: 43 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,15 @@ minor is for.
134134

135135
### Dependencies
136136

137+
- `drupal/decoupled_router` is held below 2.0.7. That release gave
138+
`RouterPathTranslatorSubscriber::onPathTranslation()` a `: void` return
139+
type, and druxt 1.2.1 declares its three subscribers without one, so
140+
the container fails to rebuild: `drush cr` aborts, Drupal keeps serving
141+
from the old container, and druxt's subscribers are silently absent.
142+
Nothing here required decoupled_router directly, so only the lock stood
143+
between an update and a broken site. The constraint comes off when
144+
druxt releases a version carrying the fix
145+
([#3618675](https://www.drupal.org/i/3618675)).
137146
- GitHub Actions on v7: `actions/checkout`, `actions/setup-node`,
138147
`actions/upload-artifact` and `codecov/codecov-action`.
139148
- Nuxt dependencies: core-js 3.50.0, dotenv 17, Cypress 15,

drupal/composer.json

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"drupal/core-composer-scaffold": "~11",
2121
"drupal/core-project-message": "~11",
2222
"drupal/core-recommended": "~11",
23+
"drupal/decoupled_router": "^2.0 <2.0.7",
2324
"drupal/druxt": "^1.2",
2425
"drupal/simple_oauth": "^6",
2526
"drush/drush": "^13",
@@ -59,26 +60,46 @@
5960
}
6061
},
6162
"installer-paths": {
62-
"web/core": ["type:drupal-core"],
63-
"web/libraries/{$name}": ["type:drupal-library"],
64-
"web/modules/contrib/{$name}": ["type:drupal-module"],
65-
"web/profiles/contrib/{$name}": ["type:drupal-profile"],
66-
"web/themes/contrib/{$name}": ["type:drupal-theme"],
67-
"drush/Commands/contrib/{$name}": ["type:drupal-drush"],
68-
"web/modules/custom/{$name}": ["type:drupal-custom-module"],
69-
"web/profiles/custom/{$name}": ["type:drupal-custom-profile"],
70-
"web/themes/custom/{$name}": ["type:drupal-custom-theme"]
63+
"web/core": [
64+
"type:drupal-core"
65+
],
66+
"web/libraries/{$name}": [
67+
"type:drupal-library"
68+
],
69+
"web/modules/contrib/{$name}": [
70+
"type:drupal-module"
71+
],
72+
"web/profiles/contrib/{$name}": [
73+
"type:drupal-profile"
74+
],
75+
"web/themes/contrib/{$name}": [
76+
"type:drupal-theme"
77+
],
78+
"drush/Commands/contrib/{$name}": [
79+
"type:drupal-drush"
80+
],
81+
"web/modules/custom/{$name}": [
82+
"type:drupal-custom-module"
83+
],
84+
"web/profiles/custom/{$name}": [
85+
"type:drupal-custom-profile"
86+
],
87+
"web/themes/custom/{$name}": [
88+
"type:drupal-custom-theme"
89+
]
7190
},
7291
"drupal-core-project-message": {
73-
"include-keys": ["homepage", "support"],
92+
"include-keys": [
93+
"homepage",
94+
"support"
95+
],
7496
"post-create-project-cmd-message": [
7597
"<bg=blue;fg=white> </>",
76-
"<bg=blue;fg=white> Congratulations, you’ve installed the Drupal codebase </>",
98+
"<bg=blue;fg=white> Congratulations, you\u2019ve installed the Drupal codebase </>",
7799
"<bg=blue;fg=white> from the drupal/recommended-project template! </>",
78100
"<bg=blue;fg=white> </>",
79101
"",
80102
"<bg=yellow;fg=black>Next steps</>:",
81-
82103
" * Install the site: https://www.drupal.org/docs/8/install",
83104
" * Read the user guide: https://www.drupal.org/docs/user_guide/en/index.html",
84105
" * Get support: https://www.drupal.org/support",

drupal/composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)