Merge branch 'main' into dam-download-folders

Author: jomunker

.changeset/config.json

@@ -7,7 +7,7 @@
     "access": "restricted",
     "baseBranch": "main",
     "updateInternalDependencies": "patch",
-    "ignore": ["comet-admin-stories", "comet-demo-api", "comet-demo-admin", "comet-demo-site"],
+    "ignore": ["comet-admin-stories", "comet-demo-api", "comet-demo-admin", "comet-demo-site", "comet-docs"],
     "snapshot": {
         "useCalculatedVersion": true
     }

.changeset/fair-clouds-poke.md

@@ -0,0 +1,5 @@
+---
+"@comet/cms-api": patch
+---
+
+API Generator: Use correct type for `where` when `getFindCondition` service method is not used

.changeset/olive-comics-knock.md

@@ -0,0 +1,36 @@
+---
+"@comet/cms-api": minor
+---
+
+Add access logging to log information about the request to standard output. The log contains information about the requester and the request itself. This can be useful for fulfilling legal requirements regarding data integrity or for forensics.
+
+There are two ways to integrate logging into an application:
+
+**First option: Use the default implementation**
+
+```ts
+imports: [
+    ...
+    AccessLogModule,
+    ...
+]
+```
+
+**Second option: Configure logging**
+
+Use the `shouldLogRequest` to prevent logging for specific requests. For instance, one may filter requests for system users.
+
+```ts
+imports: [
+    ...
+    AccessLogModule.forRoot({
+        shouldLogRequest: ({user, req}) => {
+            // do something
+            return true; //or false
+        },
+    }),
+    ...
+]
+```
+
+More information can be found in the documentation under 'Authentication > Access Logging'.

.changeset/polite-bats-poke.md

@@ -0,0 +1,6 @@
+
+
+
+
+
+- [ ] Add changeset (if necessary)

.github/pull_request_template.md

@@ -7,9 +7,6 @@ on:
             - synchronize
             - reopened
             - closed
-        branches:
-            - main
-            - next
     push:
         branches:
             - main

.github/workflows/lint.yml

@@ -0,0 +1,16 @@
+# Security policy
+
+## Supported versions
+
+The versions of the project that are currently supported with security updates.
+
+| Version | Supported                           |
+| ------: | :---------------------------------- |
+|     5.x | :white_check_mark:                  |
+|     4.x | :white_check_mark:                  |
+|     3.x | :white_check_mark: (until March 24) |
+|   < 3.0 | :x:                                 |
+
+## Reporting a vulnerability
+
+You can report a vulnerability by contacting us via email at [[email protected]](mailto:[email protected]).

SECURITY.md

