t2

.ahoy.yml

@@ -145,21 +145,15 @@ commands:
 
   fei:
     usage: Install front-end assets.
-    cmd: ahoy cli "npm --prefix ${DREVOPS_WEBROOT}/themes/custom/${DRUPAL_THEME} install"
+    cmd: |
+      [ "${CIVICTHEME_LIBRARY_INSTALL_SKIP}" != "1" ] && ahoy cli "npm --prefix web/themes/contrib/${DRUPAL_THEME}/civictheme_library install"
+      ahoy cli "npm --prefix web/themes/contrib/${DRUPAL_THEME} install"
 
   fe:
     usage: Build front-end assets.
-    cmd: ahoy cli "cd ${DREVOPS_WEBROOT}/themes/custom/${DRUPAL_THEME} && npm run build"
-
-  fed:
-    usage: Build front-end assets for development.
-    cmd: ahoy cli "cd ${DREVOPS_WEBROOT}/themes/custom/${DRUPAL_THEME} && npm run build-dev"
-
-  few:
-    usage: Watch front-end assets during development.
     cmd: |
-      ahoy cli "pkill -9 -f grunt" || true
-      ahoy cli "cd ${DREVOPS_WEBROOT}/themes/custom/${DRUPAL_THEME} && npm run watch"
+      [ "${CIVICTHEME_LIBRARY_INSTALL_SKIP}" != "1" ] && ahoy cli "cd web/themes/contrib/${DRUPAL_THEME}/civictheme_library && npm run build"
+      ahoy cli "cd web/themes/contrib/${DRUPAL_THEME} && npm run build"
 
   lint:
     usage: Lint back-end and front-end code.
@@ -178,6 +172,12 @@ commands:
       ahoy cli vendor/bin/twigcs
       ahoy cli "npm run --prefix \${DREVOPS_WEBROOT}/themes/custom/\${DRUPAL_THEME} lint"
 
+  lint-config:
+    usage: Lint config
+    cmd: |
+      ahoy cli ./scripts/lint-theme-config.sh
+      ahoy cli "./vendor/bin/drush inspect_config civictheme.settings --detail --only-error"
+
   test:
     usage: Run all tests.
     cmd: ahoy test-unit && ahoy test-kernel && ahoy test-functional && ahoy test-bdd
@@ -198,6 +198,10 @@ commands:
     usage: Run BDD tests.
     cmd: ahoy cli php -d memory_limit=-1 vendor/bin/behat --colors "$@"
 
+  test-bats:
+    usage: Run Bats tests (host only).
+    cmd: ./scripts/test-tooling.sh
+
   debug:
     usage: Enable PHP Xdebug.
     cmd: ahoy cli php -v | grep -q Xdebug || XDEBUG_ENABLE=true ahoy up cli php nginx && ahoy cli php -v | grep -q Xdebug && echo "Enabled debug configuration. Use 'ahoy up' to disable."

docker-compose.yml

@@ -36,7 +36,7 @@ x-user: &default-user
 x-environment: &default-environment
   TZ: ${DREVOPS_TZ:-Australia/Melbourne}
   # Local development URL.
-  DREVOPS_LOCALDEV_URL: &default-url ${DREVOPS_LOCALDEV_URL:-${COMPOSE_PROJECT_NAME:-example-site}.docker.amazee.io}
+  DREVOPS_LOCALDEV_URL: &default-url ${COMPOSE_PROJECT_NAME:-example-site}.docker.amazee.io
   # Local development route used in Lagoon images and Pygmy to route requests.
   LAGOON_ROUTE: *default-url
   # Local database host (not used in production).