Skip to content

Updated to Vortex 1.37.0 #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexSkrypnyk merged 1 commit into from
Mar 14, 2026
Merged

Updated to Vortex 1.37.0 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .ahoy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ commands:
usage: Watch front-end assets during development.
cmd: |
ahoy cli "pkill -9 -f grunt" || true
ahoy cli "cd ${WEBROOT}/themes/custom/${DRUPAL_THEME} && yarn run dist:watch drush cc css-js"
ahoy cli "cd ${WEBROOT}/themes/custom/${DRUPAL_THEME} && yarn run watch"
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Mar 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check what the watch script does in the theme's package.json
fd -t f 'package.json' web/themes/custom --exec cat {} \; | jq -r '.scripts.watch // "NOT DEFINED"'

Repository: drevops/website

Length of output: 70

🏁 Script executed:

#!/bin/bash
# Check actual structure of theme package.json
fd -t f 'package.json' web/themes/custom --exec cat {} \;

Repository: drevops/website

Length of output: 2166

🏁 Script executed:

#!/bin/bash
# Check for watch script in parent/root package.json
fd -t f 'package.json' --max-depth 2 | grep -E '^package.json$|/package.json$' | head -5 | xargs -I {} sh -c 'echo "=== {} ===" && jq -r ".scripts | keys[]" {} 2>/dev/null | grep -i watch'

Repository: drevops/website

Length of output: 81

🏁 Script executed:

#!/bin/bash
# Check git log to see if watch script was recently added or if this is a breaking change
git log --oneline --all -20 -- '**/package.json' web/themes/custom 2>/dev/null | head -10

Repository: drevops/website

Length of output: 472

🏁 Script executed:

#!/bin/bash
# Check recent git diff for .ahoy.yml to understand the context of this change
git diff HEAD~5 -- .ahoy.yml | head -100

Repository: drevops/website

Length of output: 87

🏁 Script executed:

#!/bin/bash
# Check if there's a pending change to package.json that adds watch script
git diff HEAD -- web/themes/custom/package.json | head -50

Repository: drevops/website

Length of output: 41

🏁 Script executed:

#!/bin/bash
# Check the current git status to see uncommitted changes
git status --short | grep -E '\.ahoy\.yml|package\.json'

Repository: drevops/website

Length of output: 41

🏁 Script executed:

#!/bin/bash
# Check if there's a root package.json
[ -f package.json ] && echo "=== Root package.json ===" && jq -r '.scripts | keys[]' package.json 2>/dev/null | grep -i watch

Repository: drevops/website

Length of output: 84

🏁 Script executed:

#!/bin/bash
# List all package.json files in the repo
find . -name "package.json" -type f | head -10

Repository: drevops/website

Length of output: 114

🏁 Script executed:

#!/bin/bash
# Check root package.json for scripts
cat package.json | jq -r '.scripts'

Repository: drevops/website

Length of output: 538

Fix the watch command - yarn run watch script is not defined.

The change from yarn run dist:watch && drush cc css-js to yarn run watch references a non-existent script. The theme's package.json only defines dist:watch (which runs node build.js build watch), not a watch script. This will cause the ahoy command to fail at runtime. Either revert to dist:watch or add the watch script to the theme's package.json.

Additionally, verify whether the removal of drush cc css-js is intentional or if cache clearing is still needed for the development workflow.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.ahoy.yml at line 174, The ahoy command was changed to run a non-existent
npm script ("yarn run watch") causing failures; update the ahoy cli entry that
currently runs `yarn run watch` to either call the existing `dist:watch` script
(i.e., use `yarn run dist:watch`) or add a corresponding "watch" script to the
theme's package.json that delegates to `node build.js build watch`; also confirm
whether the removed `drush cc css-js` cache-clear step should be restored and,
if so, re-add `&& drush cc css-js` after the watch command in the ahoy cli line.


lint:
usage: Lint back-end and front-end code.
Expand Down Expand Up @@ -284,14 +284,14 @@ commands:
confirm:
cmd: |
if [ -z "${AHOY_CONFIRM_RESPONSE}" ]; then
read -r -p ">> $1 [y/N] " AHOY_CONFIRM_RESPONSE
read -r -p "$( echo -e "\033[31m>> $1\033[0m \033[2m[y/N]\033[0m " )" AHOY_CONFIRM_RESPONSE
if [ "${AHOY_CONFIRM_RESPONSE}" != "y" ] && [ "${AHOY_CONFIRM_RESPONSE}" != "true" ]; then
echo "The operation was canceled."
exit 1
fi
else
if [ "${AHOY_CONFIRM_WAIT_SKIP}" != "1" ]; then
echo ">> $1 [y/N] ${AHOY_CONFIRM_RESPONSE}"
echo -e "\033[31m>> $1\033[0m \033[2m[y/N] ${AHOY_CONFIRM_RESPONSE}\033[0m"
echo "Waiting for 3 seconds... Press Ctrl+C to cancel."
sleep 3
fi
Expand Down
4 changes: 2 additions & 2 deletions .docker/clamav.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
# @see https://hub.docker.com/r/uselagoon/commons/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/commons

FROM uselagoon/commons:26.1.0 AS commons
FROM uselagoon/commons:26.2.0 AS commons

FROM clamav/clamav-debian:1.5.1-28
FROM clamav/clamav-debian:1.5.2-32

COPY --from=commons /lagoon /lagoon
COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
Expand Down
2 changes: 1 addition & 1 deletion .docker/cli.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal

FROM uselagoon/php-8.3-cli-drupal:26.1.0
FROM uselagoon/php-8.3-cli-drupal:26.2.0

# Add missing variables.
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
Expand Down
2 changes: 1 addition & 1 deletion .docker/database.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# The ARG value will be updated with a value passed from docker-compose.yml

ARG IMAGE=uselagoon/mysql-8.4:26.1.0
ARG IMAGE=uselagoon/mysql-8.4:26.2.0
# hadolint ignore=DL3006
FROM ${IMAGE}

Expand Down
2 changes: 1 addition & 1 deletion .docker/nginx-drupal.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG CLI_IMAGE
# hadolint ignore=DL3006
FROM ${CLI_IMAGE:-cli} AS cli

FROM uselagoon/nginx-drupal:26.1.0
FROM uselagoon/nginx-drupal:26.2.0

# Webroot is used for Nginx web root configuration.
ARG WEBROOT=web
Expand Down
2 changes: 1 addition & 1 deletion .docker/php.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG CLI_IMAGE
# hadolint ignore=DL3006
FROM ${CLI_IMAGE:-cli} AS cli

FROM uselagoon/php-8.3-fpm:26.1.0
FROM uselagoon/php-8.3-fpm:26.2.0

RUN apk add --no-cache tzdata

Expand Down
2 changes: 1 addition & 1 deletion .docker/solr.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @see https://hub.docker.com/r/uselagoon/solr-9-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/9.Dockerfile

FROM uselagoon/solr-9-drupal:26.1.0
FROM uselagoon/solr-9-drupal:26.2.0

# Solr jump-start config needs to be manually copied from the search_api_solr
# Drupal module to .docker/config/solr/config-set.
Expand Down
Loading
Loading