fix: cms sync

.husky/pre-push

@@ -1,5 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
 
 # Check if we are pushing a tag
 if echo "$*" | grep -q "refs/tags/v"; then

apps/sample-website/eslint.config.mjs

@@ -1,3 +0,0 @@
-import { nextConfig } from "@mintel/eslint-config/next";
-
-export default nextConfig;

apps/sample-website/package.json

@@ -8,15 +8,9 @@
     "dev:local": "mintel dev --local",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint",
+    "lint": "eslint src/",
     "typecheck": "tsc --noEmit",
     "test": "vitest run --passWithNoTests",
-    "cms:bootstrap": "mintel directus bootstrap",
-    "cms:push:testing": "mintel directus sync push testing",
-    "cms:pull:testing": "mintel directus sync pull testing",
-    "cms:push:staging": "mintel directus sync push staging",
-    "cms:pull:staging": "mintel directus sync pull staging",
-    "cms:push:prod": "mintel directus sync push production",
     "cms:pull:prod": "mintel directus sync pull production",
     "pagespeed:test": "mintel pagespeed"
   },
@@ -24,8 +18,8 @@
     "@mintel/next-utils": "workspace:*",
     "@mintel/observability": "workspace:*",
     "@mintel/next-observability": "workspace:*",
-    "@sentry/nextjs": "^8.55.0",
-    "next": "15.1.6",
+    "@sentry/nextjs": "10.38.0",
+    "next": "16.1.6",
     "next-intl": "^4.8.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"

directus/schema/snapshot.yaml

@@ -0,0 +1,19 @@
+version: 1
+directus: 11.15.1
+vendor: postgres
+collections: []
+fields: []
+systemFields:
+  - collection: directus_activity
+    field: timestamp
+    schema:
+      is_indexed: true
+  - collection: directus_revisions
+    field: activity
+    schema:
+      is_indexed: true
+  - collection: directus_revisions
+    field: parent
+    schema:
+      is_indexed: true
+relations: []

docker-compose.yml

@@ -1,17 +1,18 @@
 services:
   app:
     build:
-      context: .
+      context: ./apps/sample-website
       dockerfile: Dockerfile
       args:
         NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL:-http://localhost:3000}
         NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${NEXT_PUBLIC_UMAMI_WEBSITE_ID}
         NEXT_PUBLIC_UMAMI_SCRIPT_URL: ${NEXT_PUBLIC_UMAMI_SCRIPT_URL}
         NEXT_PUBLIC_TARGET: ${TARGET:-development}
-      DIRECTUS_URL: ${DIRECTUS_URL:-http://directus:8055}
     restart: always
     networks:
       - infra
+    environment:
+      - DIRECTUS_URL=${DIRECTUS_URL:-http://directus:8055}
     env_file:
       - .env
     ports:
@@ -46,6 +47,7 @@ services:
     volumes:
       - ./directus/uploads:/directus/uploads
       - ./directus/extensions:/directus/extensions
+      - ./directus/schema:/directus/schema
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.sample-website-directus.rule=Host(`${DIRECTUS_HOST:-cms.sample-website.localhost}`)"

eslint.config.js

@@ -8,6 +8,10 @@ export default [
       "packages/customer-manager/index.js",
       "**/*.db",
       "**/build/**",
+      "**/data/**",
+      "**/reference/**",
+      "**/dist/**",
+      "**/.next/**",
     ],
   },
   ...baseConfig,

package.json

@@ -5,11 +5,17 @@
   "scripts": {
     "build": "pnpm -r build",
     "dev": "pnpm -r dev",
-    "lint": "pnpm -r lint",
+    "lint": "pnpm -r --filter='./packages/**' --filter='./apps/**' lint",
     "test": "pnpm -r test",
     "changeset": "changeset",
     "version-packages": "changeset version",
     "sync-versions": "tsx scripts/sync-versions.ts",
+    "cms:push:infra": "./scripts/sync-directus.sh push infra",
+    "cms:pull:infra": "./scripts/sync-directus.sh pull infra",
+    "cms:schema:snapshot": "./scripts/cms-snapshot.sh",
+    "cms:schema:snapshot:infra": "./scripts/cms-snapshot.sh infra",
+    "cms:schema:apply": "./scripts/cms-apply.sh",
+    "dev:infra": "docker-compose up -d directus directus-db",
     "release": "pnpm build && changeset publish",
     "release:tag": "pnpm build && pnpm -r publish --no-git-checks --access public",
     "prepare": "husky"
@@ -46,5 +52,11 @@
     "pino-pretty": "^13.1.3",
     "require-in-the-middle": "^8.0.1"
   },
-  "version": "1.6.0"
+  "version": "1.6.0",
+  "pnpm": {
+    "overrides": {
+      "next": "16.1.6",
+      "@sentry/nextjs": "10.38.0"
+    }
+  }
 }

