Skip to content

Commit aeb593b

Browse files
committed
chore: fix docs drupal and tests
1 parent 1be8f96 commit aeb593b

5 files changed

Lines changed: 13 additions & 11 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292

9393
test_e2e:
9494
machine:
95-
image: ubuntu-2204:edge
95+
image: ubuntu-2204:current
9696
working_directory: ~/repo
9797
environment:
9898
DDEV_NONINTERACTIVE: "true"

docs/drupal/composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@
6666
"web/themes/custom/{$name}": ["type:drupal-custom-theme"]
6767
},
6868
"patches": {
69-
"drupal/druxt": {
70-
"https://www.drupal.org/project/druxt/issues/3273228": "https://git.drupalcode.org/project/druxt/-/merge_requests/9.diff"
71-
},
7269
"drupal/decoupled_router": {
73-
"https://www.drupal.org/project/decoupled_router/issues/3111456": "https://git.drupalcode.org/project/decoupled_router/-/merge_requests/11.diff"
70+
"https://www.drupal.org/project/decoupled_router/issues/3172926": "https://www.drupal.org/files/issues/2020-09-24/3172926-2.patch",
71+
"https://www.drupal.org/project/decoupled_router/issues/3468825": "https://git.drupalcode.org/project/decoupled_router/-/merge_requests/20.diff"
72+
},
73+
"drupal/druxt": {
74+
"#3315030 - Add a wildcard route translator": "https://git.drupalcode.org/project/druxt/-/merge_requests/11.diff",
75+
"https://www.drupal.org/project/druxt/issues/3467742": "https://git.drupalcode.org/project/druxt/-/merge_requests/14.diff"
7476
},
7577
"drupal/jsonapi_menu_items": {
7678
"https://www.drupal.org/project/jsonapi_menu_items/issues/3192576": "https://www.drupal.org/files/issues/2023-02-10/3192576-18.patch"

docs/drupal/composer.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/router/src/components/DruxtRouter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default {
6767
const result = await store.dispatch('druxtRouter/get', route.fullPath)
6868
6969
// Process redirect.
70-
if (result.redirect) {
70+
if (result?.redirect) {
7171
redirect(result.redirect)
7272
}
7373
},

packages/router/src/router.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@ class DruxtRouter {
186186
* @returns {boolean|string} The redirect path or false.
187187
*/
188188
getRedirect (path, route = {}) {
189-
const prefix = (route.props || {}).langcode || ''
189+
const prefix = route.props?.langcode || ''
190190

191191
// Redirect to route provided redirect.
192-
if (((route.redirect || [])[0] || {}).to) {
192+
if (route.redirect?.[0]?.to) {
193193
return route.redirect[0].to
194194
}
195195
const url = Url(path)

0 commit comments

Comments
 (0)