[Conflicts] Merge main into next

.cspellignore

@@ -32,3 +32,5 @@ formatjs
 cspellignore
 graphiql
 bitnamilegacy
+usehooks
+valkey

.env

@@ -62,7 +62,6 @@ SITE_PORT=3000
 SITE_URL=http://${DEV_DOMAIN:-localhost}:${SITE_PORT}
 # no gtm in dev mode
 NEXT_PUBLIC_GTM_ID=
-NEXT_PUBLIC_SITE_URL=$SITE_URL
 NEXT_PUBLIC_API_URL=$API_URL
 API_BASIC_AUTH_SYSTEM_USER_PASSWORD=$BASIC_AUTH_SYSTEM_USER_PASSWORD
 
@@ -71,10 +70,10 @@ JAEGER_UI_PORT=16686
 JAEGER_OLTP_PORT=4318
 TRACING_ENABLED=1
 
-REDIS_ENABLED=false # activate redis service in docker-compose.yml if set to true
-REDIS_PORT=6379
-REDIS_HOST=localhost
-REDIS_PASSWORD=vivid
+VALKEY_ENABLED=false # activate valkey service in docker-compose.yml if set to true
+VALKEY_PORT=6379
+VALKEY_HOST=localhost
+VALKEY_PASSWORD=vivid
 
 SITE_PREVIEW_SECRET=5b67e073dbc2434e
 

.github/workflows/test.yml

@@ -49,7 +49,7 @@ jobs:
         run: npm run test:ci
 
       - name: Upload test results
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: test-results

.gitignore

@@ -8,3 +8,6 @@ node_modules
 .env.secrets
 .env.site-configs
 coverage
+
+.agents/skills
+.claude/skills

AGENTS.md

@@ -2,6 +2,16 @@
 
 This file provides guidance to AI agents (Copilot, Cursor, Claude) when working with code in this repository.
 
+## Keeping This File Up to Date
+
+When making changes that affect project structure, commands, architecture, ports, conventions, or configuration, update the relevant section of this file to reflect the new state. This includes:
+
+- Adding or removing packages/services
+- Changing commands or scripts
+- Introducing new patterns or conventions
+- Modifying ports, environment files, or Docker services
+- Updating tooling or linting configuration
+
 ## Project Overview
 
 This is a monorepo containing a Comet DXP project. It contains three main packages:
@@ -12,16 +22,19 @@ This is a monorepo containing a Comet DXP project. It contains three main packag
 
 ## Common Commands
 
+**Important:** Always use the correct Node version before executing any npm command or ./install.sh. Run `nvm use` in the project root to do so.
+
 ### Setup
 
 ```bash
 ./install.sh                     # Full installation
 ```
 
+Use `./install.sh` instead of `npm install` whenever you add, remove, or update dependencies in any `package.json` file.
+
 ### Development
 
 ```bash
-nvm use                          # Use Node version from .nvmrc
 npm run dev                      # Start all services via dev-pm
 npx dev-pm status                # Show service status
 npx dev-pm logs <service>        # Tail service logs
@@ -149,3 +162,14 @@ Component-based with GraphQL mutations/queries co-located
 ### Site Structure
 
 Next.js App Router conventions with pages in `app/`
+
+## References
+
+This project is derived from the [Comet Starter](https://github.com/vivid-planet/comet-starter) repo and may have diverged over time. When implementing or refactoring features, consult the starter for current best-practice patterns. The repo follows the same `api/`, `admin/`, `site/` structure, so equivalent files can be found at matching paths.
+
+To browse the starter repo, use the GitHub API:
+
+- List a directory: `https://api.github.com/repos/vivid-planet/comet-starter/contents/{path}`
+- Fetch a file: `https://raw.githubusercontent.com/vivid-planet/comet-starter/main/{path}`
+
+Comet DXP documentation is available at https://docs.comet-dxp.com/docs/ - search for relevant pages with `site:docs.comet-dxp.com {topic}`.

admin/eslint.config.mjs

@@ -1,19 +1,17 @@
 import eslintConfigReact from "@comet/eslint-config/react.js";
 import cspellPlugin from "@cspell/eslint-plugin";
 import cspellRecommended from "@cspell/eslint-plugin/recommended";
+import { defineConfig, globalIgnores } from "eslint/config";
 
-/** @type {import("eslint")} */
-const config = [
-    {
-        ignores: ["schema.json", "src/fragmentTypes.json", "dist/**", "src/**/*.generated.ts", "src/**/generated/**"],
-    },
+const config = defineConfig([
+    globalIgnores(["schema.json", "src/fragmentTypes.json", "dist/**", "src/**/*.generated.ts", "src/**/generated/**", "block-meta.json", "**/package-lock.json", "lang/**", "lang-compiled/**", "lang-extracted/**"]),
     ...eslintConfigReact,
     {
         plugins: {
             "@cspell": cspellPlugin,
         },
         ...cspellRecommended,
     },
-];
+]);
 
 export default config;