Merge pull request #3801 from vivid-planet/merge-main-into-next

Merge main into next

Author: thomasdax98

.changeset/beige-comics-serve.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin": patch
+---
+
+Optimize responsive behavior of `CrudMoreActionsMenu`

.changeset/gentle-boats-hunt.md

@@ -0,0 +1,5 @@
+---
+"@comet/cms-admin": minor
+---
+
+Adapt styling of `DamTable` to align with Comet DXP design

.changeset/hip-eagles-play.md

@@ -1,6 +1,8 @@
 # node
 NODE_ENV=development
 
+SERVER_HOST=localhost # change me to 0.0.0.0 if you want to access the server from other devices
+
 # project
 PROJECT_NAME=comet-demo
 DEV_DOMAIN_POSTFIX=demo

.env

@@ -83,7 +83,7 @@ Example for a good changeset:
 
 ````md
 ---
-"@comet/cms-site": minor
+"@comet/site-nextjs": minor
 ---
 
 Add `ErrorHandlerProvider`
@@ -110,7 +110,7 @@ The `ErrorHandler` receives the errors in the application and can report them to
 ```tsx
 "use client";
 
-import { ErrorHandlerProvider } from "@comet/cms-site";
+import { ErrorHandlerProvider } from "@comet/site-nextjs";
 import { PropsWithChildren } from "react";
 
 export function ErrorHandler({ children }: PropsWithChildren) {

CONTRIBUTING.md

@@ -5,6 +5,8 @@ const fs = require("fs");
         fs.promises.copyFile("packages/api/cms-api/schema.gql", "packages/admin/cms-admin/schema.gql"),
         fs.promises.copyFile("packages/api/cms-api/block-meta.json", "packages/admin/cms-admin/block-meta.json"),
         fs.promises.copyFile("packages/api/cms-api/block-meta.json", "packages/site/cms-site/block-meta.json"),
+        fs.promises.copyFile("packages/api/cms-api/block-meta.json", "packages/site/site-nextjs/block-meta.json"),
+        fs.promises.copyFile("packages/api/cms-api/block-meta.json", "packages/site/site-react/block-meta.json"),
 
         fs.promises.copyFile("demo/api/block-meta.json", "demo/admin/block-meta.json"),
         fs.promises.copyFile("demo/api/block-meta.json", "demo/site/block-meta.json"),

copy-schema-files.js

@@ -19,7 +19,8 @@
         "lint:tsc": "tsc --project .",
         "preview": "npm run build && vite preview",
         "serve": "node server",
-        "start": "run-s admin-generator intl:compile && run-p gql:types generate-block-types && dotenv -e .env.secrets -e .env.local -e .env -e .env.site-configs -- vite"
+        "start": "$npm_execpath check-node-version && run-s admin-generator intl:compile && run-p gql:types generate-block-types && dotenv -e .env.secrets -e .env.local -e .env -e .env.site-configs -- vite",
+        "check-node-version": "check-node-version --node $(cat ../../.nvmrc)"
     },
     "dependencies": {
         "@apollo/client": "^3.13.4",
@@ -76,6 +77,7 @@
         "@types/react-router": "^5.1.20",
         "@types/react-router-dom": "^5.3.3",
         "@vitejs/plugin-react-swc": "^3.8.1",
+        "check-node-version": "^4.2.1",
         "chokidar-cli": "^3.0.0",
         "cosmiconfig-toml-loader": "^1.0.0",
         "dotenv-cli": "^7.4.4",

demo/admin/package.json

@@ -7,6 +7,7 @@ const { createProxyMiddleware } = require("http-proxy-middleware");
 
 const app = express();
 const port = process.env.APP_PORT ?? 3000;
+const host = process.env.SERVER_HOST ?? "localhost";
 
 let indexFile = fs.readFileSync("./build/index.html", "utf8");
 
@@ -38,6 +39,7 @@ app.use(
 );
 
 app.get("/status/health", (req, res) => {
+    res.setHeader("cache-control", "no-store");
     res.send("OK!");
 });
 
@@ -71,6 +73,6 @@ app.get("*", (req, res) => {
     res.send(indexFile);
 });
 
-app.listen(port, () => {
-    console.log(`Admin app listening at http://localhost:${port}`);
+app.listen(port, host, () => {
+    console.log(`Admin app listening at http://${host}:${port}`);
 });

demo/admin/server/index.js

@@ -75,7 +75,7 @@ export default defineConfig(({ mode }) => {
             adminPackagesHotReloadPlugin,
         ],
         server: {
-            host: true,
+            host: process.env.SERVER_HOST ?? "localhost",
             port: Number(process.env.ADMIN_PORT),
             proxy: process.env.API_URL_INTERNAL
                 ? {

demo/admin/vite.config.mts

@@ -21,7 +21,8 @@
         "lint:tsc": "tsc --project ./tsconfig.lint.json",
         "mikro-orm": "dotenv -e .env.secrets -e .env.local -e .env -e .env.site-configs -- mikro-orm",
         "start": "$npm_execpath prebuild && dotenv -e .env.secrets -e .env.local -e .env -e .env.site-configs -- nest start --debug --watch --preserveWatchOutput",
-        "start:dev": "run-p dev:*",
+        "check-node-version": "check-node-version --node $(cat ../../.nvmrc)",
+        "start:dev": "$npm_execpath check-node-version && run-p dev:*",
         "start:prod": "node dist/main"
     },
     "dependencies": {
@@ -75,6 +76,7 @@
         "@types/inquirer": "^8.2.11",
         "@types/node": "^22.15.21",
         "@types/response-time": "^2.3.8",
+        "check-node-version": "^4.2.1",
         "chokidar-cli": "^3.0.0",
         "dotenv-cli": "^7.4.4",
         "eslint": "^9.22.0",