Merge branch 'SLB-455-card-subgrid' into dev

.github/workflows/test.yml

@@ -37,6 +37,16 @@ jobs:
           TURBO_TOKEN: 'local'
           TURBO_TEAM: 'local'
 
+      - name: 'Logs: cms'
+        run: cat /tmp/cms.log || true
+        if: always()
+      - name: 'Logs: website'
+        run: cat /tmp/website.log || true
+        if: always()
+      - name: 'Logs: preview'
+        run: cat /tmp/preview.log || true
+        if: always()
+
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
         if: failure()

.github/workflows/test_without_turbo_cache.yml

@@ -34,6 +34,16 @@ jobs:
           TURBO_TOKEN: 'local'
           TURBO_TEAM: 'local'
 
+      - name: 'Logs: cms'
+        run: cat /tmp/cms.log || true
+        if: always()
+      - name: 'Logs: website'
+        run: cat /tmp/website.log || true
+        if: always()
+      - name: 'Logs: preview'
+        run: cat /tmp/preview.log || true
+        if: always()
+
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
         if: failure()

apps/cms/composer.json

@@ -31,9 +31,6 @@
     "amazeeio/drupal_integrations": "^0.3.7",
     "amazeelabs/default-content": "^1.2.11",
     "amazeelabs/graphql_directives": "^2.4",
-    "amazeelabs/proxy-drupal-core": "^1.1.12",
-    "amazeelabs/proxy-graphql": "^1.1.7",
-    "amazeelabs/proxy-gutenberg": "^1.3",
     "amazeelabs/silverback-cli": "^2.9.13",
     "amazeelabs/silverback_autosave": "^1.1",
     "amazeelabs/silverback_campaign_urls": "^1.0.5",
@@ -55,11 +52,13 @@
     "drupal/config_pages": "^2.14",
     "drupal/core-composer-scaffold": "^10",
     "drupal/core-recommended": "^10",
+    "drupal/default_content": "2.0.0-alpha2",
     "drupal/dropzonejs": "^2.8",
     "drupal/entity_usage": "^2.0@beta",
     "drupal/environment_indicator": "^4.0.14",
     "drupal/field_group": "^3.4",
     "drupal/focal_point": "^2.1",
+    "drupal/graphql": "^4.9",
     "drupal/honeypot": "^2.1.2",
     "drupal/key_auth": "^2.1",
     "drupal/lagoon_logs": "^2.1.1",

apps/cms/scaffold/settings.php.append.txt

@@ -69,3 +69,11 @@ if (getenv('LAGOON_ENVIRONMENT') !== 'prod') {
 // Disable key permissions check for Simple OAuth.
 // https://www.drupal.org/project/simple_oauth/issues/3021054
 $settings['simple_oauth.key_permissions_check'] = FALSE;
+
+// Repeat this declaration, so it is possible to override any setting or service.
+if (file_exists(__DIR__ . '/settings.local.php')) {
+  include __DIR__ . '/settings.local.php';
+}
+if (file_exists(__DIR__ . '/services.local.yml')) {
+  $settings['container_yamls'][] = __DIR__ . '/services.local.yml';
+}

apps/website/package.json

@@ -46,7 +46,7 @@
   "scripts": {
     "test:static": "tsc --noEmit && eslint '**/*.{ts,tsx,js,jsx}' --ignore-path='./.gitignore'",
     "full-rebuild": "pnpm clean && pnpm build:gatsby",
-    "start:drupal": "pnpm run --filter @custom/cms start",
+    "start:drupal": "pnpm run --filter @custom/cms start >> /tmp/cms.log 2>&1",
     "build:drupal": "CLOUDINARY_CLOUDNAME=test pnpm start-test start:drupal 8888 build:gatsby",
     "build:gatsby": "gatsby build",
     "build": "if node has-drupal.mjs; then pnpm build:drupal; else pnpm build:gatsby; fi",

devbox.json

@@ -1,6 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.12.0/.schema/devbox.schema.json",
   "env": {
+    "GATSBY_TELEMETRY_DISABLED": "1",
     "DEVBOX_COREPACK_ENABLED": "true",
     "PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS": "true"
   },