Update to COMET v7.5.0

vivid-planet · Oct 29, 2024 · 6e514e8 · 6e514e8
1 parent 40ba7d3
commit 6e514e8
Show file tree

Hide file tree

Showing 10 changed files with 245 additions and 181 deletions.
diff --git a/.changeset/fast-weeks-remember.md b/.changeset/fast-weeks-remember.md
@@ -6,5 +6,5 @@ Make this package compatible with [COMET v7](https://docs.comet-dxp.com/docs/mig
 
 **Breaking Changes**:
 
--   Now requires >= v7.2.1 for `@comet` packages
+-   Now requires >= v7.5.0 for `@comet` packages
 -   Now requires >= 5.9.8 for `@mikro-orm` packages (except `@mikro-orm/nestjs` where >= 5.2.3 is required)
diff --git a/demo/admin/package.json b/demo/admin/package.json
@@ -25,13 +25,13 @@
     "dependencies": {
         "@apollo/client": "^3.2.5",
         "@babel/core": "^7.0.0",
-        "@comet/admin": "^7.2.1",
-        "@comet/admin-icons": "^7.2.1",
-        "@comet/admin-rte": "^7.2.1",
-        "@comet/admin-theme": "^7.2.1",
-        "@comet/blocks-admin": "^7.2.1",
+        "@comet/admin": "^7.5.0",
+        "@comet/admin-icons": "^7.5.0",
+        "@comet/admin-rte": "^7.5.0",
+        "@comet/admin-theme": "^7.5.0",
+        "@comet/blocks-admin": "^7.5.0",
         "@comet/brevo-admin": "workspace:*",
-        "@comet/cms-admin": "^7.2.1",
+        "@comet/cms-admin": "^7.5.0",
         "@emotion/react": "^11.9.3",
         "@emotion/styled": "^11.9.3",
         "@fontsource-variable/roboto-flex": "^5.0.14",
@@ -62,8 +62,8 @@
         "react-router-dom": "^5.1.2"
     },
     "devDependencies": {
-        "@comet/cli": "^7.2.1",
-        "@comet/eslint-config": "^7.2.1",
+        "@comet/cli": "^7.5.0",
+        "@comet/eslint-config": "^7.5.0",
         "@emotion/babel-plugin": "^11.0.0",
         "@formatjs/cli": "^3.0.1",
         "@gitbeaker/node": "^35.6.0",

diff --git a/demo/api/block-meta.json b/demo/api/block-meta.json
@@ -38,6 +38,11 @@
                             "name": "fileUrl",
                             "kind": "String",
                             "nullable": false
+                        },
+                        {
+                            "name": "size",
+                            "kind": "Number",
+                            "nullable": false
                         }
                     ]
                 },
@@ -1474,6 +1479,65 @@
             }
         ]
     },
