Merge remote-tracking branch 'origin/feature/menu-rework' into collap…

…sed-menu

.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/short-donkeys-double.md

@@ -1,6 +1,16 @@
 ---
-"@comet/cms-admin": minor
 "@comet/admin": minor
 ---
 
-Add group section component for usage in menu
+Add `MenuItemGroup` component to group menu items
+
+**Example:**
+
+```tsx
+<MenuItemGroup title="Some item group title">
+    <MenuItemRouterLink primary="Menu item 1" icon={<Settings />} to="/menu-item-1" />
+    <MenuItemRouterLink primary="Menu item 2" icon={<Settings />} to="/menu-item-2" />
+    <MenuItemRouterLink primary="Menu item 3" icon={<Settings />} to="/menu-item-3" />
+    { /* Some more menu items... */ }
+</MenuItemGroup>
+```

.changeset/unlucky-files-compare.md

@@ -0,0 +1,5 @@
+---
+"@comet/eslint-config": major
+---
+
+Enable no-other-module-relative-import rule by default

.changeset/yellow-seahorses-lick.md

@@ -0,0 +1,23 @@
+---
+"@comet/cms-admin": major
+"@comet/cms-api": major
+"@comet/eslint-config": minor
+"@comet/cms-site": minor
+---
+
+Migrate site preview to Next.js Preview Mode
+
+Requires following changes to site:
+
+-   Import `useRouter` from `next/router` (not exported from `@comet/cms-site` anymore)
+-   Import `Link` from `next/link` (not exported from `@comet/cms-site` anymore)
+-   Remove preview pages (pages in `src/pages/preview/` directory which call `createGetUniversalProps` with preview parameters)
+-   Remove `createGetUniversalProps`
+    -   Just implement `getStaticProps`/`getServerSideProps` (Preview Mode will SSR automatically)
+    -   Get `previewData` from `context` and use it to configure the GraphQL Client
+-   Add `SitePreviewProvider` to `App` (typically in `src/pages/_app.tsx`)
+-   Add `/api/preview` Next API route (see demo)
+
+Requires following changes to API:
+
+-   Set `sitePreviewSecret` in `PageTreeModule`-options (make sure it's the same across multiple API-instances)

.env

@@ -64,7 +64,6 @@ SITE_PORT=3000
 SITE_URL=http://localhost:$SITE_PORT
 SITE_PRELOGIN_ENABLED=false
 SITE_PRELOGIN_PASSWORD=password
-PREVIEW_URL=$SITE_URL/preview
 # no gtm in dev mode
 NEXT_PUBLIC_GTM_ID=
 NEXT_PUBLIC_SITE_DOMAIN=main

.github/pull_request_template.md

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

.github/workflows/lint.yml

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

SECURITY.md

@@ -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 [security@vivid-planet.com](mailto:security@vivid-planet.com).

demo/admin/intl-update.sh

@@ -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/package.json

@@ -4,7 +4,7 @@
     "private": true,
     "scripts": {
         "admin-generator": "rimraf 'src/*/generated' && comet-admin-generator generate crud-generator-config.ts",
-        "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",
+        "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",
@@ -14,24 +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 && $npm_execpath lint:generated-files-not-modified",
+        "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 .",
         "lint:generated-files-not-modified": "$npm_execpath admin-generator && git diff --exit-code HEAD --",
-        "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"
+        "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-date-time": "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",
@@ -89,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",

demo/admin/src/App.tsx

@@ -45,7 +45,7 @@ import { ContentScopeIndicator } from "./common/ContentScopeIndicator";
 import { getMessages } from "./lang";
 import { Link } from "./links/Link";
 import { NewsLinkBlock } from "./news/blocks/NewsLinkBlock";
-import News from "./news/News";
+import { NewsPage } from "./news/generated/NewsPage";
 import MainMenu from "./pages/mainMenu/MainMenu";
 import { Page } from "./pages/Page";
 import ProductCategoriesPage from "./products/categories/ProductCategoriesPage";
@@ -170,7 +170,7 @@ class App extends React.Component {
                                                                                     />
                                                                                     <RouteWithErrorBoundary
                                                                                         path={`${match.path}/structured-content/news`}
-                                                                                        component={News}
+                                                                                        component={NewsPage}
                                                                                     />
                                                                                     <RouteWithErrorBoundary
                                                                                         path={`${match.path}/assets`}