packages/gatekeeper/src/app/api/verify/route.ts

@@ -44,7 +44,7 @@ export async function GET(req: NextRequest) {
 
       return response;
     }
-  } catch (e) {
+  } catch (_e) {
     // URL parsing failed, proceed with normal logic
   }
 
@@ -61,7 +61,7 @@ export async function GET(req: NextRequest) {
           isAuthenticated = true;
           identity = payload.identity;
         }
-      } catch (e) {
+      } catch (_e) {
         // Fallback or old format
       }
     }

packages/gatekeeper/src/app/api/whoami/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { cookies } from "next/headers";
 
-export async function GET(req: NextRequest) {
+export async function GET(_req: NextRequest) {
   const cookieStore = await cookies();
   const authCookieName =
     process.env.AUTH_COOKIE_NAME || "mintel_gatekeeper_session";
@@ -17,7 +17,7 @@ export async function GET(req: NextRequest) {
     const payload = JSON.parse(session.value);
     identity = payload.identity || "Guest";
     company = payload.company || null;
-  } catch (e) {
+  } catch (_e) {
     // Old format probably just the password
   }
 

packages/next-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-config",
-  "version": "1.6.1",
+  "version": "1.6.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "next-intl": "^4.8.2",
-    "@sentry/nextjs": "^8.0.0"
+    "@sentry/nextjs": "^10.38.0",
+    "next": "16.1.6"
   }
 }

packages/next-observability/package.json

@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@mintel/observability": "workspace:*",
-    "@sentry/nextjs": "^8.55.0",
+    "@sentry/nextjs": "^10.38.0",
     "next": "16.1.6"
   },
   "peerDependencies": {

scripts/cms-apply.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+ENV=$1
+REMOTE_HOST="root@infra.mintel.me"
+REMOTE_DIR="/opt/infra/directus"
+
+if [ -z "$ENV" ]; then
+    echo "Usage: ./scripts/cms-apply.sh [local|infra]"
+    exit 1
+fi
+
+case $ENV in
+  local)
+    CONTAINER=$(docker compose ps -q directus)
+    if [ -z "$CONTAINER" ]; then
+        echo "❌ Local directus container not found."
+        exit 1
+    fi
+    echo "🚀 Applying schema locally..."
+    docker exec "$CONTAINER" npx directus schema apply /directus/schema/snapshot.yaml --yes
+    ;;
+  infra)
+    PROJECT_NAME="directus"
+    
+    echo "📤 Uploading snapshot to $ENV..."
+    # Ensure remote directory exists
+    ssh "$REMOTE_HOST" "mkdir -p $REMOTE_DIR/directus/schema"
+    scp ./directus/schema/snapshot.yaml "$REMOTE_HOST:$REMOTE_DIR/directus/schema/snapshot.yaml"
+    
+    echo "🔍 Detecting remote container..."
+    REMOTE_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus")
+    
+    if [ -z "$REMOTE_CONTAINER" ]; then
+        echo "❌ Remote container for $ENV not found."
+        exit 1
+    fi
+    
+    echo "🚀 Applying schema to $ENV..."
+    ssh "$REMOTE_HOST" "docker exec $REMOTE_CONTAINER npx directus schema apply /directus/schema/snapshot.yaml --yes"
+    
+    echo "🔄 Restarting Directus to clear cache..."
+    ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME restart directus"
+    ;;
+  *)
+    echo "❌ Invalid environment: $ENV. Only 'local' and 'infra' are supported."
+    exit 1
+    ;;
+esac
+
+echo "✨ Schema apply complete!"

scripts/cms-snapshot.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Configuration
+PROJECT="directus"
+SCHEMA_PATH="./directus/schema/snapshot.yaml"
+CMD_PREFIX=""
+
+if [ "$1" == "infra" ]; then
+    PROJECT="infra-cms"
+    SCHEMA_PATH="./packages/cms-infra/schema/snapshot.yaml"
+    CMD_PREFIX="docker-compose -f packages/cms-infra/docker-compose.yml"
+else
+    CMD_PREFIX="docker compose"
+fi
+
+# Detect local container
+LOCAL_CONTAINER=$($CMD_PREFIX ps -q $PROJECT)
+
+if [ -z "$LOCAL_CONTAINER" ]; then
+    echo "❌ Local $PROJECT container not found. Is it running?"
+    exit 1
+fi
+
+echo "📸 Creating schema snapshot for $PROJECT..."
+# Note: we save it to the mounted volume path inside the container
+docker exec "$LOCAL_CONTAINER" npx directus schema snapshot -y /directus/schema/snapshot.yaml
+
+echo "✅ Snapshot saved to $SCHEMA_PATH"