+    {
+        "name": "VimeoVideo",
+        "fields": [
+            {
+                "name": "autoplay",
+                "kind": "Boolean",
+                "nullable": true
+            },
+            {
+                "name": "showControls",
+                "kind": "Boolean",
+                "nullable": true
+            },
+            {
+                "name": "loop",
+                "kind": "Boolean",
+                "nullable": true
+            },
+            {
+                "name": "previewImage",
+                "kind": "Block",
+                "block": "PixelImage",
+                "nullable": false
+            },
+            {
+                "name": "vimeoIdentifier",
+                "kind": "String",
+                "nullable": true
+            }
+        ],
+        "inputFields": [
+            {
+                "name": "autoplay",
+                "kind": "Boolean",
+                "nullable": true
+            },
+            {
+                "name": "showControls",
+                "kind": "Boolean",
+                "nullable": true
+            },
+            {
+                "name": "loop",
+                "kind": "Boolean",
+                "nullable": true
+            },
+            {
+                "name": "previewImage",
+                "kind": "Block",
+                "block": "PixelImage",
+                "nullable": false
+            },
+            {
+                "name": "vimeoIdentifier",
+                "kind": "String",
+                "nullable": true
+            }
+        ]
+    },
     {
         "name": "YouTubeVideo",
         "fields": [

diff --git a/demo/api/package.json b/demo/api/package.json
@@ -49,9 +49,9 @@
         }
     },
     "dependencies": {
-        "@comet/blocks-api": "^7.2.1",
+        "@comet/blocks-api": "^7.5.0",
         "@comet/brevo-api": "workspace:*",
-        "@comet/cms-api": "^7.2.1",
+        "@comet/cms-api": "^7.5.0",
         "@faker-js/faker": "^8.3.1",
         "@hapi/accept": "^5.0.0",
         "@kubernetes/client-node": "^0.18.0",
@@ -99,7 +99,7 @@
         "webpack": "^5.64.2"
     },
     "devDependencies": {
-        "@comet/eslint-config": "^7.2.1",
+        "@comet/eslint-config": "^7.5.0",
         "@nestjs/cli": "^9.0.0",
         "@nestjs/schematics": "^9.0.0",
         "@nestjs/testing": "^9.0.0",

diff --git a/demo/api/schema.gql b/demo/api/schema.gql
@@ -43,6 +43,23 @@ A date-time string at UTC, such as 2019-12-03T09:54:33Z, compliant with the date
 """
 scalar DateTime
 
+type Dependency {
+  rootId: String!
+  rootGraphqlObjectType: String!
+  rootColumnName: String!
+  jsonPath: String!
+  visible: Boolean!
+  targetGraphqlObjectType: String!
+  targetId: String!
+  name: String
+  secondaryInformation: String
+}
+
+type PaginatedDependencies {
+  nodes: [Dependency!]!
+  totalCount: Int!
+}
+
 type ImageCropArea {
   focalPoint: FocalPoint!
   width: Float
@@ -90,23 +107,6 @@ enum LicenseType {
   RIGHTS_MANAGED
 }
 
-type Dependency {
-  rootId: String!
-  rootGraphqlObjectType: String!
-  rootColumnName: String!
-  jsonPath: String!
-  visible: Boolean!
-  targetGraphqlObjectType: String!
-  targetId: String!
-  name: String
-  secondaryInformation: String
-}
-
-type PaginatedDependencies {
-  nodes: [Dependency!]!
-  totalCount: Int!
-}
-
 type BuildTemplate {
   id: ID!
   name: String!
@@ -515,7 +515,7 @@ type Query {
   pageTreeNode(id: ID!): PageTreeNode
   pageTreeNodeByPath(path: String!, scope: PageTreeNodeScopeInput!): PageTreeNode
   pageTreeNodeList(scope: PageTreeNodeScopeInput!, category: String): [PageTreeNode!]!
-  paginatedPageTreeNodes(scope: PageTreeNodeScopeInput!, category: String, sort: [PageTreeNodeSort!], offset: Int! = 0, limit: Int! = 25): PaginatedPageTreeNodes!
+  paginatedPageTreeNodes(scope: PageTreeNodeScopeInput!, category: String, sort: [PageTreeNodeSort!], documentType: String, offset: Int! = 0, limit: Int! = 25): PaginatedPageTreeNodes!
   pageTreeNodeSlugAvailable(scope: PageTreeNodeScopeInput!, parentId: ID, slug: String!): SlugAvailability!
   redirects(scope: RedirectScopeInput! = {}, query: String, type: RedirectGenerationType, active: Boolean, sortColumnName: String, sortDirection: SortDirection! = ASC): [Redirect!]! @deprecated(reason: "Use paginatedRedirects instead. Will be removed in the next version.")
   paginatedRedirects(scope: RedirectScopeInput! = {}, search: String, filter: RedirectFilter, sort: [RedirectSort!], offset: Int! = 0, limit: Int! = 25): PaginatedRedirects!

diff --git a/demo/campaign/package.json b/demo/campaign/package.json
@@ -19,7 +19,7 @@
         "copy-schema-files": "node copy-schema-files.js"
     },
     "dependencies": {
-        "@comet/cms-site": "^7.2.1",
+        "@comet/cms-site": "^7.5.0",
         "@faire/mjml-react": "^3.3.0",
         "@luma-team/mjml-react": "^0.2.1",
         "@next/bundle-analyzer": "^12.3.4",
@@ -48,8 +48,8 @@
     },
     "devDependencies": {
         "@babel/core": "^7.16.0",
-        "@comet/cli": "^7.2.1",
-        "@comet/eslint-config": "^7.2.1",
+        "@comet/cli": "^7.5.0",
+        "@comet/eslint-config": "^7.5.0",
         "@formatjs/cli": "^4.2.33",
         "@gitbeaker/node": "^35.6.0",
         "@graphql-codegen/add": "^3.0.0",

diff --git a/demo/site/package.json b/demo/site/package.json
@@ -25,7 +25,7 @@
         "copy-schema-files": "node copy-schema-files.js"
     },
     "dependencies": {
-        "@comet/cms-site": "^7.2.1",
+        "@comet/cms-site": "^7.5.0",
         "@next/bundle-analyzer": "^12.3.4",
         "@opentelemetry/api": "^1.7.0",
         "@opentelemetry/auto-instrumentations-node": "^0.40.0",
@@ -49,8 +49,8 @@
     },
     "devDependencies": {
         "@babel/core": "^7.16.0",
-        "@comet/cli": "^7.2.1",
-        "@comet/eslint-config": "^7.2.1",
+        "@comet/cli": "^7.5.0",
+        "@comet/eslint-config": "^7.5.0",
         "@formatjs/cli": "^4.2.33",
         "@gitbeaker/node": "^35.6.0",
         "@graphql-codegen/add": "^3.0.0",

diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -37,13 +37,13 @@
         "@apollo/client": "^3.2.5",
         "@babel/cli": "^7.17.6",
         "@babel/core": "^7.20.12",
-        "@comet/admin": "^7.2.1",
-        "@comet/admin-babel-preset": "^7.2.1",
-        "@comet/admin-date-time": "^7.2.1",
-        "@comet/admin-icons": "^7.2.1",
-        "@comet/blocks-admin": "^7.2.1",
-        "@comet/cms-admin": "^7.2.1",
-        "@comet/eslint-config": "^7.2.1",
+        "@comet/admin": "^7.5.0",
+        "@comet/admin-babel-preset": "^7.5.0",
+        "@comet/admin-date-time": "^7.5.0",
+        "@comet/admin-icons": "^7.5.0",
+        "@comet/blocks-admin": "^7.5.0",
+        "@comet/cms-admin": "^7.5.0",
+        "@comet/eslint-config": "^7.5.0",
         "@emotion/react": "^11.9.3",
         "@emotion/styled": "^11.9.3",
         "@graphql-codegen/cli": "^2.0.0",
@@ -75,11 +75,11 @@
     },
     "peerDependencies": {
         "@apollo/client": "^3.2.5",
-        "@comet/admin": "^7.2.1",
-        "@comet/admin-date-time": "^7.2.1",
-        "@comet/admin-icons": "^7.2.1",
-        "@comet/blocks-admin": "^7.2.1",
-        "@comet/cms-admin": "^7.2.1",
+        "@comet/admin": "^7.5.0",
+        "@comet/admin-date-time": "^7.5.0",
+        "@comet/admin-icons": "^7.5.0",
+        "@comet/blocks-admin": "^7.5.0",
+        "@comet/cms-admin": "^7.5.0",
         "@emotion/react": "^11.9.3",
         "@emotion/styled": "^11.9.3",
         "@mui/icons-material": "^5.8.4",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -36,9 +36,9 @@
         "node-fetch": "^2.6.1"
     },
     "devDependencies": {
-        "@comet/blocks-api": "^7.2.1",
-        "@comet/cms-api": "^7.2.1",
-        "@comet/eslint-config": "^7.2.1",
+        "@comet/blocks-api": "^7.5.0",
+        "@comet/cms-api": "^7.5.0",
+        "@comet/eslint-config": "^7.5.0",
         "@kubernetes/client-node": "^0.18.0",
         "@mikro-orm/cli": "^5.9.8",
         "@mikro-orm/core": "^5.9.8",
@@ -75,8 +75,8 @@
         "uuid": "^8.3.2"
     },
     "peerDependencies": {
-        "@comet/blocks-api": "^7.2.1",
-        "@comet/cms-api": "^7.2.1",
+        "@comet/blocks-api": "^7.5.0",
+        "@comet/cms-api": "^7.5.0",
         "@mikro-orm/cli": "^5.9.8",
         "@mikro-orm/core": "^5.9.8",
         "@mikro-orm/migrations": "^5.9.8",