fix(next-utils): use z.extend() for robust type inference in validateMintelEnv

.env.example

@@ -1,4 +1,5 @@
 # Project
+IMAGE_TAG=v1.7.0
 PROJECT_NAME=sample-website
 PROJECT_COLOR=#82ed20
 

.husky/pre-push

@@ -1,13 +1,16 @@
 
 # Check if we are pushing a tag
-if echo "$*" | grep -q "refs/tags/v"; then
-  echo "🏷️ Tag detected in push, syncing versions..."
-  pnpm sync-versions
-  
-  # Stage the changed package.json files
-  git add "package.json" "packages/*/package.json" "apps/*/package.json"
-  
-  # Amend the tag if it's on the current commit, but this is complex in pre-push.
-  # Better: Just warn the user that they might need to update the tag if package.json changed.
-  echo "⚠️ package.json files updated to match tag. Please ensure these changes are part of your tag/commit."
-fi
+while read local_ref local_sha remote_ref remote_sha
+do
+  if [[ "$remote_ref" == refs/tags/v* ]]; then
+    TAG=${remote_ref#refs/tags/}
+    echo "🏷️ Tag detected: $TAG, syncing versions..."
+    pnpm sync-versions "$TAG"
+    
+    # Stage the changed files
+    git add package.json packages/*/package.json apps/*/package.json .env .env.example
+    
+    echo "⚠️ package.json and .env files updated to match tag $TAG."
+    echo "⚠️ Note: You might need to push again if these changes were not already in your commit/tag."
+  fi
+done

apps/sample-website/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sample-website",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": true,
   "type": "module",
   "scripts": {

docker-compose.yml

@@ -23,7 +23,7 @@ services:
       - "traefik.http.services.sample-website.loadbalancer.server.port=3000"
 
   directus:
-    image: registry.infra.mintel.me/mintel/directus:latest
+    image: registry.infra.mintel.me/mintel/directus:${IMAGE_TAG:-latest}
     restart: always
     networks:
       - infra

package.json

@@ -9,7 +9,7 @@
     "test": "pnpm -r test",
     "changeset": "changeset",
     "version-packages": "changeset version",
-    "sync-versions": "tsx scripts/sync-versions.ts",
+    "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",
@@ -52,7 +52,7 @@
     "pino-pretty": "^13.1.3",
     "require-in-the-middle": "^8.0.1"
   },
-  "version": "1.6.0",
+  "version": "1.7.0",
   "pnpm": {
     "overrides": {
       "next": "16.1.6",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/cli",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/cms-infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/cms-infra",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": true,
   "type": "module",
   "scripts": {

packages/cms-infra/schema/snapshot.yaml

@@ -910,7 +910,7 @@ fields:
       foreign_key_column: null
   - collection: visual_feedback
     field: screenshot
-    type: string
+    type: uuid
     meta:
       collection: visual_feedback
       conditions: null
@@ -1111,6 +1111,24 @@ fields:
       has_auto_increment: false
       foreign_key_table: null
       foreign_key_column: null
+  - collection: visual_feedback_comments
+    field: feedback_id
+    type: integer
+    meta:
+      collection: visual_feedback_comments
+      field: feedback_id
+      interface: select-dropdown-m2o
+      special: null
+      width: full
+      required: true
+    schema:
+      name: feedback_id
+      table: visual_feedback_comments
+      data_type: integer
+      is_nullable: false
+      is_indexed: true
+      foreign_key_table: visual_feedback
+      foreign_key_column: id
 systemFields:
   - collection: directus_activity
     field: timestamp

packages/customer-manager/package.json

@@ -2,7 +2,7 @@
   "name": "customer-manager",
   "description": "Custom High-Fidelity Customer & Company Management for Directus",
   "icon": "supervisor_account",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "keywords": [
     "directus",
     "directus-extension",

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/eslint-config",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/feedback-commander/package.json

@@ -2,7 +2,7 @@
   "name": "@mintel/extension-feedback-commander",
   "description": "Custom High-Fidelity Feedback Management Extension for Directus",
   "icon": "view_kanban",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "keywords": [
     "directus",
     "directus-extension",

packages/gatekeeper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/gatekeeper",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": true,
   "type": "module",
   "scripts": {

packages/husky-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/husky-config",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/infra/docker/docker-compose.template.yml

@@ -53,7 +53,7 @@ services:
       - "traefik.http.services.${PROJECT_NAME}-gatekeeper.loadbalancer.server.port=3000"
 
   directus:
-    image: registry.infra.mintel.me/mintel/directus:latest
+    image: registry.infra.mintel.me/mintel/directus:${IMAGE_TAG:-latest}
     restart: always
     networks:
       - infra

packages/infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/infra",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-config",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-feedback/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-feedback",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-observability/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-observability",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-utils",
-  "version": "1.6.0",
+  "version": "1.7.3",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-utils/src/directus.ts

@@ -12,13 +12,35 @@ export type MintelDirectusClient = DirectusClient<any> &
   AuthenticationClient<any>;
 
 /**
- * Creates a Directus client configured with Mintel standards
+ * Creates a Directus client configured with Mintel standards.
+ * Automatically handles internal vs. external URLs based on environment.
  */
 export function createMintelDirectusClient(url?: string): MintelDirectusClient {
-  const directusUrl =
-    url || process.env.DIRECTUS_URL || "http://localhost:8055";
+  const isServer = typeof window === "undefined";
 
-  return createDirectus(directusUrl).with(rest()).with(authentication());
+  // 1. If an explicit URL is provided, use it.
+  if (url) {
+    return createDirectus(url).with(rest()).with(authentication());
+  }
+
+  // 2. On server: Prioritize INTERNAL_DIRECTUS_URL, fallback to DIRECTUS_URL
+  if (isServer) {
+    const directusUrl =
+      process.env.INTERNAL_DIRECTUS_URL ||
+      process.env.DIRECTUS_URL ||
+      "http://localhost:8055";
+    return createDirectus(directusUrl).with(rest()).with(authentication());
+  }
+
+  // 3. In browser: Use a proxy path if we are on a different origin,
+  // or use the current origin if no DIRECTUS_URL is set.
+  const proxyPath = "/api/directus"; // Standard Mintel proxy path
+  const browserUrl =
+    typeof window !== "undefined"
+      ? `${window.location.origin}${proxyPath}`
+      : proxyPath;
+
+  return createDirectus(browserUrl).with(rest()).with(authentication());
 }
 
 /**

packages/next-utils/src/env.ts

@@ -4,10 +4,17 @@ export const mintelEnvSchema = {
   NODE_ENV: z
     .enum(["development", "production", "test"])
     .default("development"),
-  NEXT_PUBLIC_BASE_URL: z.string().url(),
+  NEXT_PUBLIC_BASE_URL: z.string().url().optional(),
+  NEXT_PUBLIC_TARGET: z
+    .enum(["development", "testing", "staging", "production"])
+    .optional(),
+  TARGET: z
+    .enum(["development", "testing", "staging", "production"])
+    .optional(),
 
   // Analytics (Proxy Pattern)
   UMAMI_WEBSITE_ID: z.string().optional(),
+  NEXT_PUBLIC_UMAMI_WEBSITE_ID: z.string().optional(),
   UMAMI_API_ENDPOINT: z
     .string()
     .url()
@@ -23,6 +30,8 @@ export const mintelEnvSchema = {
   LOG_LEVEL: z
     .enum(["trace", "debug", "info", "warn", "error", "fatal"])
     .default("info"),
+
+  // Mail
   MAIL_HOST: z.string().optional(),
   MAIL_PORT: z.coerce.number().default(587),
   MAIL_USERNAME: z.string().optional(),
@@ -32,13 +41,19 @@ export const mintelEnvSchema = {
     (val) => (typeof val === "string" ? val.split(",").filter(Boolean) : val),
     z.array(z.string()).default([]),
   ),
+
+  // Directus
+  DIRECTUS_URL: z.string().url().default("http://localhost:8055"),
+  DIRECTUS_ADMIN_EMAIL: z.string().optional(),
+  DIRECTUS_ADMIN_PASSWORD: z.string().optional(),
+  DIRECTUS_API_TOKEN: z.string().optional(),
+  INTERNAL_DIRECTUS_URL: z.string().url().optional(),
 };
 
-export function validateMintelEnv(schemaExtension = {}) {
-  const fullSchema = z.object({
-    ...mintelEnvSchema,
-    ...schemaExtension,
-  });
+export function validateMintelEnv<
+  T extends z.ZodRawShape = Record<string, never>,
+>(schemaExtension: T = {} as T) {
+  const fullSchema = z.object(mintelEnvSchema).extend(schemaExtension);
 
   const isBuildTime =
     process.env.NEXT_PHASE === "phase-production-build" ||
@@ -51,7 +66,7 @@ export function validateMintelEnv(schemaExtension = {}) {
       console.warn(
         "⚠️ Some environment variables are missing during build, but skipping strict validation.",
       );
-      // Return partial data to allow build to continue
+      // Return process.env casted to the full schema type to unblock builds
       return process.env as unknown as z.infer<typeof fullSchema>;
     }
 

packages/observability/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/observability",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/tsconfig/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/tsconfig",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

pnpm-workspace.yaml

@@ -1,4 +1,3 @@
 packages:
   - 'packages/*'
   - 'apps/*'
-  - '../klz-2026'

scripts/sync-versions.ts

@@ -4,9 +4,15 @@ import * as path from "path";
 import { execSync } from "child_process";
 
 /**
- * Gets the current version tag from environment or git.
+ * Gets the current version tag from arguments, environment or git.
  */
 function getVersionTag() {
+  // 0. Check arguments (passed from husky hook or manual run)
+  const argTag = process.argv.slice(2).find((arg) => arg.startsWith("v"));
+  if (argTag) {
+    return argTag;
+  }
+
   // 1. Check CI environment variables
   if (
     process.env.GITHUB_REF_NAME &&
@@ -67,20 +73,50 @@ function updatePkg(pkgPath: string) {
   console.log(`✅ Updated ${pkg.name} to ${version}`);
 }
 
+/**
+ * Updates the IMAGE_TAG in .env files.
+ */
+function updateEnv(envPath: string) {
+  if (!fs.existsSync(envPath)) return;
+  let content = fs.readFileSync(envPath, "utf-8");
+
+  if (content.includes("IMAGE_TAG=")) {
+    content = content.replace(/IMAGE_TAG=.*/g, `IMAGE_TAG=${tag}`);
+  } else {
+    // Proactively add it if missing
+    if (content.includes("# Project")) {
+      content = content.replace("# Project", `# Project\nIMAGE_TAG=${tag}`);
+    } else {
+      content = `IMAGE_TAG=${tag}\n${content}`;
+    }
+  }
+
+  fs.writeFileSync(envPath, content);
+  console.log(`✅ Updated IMAGE_TAG in ${envPath} to ${tag}`);
+}
+
 // Update root
 rootPkg.version = version;
 fs.writeFileSync("package.json", JSON.stringify(rootPkg, null, 2) + "\n");
 
 // Update all packages
-const packages = fs.readdirSync(packagesDir);
-for (const p of packages) {
-  updatePkg(path.join(packagesDir, p, "package.json"));
+if (fs.existsSync(packagesDir)) {
+  const packages = fs.readdirSync(packagesDir);
+  for (const p of packages) {
+    updatePkg(path.join(packagesDir, p, "package.json"));
+  }
 }
 
 // Update all apps
-const apps = fs.readdirSync(appsDir);
-for (const a of apps) {
-  updatePkg(path.join(appsDir, a, "package.json"));
+if (fs.existsSync(appsDir)) {
+  const apps = fs.readdirSync(appsDir);
+  for (const a of apps) {
+    updatePkg(path.join(appsDir, a, "package.json"));
+  }
 }
 
+// Update .env files
+updateEnv(".env");
+updateEnv(".env.example");
+
 console.log("✨ All versions synced!");