scripts/sync-directus.sh

@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# Configuration
+REMOTE_HOST="root@infra.mintel.me"
+REMOTE_DIR="/opt/infra/directus"
+
+# DB Details (matching docker-compose defaults)
+DB_USER="directus"
+DB_NAME="directus"
+
+ACTION=$1
+ENV=$2
+
+# Help
+if [ -z "$ACTION" ] || [ -z "$ENV" ]; then
+    echo "Usage: ./scripts/sync-directus.sh [push|pull] [infra|testing|staging|production]"
+    echo ""
+    echo "Commands:"
+    echo "  push   Sync LOCAL data -> REMOTE"
+    echo "  pull   Sync REMOTE data -> LOCAL"
+    echo ""
+    echo "Environments:"
+    echo "  infra (infra.mintel.me)"
+    exit 1
+fi
+
+# Map Environment
+case $ENV in
+  infra)
+    PROJECT_NAME="directus"
+    ;;
+  *)
+    echo "❌ Invalid environment: $ENV. Only 'infra' is currently configured for monorepo sync."
+    exit 1
+    ;;
+esac
+
+# Detect local containers
+echo "🔍 Detecting local database..."
+LOCAL_DB_CONTAINER=$(docker compose ps -q directus-db)
+if [ -z "$LOCAL_DB_CONTAINER" ]; then
+    echo "❌ Local directus-db container not found. Is it running? (npm run dev)"
+    exit 1
+fi
+
+if [ "$ACTION" == "push" ]; then
+    echo "🚀 Pushing Local Data to $ENV..."
+    
+    # 1. DB Dump
+    echo "📦 Dumping local database..."
+    docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$DB_USER" --clean --if-exists --no-owner --no-privileges "$DB_NAME" > dump.sql
+    
+    # 2. Upload Dump
+    echo "📤 Uploading dump to remote server..."
+    scp dump.sql "$REMOTE_HOST:$REMOTE_DIR/dump.sql"
+    
+    # 3. Restore on Remote
+    echo "🔄 Restoring dump on $ENV..."
+    REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-postgres")
+
+    if [ -z "$REMOTE_DB_CONTAINER" ]; then
+        echo "❌ Remote $ENV-db container not found!"
+        exit 1
+    fi
+
+    # Wipe remote DB clean before restore to avoid constraint errors
+    echo "🧹 Wiping remote database schema..."
+    ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'"
+    
+    echo "⚡ Restoring database..."
+    ssh "$REMOTE_HOST" "docker exec -i $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME < $REMOTE_DIR/dump.sql"
+    
+    # 4. Sync Uploads
+    echo "📁 Syncing uploads (Local -> $ENV)..."
+    rsync -avz --progress ./directus/uploads/ "$REMOTE_HOST:$REMOTE_DIR/uploads/"
+    
+    # Clean up
+    rm dump.sql
+    ssh "$REMOTE_HOST" "rm $REMOTE_DIR/dump.sql"
+    
+    # 5. Restart Directus to trigger migrations and refresh schema cache
+    echo "🔄 Restarting remote Directus to apply migrations..."
+    ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME restart directus"
+    
+    echo "✨ Push to $ENV complete!"
+
+elif [ "$ACTION" == "pull" ]; then
+    echo "📥 Pulling $ENV Data to Local..."
+    
+    # 1. DB Dump on Remote
+    echo "📦 Dumping remote database ($ENV)..."
+    REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-postgres")
+
+    if [ -z "$REMOTE_DB_CONTAINER" ]; then
+        echo "❌ Remote $ENV-db container not found!"
+        exit 1
+    fi
+    ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $DB_USER --clean --if-exists --no-owner --no-privileges $DB_NAME > $REMOTE_DIR/dump.sql"
+    
+    # 2. Download Dump
+    echo "📥 Downloading dump..."
+    scp "$REMOTE_HOST:$REMOTE_DIR/dump.sql" dump.sql
+    
+    # Wipe local DB clean before restore to avoid constraint errors
+    echo "🧹 Wiping local database schema..."
+    docker exec "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'
+    
+    echo "⚡ Restoring database locally..."
+    docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" < dump.sql
+    
+    # 4. Sync Uploads
+    echo "📁 Syncing uploads ($ENV -> Local)..."
+    rsync -avz --progress "$REMOTE_HOST:$REMOTE_DIR/uploads/" ./directus/uploads/
+    
+    # Clean up
+    rm dump.sql
+    ssh "$REMOTE_HOST" "rm $REMOTE_DIR/dump.sql"
+    
+    echo "✨ Pull to Local complete!"
+else
+    echo "Invalid action: $ACTION. Use push or pull."
+    exit 1
+fi