@@ -1,6 +1,6 @@
 {
     "extends": "@comet/eslint-config/react",
-    "ignorePatterns": ["schema.json", "src/fragmentTypes.json", "src/*.generated.ts", "dist/**"],
+    "ignorePatterns": ["schema.json", "src/fragmentTypes.json", "dist/**", "src/**/*.generated.ts"],
     "rules": {
         "@calm/react-intl/missing-formatted-message": "off"
     }

demo/admin/.eslintrc.json

@@ -3,7 +3,6 @@
 /build
 .npm
 .config
-generated
 /schema.*
 fragmentTypes.json
 lang
@@ -13,4 +12,5 @@ lang-compiled
 graphql.generated.ts
 block-meta.json
 src/blocks.generated.ts
-comet-config.json
+comet-config.json
+src/**/*.generated.ts

demo/admin/.gitignore

@@ -8,7 +8,6 @@ const rootBlocks = Object.keys(schema.getTypeMap()).filter((type) => type.endsWi
 
 const config: CodegenConfig = {
     schema: "schema.gql",
-    documents: ["src/**/*.{ts,tsx}"],
     generates: {
         "./schema.json": {
             plugins: ["introspection"],
@@ -20,12 +19,7 @@ const config: CodegenConfig = {
             plugins: ["fragment-matcher"],
         },
         "./src/graphql.generated.ts": {
-            plugins: [
-                { add: { content: `import { ${rootBlocks.sort().join(", ")} } from "./blocks.generated";` } },
-                "named-operations-object",
-                "typescript",
-                "typescript-operations",
-            ],
+            plugins: [{ add: { content: `import { ${rootBlocks.sort().join(", ")} } from "@src/blocks.generated";` } }, "typescript"],
             config: {
                 avoidOptionals: {
                     field: true,
@@ -36,6 +30,29 @@ const config: CodegenConfig = {
                 typesPrefix: "GQL",
             },
         },
+
+        "./src/": {
+            documents: ["./src/**/!(*.generated).{tsx,ts}"],
+            preset: "near-operation-file",
+            presetConfig: {
+                extension: ".generated.ts",
+                baseTypesPath: "graphql.generated.ts",
+            },
+            config: {
+                avoidOptionals: {
+                    field: true,
+                },
+                enumsAsTypes: true,
+                namingConvention: "keep",
+                scalars: rootBlocks.reduce((scalars, rootBlock) => ({ ...scalars, [rootBlock]: rootBlock }), {}),
+                typesPrefix: "GQL",
+            },
+            plugins: [
+                { add: { content: `import { ${rootBlocks.sort().join(", ")} } from "@src/blocks.generated";` } },
+                "named-operations-object",
+                "typescript-operations",
+            ],
+        },
     },
 };
 

demo/admin/codegen.ts

@@ -0,0 +1,11 @@
+import { CrudGeneratorConfig } from "@comet/cms-admin";
+export default [
+    {
+        target: "src/products/generated",
+        entityName: "Product",
+    },
+    {
+        target: "src/news/generated",
+        entityName: "News",
+    },
+] satisfies CrudGeneratorConfig[];

demo/admin/crud-generator-config.ts

@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+cd "$(dirname "$0")" || exit
+
+rm -rf ./lang/
+mkdir -p ./lang
+
+git clone https://github.com/vivid-planet/comet-demo-lang lang/comet-demo-lang
+git clone https://github.com/vivid-planet/comet-lang.git lang/comet-lang

demo/admin/intl-update.sh

@@ -3,7 +3,8 @@
     "version": "1.0.0",
     "private": true,
     "scripts": {
-        "build": "run-s intl:update intl:compile && run-p gql:types generate-block-types && cross-env BABEL_ENV=production webpack --config ./webpack.config.ts --env production --mode production --progress",
+        "admin-generator": "rimraf 'src/*/generated' && comet-admin-generator generate crud-generator-config.ts",
+        "build": "run-s intl:compile && run-p gql:types generate-block-types && cross-env BABEL_ENV=production webpack --config ./webpack.config.ts --env production --mode production --progress",
         "generate-block-types": "comet generate-block-types --inputs",
         "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"",
         "gql:types": "graphql-codegen",
@@ -13,22 +14,23 @@
         "intl:compile:comet": "formatjs compile-folder --format simple --ast lang/comet-lang lang-compiled/comet-lang",
         "intl:compile:comet-demo": "formatjs compile-folder --format simple --ast lang/comet-demo-lang lang-compiled/comet-demo-lang",
         "intl:extract": "formatjs extract \"src/**/*.ts*\" --ignore ./**.d.ts --out-file lang-extracted/en.json --format simple",
-        "intl:update": "cd ./lang/comet-lang && git pull && cd ../comet-demo-lang && git pull",
-        "lint": "run-s intl:update intl:compile && run-p gql:types generate-block-types && run-p lint:eslint lint:tsc",
+        "lint": "run-s intl:compile && run-p gql:types generate-block-types && run-p lint:eslint lint:tsc && $npm_execpath lint:generated-files-not-modified",
         "lint:eslint": "eslint --max-warnings 0  --config ./.eslintrc.cli.js --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json",
         "lint:tsc": "tsc --project .",
-        "start": "run-s intl:update intl:compile && run-p gql:types generate-block-types && dotenv -- cross-env BABEL_ENV=development webpack serve --config ./webpack.config.ts --mode development"
+        "lint:generated-files-not-modified": "$npm_execpath admin-generator && git diff --exit-code HEAD --",
+        "start": "run-s intl:compile && run-p gql:types generate-block-types && dotenv -- cross-env BABEL_ENV=development webpack serve --config ./webpack.config.ts --mode development"
     },
     "dependencies": {
         "@apollo/client": "^3.7.0",
         "@babel/core": "^7.0.0",
-        "@comet/admin": "workspace:^4.5.0",
-        "@comet/admin-icons": "workspace:^4.5.0",
-        "@comet/admin-react-select": "workspace:^4.5.0",
-        "@comet/admin-rte": "workspace:^4.5.0",
-        "@comet/admin-theme": "workspace:^4.5.0",
-        "@comet/blocks-admin": "workspace:^4.5.0",
-        "@comet/cms-admin": "workspace:^4.5.0",
+        "@comet/admin": "workspace:*",
+        "@comet/admin-date-time": "workspace:*",
+        "@comet/admin-icons": "workspace:*",
+        "@comet/admin-react-select": "workspace:*",
+        "@comet/admin-rte": "workspace:*",
+        "@comet/admin-theme": "workspace:*",
+        "@comet/blocks-admin": "workspace:*",
+        "@comet/cms-admin": "workspace:*",
         "@emotion/react": "^11.9.3",
         "@emotion/styled": "^11.9.3",
         "@fontsource/roboto": "^4.5.5",
@@ -86,8 +88,8 @@
         "zen-observable": "^0.8.0"
     },
     "devDependencies": {
-        "@comet/cli": "workspace:^4.5.0",
-        "@comet/eslint-config": "workspace:^4.5.0",
+        "@comet/cli": "workspace:*",
+        "@comet/eslint-config": "workspace:*",
         "@emotion/babel-plugin": "^11.0.0",
         "@formatjs/cli": "^2.0.0",
         "@gitbeaker/node": "^25.0.0",
@@ -96,6 +98,7 @@
         "@graphql-codegen/fragment-matcher": "^2.0.0",
         "@graphql-codegen/introspection": "^2.0.0",
         "@graphql-codegen/named-operations-object": "^2.0.0",
+        "@graphql-codegen/near-operation-file-preset": "^2.5.0",
         "@graphql-codegen/typescript": "^2.0.0",
         "@graphql-codegen/typescript-operations": "^2.0.0",
         "@ory/hydra-client": "^1.0.0",